DOCX filter: handle numbering style's qFormat, rsid and friends

Change-Id: Ia261995b98e2108ab673c7b240a1aa822d3db96e

3 files changed, 37 insertions, 35 deletions

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c6af87de21e7..ecbabb45e5ac 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1314,6 +1314,9 @@ DECLARE_OOXML_TEST(testStyleInheritance, "style-inheritance.docx")
 
     // Additional char style properties should be also roundtripped.
     assertXPath(pXmlStyles, "/w:styles/w:style[@w:styleId='DefaultParagraphFont']", "default", "1");
+
+    // Finally check the same for numbering styles.
+    assertXPath(pXmlStyles, "/w:styles/w:style[@w:styleId='NoList']", "default", "1");
 }
 
 DECLARE_OOXML_TEST(testCalendar1, "calendar1.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index eaae87870579..2ff5e613b2a9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3596,36 +3596,41 @@ void DocxAttributeOutput::StartStyle( const OUString& rName, StyleType eType,
     bool bQFormat = false, bUnhideWhenUsed = false, bSemiHidden = false, bLocked = false, bDefault = false, bCustomStyle = false;
     OUString aLink, aRsid, aUiPriority;
     FastAttributeList* pStyleAttributeList = m_pSerializer->createAttrList();
+    uno::Any aAny;
     if (eType == STYLE_TYPE_PARA || eType == STYLE_TYPE_CHAR)
     {
         const SwFmt* pFmt = m_rExport.pStyles->GetSwFmt(nId);
-        uno::Any aAny;
         pFmt->GetGrabBagItem(aAny);
-        const uno::Sequence<beans::PropertyValue>& rGrabBag = aAny.get< uno::Sequence<beans::PropertyValue> >();
-
-        for (sal_Int32 i = 0; i < rGrabBag.getLength(); ++i)
-        {
-            if (rGrabBag[i].Name == "uiPriority")
-                aUiPriority = rGrabBag[i].Value.get<OUString>();
-            else if (rGrabBag[i].Name == "qFormat")
-                bQFormat = true;
-            else if (rGrabBag[i].Name == "link")
-                aLink = rGrabBag[i].Value.get<OUString>();
-            else if (rGrabBag[i].Name == "rsid")
-                aRsid = rGrabBag[i].Value.get<OUString>();
-            else if (rGrabBag[i].Name == "unhideWhenUsed")
-                bUnhideWhenUsed = true;
-            else if (rGrabBag[i].Name == "semiHidden")
-                bSemiHidden = true;
-            else if (rGrabBag[i].Name == "locked")
-                bLocked = true;
-            else if (rGrabBag[i].Name == "default")
-                bDefault = rGrabBag[i].Value.get<sal_Bool>();
-            else if (rGrabBag[i].Name == "customStyle")
-                bCustomStyle = rGrabBag[i].Value.get<sal_Bool>();
-            else
-                SAL_WARN("sw.ww8", "Unhandled style property: " << rGrabBag[i].Name);
-        }
+    }
+    else
+    {
+        const SwNumRule* pRule = m_rExport.pStyles->GetSwNumRule(nId);
+        pRule->GetGrabBagItem(aAny);
+    }
+    const uno::Sequence<beans::PropertyValue>& rGrabBag = aAny.get< uno::Sequence<beans::PropertyValue> >();
+
+    for (sal_Int32 i = 0; i < rGrabBag.getLength(); ++i)
+    {
+        if (rGrabBag[i].Name == "uiPriority")
+            aUiPriority = rGrabBag[i].Value.get<OUString>();
+        else if (rGrabBag[i].Name == "qFormat")
+            bQFormat = true;
+        else if (rGrabBag[i].Name == "link")
+            aLink = rGrabBag[i].Value.get<OUString>();
+        else if (rGrabBag[i].Name == "rsid")
+            aRsid = rGrabBag[i].Value.get<OUString>();
+        else if (rGrabBag[i].Name == "unhideWhenUsed")
+            bUnhideWhenUsed = true;
+        else if (rGrabBag[i].Name == "semiHidden")
+            bSemiHidden = true;
+        else if (rGrabBag[i].Name == "locked")
+            bLocked = true;
+        else if (rGrabBag[i].Name == "default")
+            bDefault = rGrabBag[i].Value.get<sal_Bool>();
+        else if (rGrabBag[i].Name == "customStyle")
+            bCustomStyle = rGrabBag[i].Value.get<sal_Bool>();
+        else
+            SAL_WARN("sw.ww8", "Unhandled style property: " << rGrabBag[i].Name);
     }
 
     const char* pType = 0;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 57c2c98a2fc3..941ab3ea684c 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -400,12 +400,6 @@ PropertyMapPtr StyleSheetTable::GetDefaultCharProps()
     return m_pImpl->m_pDefaultCharProps;
 }
 
-// Does the given style type support InteropGrabBag?
-bool lcl_wantGrabBag(StyleType eType)
-{
-    return eType == STYLE_TYPE_TABLE || eType == STYLE_TYPE_PARA || eType == STYLE_TYPE_CHAR;
-}
-
 void StyleSheetTable::lcl_attribute(Id Name, Value & val)
 {
     OSL_ENSURE( m_pImpl->m_pCurrentEntry, "current entry has to be set here");
@@ -491,7 +485,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
         break;
         case NS_ooxml::LN_CT_Style_default:
             m_pImpl->m_pCurrentEntry->bIsDefaultStyle = (nIntValue != 0);
-            if(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode))
+            if (m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN)
             {
                 beans::PropertyValue aValue;
                 aValue.Name = "default";
@@ -500,7 +494,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
             }
         break;
         case NS_ooxml::LN_CT_Style_customStyle:
-            if(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode))
+            if (m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN)
             {
                 beans::PropertyValue aValue;
                 aValue.Name = "customStyle";
@@ -623,7 +617,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
         case NS_ooxml::LN_CT_Style_uiPriority:
         case NS_ooxml::LN_CT_Style_link:
         case NS_ooxml::LN_CT_Style_locked:
-            if(lcl_wantGrabBag(m_pImpl->m_pCurrentEntry->nStyleTypeCode))
+            if (m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN)
             {
                 StyleSheetEntryPtr pEntry = m_pImpl->m_pCurrentEntry;
                 beans::PropertyValue aValue;