summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ww8import/ww8import.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-03-04 14:47:13 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-03-04 15:38:55 +0100
commite88ee8aa307ecec1cc22cda56b97dcfd8b838ce8 (patch)
treeaf5ee360d2bf3ec2e2352aea0c454be688656648 /sw/qa/extras/ww8import/ww8import.cxx
parentc09fc2c69510cd53da897011192ce1ed727dd12f (diff)
bnc#821208 DOC import: don't overwrite WW8Num* character styles
In general we're overwriting styles on import in case we're not pasting. But these WW8Num* character styles are in general not from the document, they are created because Writer needs a character style for each numbering level to handle what's in the DOC file. So, in case there is a character style with the same name as our "character style for numbering" styles, prefer the later ones, as that's intended most likely. Change-Id: I675f867722360aca765bb96b0b43ea47deab9847
Diffstat (limited to 'sw/qa/extras/ww8import/ww8import.cxx')
-rw-r--r--sw/qa/extras/ww8import/ww8import.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx
index 0c3e1fcb26e9..cc107e041ead 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -234,6 +234,15 @@ DECLARE_WW8IMPORT_TEST(testListNolevel, "list-nolevel.doc")
CPPUNIT_ASSERT_EQUAL(OUString("1."), aText);
}
+DECLARE_WW8IMPORT_TEST(testBnc821208, "bnc821208.doc")
+{
+ // WW8Num1z0 earned a Symbol font, turning numbers into rectangles.
+ uno::Reference<beans::XPropertyState> xPropertyState(getStyles("CharacterStyles")->getByName("WW8Num1z0"), uno::UNO_QUERY);
+ beans::PropertyState ePropertyState = xPropertyState->getPropertyState("CharFontName");
+ // This was beans::PropertyState_DIRECT_VALUE.
+ CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();