1 files changed, 5 insertions, 7 deletions

diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx
index e52d8b27a464..5b622b6ef602 100644
--- a/oox/source/ppt/conditioncontext.cxx
+++ b/oox/source/ppt/conditioncontext.cxx
@@ -37,13 +37,11 @@
 #include <com/sun/star/animations/EventTrigger.hpp>
 
 #include "oox/helper/attributelist.hxx"
-#include "oox/core/namespaces.hxx"
 #include "oox/core/contexthandler.hxx"
 #include "oox/ppt/animationspersist.hxx"
 #include "animationtypes.hxx"
 
 #include "timetargetelementcontext.hxx"
-#include "tokens.hxx"
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
@@ -54,7 +52,7 @@ namespace oox { namespace ppt {
 
     CondContext::CondContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs,
                 const TimeNodePtr & pNode, AnimationCondition & aValue )
-        :  TimeNodeContext( rParent, NMSP_PPT|XML_cond, xAttribs, pNode )
+        :  TimeNodeContext( rParent, PPT_TOKEN( cond ), xAttribs, pNode )
         , maCond( aValue )
     {
         maEvent.Trigger =  EventTrigger::NONE;
@@ -123,7 +121,7 @@ namespace oox { namespace ppt {
 
         switch( aElementToken )
         {
-        case NMSP_PPT|XML_rtn:
+        case PPT_TOKEN( rtn ):
         {
             // ST_TLTriggerRuntimeNode { first, last, all }
             sal_Int32 aTok;
@@ -147,7 +145,7 @@ namespace oox { namespace ppt {
             maCond.maValue = makeAny( nEnum );
             break;
         }
-        case NMSP_PPT|XML_tn:
+        case PPT_TOKEN( tn ):
         {
             maCond.mnType = aElementToken;
             AttributeList attribs( xAttribs );
@@ -155,7 +153,7 @@ namespace oox { namespace ppt {
             maCond.maValue = makeAny( nId );
             break;
         }
-        case NMSP_PPT|XML_tgtEl:
+        case PPT_TOKEN( tgtEl ):
             // CT_TLTimeTargetElement
             xRet.set( new TimeTargetElementContext( *this, maCond.getTarget() ) );
             break;
@@ -194,7 +192,7 @@ namespace oox { namespace ppt {
 
         switch( aElement )
         {
-        case NMSP_PPT|XML_cond:
+        case PPT_TOKEN( cond ):
             // add a condition to the list
             maConditions.push_back( AnimationCondition() );
             xRet.set( new CondContext( *this, xAttribs, mpNode, maConditions.back() ) );