diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-05 19:19:44 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-04-06 22:52:17 +0200 |
| commit | 6d9d8c5a1abaf4ce2672406e2c04d68da5bb2cf7 (patch) | |
| tree | c0c2c8eb475b506f9d87aae52621035b0c48f593 /writerfilter | |
| parent | 6494b99f09a29c22d51fb898423ced36ce02a9e7 (diff) | |
tdf#136740: Do not initialize document settings when pasting
When pasting from clipboard, the document already has the defaults
set, and pasted text must not change those defaults.
When pasting RTF, RTFDocumentImpl::outputSettingsTable does the document
settings initialization, and is called from RTFDocumentImpl::checkFirstRun
when m_bFirstRun is true. Other defaults are set in the latter function,
too.
This makes m_bFirstRun false when RTFDocumentImpl is created in the context
of a paste operation. Alternatively, checking the context could be made
when deciding if to apply specific settings.
Change-Id: Ide1eabbef1d04a4fa2f1ca14846b8e404f2a0cb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113613
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit d7c4d0d4ea83481693af3645a03b03b53e456f60)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113634
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9977306b90f0..3cc89508c71c 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <filter/msfilter/util.hxx> #include <filter/msfilter/rtfutil.hxx> +#include <comphelper/SetFlagContextHelper.hxx> #include <comphelper/string.hxx> #include <tools/diagnose_ex.h> #include <tools/globname.hxx> @@ -266,7 +267,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x , m_pMapperStream(nullptr) , m_aDefaultState(this) , m_bSkipUnknown(false) - , m_bFirstRun(true) + , m_bFirstRun(!comphelper::IsContextFlagActive("InPasteFromClipboard")) , m_bFirstRunException(false) , m_bNeedPap(true) , m_bNeedCr(false) |