Kaydet (Commit) 827e8d6a authored tarafından Miklos Vajna's avatar Miklos Vajna

loplugin:salbool

Change-Id: I29bea17bd6cc3ae88baa5cfaa5c0897c23044c3c
üst 2a2b6d3e
...@@ -51,14 +51,14 @@ public: ...@@ -51,14 +51,14 @@ public:
return (OString(filename).endsWith(".rtf") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end()); return (OString(filename).endsWith(".rtf") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
} }
sal_Bool CjkNumberedListTestHelper(sal_Int16& rValue) bool CjkNumberedListTestHelper(sal_Int16& rValue)
{ {
sal_Bool isNumber; sal_Bool isNumber;
uno::Reference<text::XTextRange> xPara(getParagraph(1)); uno::Reference<text::XTextRange> xPara(getParagraph(1));
uno::Reference<beans::XPropertySet> properties(xPara, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> properties(xPara, uno::UNO_QUERY);
properties->getPropertyValue("NumberingIsNumber") >>= isNumber; properties->getPropertyValue("NumberingIsNumber") >>= isNumber;
if (!isNumber) if (!isNumber)
return sal_False; return false;
uno::Reference<container::XIndexAccess> xLevels(properties->getPropertyValue("NumberingRules"), uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xLevels(properties->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
uno::Sequence< beans::PropertyValue > aPropertyValue; uno::Sequence< beans::PropertyValue > aPropertyValue;
xLevels->getByIndex(0) >>= aPropertyValue; xLevels->getByIndex(0) >>= aPropertyValue;
...@@ -68,10 +68,10 @@ public: ...@@ -68,10 +68,10 @@ public:
if (aProp.Name == "NumberingType") if (aProp.Name == "NumberingType")
{ {
rValue = aProp.Value.get<sal_Int16>(); rValue = aProp.Value.get<sal_Int16>();
return sal_True; return true;
} }
} }
return sal_False; return false;
} }
}; };
...@@ -752,77 +752,77 @@ DECLARE_RTFEXPORT_TEST(testFdo82858, "fdo82858.docx") ...@@ -752,77 +752,77 @@ DECLARE_RTFEXPORT_TEST(testFdo82858, "fdo82858.docx")
DECLARE_RTFEXPORT_TEST(testCjklist12, "cjklist12.rtf") DECLARE_RTFEXPORT_TEST(testCjklist12, "cjklist12.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::AIU_HALFWIDTH_JA, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::AIU_HALFWIDTH_JA, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist13, "cjklist13.rtf") DECLARE_RTFEXPORT_TEST(testCjklist13, "cjklist13.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::IROHA_HALFWIDTH_JA, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::IROHA_HALFWIDTH_JA, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist16, "cjklist16.rtf") DECLARE_RTFEXPORT_TEST(testCjklist16, "cjklist16.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_TRADITIONAL_JA, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_TRADITIONAL_JA, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist20, "cjklist20.rtf") DECLARE_RTFEXPORT_TEST(testCjklist20, "cjklist20.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::AIU_FULLWIDTH_JA, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::AIU_FULLWIDTH_JA, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist21, "cjklist21.rtf") DECLARE_RTFEXPORT_TEST(testCjklist21, "cjklist21.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::IROHA_FULLWIDTH_JA, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::IROHA_FULLWIDTH_JA, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist24, "cjklist24.rtf") DECLARE_RTFEXPORT_TEST(testCjklist24, "cjklist24.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::HANGUL_SYLLABLE_KO, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::HANGUL_SYLLABLE_KO, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist25, "cjklist25.rtf") DECLARE_RTFEXPORT_TEST(testCjklist25, "cjklist25.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::HANGUL_JAMO_KO, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::HANGUL_JAMO_KO, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist30, "cjklist30.rtf") DECLARE_RTFEXPORT_TEST(testCjklist30, "cjklist30.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::TIAN_GAN_ZH, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::TIAN_GAN_ZH, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist31, "cjklist31.rtf") DECLARE_RTFEXPORT_TEST(testCjklist31, "cjklist31.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::DI_ZI_ZH, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::DI_ZI_ZH, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist34, "cjklist34.rtf") DECLARE_RTFEXPORT_TEST(testCjklist34, "cjklist34.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH_TW, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH_TW, numFormat);
} }
DECLARE_RTFEXPORT_TEST(testCjklist38, "cjklist38.rtf") DECLARE_RTFEXPORT_TEST(testCjklist38, "cjklist38.rtf")
{ {
sal_Int16 numFormat; sal_Int16 numFormat;
CPPUNIT_ASSERT_EQUAL(sal_True, CjkNumberedListTestHelper(numFormat)); CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat));
CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH, numFormat); CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH, numFormat);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment