com::sun::star->css in sd

Change-Id: Ic0cbc857a3a9c66241b94c30bf8c859435f5a4b4

19 files changed, 210 insertions, 213 deletions

diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx
index f59d6df11461..7127f372eccd 100644
--- a/sd/inc/CustomAnimationCloner.hxx
+++ b/sd/inc/CustomAnimationCloner.hxx
@@ -26,8 +26,8 @@ class SdPage;
 
 namespace sd
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > Clone(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSourceNode,
+    css::uno::Reference< css::animations::XAnimationNode > Clone(
+        const css::uno::Reference< css::animations::XAnimationNode >& xSourceNode,
         const SdPage* pSource = 0, const SdPage* pTarget = 0 );
 }
 
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index f3eff3062d4b..f6dbd1815821 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -57,12 +57,12 @@ class SD_DLLPUBLIC CustomAnimationEffect
     friend class EffectSequenceHelper;
 
 public:
-    CustomAnimationEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+    CustomAnimationEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
     virtual ~CustomAnimationEffect();
 
-    SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& getNode() const { return mxNode; }
-    SAL_DLLPRIVATE void setNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
-    SAL_DLLPRIVATE void replaceNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+    SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAnimationNode >& getNode() const { return mxNode; }
+    SAL_DLLPRIVATE void setNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+    SAL_DLLPRIVATE void replaceNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
 
     SAL_DLLPRIVATE CustomAnimationEffectPtr clone() const;
 
@@ -71,39 +71,39 @@ public:
     SAL_DLLPRIVATE const OUString&    getPresetSubType() const { return maPresetSubType; }
     SAL_DLLPRIVATE const OUString&    getProperty() const { return maProperty; }
 
-    SAL_DLLPRIVATE sal_Int16               getPresetClass() const { return mnPresetClass; }
-    SAL_DLLPRIVATE void                    setPresetClass( sal_Int16 nPresetClass );
+    SAL_DLLPRIVATE sal_Int16       getPresetClass() const { return mnPresetClass; }
+    SAL_DLLPRIVATE void            setPresetClass( sal_Int16 nPresetClass );
 
     SAL_DLLPRIVATE sal_Int16       getNodeType() const { return mnNodeType; }
-    void           setNodeType( sal_Int16 nNodeType );
+    void                           setNodeType( sal_Int16 nNodeType );
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Any              getRepeatCount() const;
-    SAL_DLLPRIVATE void            setRepeatCount( const ::com::sun::star::uno::Any& rRepeatCount );
+    SAL_DLLPRIVATE css::uno::Any   getRepeatCount() const;
+    SAL_DLLPRIVATE void            setRepeatCount( const css::uno::Any& rRepeatCount );
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Any              getEnd() const;
-    SAL_DLLPRIVATE void            setEnd( const ::com::sun::star::uno::Any& rEnd );
+    SAL_DLLPRIVATE css::uno::Any   getEnd() const;
+    SAL_DLLPRIVATE void            setEnd( const css::uno::Any& rEnd );
 
     SAL_DLLPRIVATE sal_Int16       getFill() const;
     SAL_DLLPRIVATE void            setFill( sal_Int16 nFill );
 
     SAL_DLLPRIVATE double          getBegin() const { return mfBegin; }
-    void           setBegin( double fBegin );
+    void                           setBegin( double fBegin );
 
     SAL_DLLPRIVATE double          getDuration() const { return mfDuration; }
-    void           setDuration( double fDuration );
+    void                           setDuration( double fDuration );
 
     SAL_DLLPRIVATE double          getAbsoluteDuration() const { return mfAbsoluteDuration; }
 
     SAL_DLLPRIVATE sal_Int16       getIterateType() const { return mnIterateType; }
-    void           setIterateType( sal_Int16 nIterateType );
+    void                           setIterateType( sal_Int16 nIterateType );
 
     SAL_DLLPRIVATE double          getIterateInterval() const { return mfIterateInterval; }
-    void           setIterateInterval( double fIterateInterval );
+    void                           setIterateInterval( double fIterateInterval );
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Any  getTarget() const { return maTarget; }
-    void                       setTarget( const ::com::sun::star::uno::Any& rTarget );
+    SAL_DLLPRIVATE css::uno::Any  getTarget() const { return maTarget; }
+    void                          setTarget( const css::uno::Any& rTarget );
 
