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

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 ) )
              )
     {

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

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;
             }

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;

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)

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:

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 );

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;
         }