Skip to content

Commit ad30dcd

Browse files
authored
Fix DataObject SetData methods inaccordance to previous implementation (#10732)
* Fix DataObject SetData methods inaccordance to previous implementation * Address review comments
1 parent 32eaee9 commit ad30dcd

File tree

1 file changed

+17
-3
lines changed
  • src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows

1 file changed

+17
-3
lines changed

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,19 +225,33 @@ private bool TryGetDataInternal<T>(
225225
/// <summary>
226226
/// Stores the specified data and its associated format in this instance.
227227
/// </summary>
228-
public void SetData(string format, object? data) => _innerData.SetData(format, data);
228+
public void SetData(string format, object? data)
229+
{
230+
ArgumentNullException.ThrowIfNull(data);
231+
232+
_innerData.SetData(format, data);
233+
}
229234

230235
/// <summary>
231236
/// Stores the specified data and its associated class type in this instance.
232237
/// </summary>
233-
public void SetData(Type format, object? data) => _innerData.SetData(format, data);
238+
public void SetData(Type format, object? data)
239+
{
240+
ArgumentNullException.ThrowIfNull(data);
241+
242+
_innerData.SetData(format, data);
243+
}
234244

235245
/// <summary>
236246
/// Stores the specified data and its associated format in this instance, using the automatic conversion parameter
237247
/// to specify whether the data can be converted to another format.
238248
/// </summary>
239-
public void SetData(string format, object? data, bool autoConvert) =>
249+
public void SetData(string format, object? data, bool autoConvert)
250+
{
251+
ArgumentNullException.ThrowIfNull(data);
252+
240253
_innerData.SetData(format, autoConvert, data);
254+
}
241255

242256
// WinForms and WPF have these defined in a different order.
243257
void IDataObjectInternal.SetData(string format, bool autoConvert, object? data) => SetData(format, data, autoConvert);

0 commit comments

Comments
 (0)