-    SAL_DLLPRIVATE bool        hasAfterEffect() const { return mbHasAfterEffect; }
+    SAL_DLLPRIVATE bool             hasAfterEffect() const { return mbHasAfterEffect; }
     SAL_DLLPRIVATE void            setHasAfterEffect( bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
 
     SAL_DLLPRIVATE css::uno::Any   getDimColor() const { return maDimColor; }
@@ -114,7 +114,7 @@ public:
 
     SAL_DLLPRIVATE sal_Int32       getParaDepth() const { return mnParaDepth; }
 
-    SAL_DLLPRIVATE bool        hasText() const { return mbHasText; }
+    SAL_DLLPRIVATE bool            hasText() const { return mbHasText; }
 
     SAL_DLLPRIVATE sal_Int16       getCommand() const { return mnCommand; }
 
@@ -124,23 +124,23 @@ public:
     SAL_DLLPRIVATE double          getDecelerate() const { return mfDecelerate; }
     SAL_DLLPRIVATE void            setDecelerate( double fDecelerate );
 
-    SAL_DLLPRIVATE bool        getAutoReverse() const { return mbAutoReverse; }
+    SAL_DLLPRIVATE bool            getAutoReverse() const { return mbAutoReverse; }
     SAL_DLLPRIVATE void            setAutoReverse( bool bAutoReverse );
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Any  getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue );
-    SAL_DLLPRIVATE bool                        setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
+    SAL_DLLPRIVATE css::uno::Any  getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue );
+    SAL_DLLPRIVATE bool           setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const css::uno::Any& rValue );
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Any  getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
-    SAL_DLLPRIVATE bool                        setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue );
+    SAL_DLLPRIVATE css::uno::Any  getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
+    SAL_DLLPRIVATE bool           setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const css::uno::Any& rValue );
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Any  getColor( sal_Int32 nIndex );
-    SAL_DLLPRIVATE void                        setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor );
+    SAL_DLLPRIVATE css::uno::Any  getColor( sal_Int32 nIndex );
+    SAL_DLLPRIVATE void            setColor( sal_Int32 nIndex, const css::uno::Any& rColor );
 
     SAL_DLLPRIVATE sal_Int32       getGroupId() const { return mnGroupId; }
     SAL_DLLPRIVATE void            setGroupId( sal_Int32 nGroupId );
 
     SAL_DLLPRIVATE sal_Int16       getTargetSubItem() const { return mnTargetSubItem; }
-    void           setTargetSubItem( sal_Int16 nSubItem );
+    void                           setTargetSubItem( sal_Int16 nSubItem );
 
     SAL_DLLPRIVATE OUString getPath() const;
     SAL_DLLPRIVATE void setPath( const OUString& rPath );
@@ -148,22 +148,22 @@ public:
     SAL_DLLPRIVATE bool checkForText();
     SAL_DLLPRIVATE bool calculateIterateDuration();
 
-    SAL_DLLPRIVATE void setAudio( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& xAudio );
+    SAL_DLLPRIVATE void setAudio( const css::uno::Reference< css::animations::XAudio >& xAudio );
     SAL_DLLPRIVATE bool getStopAudio() const;
     void setStopAudio();
-    void createAudio( const ::com::sun::star::uno::Any& rSource, double fVolume = 1.0 );
+    void createAudio( const css::uno::Any& rSource, double fVolume = 1.0 );
     SAL_DLLPRIVATE void removeAudio();
-    SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& getAudio() const { return mxAudio; }
+    SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAudio >& getAudio() const { return mxAudio; }
 
     SAL_DLLPRIVATE EffectSequenceHelper*   getEffectSequence() const { return mpEffectSequence; }
 
     // helper
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAfterEffectNode() const throw (com::sun::star::uno::Exception);
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetShape() const;
+    SAL_DLLPRIVATE css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNode() const throw (css::uno::Exception);
+    SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > getTargetShape() const;
 
     // static helpers
-    SAL_DLLPRIVATE static sal_Int32 get_node_type( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
-    SAL_DLLPRIVATE static sal_Int32 getNumberOfSubitems( const ::com::sun::star::uno::Any& aTarget, sal_Int16 nIterateType );
+    SAL_DLLPRIVATE static sal_Int32 get_node_type( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+    SAL_DLLPRIVATE static sal_Int32 getNumberOfSubitems( const css::uno::Any& aTarget, sal_Int16 nIterateType );
 
     SAL_DLLPRIVATE SdrPathObj* createSdrPathObjFromPath();
     SAL_DLLPRIVATE void updateSdrPathObjFromPath( SdrPathObj& rPathObj );
@@ -174,9 +174,9 @@ protected:
 
 private:
     sal_Int16       mnNodeType;
-    OUString   maPresetId;
-    OUString   maPresetSubType;
-    OUString   maProperty;
+    OUString        maPresetId;
+    OUString        maPresetSubType;
+    OUString        maProperty;
     sal_Int16       mnPresetClass;
     double          mfBegin;
     double          mfDuration;                 // this is the maximum duration of the subeffects
@@ -185,29 +185,29 @@ private:
     sal_Int16       mnIterateType;
     double          mfIterateInterval;
     sal_Int32       mnParaDepth;
-    bool        mbHasText;
+    bool            mbHasText;
     double          mfAcceleration;
     double          mfDecelerate;
-    bool        mbAutoReverse;
+    bool            mbAutoReverse;
     sal_Int16       mnTargetSubItem;
     sal_Int16       mnCommand;
 
     EffectSequenceHelper* mpEffectSequence;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode;
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudio;
-    ::com::sun::star::uno::Any maTarget;
+    css::uno::Reference< css::animations::XAnimationNode > mxNode;
+    css::uno::Reference< css::animations::XAudio > mxAudio;
+    css::uno::Any maTarget;
 
     bool        mbHasAfterEffect;
-    ::com::sun::star::uno::Any maDimColor;
+    css::uno::Any maDimColor;
     bool        mbAfterEffectOnNextEffect;
 };
 
 struct stl_CustomAnimationEffect_search_node_predict
 {
-    stl_CustomAnimationEffect_search_node_predict( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSearchNode );
+    stl_CustomAnimationEffect_search_node_predict( const css::uno::Reference< css::animations::XAnimationNode >& xSearchNode );
     bool operator()( CustomAnimationEffectPtr pEffect ) const;
-    const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& mxSearchNode;
+    const css::uno::Reference< css::animations::XAnimationNode >& mxSearchNode;
 };
 
 enum ESequenceHint { EFFECT_EDITED, EFFECT_REMOVED, EFFECT_ADDED };
@@ -229,7 +229,7 @@ class CustomAnimationTextGroup
     friend class EffectSequenceHelper;
 
 public:
-    CustomAnimationTextGroup( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rTarget, sal_Int32 nGroupId );
+    CustomAnimationTextGroup( const css::uno::Reference< css::drawing::XShape >& rTarget, sal_Int32 nGroupId );
 
     void reset();
     void addEffect( CustomAnimationEffectPtr& pEffect );
@@ -245,7 +245,7 @@ public:
 
 private:
     EffectSequence maEffects;
-    ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape > maTarget;
+    css::uno::Reference< css::drawing::XShape > maTarget;
 
     enum { PARA_LEVELS = 5 };
 
@@ -267,32 +267,32 @@ friend class MainSequence;
 
 public:
     SAL_DLLPRIVATE EffectSequenceHelper();
-    SAL_DLLPRIVATE EffectSequenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot );
+    SAL_DLLPRIVATE EffectSequenceHelper( const css::uno::Reference< css::animations::XTimeContainer >& xSequenceRoot );
     SAL_DLLPRIVATE virtual ~EffectSequenceHelper();
 
