dr77: optimizations in generation of XML tokens, XML namespaces, property names; code cleanup

1 files changed, 13 insertions, 15 deletions

diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index 884b6d30fa61..81320bef5e89 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -34,9 +34,7 @@
 #include <com/sun/star/uno/Any.hxx>
 
 #include "oox/helper/attributelist.hxx"
-#include "oox/core/namespaces.hxx"
 #include "oox/drawingml/embeddedwavaudiofile.hxx"
-#include "tokens.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
@@ -67,29 +65,29 @@ namespace oox { namespace ppt {
 
                 switch( aElementToken )
                 {
-                case NMSP_PPT|XML_bg:
+                case PPT_TOKEN( bg ):
                     bTargetSet = true;
                     maShapeTarget.mnType = XML_bg;
                     break;
-                case NMSP_PPT|XML_txEl:
+                case PPT_TOKEN( txEl ):
                     bTargetSet = true;
                     maShapeTarget.mnType = XML_txEl;
                     break;
-                case NMSP_PPT|XML_subSp:
+                case PPT_TOKEN( subSp ):
                     bTargetSet = true;
                     maShapeTarget.mnType = XML_subSp;
                     maShapeTarget.msSubShapeId = xAttribs->getOptionalValue( XML_spid );
                     break;
-                case NMSP_PPT|XML_graphicEl:
-                case NMSP_PPT|XML_oleChartEl:
+                case PPT_TOKEN( graphicEl ):
+                case PPT_TOKEN( oleChartEl ):
                     bTargetSet = true;
                     // TODO
                     break;
-                case NMSP_PPT|XML_charRg:
-                case NMSP_PPT|XML_pRg:
+                case PPT_TOKEN( charRg ):
+                case PPT_TOKEN( pRg ):
                     if( bTargetSet && maShapeTarget.mnType == XML_txEl )
                     {
-                        maShapeTarget.mnRangeType = getToken( aElementToken );
+                        maShapeTarget.mnRangeType = getBaseToken( aElementToken );
                         maShapeTarget.maRange = drawingml::GetIndexRange( xAttribs );
                     }
                     break;
@@ -130,7 +128,7 @@ namespace oox { namespace ppt {
 
         switch( aElementToken )
         {
-        case NMSP_PPT|XML_inkTgt:
+        case PPT_TOKEN( inkTgt ):
         {
             mpTarget->mnType = XML_inkTgt;
             OUString aId = xAttribs->getOptionalValue( XML_spid );
@@ -140,10 +138,10 @@ namespace oox { namespace ppt {
             }
             break;
         }
-        case NMSP_PPT|XML_sldTgt:
+        case PPT_TOKEN( sldTgt ):
             mpTarget->mnType = XML_sldTgt;
             break;
-        case NMSP_PPT|XML_sndTgt:
+        case PPT_TOKEN( sndTgt ):
         {
             mpTarget->mnType = XML_sndTgt;
             drawingml::EmbeddedWAVAudioFile aAudio;
@@ -153,7 +151,7 @@ namespace oox { namespace ppt {
             mpTarget->msValue = sSndName;
             break;
         }
-        case NMSP_PPT|XML_spTgt:
+        case PPT_TOKEN( spTgt ):
         {
             mpTarget->mnType = XML_spTgt;
             OUString aId = xAttribs->getOptionalValue( XML_spid );
@@ -162,7 +160,7 @@ namespace oox { namespace ppt {
             break;
         }
         default:
-            OSL_TRACE( "OOX: unhandled tag %ld in TL_TimeTargetElement.", getToken( aElementToken ) );
+            OSL_TRACE( "OOX: unhandled tag %ld in TL_TimeTargetElement.", getBaseToken( aElementToken ) );
             break;
         }