diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-06 14:52:02 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-06 16:13:43 +0200 |
| commit | 7fc2cafbba36db25e7d0083cea162d2df08611b5 (patch) | |
| tree | 4211c8afe1725ad00f236c98db0969297645fcbe /sw | |
| parent | 6fcabbd6199869753fd6a266f23901962a77f556 (diff) | |
tdf#136740: reimplement the fix using existing m_bIsNewDoc
This reimplements the fix from commit d7c4d0d4ea83481693af3645a03b03b53e456f60.
The unit test from commit a90a324aa590a94a4091fbfadea67e0b0203767c still passes.
Change-Id: I84c61fa68b9bee679a8e82ef7b8f164297bacb5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113665
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index bf552656356d..6466f17af9c2 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -32,7 +32,6 @@ #include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> -#include <comphelper/SetFlagContextHelper.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/string.hxx> #include <o3tl/deleter.hxx> @@ -2163,11 +2162,6 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, rSh.SetChgLnk( Link<LinkParamNone*,void>() ); const SwPosition& rInsPos = *rSh.GetCursor()->Start(); - - // Reader might need to know if we are pasting into an existing document, or initializing - // a new document; e.g. initializing document setting could be skipped when pasting. - css::uno::ContextLayer layer(comphelper::NewFlagContext("InPasteFromClipboard")); - SwReader aReader(*pStream, OUString(), OUString(), *rSh.GetCursor()); rSh.SaveTableBoxContent( &rInsPos ); |