-    SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode();
+    SAL_DLLPRIVATE virtual css::uno::Reference< css::animations::XAnimationNode > getRootNode();
 
-    SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 );
-    SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 );
+    SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const css::uno::Any& rTarget, double fDuration = -1.0 );
+    SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const css::uno::Any& rTarget, double fDuration = -1.0 );
     void append( const CustomAnimationEffectPtr& pEffect );
     SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration = -1.0 );
     SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration = -1.0 );
     SAL_DLLPRIVATE void remove( const CustomAnimationEffectPtr& pEffect );
 
-    SAL_DLLPRIVATE void create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
-    SAL_DLLPRIVATE void createEffectsequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
-    SAL_DLLPRIVATE void processAfterEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
-    SAL_DLLPRIVATE void createEffects( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+    SAL_DLLPRIVATE void create( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+    SAL_DLLPRIVATE void createEffectsequence( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+    SAL_DLLPRIVATE void processAfterEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+    SAL_DLLPRIVATE void createEffects( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
 
     SAL_DLLPRIVATE sal_Int32 getCount() const { return sal::static_int_cast< sal_Int32 >( maEffects.size() ); }
 
-    SAL_DLLPRIVATE virtual CustomAnimationEffectPtr findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const;
+    SAL_DLLPRIVATE virtual CustomAnimationEffectPtr findEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode ) const;
 
-    SAL_DLLPRIVATE virtual bool disposeShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
-    SAL_DLLPRIVATE virtual void insertTextRange( const com::sun::star::uno::Any& aTarget );
-    SAL_DLLPRIVATE virtual void disposeTextRange( const com::sun::star::uno::Any& aTarget );
-    SAL_DLLPRIVATE virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
-    SAL_DLLPRIVATE virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
+    SAL_DLLPRIVATE virtual bool disposeShape( const css::uno::Reference< css::drawing::XShape >& xShape );
+    SAL_DLLPRIVATE virtual void insertTextRange( const css::uno::Any& aTarget );
+    SAL_DLLPRIVATE virtual void disposeTextRange( const css::uno::Any& aTarget );
+    SAL_DLLPRIVATE virtual bool hasEffect( const css::uno::Reference< css::drawing::XShape >& xShape );
+    SAL_DLLPRIVATE virtual void onTextChanged( const css::uno::Reference< css::drawing::XShape >& xShape );
 
     /** this method rebuilds the animation nodes */
     SAL_DLLPRIVATE virtual void rebuild();
@@ -317,8 +317,8 @@ public:
 
     SAL_DLLPRIVATE sal_Int32 getSequenceType() const { return mnSequenceType; }
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTriggerShape() const { return mxEventSource; }
-    SAL_DLLPRIVATE void setTriggerShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTrigger ) { mxEventSource = xTrigger; }
+    SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > getTriggerShape() const { return mxEventSource; }
+    SAL_DLLPRIVATE void setTriggerShape( const css::uno::Reference< css::drawing::XShape >& xTrigger ) { mxEventSource = xTrigger; }
 
     SAL_DLLPRIVATE virtual sal_Int32 getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const;
     SAL_DLLPRIVATE virtual CustomAnimationEffectPtr getEffectFromOffset( sal_Int32 nOffset ) const;
@@ -334,12 +334,12 @@ protected:
     SAL_DLLPRIVATE void updateTextGroups();
 
 protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer > mxSequenceRoot;
+    css::uno::Reference< css::animations::XTimeContainer > mxSequenceRoot;
     EffectSequence maEffects;
     std::list< ISequenceListener* > maListeners;
     CustomAnimationTextGroupMap maGroupMap;
     sal_Int32 mnSequenceType;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxEventSource;
+    css::uno::Reference< css::drawing::XShape > mxEventSource;
 };
 
 class MainSequence;
@@ -350,7 +350,7 @@ friend class MainSequence;
 friend class MainSequenceChangeGuard;
 
 public:
-    InteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot, MainSequence* pMainSequence );
+    InteractiveSequence( const css::uno::Reference< css::animations::XTimeContainer >& xSequenceRoot, MainSequence* pMainSequence );
 
     /** this method rebuilds the animation nodes */
     virtual void rebuild() override;
