Sync oox -> writerfilter alias for wordprocessingml

The motivation is that once all the namespace aliases in
writerfilter/source/ooxml/model.xml match the ones in
oox/source/token/namespaces.txt, then the writerfilter copies could be
dropped.

Change-Id: I1f9abb8bb457189997f28c99b0f6b00660252c14

11 files changed, 213 insertions, 213 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index bd2c226e4d93..78d7ba0e758c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -408,19 +408,19 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             else //NS_ooxml::LN_CT_Spacing_lineRule:
             {
                     // exactly, atLeast, auto
-                    if( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_auto)
+                    if( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_LineSpacingRule_auto)
                     {
                         m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "lineRule", "auto");
                         aSpacing.Mode = style::LineSpacingMode::PROP;
                         //reinterpret the already set value
                         aSpacing.Height = sal_Int16( aSpacing.Height * 100 /  ConversionHelper::convertTwipToMM100( SINGLE_LINE_SPACING ));
                     }
-                    else if( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_atLeast)
+                    else if( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_LineSpacingRule_atLeast)
                     {
                         m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "lineRule", "atLeast");
                         aSpacing.Mode = style::LineSpacingMode::MINIMUM;
                     }
-                    else // NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_exact
+                    else // NS_ooxml::LN_Value_doc_ST_LineSpacingRule_exact
                     {
                         m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "lineRule", "exact");
                         aSpacing.Mode = style::LineSpacingMode::FIX;
