From ed654c4aa7f9f10fcb16127349009bc0c38b12e8 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 30 Nov 2012 17:37:08 +0100 Subject: [PATCH] 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. --- sw/source/filter/rtf/swparrtf.cxx | 6 ------ 1 file changed, 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 #include #include -#include #include #include #include @@ -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(); }