@@ -372,28 +372,28 @@ class MainSequence : public EffectSequenceHelper, public ISequenceListener
 
 public:
     MainSequence();
-    MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode );
+    MainSequence( const css::uno::Reference< css::animations::XAnimationNode >& xTimingRootNode );
     virtual ~MainSequence();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode() override;
-    void reset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode );
+    virtual css::uno::Reference< css::animations::XAnimationNode > getRootNode() override;
+    void reset( const css::uno::Reference< css::animations::XAnimationNode >& xTimingRootNode );
 
     /** this method rebuilds the animation nodes */
     virtual void rebuild() override;
 
-    virtual CustomAnimationEffectPtr findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const override;
+    virtual CustomAnimationEffectPtr findEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode ) const override;
 
-    virtual bool disposeShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) override;
-    virtual void insertTextRange( const com::sun::star::uno::Any& aTarget ) override;
-    virtual void disposeTextRange( const com::sun::star::uno::Any& aTarget ) override;
-    virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) override;
-    virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) override;
+    virtual bool disposeShape( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void insertTextRange( const css::uno::Any& aTarget ) override;
+    virtual void disposeTextRange( const css::uno::Any& aTarget ) override;
+    virtual bool hasEffect( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void onTextChanged( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     const InteractiveSequenceList& getInteractiveSequenceList() const { return maInteractiveSequenceList; }
 
     virtual void notify_change() override;
 
-    bool setTrigger( const CustomAnimationEffectPtr& pEffect, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTriggerShape );
+    bool setTrigger( const CustomAnimationEffectPtr& pEffect, const css::uno::Reference< css::drawing::XShape >& xTriggerShape );
 
     /** starts a timer that recreates the internal structure from the API core after 1 second */
     void startRecreateTimer();
@@ -419,12 +419,12 @@ protected:
     void createMainSequence();
     virtual void reset() override;
 
-    InteractiveSequencePtr createInteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape );
+    InteractiveSequencePtr createInteractiveSequence( const css::uno::Reference< css::drawing::XShape >& xShape );
 
     InteractiveSequenceList maInteractiveSequenceList;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener > mxChangesListener;
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer > mxTimingRootNode;
+    css::uno::Reference< css::util::XChangesListener > mxChangesListener;
+    css::uno::Reference< css::animations::XTimeContainer > mxTimingRootNode;
     Timer maTimer;
     bool mbTimerMode;
     bool mbRebuilding;
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 1f7abce5a724..8c8ef2fb518c 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -47,7 +47,7 @@ public:
 
     void add( CustomAnimationEffectPtr pEffect );
 
-    SD_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > create( const OUString& rstrSubType );
+    SD_DLLPUBLIC css::uno::Reference< css::animations::XAnimationNode > create( const OUString& rstrSubType );
 
     const OUString& getPresetId() const { return maPresetId; }
     const OUString& getLabel() const { return maLabel; }
@@ -96,7 +96,7 @@ public:
 
     static const CustomAnimationPresets& getCustomAnimationPresets();
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const;
+    SAL_DLLPRIVATE css::uno::Reference< css::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const;
 
     CustomAnimationPresetPtr getEffectDescriptor( const OUString& rPresetId ) const;
 
@@ -115,12 +115,12 @@ private:
     SAL_DLLPRIVATE void importEffects();
     SAL_DLLPRIVATE void importResources();
 
-    SAL_DLLPRIVATE void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap  );
+    SAL_DLLPRIVATE void importPresets( const css::uno::Reference< css::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap  );
 
     SAL_DLLPRIVATE const OUString& translateName( const OUString& rId, const UStringMap& rNameMap ) const;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode;
+    css::uno::Reference< css::animations::XAnimationNode > mxRootNode;
     EffectDescriptorMap maEffectDiscriptorMap;
     UStringMap maEffectNameMap;
     UStringMap maPropertyNameMap;
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index 62103d03ceda..033e4ed9a233 100644
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.hxx
@@ -39,21 +39,21 @@ namespace sd {
 class EffectMigration
 {
 public:
-    static ::com::sun::star::presentation::AnimationSpeed ConvertDuration( double fDuration );
-    static double ConvertAnimationSpeed( ::com::sun::star::presentation::AnimationSpeed eSpeed );
+    static css::presentation::AnimationSpeed ConvertDuration( double fDuration );
+    static double ConvertAnimationSpeed( css::presentation::AnimationSpeed eSpeed );
 
-    static bool ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, ::com::sun::star::presentation::AnimationEffect& rEffect );
-    static bool ConvertAnimationEffect( const ::com::sun::star::presentation::AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType );
+    static bool ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, css::presentation::AnimationEffect& rEffect );
+    static bool ConvertAnimationEffect( const css::presentation::AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType );
 
-    static void SetFadeEffect( SdPage* pPage, ::com::sun::star::presentation::FadeEffect eNewEffect);
-    static ::com::sun::star::presentation::FadeEffect GetFadeEffect( const SdPage* pPage );
+    static void SetFadeEffect( SdPage* pPage, css::presentation::FadeEffect eNewEffect);
+    static css::presentation::FadeEffect GetFadeEffect( const SdPage* pPage );
 
-    static void SetAnimationEffect( SvxShape* pShape, ::com::sun::star::presentation::AnimationEffect eValue );
-    static ::com::sun::star::presentation::AnimationEffect GetAnimationEffect( SvxShape* pShape );
-    static void SetTextAnimationEffect( SvxShape* pShape, ::com::sun::star::presentation::AnimationEffect eValue );
-    static ::com::sun::star::presentation::AnimationEffect GetTextAnimationEffect( SvxShape* pShape );
-    static void SetAnimationSpeed( SvxShape* pShape, ::com::sun::star::presentation::AnimationSpeed eSpeed );
-    static ::com::sun::star::presentation::AnimationSpeed GetAnimationSpeed( SvxShape* pShape );
+    static void SetAnimationEffect( SvxShape* pShape, css::presentation::AnimationEffect eValue );
+    static css::presentation::AnimationEffect GetAnimationEffect( SvxShape* pShape );
+    static void SetTextAnimationEffect( SvxShape* pShape, css::presentation::AnimationEffect eValue );
+    static css::presentation::AnimationEffect GetTextAnimationEffect( SvxShape* pShape );
+    static void SetAnimationSpeed( SvxShape* pShape, css::presentation::AnimationSpeed eSpeed );
+    static css::presentation::AnimationSpeed GetAnimationSpeed( SvxShape* pShape );
     static void SetDimColor( SvxShape* pShape, sal_Int32 nColor );
     static sal_Int32 GetDimColor( SvxShape* pShape );
     static void SetDimHide( SvxShape* pShape, bool bDimHide );
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 65fcbee702fd..95416a259af3 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -57,7 +57,7 @@ public:
     const OUString& getPresetId() const { return maPresetId; }
 
 private:
-    TransitionPreset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+    TransitionPreset( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
 
     sal_Int16 mnTransition;
     sal_Int16 mnSubtype;
@@ -67,7 +67,7 @@ private:
     OUString maUIName;
 
     static bool importTransitionsFile( TransitionPresetList& rList,
-                                       ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+                                       css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceFactory,
                                        UStringMap& rTransitionNameMap,
                                        const OUString& aFilename );
 };
diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx
index a0be770eeee3..4d7755f4ccbf 100644
--- a/sd/inc/animations.hxx
+++ b/sd/inc/animations.hxx
@@ -30,11 +30,11 @@ namespace sd
 */
 struct AfterEffectNode
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode;
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxMaster;
+    css::uno::Reference< css::animations::XAnimationNode > mxNode;
+    css::uno::Reference< css::animations::XAnimationNode > mxMaster;
     bool mbOnNextEffect;
 
-    AfterEffectNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xMaster, bool bOnNextEffect )
+    AfterEffectNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const css::uno::Reference< css::animations::XAnimationNode >& xMaster, bool bOnNextEffect )
         : mxNode( xNode ), mxMaster( xMaster ), mbOnNextEffect( bOnNextEffect ) {}
 };
 
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 1a77dd033231..db2aeb38553b 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -37,25 +37,25 @@ public:
     PresObjKind             mePresObjKind;
 
     /* deprecated animation infos */
