sw/qa/extras/ww8import/data/bnc821208.doc |binary
sw/qa/extras/ww8import/ww8import.cxx | 9 +++++++++
sw/source/filter/ww8/ww8par2.cxx | 5 +++++
3 files changed, 14 insertions(+)
New commits:
commit e88ee8aa307ecec1cc22cda56b97dcfd8b838ce8
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Mar 4 14:47:13 2014 +0100
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
diff --git a/sw/qa/extras/ww8import/data/bnc821208.doc
b/sw/qa/extras/ww8import/data/bnc821208.doc
new file mode 100755
index 0000000..d89d711
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc821208.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 0c3e1fc..cc107e0 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();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c5ac5b8..4d89649 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3736,6 +3736,11 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti
eSti, sal_uInt16 nThisSty
}
bool bImport = !bStyExist || pIo->mbNewDoc; // import content ?
+
+ // Do not override character styles the list import code created earlier.
+ if (bImport && bStyExist && rSI.GetOrgWWName().startsWith("WW8Num"))
+ bImport = false;
+
bool bOldNoImp = pIo->bNoAttrImport;
rSI.bImportSkipped = !bImport;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
