diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2012-01-25 16:33:25 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-01-26 15:28:40 +0100 |
| commit | 20196b4e7c7de25c1863e7919d205d0352616c56 (patch) | |
| tree | 3a52a5360974f97dfda1f2ce4e687faf75c1f41d | |
| parent | c82d91e040b7716141cd87d1c774e01ca2e1593e (diff) | |
fdo#43869 use the old rtf importer for paste
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat@free.fr>
Signed-off-by: Lubos Lunak <l.lunak@suse.cz>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 5378d07f3bf2..2fc6756bb71f 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -34,6 +34,7 @@ #include <tools/stream.hxx> #include <svl/itemiter.hxx> #include <svtools/rtftoken.h> +#include <svtools/miscopt.hxx> #include <svl/intitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/ulspitem.hxx> @@ -161,6 +162,11 @@ sal_uLong SwRTFReader::Read( SwDoc &rDoc, const String& /*rBaseURL*/, SwPaM& /*r extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF() { + // Use the old rtf importer by default for paste, till the new one supports + // undo stack and PaM. + SvtMiscOptions aMiscOptions; + if (!aMiscOptions.IsExperimentalMode()) + return new RtfReader(); return new SwRTFReader(); } |