-    ::com::sun::star::presentation::AnimationEffect meEffect;     ///< Animation effect
-    ::com::sun::star::presentation::AnimationEffect meTextEffect; ///< Animation effect for text content
-    ::com::sun::star::presentation::AnimationSpeed  meSpeed;      ///< Speed of the animation
-    bool                    mbActive;       ///< turned on?
-    bool                    mbDimPrevious;  ///< Object fade out
-    bool                    mbIsMovie;      ///< if group object than it is a sequence of them.
-    bool                    mbDimHide;      ///< hide rather than dim
+    css::presentation::AnimationEffect meEffect;     ///< Animation effect
+    css::presentation::AnimationEffect meTextEffect; ///< Animation effect for text content
+    css::presentation::AnimationSpeed  meSpeed;      ///< Speed of the animation
+    bool                        mbActive;       ///< turned on?
+    bool                        mbDimPrevious;  ///< Object fade out
+    bool                        mbIsMovie;      ///< if group object than it is a sequence of them.
+    bool                        mbDimHide;      ///< hide rather than dim
     Color                       maBlueScreen;   ///< identifies "background pixels"
     Color                       maDimColor;     ///< for fading the object
     OUString                    maSoundFile;    ///< Path to the sound file in MS DOS notation
-    bool                    mbSoundOn;      ///< Sound on / off
-    bool                    mbPlayFull;     ///< play sound completely.
+    bool                        mbSoundOn;      ///< Sound on / off
+    bool                        mbPlayFull;     ///< play sound completely.
     SdrPathObj*                 mpPathObj;      ///< The path object
-    ::com::sun::star::presentation::ClickAction     meClickAction;  ///< Action at mouse click
-    ::com::sun::star::presentation::AnimationEffect meSecondEffect; ///< for object fading.
-    ::com::sun::star::presentation::AnimationSpeed  meSecondSpeed;  ///< for object fading.
+    css::presentation::ClickAction     meClickAction;  ///< Action at mouse click
+    css::presentation::AnimationEffect meSecondEffect; ///< for object fading.
+    css::presentation::AnimationSpeed  meSecondSpeed;  ///< for object fading.
     OUString                    maSecondSoundFile; ///< for object fading.
-    bool                    mbSecondSoundOn;   ///< for object fading.
-    bool                    mbSecondPlayFull;  ///< for object fading.
+    bool                        mbSecondSoundOn;   ///< for object fading.
+    bool                        mbSecondPlayFull;  ///< for object fading.
     sal_uInt16                  mnVerb;            ///< for OLE object
     sal_uLong                   mnPresOrder;
     SdrObject&                  mrObject;
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index 1f406029e861..11d1e15da139 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -38,7 +38,7 @@ private:
     SdDrawDocument* pDoc;
 
     // this is a weak reference to a possible living api wrapper for this custom show
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > mxUnoCustomShow;
+    css::uno::WeakReference< css::uno::XInterface > mxUnoCustomShow;
 
     // forbidden and not implemented
     SdCustomShow();
@@ -46,7 +46,7 @@ private:
 public:
     // single argument ctors shall be explicit
     explicit SdCustomShow(SdDrawDocument* pDrawDoc);
-    SdCustomShow(SdDrawDocument* pDrawDoc, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xShow );
+    SdCustomShow(SdDrawDocument* pDrawDoc, css::uno::Reference< css::uno::XInterface > xShow );
 
     virtual ~SdCustomShow();
 
@@ -68,7 +68,7 @@ public:
 
     SdDrawDocument* GetDoc() const { return pDoc; }
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoCustomShow();
+    css::uno::Reference< css::uno::XInterface > getUnoCustomShow();
 };
 
 #endif // INCLUDED_SD_INC_CUSSHOW_HXX
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 63370e02fd04..0b3c1e7b6de8 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -163,7 +163,7 @@ private:
 
     sd::PresentationSettings maPresentationSettings;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation;
+    css::uno::Reference< css::presentation::XPresentation2 > mxPresentation;
 
     bool                mbNewOrLoadCompleted;
 
@@ -179,7 +179,7 @@ private:
     bool                mbAllocDocSh;       // => AllocModel()
     DocumentType        meDocType;
     CharClass*          mpCharClass;
-    ::com::sun::star::lang::Locale* mpLocale;
+    css::lang::Locale*  mpLocale;
 
     ::std::unique_ptr<ImpDrawPageListWatcher> mpDrawPageListWatcher;
     ::std::unique_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher;
@@ -194,16 +194,14 @@ private:
                         DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellEventHdl, EditStatus&, void);
 
     std::vector< OUString > maAnnotationAuthors;
-    std::vector<com::sun::star::uno::Reference<
-        com::sun::star::xml::dom::XNode> > maLayoutInfo;
+    std::vector<css::uno::Reference< css::xml::dom::XNode> > maLayoutInfo;
 
-    std::vector<com::sun::star::uno::Reference<
-        com::sun::star::xml::dom::XNode> > maPresObjectInfo;
+    std::vector<css::uno::Reference< css::xml::dom::XNode> > maPresObjectInfo;
 
     bool                mbUseEmbedFonts;
 protected:
 
-    SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override;
+    SAL_DLLPRIVATE virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override;
 
 public:
 
@@ -279,14 +277,13 @@ public:
     /// load xml-based impress layout definitions into document
     SAL_DLLPRIVATE void InitLayoutVector();
     /// return reference to vector of Impress layout definitions
-    SAL_DLLPRIVATE const std::vector<com::sun::star::uno::Reference<
-        com::sun::star::xml::dom::XNode> >& GetLayoutVector() const
+    SAL_DLLPRIVATE const std::vector<css::uno::Reference< css::xml::dom::XNode> >& GetLayoutVector() const
     { return maLayoutInfo; }
 
    /// load xml-based impress master presentation object definitions into document
     SAL_DLLPRIVATE void InitObjectVector();
     /// return reference to vector of master presentation object definitions
-    SAL_DLLPRIVATE const std::vector<com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> >& GetObjectVector() const { return maPresObjectInfo; }
+    SAL_DLLPRIVATE const std::vector<css::uno::Reference<css::xml::dom::XNode> >& GetObjectVector() const { return maPresObjectInfo; }
     /** Insert pages into this document
 
         This method inserts whole pages into this document, either
@@ -379,7 +376,7 @@ public:
     SAL_DLLPRIVATE const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; }
     SAL_DLLPRIVATE sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; }
 
-    SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 >& getPresentation() const;
+    SAL_DLLPRIVATE const css::uno::Reference< css::presentation::XPresentation2 >& getPresentation() const;
 
     SAL_DLLPRIVATE void                SetSummationOfParagraphs( bool bOn = true ) { mbSummationOfParagraphs = bOn; }
     SAL_DLLPRIVATE bool            IsSummationOfParagraphs() const { return mbSummationOfParagraphs; }
@@ -388,9 +385,9 @@ public:
         depends on the current printer metrics.
         @param nMode
             Use <const
-            scope="com::sun::star::document::PrinterIndependentLayout">ENABLED</const>
+            scope="css::document::PrinterIndependentLayout">ENABLED</const>
             to make formatting printer-independent and <const
-            scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const>
+            scope="css::document::PrinterIndependentLayout">DISABLED</const>
             to make formatting depend on the current printer metrics.
     */
     SAL_DLLPRIVATE void SetPrinterIndependentLayout (sal_Int32 nMode);
@@ -399,9 +396,9 @@ public:
         depends on the current printer metrics.
         @return
             Use <const
-            scope="com::sun::star::document::PrinterIndependentLayout">ENABLED</const>
+            scope="css::document::PrinterIndependentLayout">ENABLED</const>
             when formatting is printer-independent and <const
