sw/source/filter/rtf/swparrtf.cxx | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit 85fb62b9103428ee83e5b9f9ef7bdcb736e04ff9 Author: Miklos Vajna <vmik...@frugalware.org> Date: Wed Jan 25 16:33:25 2012 +0100 fdo#43869 use the old rtf importer for paste Signed-off-by: Cédric Bosdonnat <cedric.bosdon...@free.fr> diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 5378d07..2fc6756 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(); }
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits