sw/qa/extras/rtfimport/data/fdo85889-mac.rtf | 3 -- sw/qa/extras/rtfimport/data/fdo85889-pc.rtf | 3 -- sw/qa/extras/rtfimport/data/fdo85889-pca.rtf | 3 -- sw/qa/extras/rtfimport/rtfimport.cxx | 26 ------------------------- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 12 ----------- 5 files changed, 47 deletions(-)
New commits: commit 10d94280e7d23615f1bfe952fd0cf3be861f3618 Author: Andras Timar <[email protected]> Date: Mon Nov 24 13:27:13 2014 +0100 Revert "fdo#85889 handle pc, pca and mac rtf keywords in writerfilter" This reverts commit 31ef2b6396e2ebec10f84f21dfdee645690f5e62. diff --git a/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf b/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf deleted file mode 100644 index 8056d47..0000000 --- a/sw/qa/extras/rtfimport/data/fdo85889-mac.rtf +++ /dev/null @@ -1,3 +0,0 @@ -{\rtf1\mac \deff0{\fonttbl{\f0\fmodern Helvetica;}} -\pard\f0\fs20 \'f1\'f2\'f3\par -} diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf b/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf deleted file mode 100644 index a3b9d27..0000000 --- a/sw/qa/extras/rtfimport/data/fdo85889-pc.rtf +++ /dev/null @@ -1,3 +0,0 @@ -{\rtf1\pc \deff0{\fonttbl{\f0\fmodern Helvetica;}} -\pard\f0\fs20 \'f1\'f2\'f3\par -} diff --git a/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf b/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf deleted file mode 100644 index 34eeb18..0000000 --- a/sw/qa/extras/rtfimport/data/fdo85889-pca.rtf +++ /dev/null @@ -1,3 +0,0 @@ -{\rtf1\pca \deff0{\fonttbl{\f0\fmodern Helvetica;}} -\pard\f0\fs20 \'f1\'f2\'f3\par -} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index e07e6aa..b89472a 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2181,32 +2181,6 @@ DECLARE_RTFIMPORT_TEST(testChtOutlineNumberingRtf, "chtoutline.rtf") CPPUNIT_ASSERT_EQUAL(OUString(aExpectedPrefix,SAL_N_ELEMENTS(aExpectedPrefix)), aPrefix); CPPUNIT_ASSERT_EQUAL(OUString(aExpectedSuffix,SAL_N_ELEMENTS(aExpectedSuffix)), aSuffix); } - -DECLARE_RTFIMPORT_TEST(testFdo85889pc, "fdo85889-pc.rtf") -{ - uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); - - OUString aExpected("\xc2\xb1\xe2\x89\xa5\xe2\x89\xa4", 8, RTL_TEXTENCODING_UTF8); - CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString()); -} - -DECLARE_RTFIMPORT_TEST(testFdo85889pca, "fdo85889-pca.rtf") -{ - uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); - - OUString aExpected("\xc2\xb1\xe2\x80\xc2\xbe", 6, RTL_TEXTENCODING_UTF8); - CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString()); -} - -DECLARE_RTFIMPORT_TEST(testFdo85889mac, "fdo85889-mac.rtf") -{ - uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); - - OUString aExpected("\xc3\x92\xc3\x9a\xc3\x9b", 6, RTL_TEXTENCODING_UTF8); - CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString()); -} - - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index fe4c870..a998351 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2913,18 +2913,6 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_ANSI: m_aStates.top().nCurrentEncoding = RTL_TEXTENCODING_MS_1252; break; - case RTF_MAC: - m_nCurrentEncoding = RTL_TEXTENCODING_APPLE_ROMAN; - m_aStates.top().nCurrentEncoding = m_nCurrentEncoding; - break; - case RTF_PC: - m_nCurrentEncoding = RTL_TEXTENCODING_IBM_437; - m_aStates.top().nCurrentEncoding = m_nCurrentEncoding; - break; - case RTF_PCA: - m_nCurrentEncoding = RTL_TEXTENCODING_IBM_850; - m_aStates.top().nCurrentEncoding = m_nCurrentEncoding; - break; case RTF_PLAIN: { m_aStates.top().aCharacterSprms = getDefaultState().aCharacterSprms; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