@@ -583,7 +583,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             {
                 // 49 is just the old value that should be removed, once the
                 // root cause in SwTabFrm::MakeAll() is fixed.
-                if (m_pImpl->GetSettingsTable()->GetView() == NS_ooxml::LN_Value_wordprocessingml_ST_View_web)
+                if (m_pImpl->GetSettingsTable()->GetView() == NS_ooxml::LN_Value_doc_ST_View_web)
                     default_spacing = 49;
                 else
                     default_spacing = 280;
@@ -605,7 +605,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 
             if (!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing())
             {
-                if (m_pImpl->GetSettingsTable()->GetView() == NS_ooxml::LN_Value_wordprocessingml_ST_View_web)
+                if (m_pImpl->GetSettingsTable()->GetView() == NS_ooxml::LN_Value_doc_ST_View_web)
                     default_spacing = 49;
                 else
                     default_spacing = 280;
@@ -684,10 +684,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                     case NS_ooxml::LN_CT_FramePr_hAnchor:
                         switch(nIntValue)
                         {
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_text:   //relative to column
+                            case  NS_ooxml::LN_Value_doc_ST_HAnchor_text:   //relative to column
                                 nIntValue = text::RelOrientation::FRAME; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_margin: nIntValue = text::RelOrientation::PAGE_PRINT_AREA; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_page:   nIntValue = text::RelOrientation::PAGE_FRAME; break;
+                            case  NS_ooxml::LN_Value_doc_ST_HAnchor_margin: nIntValue = text::RelOrientation::PAGE_PRINT_AREA; break;
+                            case  NS_ooxml::LN_Value_doc_ST_HAnchor_page:   nIntValue = text::RelOrientation::PAGE_FRAME; break;
                             default:;
                         }
                         pParaProperties->SethAnchor( nIntValue );
@@ -695,10 +695,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                     case NS_ooxml::LN_CT_FramePr_vAnchor:
                         switch(nIntValue)
                         {
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_text:  //relative to paragraph
+                            case  NS_ooxml::LN_Value_doc_ST_VAnchor_text:  //relative to paragraph
                                     nIntValue = text::RelOrientation::FRAME; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_margin:nIntValue = text::RelOrientation::PAGE_PRINT_AREA ; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_page: nIntValue = text::RelOrientation::PAGE_FRAME; break;
+                            case  NS_ooxml::LN_Value_doc_ST_VAnchor_margin:nIntValue = text::RelOrientation::PAGE_PRINT_AREA ; break;
+                            case  NS_ooxml::LN_Value_doc_ST_VAnchor_page: nIntValue = text::RelOrientation::PAGE_FRAME; break;
                             default:;
                         }
                         pParaProperties->SetvAnchor( nIntValue );
@@ -709,11 +709,11 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                     case NS_ooxml::LN_CT_FramePr_xAlign:
                         switch( nIntValue )
                         {
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_center  : nIntValue = text::HoriOrientation::CENTER; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right   : nIntValue = text::HoriOrientation::RIGHT; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_inside  : nIntValue = text::HoriOrientation::INSIDE; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_outside : nIntValue = text::HoriOrientation::OUTSIDE; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_left    : nIntValue = text::HoriOrientation::LEFT; break;
+                            case  NS_ooxml::LN_Value_doc_ST_XAlign_center  : nIntValue = text::HoriOrientation::CENTER; break;
+                            case  NS_ooxml::LN_Value_doc_ST_XAlign_right   : nIntValue = text::HoriOrientation::RIGHT; break;
+                            case  NS_ooxml::LN_Value_doc_ST_XAlign_inside  : nIntValue = text::HoriOrientation::INSIDE; break;
+                            case  NS_ooxml::LN_Value_doc_ST_XAlign_outside : nIntValue = text::HoriOrientation::OUTSIDE; break;
+                            case  NS_ooxml::LN_Value_doc_ST_XAlign_left    : nIntValue = text::HoriOrientation::LEFT; break;
                             default:    nIntValue = text::HoriOrientation::NONE;
                         }
                         pParaProperties->SetxAlign( nIntValue );
@@ -724,12 +724,12 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                     case NS_ooxml::LN_CT_FramePr_yAlign:
                         switch( nIntValue )
                         {
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_top     :
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_inside  :nIntValue = text::VertOrientation::TOP; break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center  :nIntValue = text::VertOrientation::CENTER;break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom  :
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_outside :nIntValue = text::VertOrientation::BOTTOM;break;
-                            case  NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_inline  :
+                            case  NS_ooxml::LN_Value_doc_ST_YAlign_top     :
+                            case  NS_ooxml::LN_Value_doc_ST_YAlign_inside  :nIntValue = text::VertOrientation::TOP; break;
+                            case  NS_ooxml::LN_Value_doc_ST_YAlign_center  :nIntValue = text::VertOrientation::CENTER;break;
+                            case  NS_ooxml::LN_Value_doc_ST_YAlign_bottom  :
+                            case  NS_ooxml::LN_Value_doc_ST_YAlign_outside :nIntValue = text::VertOrientation::BOTTOM;break;
+                            case  NS_ooxml::LN_Value_doc_ST_YAlign_inline  :
                             {
                             // HACK: This is for bnc#780851, where a table has one cell that has w:framePr,
                             // which causes that paragraph to be converted to a text frame, and the original
@@ -756,13 +756,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                     case NS_ooxml::LN_CT_FramePr_hRule:
                          switch( nIntValue )
                          {
-                            case NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact:
+                            case NS_ooxml::LN_Value_doc_ST_HeightRule_exact:
                                 nIntValue = text::SizeType::FIX;
                             break;
-                            case NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_atLeast:
+                            case NS_ooxml::LN_Value_doc_ST_HeightRule_atLeast:
                                 nIntValue = text::SizeType::MIN;
                             break;
-                            case NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto:
+                            case NS_ooxml::LN_Value_doc_ST_HeightRule_auto:
                             //no break;
                             default:;
                                 nIntValue = text::SizeType::VARIABLE;
@@ -771,13 +771,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                     break;
                     case NS_ooxml::LN_CT_FramePr_wrap:
                     {
-                        //should be either LN_Value_wordprocessingml_ST_Wrap_notBeside or LN_Value_wordprocessingml_ST_Wrap_around or LN_Value_wordprocessingml_ST_Wrap_auto
-                        OSL_ENSURE( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_around ||
-                                    sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_notBeside ||
-                                    sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_auto,
+                        //should be either LN_Value_doc_ST_Wrap_notBeside or LN_Value_doc_ST_Wrap_around or LN_Value_doc_ST_Wrap_auto
+                        OSL_ENSURE( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_Wrap_around ||
+                                    sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_Wrap_notBeside ||
+                                    sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_Wrap_auto,
                             "wrap not around, not_Beside or auto?");
-                        if( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_around ||
-                            sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_auto )
+                        if( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_Wrap_around ||
+                            sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_Wrap_auto )
                             pParaProperties->SetWrap ( text::WrapTextMode_DYNAMIC ) ;
                         else
                             pParaProperties->SetWrap ( text::WrapTextMode_NONE ) ;
@@ -905,14 +905,14 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             {
                 switch( nIntValue )
                 {
-                    case NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_default:
-                    case NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_snapToChars:
+                    case NS_ooxml::LN_Value_doc_ST_DocGrid_default:
+                    case NS_ooxml::LN_Value_doc_ST_DocGrid_snapToChars:
                         pSectionContext->SetGridType( 0 );
                         break;
-                    case NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_lines:
+                    case NS_ooxml::LN_Value_doc_ST_DocGrid_lines:
                         pSectionContext->SetGridType( 1 );
                         break;
-                    case NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_linesAndChars:
+                    case NS_ooxml::LN_Value_doc_ST_DocGrid_linesAndChars:
                         pSectionContext->SetGridType( 2 );
                         break;
                     default :
@@ -958,7 +958,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
         break;
         case NS_ooxml::LN_CT_FtnEdn_type:
             // This is the "separator" footnote, ignore its linebreak.
-            if (static_cast<sal_uInt32>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_separator)
+            if (static_cast<sal_uInt32>(nIntValue) == NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)
                 m_pImpl->m_bIgnoreNextPara = true;
         break;
         case NS_ooxml::LN_CT_DataBinding_prefixMappings:
@@ -1352,19 +1352,19 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
             sal_Int16 nAlignment = 0;
             switch (nIntValue)
             {
-                case NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_top:
+                case NS_ooxml::LN_Value_doc_ST_TextAlignment_top:
                     nAlignment = 2;
                     break;
-                case NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_center:
+                case NS_ooxml::LN_Value_doc_ST_TextAlignment_center:
                     nAlignment = 3;
                     break;
-                case NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_baseline:
+                case NS_ooxml::LN_Value_doc_ST_TextAlignment_baseline:
                     nAlignment = 1;
                     break;
-                case NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_bottom:
+                case NS_ooxml::LN_Value_doc_ST_TextAlignment_bottom:
                     nAlignment = 4;
                     break;
-                case NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_auto:
+                case NS_ooxml::LN_Value_doc_ST_TextAlignment_auto:
                 default:
                     break;
             }
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 904128b05a4f..efbecfe59754 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -753,7 +753,7 @@ void DomainMapperTableManager::endOfRowAction()
         insertRowProps(pPropMap);
     }
     else if ( pCellWidths->size() > 0 &&
-               ( m_nLayoutType == NS_ooxml::LN_Value_wordprocessingml_ST_TblLayout_fixed
+               ( m_nLayoutType == NS_ooxml::LN_Value_doc_ST_TblLayout_fixed
                  || pCellWidths->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) )
              )
     {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d0465999e7ea..1bf28fac2627 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1042,7 +1042,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
 
             bool bIsDropCap =
                 pParaContext->IsFrameMode() &&
-                sal::static_int_cast<Id>(pParaContext->GetDropCap()) != NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none;
+                sal::static_int_cast<Id>(pParaContext->GetDropCap()) != NS_ooxml::LN_Value_doc_ST_DropCap_none;
 
             style::DropCapFormat aDrop;
             ParagraphPropertiesPtr pToBeSavedProperties;
@@ -1063,7 +1063,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
             }
             if( rAppendContext.pLastParagraphProperties.get() )
             {
-                if( sal::static_int_cast<Id>(rAppendContext.pLastParagraphProperties->GetDropCap()) != NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none)
+                if( sal::static_int_cast<Id>(rAppendContext.pLastParagraphProperties->GetDropCap()) != NS_ooxml::LN_Value_doc_ST_DropCap_none)
                 {
                     //handles (4) and part of (5)
                     //create a DropCap property, add it to the property sequence of finishParagraph
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index 471a85a3b0ca..10b36e64095c 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -58,13 +58,13 @@ void PageBordersHandler::lcl_attribute( Id eName, Value& rVal )
             switch ( nIntValue )
             {
                 default:
-                case NS_ooxml::LN_Value_wordprocessingml_ST_PageBorderDisplay_allPages:
+                case NS_ooxml::LN_Value_doc_ST_PageBorderDisplay_allPages:
                     m_nDisplay = 0;
                     break;
-                case NS_ooxml::LN_Value_wordprocessingml_ST_PageBorderDisplay_firstPage:
+                case NS_ooxml::LN_Value_doc_ST_PageBorderDisplay_firstPage:
                     m_nDisplay = 1;
                     break;
-                case NS_ooxml::LN_Value_wordprocessingml_ST_PageBorderDisplay_notFirstPage:
+                case NS_ooxml::LN_Value_doc_ST_PageBorderDisplay_notFirstPage:
                     m_nDisplay = 2;
                     break;
             }
@@ -75,10 +75,10 @@ void PageBordersHandler::lcl_attribute( Id eName, Value& rVal )
             switch ( nIntValue )
             {
                 default:
-                case NS_ooxml::LN_Value_wordprocessingml_ST_PageBorderOffset_page:
+                case NS_ooxml::LN_Value_doc_ST_PageBorderOffset_page:
                     m_nOffset = 1;
                     break;
-                case NS_ooxml::LN_Value_wordprocessingml_ST_PageBorderOffset_text:
+                case NS_ooxml::LN_Value_doc_ST_PageBorderOffset_text:
                     m_nOffset = 0;
                     break;
             }
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index e36dc1c0a825..9a4a953c9816 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1407,7 +1407,7 @@ StyleSheetPropertyMap::~StyleSheetPropertyMap()
 
 ParagraphProperties::ParagraphProperties() :
     m_bFrameMode( false ),
-    m_nDropCap(NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none),
+    m_nDropCap(NS_ooxml::LN_Value_doc_ST_DropCap_none),
     m_nLines(0),
     m_w(-1),
     m_h(-1),
@@ -1487,7 +1487,7 @@ bool ParagraphProperties::operator==(const ParagraphProperties& rCompare)
 void ParagraphProperties::ResetFrameProperties()
 {
     m_bFrameMode = false;
-    m_nDropCap = NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none;
+    m_nDropCap = NS_ooxml::LN_Value_doc_ST_DropCap_none;
     m_nLines = 0;
     m_w = -1;
     m_h = -1;
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 48492ed323bc..f0bc0886d458 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -90,12 +90,12 @@ struct SettingsTable_Impl
     , m_bNoPunctuationKerning(false)
     , m_doNotIncludeSubdocsInStats(false)
     , m_bRecordChanges(false)
-    , m_nEdit(NS_ooxml::LN_Value_wordprocessingml_ST_DocProtect_none)
+    , m_nEdit(NS_ooxml::LN_Value_doc_ST_DocProtect_none)
     , m_bFormatting(false)
     , m_bEnforcement(false)
-    , m_nCryptProviderType(NS_ooxml::LN_Value_wordprocessingml_ST_CryptProv_rsaAES)
-    , m_nCryptAlgorithmClass(NS_ooxml::LN_Value_wordprocessingml_ST_AlgClass_hash)
-    , m_nCryptAlgorithmType(NS_ooxml::LN_Value_wordprocessingml_ST_AlgType_typeAny)
+    , m_nCryptProviderType(NS_ooxml::LN_Value_doc_ST_CryptProv_rsaAES)
+    , m_nCryptAlgorithmClass(NS_ooxml::LN_Value_doc_ST_AlgClass_hash)
+    , m_nCryptAlgorithmType(NS_ooxml::LN_Value_doc_ST_AlgType_typeAny)
     , m_nCryptSpinCount(0)
     , m_bLinkStyles(false)
     , m_nZoomFactor(0)
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 1bef14ed8364..4cacd10cc752 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -298,8 +298,8 @@ void OOXMLDocumentImpl::resolveFootnote(Stream & rStream,
     Id nId;
     switch (rType)
     {
-    case NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_separator:
-    case NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_continuationSeparator:
+    case NS_ooxml::LN_Value_doc_ST_FtnEdn_separator:
+    case NS_ooxml::LN_Value_doc_ST_FtnEdn_continuationSeparator:
         nId = rType;
         break;
     default:
@@ -320,8 +320,8 @@ void OOXMLDocumentImpl::resolveEndnote(Stream & rStream,
     Id nId;
     switch (rType)
     {
-    case NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_separator:
-    case NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_continuationSeparator:
+    case NS_ooxml::LN_Value_doc_ST_FtnEdn_separator:
+    case NS_ooxml::LN_Value_doc_ST_FtnEdn_continuationSeparator:
         nId = rType;
         break;
     default:
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 9907e0548437..802dbb58b9a1 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1143,13 +1143,13 @@ void OOXMLFastContextHandlerProperties::handleXNotes()
 {
     switch (mnToken)
     {
-    case NS_wordprocessingml|XML_footnoteReference:
+    case NS_doc|XML_footnoteReference:
         {
             OOXMLFootnoteHandler aFootnoteHandler(this);
             mpPropertySet->resolve(aFootnoteHandler);
         }
         break;
-    case NS_wordprocessingml|XML_endnoteReference:
+    case NS_doc|XML_endnoteReference:
         {
             OOXMLEndnoteHandler aEndnoteHandler(this);
             mpPropertySet->resolve(aEndnoteHandler);
@@ -1164,13 +1164,13 @@ void OOXMLFastContextHandlerProperties::handleHdrFtr()
 {
     switch (mnToken)
     {
-    case NS_wordprocessingml|XML_footerReference:
+    case NS_doc|XML_footerReference:
         {
             OOXMLFooterHandler aFooterHandler(this);
             mpPropertySet->resolve(aFooterHandler);
         }
         break;
-    case NS_wordprocessingml|XML_headerReference:
+    case NS_doc|XML_headerReference:
         {
             OOXMLHeaderHandler aHeaderHandler(this);
             mpPropertySet->resolve(aHeaderHandler);
@@ -1418,7 +1418,7 @@ void OOXMLFastContextHandlerXNote::lcl_startFastElement
     mbForwardEventsSaved = isForwardEvents();
 
     // If this is the note we're looking for or this is the footnote separator one.
-    if (mnMyXNoteId == getXNoteId() || static_cast<sal_uInt32>(mnMyXNoteType) == NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_separator)
+    if (mnMyXNoteId == getXNoteId() || static_cast<sal_uInt32>(mnMyXNoteType) == NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)
         setForwardEvents(true);
     else
         setForwardEvents(false);
@@ -1802,7 +1802,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext
 
     switch (nNamespace)
     {
-        case NS_wordprocessingml:
+        case NS_doc:
         case NS_vml_wordprocessingDrawing:
         case NS_office:
             if (!bGroupShape)
@@ -1821,7 +1821,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext
 
                     if (!bGroupShape)
                     {
-                        pWrapper->addNamespace(NS_wordprocessingml);
+                        pWrapper->addNamespace(NS_doc);
                         pWrapper->addNamespace(NS_vml_wordprocessingDrawing);
                         pWrapper->addNamespace(NS_office);
                         pWrapper->addToken( NS_vml|XML_textbox );
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 5ccd0a36312d..95af0d4eea40 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -38,8 +38,8 @@
   <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/chart" alias="chart"/>
   <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/chart" alias="chart"/>
   <namespace-alias name="urn:schemas-microsoft-com:office:word" alias="vml_wordprocessingDrawing"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/wordprocessingml/2006/main" alias="wordprocessingml"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/wordprocessingml/main" alias="wordprocessingml"/>
+  <namespace-alias name="http://schemas.openxmlformats.org/wordprocessingml/2006/main" alias="doc"/>
+  <namespace-alias name="http://purl.oclc.org/ooxml/wordprocessingml/main" alias="doc"/>
   <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/math" alias="math"/>
   <namespace-alias name="http://purl.oclc.org/ooxml/officeDocument/math" alias="math"/>
   <namespace-alias name="http://schemas.openxmlformats.org/schemaLibrary/2006/main" alias="schemaLibrary"/>
@@ -17062,47 +17062,47 @@
       <attribute name="vertCompress" tokenid="ooxml:CT_EastAsianLayout_vertCompress"/>
     </resource>
     <resource name="ST_XAlign" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_XAlign_left">left</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_XAlign_center">center</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_XAlign_right">right</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_XAlign_inside">inside</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_XAlign_outside">outside</value>
+      <value tokenid="ooxml:Value_doc_ST_XAlign_left">left</value>
+      <value tokenid="ooxml:Value_doc_ST_XAlign_center">center</value>
+      <value tokenid="ooxml:Value_doc_ST_XAlign_right">right</value>
+      <value tokenid="ooxml:Value_doc_ST_XAlign_inside">inside</value>
+      <value tokenid="ooxml:Value_doc_ST_XAlign_outside">outside</value>
     </resource>
     <resource name="ST_YAlign" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_YAlign_inline">inline</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_YAlign_top">top</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_YAlign_center">center</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_YAlign_bottom">bottom</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_YAlign_inside">inside</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_YAlign_outside">outside</value>
+      <value tokenid="ooxml:Value_doc_ST_YAlign_inline">inline</value>
+      <value tokenid="ooxml:Value_doc_ST_YAlign_top">top</value>
+      <value tokenid="ooxml:Value_doc_ST_YAlign_center">center</value>
+      <value tokenid="ooxml:Value_doc_ST_YAlign_bottom">bottom</value>
+      <value tokenid="ooxml:Value_doc_ST_YAlign_inside">inside</value>
+      <value tokenid="ooxml:Value_doc_ST_YAlign_outside">outside</value>
     </resource>
     <resource name="ST_HeightRule" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_HeightRule_auto">auto</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_HeightRule_exact">exact</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_HeightRule_atLeast">atLeast</value>
+      <value tokenid="ooxml:Value_doc_ST_HeightRule_auto">auto</value>
+      <value tokenid="ooxml:Value_doc_ST_HeightRule_exact">exact</value>
+      <value tokenid="ooxml:Value_doc_ST_HeightRule_atLeast">atLeast</value>
     </resource>
     <resource name="ST_Wrap" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Wrap_auto">auto</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Wrap_notBeside">notBeside</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Wrap_around">around</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Wrap_tight">tight</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Wrap_through">through</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Wrap_none">none</value>
+      <value tokenid="ooxml:Value_doc_ST_Wrap_auto">auto</value>
+      <value tokenid="ooxml:Value_doc_ST_Wrap_notBeside">notBeside</value>
+      <value tokenid="ooxml:Value_doc_ST_Wrap_around">around</value>
+      <value tokenid="ooxml:Value_doc_ST_Wrap_tight">tight</value>
+      <value tokenid="ooxml:Value_doc_ST_Wrap_through">through</value>
+      <value tokenid="ooxml:Value_doc_ST_Wrap_none">none</value>
     </resource>
     <resource name="ST_VAnchor" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_VAnchor_text">text</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_VAnchor_margin">margin</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_VAnchor_page">page</value>
+      <value tokenid="ooxml:Value_doc_ST_VAnchor_text">text</value>
+      <value tokenid="ooxml:Value_doc_ST_VAnchor_margin">margin</value>
+      <value tokenid="ooxml:Value_doc_ST_VAnchor_page">page</value>
     </resource>
     <resource name="ST_HAnchor" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_HAnchor_text">text</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_HAnchor_margin">margin</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_HAnchor_page">page</value>
+      <value tokenid="ooxml:Value_doc_ST_HAnchor_text">text</value>
+      <value tokenid="ooxml:Value_doc_ST_HAnchor_margin">margin</value>
+      <value tokenid="ooxml:Value_doc_ST_HAnchor_page">page</value>
     </resource>
     <resource name="ST_DropCap" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DropCap_none">none</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DropCap_drop">drop</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DropCap_margin">margin</value>
+      <value tokenid="ooxml:Value_doc_ST_DropCap_none">none</value>
+      <value tokenid="ooxml:Value_doc_ST_DropCap_drop">drop</value>
+      <value tokenid="ooxml:Value_doc_ST_DropCap_margin">margin</value>
     </resource>
     <resource name="CT_FramePr" resource="Properties">
       <attribute name="dropCap" tokenid="ooxml:CT_FramePr_dropCap"/>
@@ -17146,9 +17146,9 @@
       <attribute name="pos" tokenid="ooxml:CT_TabStop_pos"/>
     </resource>
     <resource name="ST_LineSpacingRule" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_auto">auto</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_exact">exact</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_atLeast">atLeast</value>
+      <value tokenid="ooxml:Value_doc_ST_LineSpacingRule_auto">auto</value>
+      <value tokenid="ooxml:Value_doc_ST_LineSpacingRule_exact">exact</value>
+      <value tokenid="ooxml:Value_doc_ST_LineSpacingRule_atLeast">atLeast</value>
     </resource>
     <resource name="CT_Spacing" resource="Properties">
       <attribute name="before" tokenid="ooxml:CT_Spacing_before"/>
@@ -17193,21 +17193,21 @@
       <attribute name="val" tokenid="ooxml:CT_Jc_val" action="setValue"/>
     </resource>
     <resource name="ST_View" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_View_none">none</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_View_print">print</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_View_outline">outline</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_View_masterPages">masterPages</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_View_normal">normal</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_View_web">web</value>
+      <value tokenid="ooxml:Value_doc_ST_View_none">none</value>
+      <value tokenid="ooxml:Value_doc_ST_View_print">print</value>
+      <value tokenid="ooxml:Value_doc_ST_View_outline">outline</value>
+      <value tokenid="ooxml:Value_doc_ST_View_masterPages">masterPages</value>
+      <value tokenid="ooxml:Value_doc_ST_View_normal">normal</value>
+      <value tokenid="ooxml:Value_doc_ST_View_web">web</value>
     </resource>
     <resource name="CT_View" resource="Properties">
       <attribute name="val" tokenid="ooxml:CT_View_val"/>
     </resource>
     <resource name="ST_Zoom" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Zoom_none">none</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Zoom_fullPage">fullPage</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Zoom_bestFit">bestFit</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_Zoom_textFit">textFit</value>
+      <value tokenid="ooxml:Value_doc_ST_Zoom_none">none</value>
+      <value tokenid="ooxml:Value_doc_ST_Zoom_fullPage">fullPage</value>
+      <value tokenid="ooxml:Value_doc_ST_Zoom_bestFit">bestFit</value>
+      <value tokenid="ooxml:Value_doc_ST_Zoom_textFit">textFit</value>
     </resource>
     <resource name="ST_Percentage" resource="Integer"/>
     <resource name="CT_Zoom" resource="Properties">
@@ -17227,29 +17227,29 @@
       <attribute name="grammar" tokenid="ooxml:CT_Proof_grammar"/>
     </resource>
     <resource name="ST_DocType" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocType_notSpecified">notSpecified</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocType_letter">letter</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocType_eMail">eMail</value>
+      <value tokenid="ooxml:Value_doc_ST_DocType_notSpecified">notSpecified</value>
+      <value tokenid="ooxml:Value_doc_ST_DocType_letter">letter</value>
+      <value tokenid="ooxml:Value_doc_ST_DocType_eMail">eMail</value>
     </resource>
     <resource name="CT_DocType" resource="Properties">
       <attribute name="val" tokenid="ooxml:CT_DocType_val"/>
     </resource>
     <resource name="ST_DocProtect" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocProtect_none">none</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocProtect_readOnly">readOnly</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocProtect_comments">comments</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocProtect_trackedChanges">trackedChanges</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocProtect_forms">forms</value>
+      <value tokenid="ooxml:Value_doc_ST_DocProtect_none">none</value>
+      <value tokenid="ooxml:Value_doc_ST_DocProtect_readOnly">readOnly</value>
+      <value tokenid="ooxml:Value_doc_ST_DocProtect_comments">comments</value>
+      <value tokenid="ooxml:Value_doc_ST_DocProtect_trackedChanges">trackedChanges</value>
+      <value tokenid="ooxml:Value_doc_ST_DocProtect_forms">forms</value>
     </resource>
     <resource name="ST_CryptProv" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_CryptProv_rsaAES">rsaAES</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_CryptProv_rsaFull">rsaFull</value>
+      <value tokenid="ooxml:Value_doc_ST_CryptProv_rsaAES">rsaAES</value>
+      <value tokenid="ooxml:Value_doc_ST_CryptProv_rsaFull">rsaFull</value>
     </resource>
     <resource name="ST_AlgClass" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_AlgClass_hash">hash</value>
+      <value tokenid="ooxml:Value_doc_ST_AlgClass_hash">hash</value>
     </resource>
     <resource name="ST_AlgType" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_AlgType_typeAny">typeAny</value>
+      <value tokenid="ooxml:Value_doc_ST_AlgType_typeAny">typeAny</value>
     </resource>
     <resource name="AG_Password" resource="Properties">
       <attribute name="cryptProviderType" tokenid="ooxml:AG_Password_cryptProviderType"/>
@@ -17309,22 +17309,22 @@
       <attribute name="val" tokenid="ooxml:CT_TextDirection_val" action="setValue"/>
     </resource>
     <resource name="ST_TextAlignment" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_TextAlignment_top">top</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_TextAlignment_center">center</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_TextAlignment_baseline">baseline</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_TextAlignment_bottom">bottom</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_TextAlignment_auto">auto</value>
+      <value tokenid="ooxml:Value_doc_ST_TextAlignment_top">top</value>
+      <value tokenid="ooxml:Value_doc_ST_TextAlignment_center">center</value>
+      <value tokenid="ooxml:Value_doc_ST_TextAlignment_baseline">baseline</value>
+      <value tokenid="ooxml:Value_doc_ST_TextAlignment_bottom">bottom</value>
+      <value tokenid="ooxml:Value_doc_ST_TextAlignment_auto">auto</value>
     </resource>
     <resource name="CT_TextAlignment" resource="Value">
       <attribute name="val" tokenid="ooxml:CT_TextAlignment_val" action="setValue"/>
     </resource>
     <resource name="ST_DisplacedByCustomXml" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DisplacedByCustomXml_next">next</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DisplacedByCustomXml_prev">prev</value>
+      <value tokenid="ooxml:Value_doc_ST_DisplacedByCustomXml_next">next</value>
+      <value tokenid="ooxml:Value_doc_ST_DisplacedByCustomXml_prev">prev</value>
     </resource>
     <resource name="ST_AnnotationVMerge" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_AnnotationVMerge_cont">cont</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_AnnotationVMerge_rest">rest</value>
+      <value tokenid="ooxml:Value_doc_ST_AnnotationVMerge_cont">cont</value>
+      <value tokenid="ooxml:Value_doc_ST_AnnotationVMerge_rest">rest</value>
     </resource>
     <resource name="CT_Markup" resource="Properties">
       <attribute name="id" tokenid="ooxml:CT_Markup_id"/>
@@ -17539,8 +17539,8 @@
       <value tokenid="ooxml:Value_ST_FldCharType_end">end</value>
     </resource>
     <resource name="ST_InfoTextType" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_InfoTextType_text">text</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_InfoTextType_autoText">autoText</value>
+      <value tokenid="ooxml:Value_doc_ST_InfoTextType_text">text</value>
+      <value tokenid="ooxml:Value_doc_ST_InfoTextType_autoText">autoText</value>
     </resource>
     <resource name="ST_FFName" resource="String"/>
     <resource name="CT_FFTextType" resource="Value">
@@ -17714,17 +17714,17 @@
       <attribute name="gutter" tokenid="ooxml:CT_PageMar_gutter"/>
     </resource>
     <resource name="ST_PageBorderZOrder" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_PageBorderZOrder_front">front</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_PageBorderZOrder_back">back</value>
+      <value tokenid="ooxml:Value_doc_ST_PageBorderZOrder_front">front</value>
+      <value tokenid="ooxml:Value_doc_ST_PageBorderZOrder_back">back</value>
     </resource>
     <resource name="ST_PageBorderDisplay" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_PageBorderDisplay_allPages">allPages</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_PageBorderDisplay_firstPage">firstPage</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_PageBorderDisplay_notFirstPage">notFirstPage</value>
+      <value tokenid="ooxml:Value_doc_ST_PageBorderDisplay_allPages">allPages</value>
+      <value tokenid="ooxml:Value_doc_ST_PageBorderDisplay_firstPage">firstPage</value>
+      <value tokenid="ooxml:Value_doc_ST_PageBorderDisplay_notFirstPage">notFirstPage</value>
     </resource>
     <resource name="ST_PageBorderOffset" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_PageBorderOffset_page">page</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_PageBorderOffset_text">text</value>
+      <value tokenid="ooxml:Value_doc_ST_PageBorderOffset_page">page</value>
+      <value tokenid="ooxml:Value_doc_ST_PageBorderOffset_text">text</value>
     </resource>
     <resource name="CT_PageBorders" resource="Properties">
       <element name="top" tokenid="ooxml:CT_PageBorders_top"/>
@@ -17780,10 +17780,10 @@
       <attribute name="val" tokenid="ooxml:CT_VerticalJc_val" action="setValue"/>
     </resource>
     <resource name="ST_DocGrid" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocGrid_default">default</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocGrid_lines">lines</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocGrid_linesAndChars">linesAndChars</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_DocGrid_snapToChars">snapToChars</value>
+      <value tokenid="ooxml:Value_doc_ST_DocGrid_default">default</value>
+      <value tokenid="ooxml:Value_doc_ST_DocGrid_lines">lines</value>
+      <value tokenid="ooxml:Value_doc_ST_DocGrid_linesAndChars">linesAndChars</value>
+      <value tokenid="ooxml:Value_doc_ST_DocGrid_snapToChars">snapToChars</value>
     </resource>
     <resource name="CT_DocGrid" resource="Properties">
       <attribute name="type" tokenid="ooxml:CT_DocGrid_type"/>
@@ -17796,10 +17796,10 @@
       <value tokenid="ooxml:Value_ST_HdrFtr_first">first</value>
     </resource>
     <resource name="ST_FtnEdn" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_FtnEdn_normal">normal</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_FtnEdn_separator">separator</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_FtnEdn_continuationSeparator">continuationSeparator</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_FtnEdn_continuationNotice">continuationNotice</value>
+      <value tokenid="ooxml:Value_doc_ST_FtnEdn_normal">normal</value>
+      <value tokenid="ooxml:Value_doc_ST_FtnEdn_separator">separator</value>
+      <value tokenid="ooxml:Value_doc_ST_FtnEdn_continuationSeparator">continuationSeparator</value>
+      <value tokenid="ooxml:Value_doc_ST_FtnEdn_continuationNotice">continuationNotice</value>
     </resource>
     <resource xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" name="CT_HdrFtrRef" resource="Properties">
       <attribute name="type" tokenid="ooxml:CT_HdrFtrRef_type"/>
@@ -18319,8 +18319,8 @@
       <action name="end" action="endRow"/>
     </resource>
     <resource name="ST_TblLayout" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_TblLayout_fixed">fixed</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_TblLayout_autofit">autofit</value>
+      <value tokenid="ooxml:Value_doc_ST_TblLayout_fixed">fixed</value>
+      <value tokenid="ooxml:Value_doc_ST_TblLayout_autofit">autofit</value>
     </resource>
     <resource name="CT_TblLayoutType" resource="Value">
       <attribute name="type" tokenid="ooxml:CT_TblLayoutType_type" action="setValue"/>
@@ -18587,18 +18587,18 @@
       <attribute name="qFormat" tokenid="ooxml:CT_LsdException_qFormat"/>
     </resource>
     <resource name="ST_ColorSchemeIndex" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_dark1">dark1</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_light1">light1</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_dark2">dark2</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_light2">light2</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_accent1">accent1</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_accent2">accent2</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_accent3">accent3</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_accent4">accent4</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_accent5">accent5</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_accent6">accent6</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_hyperlink">hyperlink</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_ColorSchemeIndex_followedHyperlink">followedHyperlink</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_dark1">dark1</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_light1">light1</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_dark2">dark2</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_light2">light2</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_accent1">accent1</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_accent2">accent2</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_accent3">accent3</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_accent4">accent4</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_accent5">accent5</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_accent6">accent6</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_hyperlink">hyperlink</value>
+      <value tokenid="ooxml:Value_doc_ST_ColorSchemeIndex_followedHyperlink">followedHyperlink</value>
     </resource>
     <resource name="CT_ReadingModeInkLockDown" resource="Properties">
       <attribute name="actualPg" tokenid="ooxml:CT_ReadingModeInkLockDown_actualPg"/>
@@ -18999,10 +18999,10 @@
       <element name="styles" tokenid="ooxml:STYLESHEET"/>
     </resource>
     <resource name="ST_CaptionPos" resource="List">
-      <value tokenid="ooxml:Value_wordprocessingml_ST_CaptionPos_above">above</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_CaptionPos_below">below</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_CaptionPos_left">left</value>
-      <value tokenid="ooxml:Value_wordprocessingml_ST_CaptionPos_right">right</value>
+      <value tokenid="ooxml:Value_doc_ST_CaptionPos_above">above</value>
+      <value tokenid="ooxml:Value_doc_ST_CaptionPos_below">below</value>
+      <value tokenid="ooxml:Value_doc_ST_CaptionPos_left">left</value>
+      <value tokenid="ooxml:Value_doc_ST_CaptionPos_right">right</value>
     </resource>
     <resource name="CT_Caption" resource="Properties">
       <attribute name="name" tokenid="ooxml:CT_Caption_name"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1003601ebe73..52d89934120d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1943,7 +1943,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
         break;
         case RTF_FTNSEP:
             m_aStates.top().nDestinationState = DESTINATION_FOOTNOTESEPARATOR;
-            m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_FtnEdn_type, RTFValue::Pointer_t(new RTFValue(NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_separator)));
+            m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_FtnEdn_type, RTFValue::Pointer_t(new RTFValue(NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)));
             break;
         default:
         {
@@ -2435,19 +2435,19 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
     {
     case RTF_FAFIXED:
     case RTF_FAAUTO:
-        nParam = NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_auto;
+        nParam = NS_ooxml::LN_Value_doc_ST_TextAlignment_auto;
         break;
     case RTF_FAHANG:
-        nParam = NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_top;
+        nParam = NS_ooxml::LN_Value_doc_ST_TextAlignment_top;
         break;
     case RTF_FACENTER:
-        nParam = NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_center;
+        nParam = NS_ooxml::LN_Value_doc_ST_TextAlignment_center;
         break;
     case RTF_FAROMAN:
-        nParam = NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_baseline;
+        nParam = NS_ooxml::LN_Value_doc_ST_TextAlignment_baseline;
         break;
     case RTF_FAVAR:
-        nParam = NS_ooxml::LN_Value_wordprocessingml_ST_TextAlignment_bottom;
+        nParam = NS_ooxml::LN_Value_doc_ST_TextAlignment_bottom;
         break;
     default:
         break;
@@ -3143,57 +3143,57 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
         m_aStates.top().aPicture.nStyle = BMPSTYLE_JPEG;
         break;
     case RTF_POSYT:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_top);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_doc_ST_YAlign_top);
         break;
     case RTF_POSYB:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_doc_ST_YAlign_bottom);
         break;
     case RTF_POSYC:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_doc_ST_YAlign_center);
         break;
     case RTF_POSYIN:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_inside);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_doc_ST_YAlign_inside);
         break;
     case RTF_POSYOUT:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_outside);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_doc_ST_YAlign_outside);
         break;
     case RTF_POSYIL:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_inline);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_yAlign, NS_ooxml::LN_Value_doc_ST_YAlign_inline);
         break;
 
     case RTF_PHMRG:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_hAnchor, NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_margin);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_hAnchor, NS_ooxml::LN_Value_doc_ST_HAnchor_margin);
         break;
     case RTF_PVMRG:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_vAnchor, NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_margin);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_vAnchor, NS_ooxml::LN_Value_doc_ST_VAnchor_margin);
         break;
     case RTF_PHPG:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_hAnchor, NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_page);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_hAnchor, NS_ooxml::LN_Value_doc_ST_HAnchor_page);
         break;
     case RTF_PVPG:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_vAnchor, NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_page);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_vAnchor, NS_ooxml::LN_Value_doc_ST_VAnchor_page);
         break;
     case RTF_PHCOL:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_hAnchor, NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_text);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_hAnchor, NS_ooxml::LN_Value_doc_ST_HAnchor_text);
         break;
     case RTF_PVPARA:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_vAnchor, NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_text);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_vAnchor, NS_ooxml::LN_Value_doc_ST_VAnchor_text);
         break;
 
     case RTF_POSXC:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_center);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_doc_ST_XAlign_center);
         break;
     case RTF_POSXI:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_inside);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_doc_ST_XAlign_inside);
         break;
     case RTF_POSXO:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_outside);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_doc_ST_XAlign_outside);
         break;
     case RTF_POSXL:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_left);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_doc_ST_XAlign_left);
         break;
     case RTF_POSXR:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_Value_doc_ST_XAlign_right);
         break;
 
     case RTF_DPLINE:
@@ -3335,7 +3335,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
             m_aStates.top().aDrawingObject.xPropertySet->setPropertyValue("CornerRadius", uno::makeAny(sal_Int32(83)));
         break;
     case RTF_NOWRAP:
-        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_wrap, NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_notBeside);
+        m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_wrap, NS_ooxml::LN_Value_doc_ST_Wrap_notBeside);
         break;
     case RTF_MNOR:
         m_bMathNor = true;
@@ -3766,10 +3766,10 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
     case RTF_SL:
     {
         // This is similar to RTF_ABSH, negative value means 'exact', positive means 'at least'.
-        RTFValue::Pointer_t pValue(new RTFValue(NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_atLeast));
+        RTFValue::Pointer_t pValue(new RTFValue(NS_ooxml::LN_Value_doc_ST_LineSpacingRule_atLeast));
         if (nParam < 0)
         {
-            pValue.reset(new RTFValue(NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_exact));
+            pValue.reset(new RTFValue(NS_ooxml::LN_Value_doc_ST_LineSpacingRule_exact));
             pIntValue.reset(new RTFValue(-nParam));
         }
         m_aStates.top().aParagraphAttributes.set(NS_ooxml::LN_CT_Spacing_lineRule, pValue);
@@ -3779,7 +3779,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
     case RTF_SLMULT:
         if (nParam > 0)
         {
-            RTFValue::Pointer_t pValue(new RTFValue(NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_auto));
+            RTFValue::Pointer_t pValue(new RTFValue(NS_ooxml::LN_Value_doc_ST_LineSpacingRule_auto));
             m_aStates.top().aParagraphAttributes.set(NS_ooxml::LN_CT_Spacing_lineRule, pValue);
         }
         break;
@@ -5966,7 +5966,7 @@ RTFFrame::RTFFrame(RTFParserState* pParserState)
       nHoriAnchor(0),
       nVertAlign(0),
       nVertAnchor(0),
-      nHRule(NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto),
+      nHRule(NS_ooxml::LN_Value_doc_ST_HeightRule_auto),
       nAnchorType(0)
 {
 }
@@ -6058,7 +6058,7 @@ RTFSprms RTFFrame::getSprms()
         case NS_ooxml::LN_CT_FramePr_h:
             if (nH != 0)
             {
-                if (nHRule == NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact)
+                if (nHRule == NS_ooxml::LN_Value_doc_ST_HeightRule_exact)
                     pValue.reset(new RTFValue(-nH)); // The negative value just sets nHRule
                 else
                     pValue.reset(new RTFValue(nH));
@@ -6079,14 +6079,14 @@ RTFSprms RTFFrame::getSprms()
         case NS_ooxml::LN_CT_FramePr_hAnchor:
         {
             if (nHoriAnchor == 0)
-                nHoriAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_margin;
+                nHoriAnchor = NS_ooxml::LN_Value_doc_ST_HAnchor_margin;
             pValue.reset(new RTFValue(nHoriAnchor));
         }
         break;
         case NS_ooxml::LN_CT_FramePr_vAnchor:
         {
             if (nVertAnchor == 0)
-                nVertAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_margin;
+                nVertAnchor = NS_ooxml::LN_Value_doc_ST_VAnchor_margin;
             pValue.reset(new RTFValue(nVertAnchor));
         }
         break;
@@ -6099,9 +6099,9 @@ RTFSprms RTFFrame::getSprms()
         case NS_ooxml::LN_CT_FramePr_hRule:
         {
             if (nH < 0)
-                nHRule = NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact;
+                nHRule = NS_ooxml::LN_Value_doc_ST_HeightRule_exact;
             else if (nH > 0)
-                nHRule = NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_atLeast;
+                nHRule = NS_ooxml::LN_Value_doc_ST_HeightRule_atLeast;
             pValue.reset(new RTFValue(nHRule));
         }
         break;
diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx
index 4725a2865fc2..e33927a2e14a 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -39,13 +39,13 @@ public:
         switch (GetOrient())
         {
         case css::text::VertOrientation::CENTER:
-            nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center;
+            nAlign = NS_ooxml::LN_Value_doc_ST_YAlign_center;
             break;
         case css::text::VertOrientation::TOP:
-            nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_top;
+            nAlign = NS_ooxml::LN_Value_doc_ST_YAlign_top;
             break;
         case css::text::VertOrientation::BOTTOM:
-            nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom;
+            nAlign = NS_ooxml::LN_Value_doc_ST_YAlign_bottom;
             break;
         }
 
@@ -58,13 +58,13 @@ public:
         switch (GetRelation())
         {
         case css::text::RelOrientation::FRAME:
-            nAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_text;
+            nAnchor = NS_ooxml::LN_Value_doc_ST_VAnchor_text;
             break;
         case css::text::RelOrientation::PAGE_FRAME:
-            nAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_page;
+            nAnchor = NS_ooxml::LN_Value_doc_ST_VAnchor_page;
             break;
         case css::text::RelOrientation::PAGE_PRINT_AREA:
-            nAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_margin;
+            nAnchor = NS_ooxml::LN_Value_doc_ST_VAnchor_margin;
             break;
         }
 
@@ -110,19 +110,19 @@ public:
         switch (GetOrient())
         {
         case css::text::HoriOrientation::CENTER:
-            nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_center;
+            nAlign = NS_ooxml::LN_Value_doc_ST_XAlign_center;
             break;
         case css::text::HoriOrientation::RIGHT:
-            nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right;
+            nAlign = NS_ooxml::LN_Value_doc_ST_XAlign_right;
             break;
         case css::text::HoriOrientation::LEFT:
-            nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_left;
+            nAlign = NS_ooxml::LN_Value_doc_ST_XAlign_left;
             break;
         case css::text::HoriOrientation::INSIDE:
-            nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_inside;
+            nAlign = NS_ooxml::LN_Value_doc_ST_XAlign_inside;
             break;
         case css::text::HoriOrientation::OUTSIDE:
-            nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_outside;
+            nAlign = NS_ooxml::LN_Value_doc_ST_XAlign_outside;
             break;
         }
 
@@ -135,13 +135,13 @@ public:
         switch (GetRelation())
         {
         case css::text::RelOrientation::FRAME:
-            nAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_text;
+            nAnchor = NS_ooxml::LN_Value_doc_ST_HAnchor_text;
             break;
         case css::text::RelOrientation::PAGE_FRAME:
-            nAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_page;
+            nAnchor = NS_ooxml::LN_Value_doc_ST_HAnchor_page;
             break;
         case css::text::RelOrientation::PAGE_PRINT_AREA:
-            nAnchor = NS_ooxml::LN_Value_wordprocessingml_ST_HAnchor_margin;
+            nAnchor = NS_ooxml::LN_Value_doc_ST_HAnchor_margin;
             break;
         }