diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-11-30 17:37:08 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-11-30 17:41:58 +0100 |
commit | ed654c4aa7f9f10fcb16127349009bc0c38b12e8 (patch) | |
tree | 02d0d7a7b182e93af996a7edbc43dfe67bcc3f48 /sw/source | |
parent | 1b7d7f8e2f78de0b685ea6b43e4379ff067d9097 (diff) |
Revert "fdo#43869 use the old rtf importer for paste"
This reverts commit bb147bbb801b53dba8928340df7e2aa2d4545349. It's no
longer needed, now the new importer supports importing to an existing
document.
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 8f5a55430d39..13216ca96723 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -26,7 +26,6 @@ #include <tools/helpers.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> @@ -223,11 +222,6 @@ sal_uLong SwRTFReader::Read( SwDoc &rDoc, const String& /*rBaseURL*/, SwPaM& rPa 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(); } |