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

Change-Id: I7ae3c5198c22a3937e8c3ef87f48fa2a7e562c62
Reviewed-on: https://gerrit.libreoffice.org/19664
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

17 files changed, 35 insertions, 59 deletions

diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx
index a30ece2a4eae..e56b3bcd6212 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.hxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx
@@ -37,8 +37,7 @@ class AnimationAudioNode : public BaseNode, public AnimationEventHandler
 {
 public:
     AnimationAudioNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext );
 
@@ -54,10 +53,9 @@ private:
     virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) override;
 
 private:
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAudio >  mxAudioNode;
-    OUString                             maSoundURL;
-    mutable SoundPlayerSharedPtr                mpPlayer;
+    css::uno::Reference<css::animations::XAudio >  mxAudioNode;
+    OUString                                       maSoundURL;
+    mutable SoundPlayerSharedPtr                   mpPlayer;
 
     void createPlayer() const;
     void resetPlayer() const;
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index 3d3f05668e18..8470b8827d9e 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -39,8 +39,7 @@ class AnimationBaseNode : public BaseNode
 {
 public:
     AnimationBaseNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext );
 
@@ -51,8 +50,7 @@ public:
 protected:
     virtual void dispose() override;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimate> const& getXAnimateNode() const
+    css::uno::Reference<css::animations::XAnimate> const& getXAnimateNode() const
         { return mxAnimateNode; }
 
     /// Create parameter struct for ActivitiesFactory
@@ -79,8 +77,7 @@ private:
         { return mpShapeSubset && !mbIsIndependentSubset; }
 
 private:
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimate>     mxAnimateNode;
+    css::uno::Reference<css::animations::XAnimate>  mxAnimateNode;
     ShapeAttributeLayerHolder                       maAttributeLayerHolder;
     ::basegfx::B2DVector                            maSlideSize;
     AnimationActivitySharedPtr                      mpActivity;
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx
index ab05d632975c..4f5002d2c5e3 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx
@@ -30,12 +30,11 @@ class AnimationColorNode : public AnimationBaseNode
 {
 public:
     AnimationColorNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext )
         : AnimationBaseNode( xNode, pParent, rContext ),
-          mxColorNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
+          mxColorNode( xNode, css::uno::UNO_QUERY_THROW ) {}
 
 #if defined(DBG_UTIL)
     virtual const char* getDescription() const override { return "AnimationColorNode"; }
@@ -44,8 +43,7 @@ public:
 private:
     virtual AnimationActivitySharedPtr createActivity() const override;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimateColor > mxColorNode;
