DOCX import: handle <w:cnfStyle> paragraph property

Change-Id: I47d9dab17d4891d05cf7497e53026bc801f2726b

4 files changed, 50 insertions, 1 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 90dbf1411eb5..c89395f672d4 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -971,6 +971,45 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
         case NS_ooxml::LN_CT_PTab_relativeTo:
         case NS_ooxml::LN_CT_PTab_alignment:
             break;
+        case NS_ooxml::LN_CT_Cnf_lastRowLastColumn:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lastRowLastColumn", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_lastRowFirstColumn:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lastRowFirstColumn", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_firstRowLastColumn:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "firstRowLastColumn", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_oddHBand:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "oddHBand", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_firstRowFirstColumn:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "firstRowFirstColumn", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_evenVBand:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "evenVBand", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_evenHBand:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "evenHBand", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_lastColumn:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lastColumn", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_firstColumn:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "firstColumn", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_oddVBand:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "oddVBand", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_lastRow:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lastRow", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_firstRow:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "firstRow", OUString::number(nIntValue));
+            break;
+        case NS_ooxml::LN_CT_Cnf_val:
+            m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "val", sStringValue);
+            break;
         default:
             {
 #if OSL_DEBUG_LEVEL > 0
@@ -2465,6 +2504,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
         }
     }
     break;
+    case NS_ooxml::LN_CT_PPrBase_cnfStyle:
+    {
+        m_pImpl->enableInteropGrabBag("cnfStyle");
+        resourcemodel::resolveSprmProps(*this, rSprm);
+        rContext->Insert(PROP_PARA_CNF_STYLE, uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList()), true, PARA_GRAB_BAG);
+        m_pImpl->disableInteropGrabBag();
+    }
+    break;
     default:
         {
 #ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index e0d825967b17..98d6b0cae424 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -809,7 +809,7 @@ public:
     OUString m_aInteropGrabBagName;
 
     /// A toplevel dmapper grabbag, like 'pPr'.
-    std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
+    comphelper::SequenceAsVector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     /// A sub-grabbag of m_aInteropGrabBag, like 'spacing'.
     std::vector<css::beans::PropertyValue> m_aSubInteropGrabBag;
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index af8b1b3a2927..6d236c155be7 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -396,6 +396,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const
             case PROP_SDT_END_BEFORE: sName = "SdtEndBefore"; break;
             case PROP_PARA_SDT_END_BEFORE: sName = "ParaSdtEndBefore"; break;
             case META_PROP_TABLE_LOOK: sName = "TableStyleLook"; break;
+            case PROP_PARA_CNF_STYLE: sName = "ParaCnfStyle"; break;
         }
         ::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt =
                 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index c3cea173c289..5814c34f295d 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -368,6 +368,7 @@ enum PropertyIds
         ,PROP_SDT_END_BEFORE
         ,PROP_PARA_SDT_END_BEFORE
         ,META_PROP_TABLE_LOOK
+        ,PROP_PARA_CNF_STYLE
     };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier