diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-18 13:30:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-08-18 13:30:18 +0200 |
| commit | 2cce29a36d857b8e0bdf139bc1823681ae23c08c (patch) | |
| tree | f6e754cb0ba195b23813794d8ec3adde8a308d22 /sw | |
| parent | fedb09d74c69a9525d2117689abd04cc6140db9e (diff) | |
| parent | 13c00ce322e78eb4e0f50ab84ded19cd6aae1ded (diff) | |
Merge remote-tracking branch 'feature/gsoc2011_rtfimport'
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/core/filters-test.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index e9d2e4ac5633..c9616ec4be98 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -171,12 +171,6 @@ void FiltersTest::testCVEs() recursiveScan(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Staroffice XML (Writer)")), m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data/xml/fail")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CXML")), false); - recursiveScan(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rich Text Format")), m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data/rtf/pass")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RTF")), true); - - recursiveScan(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rich Text Format")), m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data/rtf/fail")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RTF")), false); - - recursiveScan(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rich Text Format")), m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data/rtf/indeterminate")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RTF")), indeterminate); - recursiveScan(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MS Word 97")), m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data/ww8/pass")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CWW8")), true); recursiveScan(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MS Word 97")), m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data/ww8/fail")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CWW8")), false); diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 60e5d46e4502..9fe62ed49e33 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -103,7 +103,6 @@ #include <svx/xflclit.hxx> #include <svx/xlnwtit.hxx> #include <svx/svdoutl.hxx> -#include <svtools/miscopt.hxx> #include <unotools/streamwrap.hxx> #include <comphelper/processfactory.hxx> #include <editeng/outlobj.hxx> @@ -163,10 +162,7 @@ sal_uLong SwRTFReader::Read( SwDoc &rDoc, const String& /*rBaseURL*/, SwPaM& /*r extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF() { - SvtMiscOptions aMiscOptions; - if (aMiscOptions.IsExperimentalMode()) - return new SwRTFReader(); - return new RtfReader(); + return new SwRTFReader(); } // Aufruf fuer die allg. Reader-Schnittstelle |