+    css::uno::Reference<css::animations::XAnimateColor > mxColorNode;
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index 47e4f961bb20..0ccc94fc7f68 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -33,14 +33,14 @@ using namespace com::sun::star;
 namespace slideshow {
 namespace internal {
 
-namespace EffectCommands = com::sun::star::presentation::EffectCommands;
+namespace EffectCommands = css::presentation::EffectCommands;
 
 AnimationCommandNode::AnimationCommandNode( uno::Reference<animations::XAnimationNode> const& xNode,
                                              ::boost::shared_ptr<BaseContainerNode> const& pParent,
                                              NodeContext const& rContext ) :
     BaseNode( xNode, pParent, rContext ),
     mpShape(),
-    mxCommandNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW )
+    mxCommandNode( xNode, css::uno::UNO_QUERY_THROW )
 {
     uno::Reference< drawing::XShape > xShape( mxCommandNode->getTarget(),
                                               uno::UNO_QUERY );
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index 545e5821b29e..d252e23edce9 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -37,8 +37,7 @@ class AnimationCommandNode : public BaseNode
 {
 public:
     AnimationCommandNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext );
 
@@ -51,8 +50,7 @@ private:
 
 private:
     IExternalMediaShapeBaseSharedPtr mpShape;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XCommand > mxCommandNode;
+    css::uno::Reference<css::animations::XCommand > mxCommandNode;
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
index 5954f5a7af64..ead89c7e22dc 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
@@ -29,12 +29,11 @@ class AnimationPathMotionNode : public AnimationBaseNode
 {
 public:
     AnimationPathMotionNode(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode >& xNode,
+        const css::uno::Reference<css::animations::XAnimationNode >& xNode,
         const BaseContainerNodeSharedPtr&               rParent,
         const NodeContext&                              rContext )
         : AnimationBaseNode( xNode, rParent, rContext ),
-          mxPathMotionNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
+          mxPathMotionNode( xNode, css::uno::UNO_QUERY_THROW ) {}
 
 #if defined(DBG_UTIL)
     virtual const char* getDescription() const override
@@ -47,8 +46,7 @@ protected:
 private:
     virtual AnimationActivitySharedPtr createActivity() const override;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimateMotion >  mxPathMotionNode;
+    css::uno::Reference<css::animations::XAnimateMotion >  mxPathMotionNode;
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx b/slideshow/source/engine/animationnodes/animationsetnode.hxx
index 11771fd4d206..aa48843e4819 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx
@@ -28,8 +28,7 @@ class AnimationSetNode : public AnimationBaseNode
 {
 public:
     AnimationSetNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext )
         : AnimationBaseNode( xNode, pParent, rContext ) {}
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
index 7f33847321cf..852eeb015aea 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
@@ -30,12 +30,11 @@ class AnimationTransformNode : public AnimationBaseNode
 {
 public:
     AnimationTransformNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext )
         : AnimationBaseNode( xNode, pParent, rContext ),
-          mxTransformNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
+          mxTransformNode( xNode, css::uno::UNO_QUERY_THROW ) {}
 
 #if defined(DBG_UTIL)
     virtual const char* getDescription() const override
@@ -48,8 +47,7 @@ protected:
 private:
     virtual AnimationActivitySharedPtr createActivity() const override;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimateTransform >   mxTransformNode;
+    css::uno::Reference<css::animations::XAnimateTransform >   mxTransformNode;
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
index bf94f14580a7..38ea94d21d62 100644
--- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
@@ -30,12 +30,11 @@ class AnimationTransitionFilterNode : public AnimationBaseNode
 {
 public:
     AnimationTransitionFilterNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext )
         : AnimationBaseNode( xNode, pParent, rContext ),
-          mxTransitionFilterNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW)
+          mxTransitionFilterNode( xNode, css::uno::UNO_QUERY_THROW)
         {}
 
 #if OSL_DEBUG_LEVEL >= 2
@@ -49,8 +48,7 @@ protected:
 private:
     virtual AnimationActivitySharedPtr createActivity() const override;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XTransitionFilter> mxTransitionFilterNode;
+    css::uno::Reference<css::animations::XTransitionFilter> mxTransitionFilterNode;
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx
index 48e3e021a24b..7549039b7106 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.hxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx
@@ -31,8 +31,7 @@ class BaseContainerNode : public BaseNode
 {
 public:
     BaseContainerNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext );
 
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 998c1e0ccac9..56bfecf7b5f4 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -704,7 +704,7 @@ void BaseNode::showState() const
 
         if( !xTargetShape.is() )
         {
-            ::com::sun::star::presentation::ParagraphTarget aTarget;
+            css::presentation::ParagraphTarget aTarget;
 
             // no shape provided. Maybe a ParagraphTarget?
             if( (xAnimate->getTarget() >>= aTarget) )
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index 28322a5385af..25dd2b94fadc 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -78,8 +78,7 @@ class BaseNode : public AnimationNode,
                  private ::boost::noncopyable
 {
 public:
-    BaseNode( ::com::sun::star::uno::Reference<
-              ::com::sun::star::animations::XAnimationNode> const& xNode,
+    BaseNode( css::uno::Reference<css::animations::XAnimationNode> const& xNode,
               ::boost::shared_ptr<BaseContainerNode> const&        pParent,
               NodeContext const&                                   rContext );
 
@@ -110,8 +109,7 @@ public:
     virtual bool activate() override;
     virtual void deactivate() override;
     virtual void end() override;
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> getXAnimationNode() const override;
+    virtual css::uno::Reference<css::animations::XAnimationNode> getXAnimationNode() const override;
     virtual NodeState getState() const override;
     virtual bool registerDeactivatingListener(
         const AnimationNodeSharedPtr& rNotifee ) override;
@@ -192,8 +190,7 @@ private:
     typedef ::std::vector< AnimationNodeSharedPtr >    ListenerVector;
 
     ListenerVector                                     maDeactivatingListeners;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode > mxAnimationNode;
+    css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode;
     ::boost::shared_ptr< BaseContainerNode >           mpParent;
     ::boost::shared_ptr< BaseNode >                    mpSelf;
     const int*                                         mpStateTransitionTable;
diff --git a/slideshow/source/engine/animationnodes/generateevent.hxx b/slideshow/source/engine/animationnodes/generateevent.hxx
index b59b3af6255f..10f66a195903 100644
--- a/slideshow/source/engine/animationnodes/generateevent.hxx
+++ b/slideshow/source/engine/animationnodes/generateevent.hxx
@@ -42,7 +42,7 @@ namespace internal {
     Additional delay, gets added on top of timeout.
 */
 EventSharedPtr generateEvent(
-    ::com::sun::star::uno::Any const& rEventDescription,
+    css::uno::Any const& rEventDescription,
     Delay::FunctorT const& rFunctor,
     SlideShowContext const& rContext,
     double nAdditionalDelay );
diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx
index 984fe1581053..cf25d793226f 100644
--- a/slideshow/source/engine/animationnodes/nodetools.hxx
+++ b/slideshow/source/engine/animationnodes/nodetools.hxx
@@ -58,14 +58,13 @@ namespace slideshow
             it does not implement the AttributableShape interface.
          */
         AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr&                rShapeManager,
-                                                            const ::com::sun::star::uno::Reference<
-                                                                ::com::sun::star::drawing::XShape >&    xShape          );
+                                                            const css::uno::Reference< css::drawing::XShape >&    xShape );
 
         /** Predicate whether a Begin, Duration or End timing is
             indefinite, i.e. either contains no value, or the
             value Timing_INDEFINITE.
         */
-        bool isIndefiniteTiming( const ::com::sun::star::uno::Any& rAny );
+        bool isIndefiniteTiming( const css::uno::Any& rAny );
 
     }
 }
diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
index ea9a97b8f554..b5e04c0b6b4e 100644
--- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
@@ -32,8 +32,7 @@ class ParallelTimeContainer : public BaseContainerNode
 {
 public:
     ParallelTimeContainer(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode >& xNode,
+        const css::uno::Reference< css::animations::XAnimationNode >& xNode,
         const BaseContainerNodeSharedPtr&               rParent,
         const NodeContext&                              rContext )
         : BaseContainerNode( xNode, rParent, rContext ) {}
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
index da4ef57cd387..654cf85daa8a 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
@@ -28,8 +28,7 @@ class PropertyAnimationNode : public AnimationBaseNode
 {
 public:
     PropertyAnimationNode(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         ::boost::shared_ptr<BaseContainerNode> const& pParent,
         NodeContext const& rContext )
         : AnimationBaseNode( xNode, pParent, rContext ) {}
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index 900069e10d4c..76b7f6c313dc 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -32,8 +32,7 @@ class SequentialTimeContainer : public BaseContainerNode
 {
 public:
     SequentialTimeContainer(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        css::uno::Reference<css::animations::XAnimationNode> const& xNode,
         BaseContainerNodeSharedPtr const& pParent,
         NodeContext const& rContext )
         : BaseContainerNode( xNode, pParent, rContext ) {}