diff options
| author | Aaron Bockover <abock@microsoft.com> | 2019-08-20 22:59:12 +0300 |
|---|---|---|
| committer | Aaron Bockover <abock@microsoft.com> | 2019-08-20 22:59:12 +0300 |
| commit | eff583c97f3bd789e99d7ec90646782d2cca115d (patch) | |
| tree | 1c50a3f8e232524cfe5c65632910b7483acc90ff | |
| parent | bf08f61283c38940a96fab59bfaa6e74f255207c (diff) | |
Sync with vs-editor-core@8d85b0cb
3 files changed, 4 insertions, 3 deletions
diff --git a/src/Editor/Text/Impl/StandaloneUndo/UndoTransactionImpl.cs b/src/Editor/Text/Impl/StandaloneUndo/UndoTransactionImpl.cs index 7bc7db8..41d9b4a 100644 --- a/src/Editor/Text/Impl/StandaloneUndo/UndoTransactionImpl.cs +++ b/src/Editor/Text/Impl/StandaloneUndo/UndoTransactionImpl.cs @@ -135,6 +135,7 @@ namespace Microsoft.VisualStudio.Text.Operations.Standalone // now we need to pump these primitives into the parent, if the parent exists. FlattenPrimitivesToParent(); + Dispose(); } /// <summary> @@ -184,6 +185,7 @@ namespace Microsoft.VisualStudio.Text.Operations.Standalone this.primitives.Clear(); this.state = UndoTransactionState.Canceled; + Dispose(); } /// <summary> diff --git a/src/FPF/PresentationCore/System.Windows.DataFormats.cs b/src/FPF/PresentationCore/System.Windows.DataFormats.cs index a997a38..3ca9ae2 100644 --- a/src/FPF/PresentationCore/System.Windows.DataFormats.cs +++ b/src/FPF/PresentationCore/System.Windows.DataFormats.cs @@ -7,6 +7,7 @@ namespace System.Windows public static readonly string Rtf = "public.rtf"; public static readonly string Html = "public.html"; public static readonly string CommaSeparatedValue = "public.utf8-tab-separated-values-text"; + public static readonly string FileDrop = ""; internal static string ConvertToDataFormats(TextDataFormat textDataformat) { diff --git a/src/FPF/PresentationCore/System.Windows.Media.ImageSource.cs b/src/FPF/PresentationCore/System.Windows.Media.ImageSource.cs index a35f459..6db3b26 100644 --- a/src/FPF/PresentationCore/System.Windows.Media.ImageSource.cs +++ b/src/FPF/PresentationCore/System.Windows.Media.ImageSource.cs @@ -2,9 +2,7 @@ namespace System.Windows.Media { public abstract class ImageSource : System.Windows.Media.Animation.Animatable { - public abstract System.Double Height { get; } public abstract System.Double Width { get; } - - } + } }
\ No newline at end of file |