-            scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const>
+            scope="css::document::PrinterIndependentLayout">DISABLED</const>
             when formatting depends on the current printer metrics.
     */
     SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout() { return mnPrinterIndependentLayout;}
@@ -461,8 +458,8 @@ public:
                                 bool bMergeMasterPages = false, bool bAllMasterPages = false,
                                 bool bUndo = true, bool bTreadSourceAsConst = false) override;
 
-    ::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
-    SAL_DLLPRIVATE void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode );
+    css::text::WritingMode GetDefaultWritingMode() const;
+    SAL_DLLPRIVATE void SetDefaultWritingMode( css::text::WritingMode eMode );
 
     /** replacespOldPage from all custom shows with pNewPage or removes pOldPage from
         all custom shows if pNewPage is 0.
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 390bca87b676..0d422752fe66 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -34,7 +34,7 @@ public:
 
     virtual void Closed() override;
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override;
+        const OUString& rMimeType, const css::uno::Any & rValue ) override;
     bool         Connect() { return 0 != SvBaseLink::GetRealObject(); }
 };
 
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 51a4b660e253..c732d4a9aba7 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -82,7 +82,7 @@ public:
     virtual OUString GetDocPath() const = 0;
     virtual bool GetStartWithFlag() const = 0;
     virtual bool IsDocEmpty() const = 0;
-    virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword() = 0;
+    virtual css::uno::Sequence< css::beans::NamedValue > GetPassword() = 0;
 };
 
 class AbstractSdModifyFieldDlg : public VclAbstractDialog
@@ -154,7 +154,7 @@ public:
 class AbstractSdPublishingDlg : public VclAbstractDialog
 {
 public:
-    virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ) = 0;
+    virtual void GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams ) = 0;
 };
 
 class AbstractHeaderFooterDialog : public VclAbstractDialog
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 2acf16b8889d..268db69c730b 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -87,7 +87,7 @@ class DiaEffectItem : public SfxEnumItem
 {
 public:
             TYPEINFO_OVERRIDE();
-            DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE );
+            DiaEffectItem( css::presentation::FadeEffect eFade = css::presentation::FadeEffect_NONE );
             DiaEffectItem( SvStream& rIn );
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const override;
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index 6b9293509c3a..1a5b57ab0353 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -44,14 +44,14 @@ public:
     virtual bool            Export() = 0;
 
 protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >             mxModel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >    mxStatusIndicator;
+    css::uno::Reference< css::frame::XModel >             mxModel;
+    css::uno::Reference< css::task::XStatusIndicator >    mxStatusIndicator;
 
     SfxMedium&                  mrMedium;
     ::sd::DrawDocShell&         mrDocShell;
     SdDrawDocument&             mrDocument;
-    bool                    mbIsDraw : 1;
-    bool                    mbShowProgress : 1;
+    bool                        mbIsDraw : 1;
+    bool                        mbShowProgress : 1;
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module*       OpenLibrary( const OUString& rLibraryName );
 #endif
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 658964454490..195728e8420b 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -152,8 +152,8 @@ private:
     SfxFrame* ExecuteNewDocument( SfxRequest& rReq );
 
     static void ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewFrame, const sal_Int32 eMedium );
-    static SfxFrame* CreateEmptyDocument( DocumentType eDocType, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
-    static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
+    static SfxFrame* CreateEmptyDocument( DocumentType eDocType, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
+    static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
 
     /** The resource container controls the lifetime of some singletons.
     */
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 017e911ed34f..624c86dba1cf 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -80,7 +80,7 @@ namespace sd {
         bool operator==( const HeaderFooterSettings& rSettings ) const;
     };
 
-    typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > > AnnotationVector;
+    typedef std::vector< css::uno::Reference< css::office::XAnnotation > > AnnotationVector;
 }
 
 namespace sd {
@@ -129,12 +129,12 @@ protected:
     sd::AnnotationVector    maAnnotations;
 
     /** holds the smil animation sequences for this page */
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode;
+    css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode;
 
     /** a helper class to manipulate effects inside the main sequence */
     std::shared_ptr< sd::MainSequence > mpMainSequence;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override;
+    virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
 
     SfxItemSet* mpItems;
 
@@ -214,8 +214,8 @@ public:
     void        SetSelected(bool bSel)               { mbSelected = bSel; }
     bool        IsSelected() const                   { return mbSelected; }
 
-    void        SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect);
-    ::com::sun::star::presentation::FadeEffect  GetFadeEffect() const;
+    void        SetFadeEffect(css::presentation::FadeEffect eNewEffect);
+    css::presentation::FadeEffect  GetFadeEffect() const;
 
     void        SetPresChange(PresChange eChange)    { mePresChange = eChange; }
     PresChange  GetPresChange() const                { return mePresChange; }
@@ -291,14 +291,14 @@ public:
 
     virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const override;
 
-    bool setAlienAttributes( const com::sun::star::uno::Any& rAttributes );
-    void getAlienAttributes( com::sun::star::uno::Any& rAttributes );
+    bool setAlienAttributes( const css::uno::Any& rAttributes );
+    void getAlienAttributes( css::uno::Any& rAttributes );
 
     /** @return the main animation node */
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getAnimationNode() throw (::com::sun::star::uno::RuntimeException);
+    css::uno::Reference< css::animations::XAnimationNode > getAnimationNode() throw (css::uno::RuntimeException);
 
     /** sets the main animation node */
