diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 3e2865956234..805be5809e51 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -476,72 +476,56 @@ DECLARE_RTFIMPORT_TEST(testFdo48037, "fdo48037.rtf") DECLARE_RTFIMPORT_TEST(testFdo85812, "fdo85812.rtf") { - lang::Locale locale(getProperty<lang::Locale>( - getRun(getParagraph(1), 1, "This "), "CharLocale")); + lang::Locale locale(getProperty<lang::Locale>(getRun(getParagraph(1), 1, "This "), "CharLocale")); // the \lang inside the group was applied to CJK not Western CPPUNIT_ASSERT_EQUAL(OUString("en"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("US"), locale.Country); // further testing indicates that Word is doing really weird stuff // \loch \hich \dbch is reset by opening a group - locale = getProperty<lang::Locale>( - getRun(getParagraph(2), 1, "CharGroup"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(2), 1, "CharGroup"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("ru"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("RU"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(2), 2, "AfterChar"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(2), 2, "AfterChar"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("en"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("US"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(3), 2, "AfterBookmark"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(3), 2, "AfterBookmark"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("en"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("US"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(4), 1, "CharGroup"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(4), 1, "CharGroup"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("ru"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("RU"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(4), 1, "CharGroup"), "CharLocaleComplex"); + locale = getProperty<lang::Locale>(getRun(getParagraph(4), 1, "CharGroup"), "CharLocaleComplex"); CPPUNIT_ASSERT_EQUAL(OUString("ar"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("DZ"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(4), 2, "AfterChar"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(4), 2, "AfterChar"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("en"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("US"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(4), 2, "AfterChar"), "CharLocaleComplex"); + locale = getProperty<lang::Locale>(getRun(getParagraph(4), 2, "AfterChar"), "CharLocaleComplex"); CPPUNIT_ASSERT_EQUAL(OUString("ar"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("DZ"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(5), 2, "AfterBookmark"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(5), 2, "AfterBookmark"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("en"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("US"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(5), 2, "AfterBookmark"), "CharLocaleComplex"); + locale = getProperty<lang::Locale>(getRun(getParagraph(5), 2, "AfterBookmark"), "CharLocaleComplex"); CPPUNIT_ASSERT_EQUAL(OUString("ar"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("DZ"), locale.Country); // \ltrch \rtlch works differently - it is sticky across groups - locale = getProperty<lang::Locale>( - getRun(getParagraph(6), 1, "CharGroup"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(6), 1, "CharGroup"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("en"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("US"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(6), 1, "CharGroup"), "CharLocaleComplex"); + locale = getProperty<lang::Locale>(getRun(getParagraph(6), 1, "CharGroup"), "CharLocaleComplex"); CPPUNIT_ASSERT_EQUAL(OUString("ar"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("DZ"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(6), 2, "AfterChar"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(6), 2, "AfterChar"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("en"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("US"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(6), 2, "AfterChar"), "CharLocaleComplex"); + locale = getProperty<lang::Locale>(getRun(getParagraph(6), 2, "AfterChar"), "CharLocaleComplex"); CPPUNIT_ASSERT_EQUAL(OUString("ar"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("EG"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(7), 2, "AfterBookmark"), "CharLocale"); + locale = getProperty<lang::Locale>(getRun(getParagraph(7), 2, "AfterBookmark"), "CharLocale"); CPPUNIT_ASSERT_EQUAL(OUString("en"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("US"), locale.Country); - locale = getProperty<lang::Locale>( - getRun(getParagraph(7), 2, "AfterBookmark"), "CharLocaleComplex"); + locale = getProperty<lang::Locale>(getRun(getParagraph(7), 2, "AfterBookmark"), "CharLocaleComplex"); CPPUNIT_ASSERT_EQUAL(OUString("ar"), locale.Language); CPPUNIT_ASSERT_EQUAL(OUString("EG"), locale.Country); } |