Line spacing is not preserved for styles.
Description :
In StyleSheetTable.cxx, while setting the property "ParaInteropGrabBag" throws an exception.
Hence rest of the properties are not set.
Implimentation :
Skip that property so that rest of the properties will not be lost.
Change-Id: Id488de71bc5f893a7401420d9e63e4405b90f760
Reviewed-on: https://gerrit.libreoffice.org/8902
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
diff --git a/sw/qa/extras/ooxmlexport/data/fdo76587.docx b/sw/qa/extras/ooxmlexport/data/fdo76587.docx
new file mode 100644
index 0000000..84c23ad
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/fdo76587.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 413e4fc..0dbb726 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3102,6 +3102,15 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76586, "fdo76586.docx")
assertXPath(pXmlDoc, "//w:tblGrid/w:gridCol[2]", "w", "7843");
}
DECLARE_OOXMLEXPORT_TEST(testFDO76587 , "fdo76587.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/styles.xml");
if (!pXmlDoc)
return;
assertXPath(pXmlDoc, "/w:styles/w:style[8]/w:pPr/w:spacing", "line", "240");
assertXPath(pXmlDoc, "/w:styles/w:style[8]/w:pPr/w:spacing", "lineRule", "auto");
}
DECLARE_OOXMLEXPORT_TEST(test76734_2K7, "test76734_2K7.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index a37caca..3548ec3 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1113,7 +1113,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
// Don't add the style name properties
bool bIsParaStyleName = aPropValues[nProp].Name == "ParaStyleName";
bool bIsCharStyleName = aPropValues[nProp].Name == "CharStyleName";
if ( !bIsParaStyleName && !bIsCharStyleName )
bool bIsParaInteropGrabBag = aPropValues[nProp].Name == "ParaInteropGrabBag";
if ( !bIsParaStyleName && !bIsCharStyleName && !bIsParaInteropGrabBag)
{
aSortedPropVals.Insert( aPropValues[nProp] );
}