-    void setAnimationNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) throw (::com::sun::star::uno::RuntimeException);
+    void setAnimationNode( css::uno::Reference< css::animations::XAnimationNode >& xNode ) throw (css::uno::RuntimeException);
 
     /// @return a helper class to manipulate effects inside the main sequence
     std::shared_ptr< sd::MainSequence > getMainSequence();
@@ -310,7 +310,7 @@ public:
     bool hasAnimationNode() const;
 
     /// @return the SdPage implementation for the given XDrawPage or 0 if not available
-    static SdPage* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage );
+    static SdPage* getImplementation( const css::uno::Reference< css::drawing::XDrawPage >& xPage );
 
     /** removes all custom animations for the given shape */
     void removeAnimations( const SdrObject* pObj );
@@ -368,9 +368,9 @@ public:
     */
     bool IsPrecious() const { return mbIsPrecious; }
 
-    void createAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation );
-    void addAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, int nIndex = -1 );
-    void removeAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation );
+    void createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation );
+    void addAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, int nIndex = -1 );
+    void removeAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation );
     const sd::AnnotationVector& getAnnotations() const { return maAnnotations; }
     sal_Int32 getHash() const;
     OString stringify() const;
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index d7451cb16ca0..9949f6339cb8 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -46,10 +46,10 @@ class SvxNumberFormat;
 typedef std::map< const SdPage*, SdStyleFamilyRef > SdStyleFamilyMap;
 
 typedef ::cppu::ImplInheritanceHelper< SfxStyleSheetPool,
-                                        ::com::sun::star::lang::XServiceInfo,
-                                        ::com::sun::star::container::XIndexAccess,
-                                        ::com::sun::star::container::XNameAccess,
-                                        ::com::sun::star::lang::XComponent > SdStyleSheetPoolBase;
+                                        css::lang::XServiceInfo,
+                                        css::container::XIndexAccess,
+                                        css::container::XNameAccess,
+                                        css::lang::XComponent > SdStyleSheetPoolBase;
 
 class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
 {
@@ -95,30 +95,30 @@ public:
     static void setDefaultOutlineNumberFormatBulletAndIndent(sal_uInt16 i, SvxNumberFormat &rNumberFormat);
 
 public:
-    void throwIfDisposed() throw(::com::sun::star::uno::RuntimeException);
+    void throwIfDisposed() throw(css::uno::RuntimeException);
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
     // XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ;
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
@@ -142,8 +142,8 @@ private:
     SdStyleFamilyRef        mxGraphicFamily;
     SdStyleFamilyRef        mxCellFamily;
     SdStyleFamilyMap        maStyleFamilyMap;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxTableFamily;
-    OUString           msTableFamilyName;
+    css::uno::Reference< css::container::XNameAccess > mxTableFamily;
+    OUString                msTableFamilyName;
 };
 
 #endif // INCLUDED_SD_INC_STLPOOL_HXX
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index a6f007024d84..e6f8522da705 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -44,11 +44,11 @@
 class ModifyListenerForewarder;
 
 typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet,
-                                    ::com::sun::star::beans::XPropertySet,
-                                    ::com::sun::star::lang::XServiceInfo,
-                                    ::com::sun::star::beans::XPropertyState,
-                                    ::com::sun::star::util::XModifyBroadcaster,
-                                    ::com::sun::star::lang::XComponent > SdStyleSheetBase ;
+                                    css::beans::XPropertySet,
+                                    css::lang::XServiceInfo,
+                                    css::beans::XPropertyState,
+                                    css::util::XModifyBroadcaster,
+                                    css::lang::XComponent > SdStyleSheetBase ;
 
 class SdStyleSheet : public SdStyleSheetBase, private ::cppu::BaseMutex
 {
@@ -87,43 +87,43 @@ public:
     virtual void SAL_CALL release(  ) throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XStyle
-    virtual sal_Bool SAL_CALL isUserDefined(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isInUse(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getParentStyle(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isUserDefined(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isInUse(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getParentStyle(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
 
     // XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     void notifyModifyListener();
 
@@ -136,7 +136,7 @@ protected:
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
     virtual             ~SdStyleSheet();
 
-    void throwIfDisposed() throw (::com::sun::star::uno::RuntimeException);
+    void throwIfDisposed() throw (css::uno::RuntimeException);
 
     void disposing();
 
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index 5844170f397b..466aad0eae38 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -42,13 +42,13 @@ public:
 
     virtual             ~TextApiObject() throw();
 
-    void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL dispose() throw(css::uno::RuntimeException);
 
     OutlinerParaObject* CreateText();
     void                SetText( OutlinerParaObject& rText );
     OUString            GetText();
 
-    static TextApiObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& );
+    static TextApiObject* getImplementation( const css::uno::Reference< css::text::XText >& );
 
 private:
     TextAPIEditSource*  mpSource;
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 2e42b9a2a726..9f97a1248d91 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -53,7 +53,7 @@ struct UndoAnimationPathImpl;
 class UndoAnimationPath : public SdrUndoAction
 {
 public:
-    UndoAnimationPath( SdDrawDocument* pDoc, SdPage* pThePage, const com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+    UndoAnimationPath( SdDrawDocument* pDoc, SdPage* pThePage, const css::uno::Reference< css::animations::XAnimationNode >& xNode );
     virtual ~UndoAnimationPath();
 
     virtual void Undo() override;