oox: introduce W_TOKEN() macro

It was inconsistent that when parsing <a:foo> elements, A_TOKEN(foo) was
available, but for <w:foo> elements there was no W_TOKEN() macro.

Also, there were two manual variants (NMSP_doc|XML_foo or via
OOX_TOKEN(doc, foo)), replace both of them with W_TOKEN() for easier
searching.

Change-Id: Ic5cd027f07518535b92671ffe3c486016a3f9f0a

1 files changed, 4 insertions, 4 deletions

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 0b490652cc68..6f03fdc56b8f 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1030,13 +1030,13 @@ void OOXMLFastContextHandlerProperties::handleXNotes()
 {
     switch (mnToken)
     {
-    case NMSP_doc|XML_footnoteReference:
+    case W_TOKEN(footnoteReference):
         {
             OOXMLFootnoteHandler aFootnoteHandler(this);
             mpPropertySet->resolve(aFootnoteHandler);
         }
         break;
-    case NMSP_doc|XML_endnoteReference:
+    case W_TOKEN(endnoteReference):
         {
             OOXMLEndnoteHandler aEndnoteHandler(this);
             mpPropertySet->resolve(aEndnoteHandler);
@@ -1051,13 +1051,13 @@ void OOXMLFastContextHandlerProperties::handleHdrFtr()
 {
     switch (mnToken)
     {
-    case NMSP_doc|XML_footerReference:
+    case W_TOKEN(footerReference):
         {
             OOXMLFooterHandler aFooterHandler(this);
             mpPropertySet->resolve(aFooterHandler);
         }
         break;
-    case NMSP_doc|XML_headerReference:
+    case W_TOKEN(headerReference):
         {
             OOXMLHeaderHandler aHeaderHandler(this);
             mpPropertySet->resolve(aHeaderHandler);