diff options
| -rw-r--r-- | sw/qa/extras/uiwriter/data/fdo70807.odt | bin | 22100 -> 22693 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 18 |
2 files changed, 13 insertions, 5 deletions
diff --git a/sw/qa/extras/uiwriter/data/fdo70807.odt b/sw/qa/extras/uiwriter/data/fdo70807.odt Binary files differindex 6dad55ecf8a8..c22e24fa8ff9 100644 --- a/sw/qa/extras/uiwriter/data/fdo70807.odt +++ b/sw/qa/extras/uiwriter/data/fdo70807.odt diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 2e6a79ba8b02..8b2c1227124a 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -126,13 +126,21 @@ void SwUiWriterTest::testFdo70807() uno::Reference<style::XStyle> xStyle(stylesIter->getByIndex(i), uno::UNO_QUERY); uno::Reference<container::XNamed> xName(xStyle, uno::UNO_QUERY); - sal_Bool isUsed = xStyle->isInUse(); - sal_Bool used = sal_False; // just "Right Page" is used + sal_Bool expectedUsedStyle = sal_False; + sal_Bool expectedUserDefined = sal_False; - if (xName->getName() == "Right Page") - used = sal_True; + OUString styleName(xName->getName()); - CPPUNIT_ASSERT_EQUAL(used, isUsed); + // just these styles are user defined styles + if (styleName == "pagestyle1" || styleName == "pagestyle2") + expectedUserDefined = sal_True; + + // just these styles are used in the document + if (styleName == "Right Page" || styleName == "pagestyle1" || styleName == "pagestyle2") + expectedUsedStyle = sal_True; + + CPPUNIT_ASSERT_EQUAL(expectedUserDefined, xStyle->isUserDefined()); + CPPUNIT_ASSERT_EQUAL(expectedUsedStyle, xStyle->isInUse()); } } |