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>

23 files changed, 113 insertions, 176 deletions

diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx
index 587997d56512..57c8541d25b5 100644
--- a/slideshow/source/inc/activitiesfactory.hxx
+++ b/slideshow/source/inc/activitiesfactory.hxx
@@ -149,8 +149,7 @@ namespace ActivitiesFactory
     AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const NumberAnimationSharedPtr&                rAnimator,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimate >&   xNode );
+        const css::uno::Reference< css::animations::XAnimate >&   xNode );
 
     /** Create an activity from an XAnimate node.
 
@@ -172,8 +171,7 @@ namespace ActivitiesFactory
     AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const EnumAnimationSharedPtr&                  rAnimator,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimate >&      xNode );
+        const css::uno::Reference< css::animations::XAnimate >&      xNode );
 
     /** Create an activity from an XAnimate node.
 
@@ -195,8 +193,7 @@ namespace ActivitiesFactory
     AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const ColorAnimationSharedPtr&                 rAnimator,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimate >&      xNode );
+        const css::uno::Reference< css::animations::XAnimate >&      xNode );
 
     /** Create an activity from an XAnimate node.
 
@@ -218,8 +215,7 @@ namespace ActivitiesFactory
     AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                            rParms,
         const HSLColorAnimationSharedPtr&                  rAnimator,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimateColor >&     xNode );
+        const css::uno::Reference< css::animations::XAnimateColor >&     xNode );
 
     /** Create an activity from an XAnimate node.
 
@@ -241,8 +237,7 @@ namespace ActivitiesFactory
     AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const PairAnimationSharedPtr&                  rAnimator,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimate >&   xNode );
+        const css::uno::Reference< css::animations::XAnimate >&   xNode );
 
     /** Create an activity from an XAnimate node.
 
@@ -264,8 +259,7 @@ namespace ActivitiesFactory
     AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const StringAnimationSharedPtr&                rAnimator,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimate >&      xNode );
+        const css::uno::Reference< css::animations::XAnimate >&      xNode );
 
     /** Create an activity from an XAnimate node.
 
@@ -287,8 +281,7 @@ namespace ActivitiesFactory
     AnimationActivitySharedPtr createAnimateActivity(
         const CommonParameters&                        rParms,
         const BoolAnimationSharedPtr&                  rAnimator,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimate >&      xNode );
+        const css::uno::Reference< css::animations::XAnimate >&      xNode );
 
     /** Create a simple activity for the given animator
 
diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx
index 54f3c7e1306e..8eabe47e98be 100644
--- a/slideshow/source/inc/animationnode.hxx
+++ b/slideshow/source/inc/animationnode.hxx
@@ -53,8 +53,7 @@ public:
 
     /** Query the corresponding XAnimationNode.
      */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode >
+    virtual css::uno::Reference< css::animations::XAnimationNode >
     getXAnimationNode() const = 0;
 
     /** Init this node
diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx
index f0ab3135caf1..d7c9162824f4 100644
--- a/slideshow/source/inc/animationnodefactory.hxx
+++ b/slideshow/source/inc/animationnodefactory.hxx
@@ -44,10 +44,9 @@ namespace slideshow
         {
             /** Create an AnimationNode for the given XAnimationNode
              */
-            AnimationNodeSharedPtr createAnimationNode( const ::com::sun::star::uno::Reference<
-                                                                       ::com::sun::star::animations::XAnimationNode >& xNode,
-                                                               const ::basegfx::B2DVector&                          rSlideSize,
-                                                               const SlideShowContext&                              rContext );
+            AnimationNodeSharedPtr createAnimationNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode,
+                                                        const ::basegfx::B2DVector&                          rSlideSize,
+                                                        const SlideShowContext&                              rContext );
 
 
 #if defined(DBG_UTIL)
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index 6262bc7734f0..b92cd442ec18 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -135,8 +135,7 @@ class ShapeCursorEventHandler
 public:
     virtual ~ShapeCursorEventHandler() {}
 
-    virtual bool cursorChanged( const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::drawing::XShape>&   xShape,
+    virtual bool cursorChanged( const css::uno::Reference< css::drawing::XShape>&   xShape,
                                       sal_Int16                                nCursor ) = 0;
 };
 
@@ -491,8 +490,7 @@ public:
         @param xView
         View that has changed
     */
-    bool notifyViewChanged( const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::presentation::XSlideShowView>& xView );
+    bool notifyViewChanged( const css::uno::Reference<css::presentation::XSlideShowView>& xView );
 
     /** All Views changed
 
@@ -510,8 +508,7 @@ public:
         @param xView
         View that has been clobbered
     */
-    bool notifyViewClobbered( const ::com::sun::star::uno::Reference<
-                                 ::com::sun::star::presentation::XSlideShowView>& xView );
+    bool notifyViewClobbered( const css::uno::Reference<css::presentation::XSlideShowView>& xView );
 
     /** New shape event listener added
 
@@ -521,10 +518,8 @@ public:
         @return true, if at least one handler successfully processed
         the notification.
      */
-    bool notifyShapeListenerAdded( const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::presentation::XShapeEventListener>& xListener,
-                                   const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::drawing::XShape>&                   xShape );
+    bool notifyShapeListenerAdded( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener,
+                                   const css::uno::Reference<css::drawing::XShape>&                   xShape );
 
     /** A shape event listener was removed
 
@@ -534,10 +529,8 @@ public:
         @return true, if at least one handler successfully processed
         the notification.
      */
-    bool notifyShapeListenerRemoved( const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::presentation::XShapeEventListener>& xListener,
-                                     const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::drawing::XShape>&                   xShape );
+    bool notifyShapeListenerRemoved( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener,
+                                     const css::uno::Reference<css::drawing::XShape>&                   xShape );
 
     /** A new shape cursor was set
 
@@ -547,8 +540,7 @@ public:
         @return true, if at least one handler successfully processed
         the notification.
      */
-    bool notifyShapeCursorChange( const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::drawing::XShape>&  xShape,
+    bool notifyShapeCursorChange( const css::uno::Reference<css::drawing::XShape>&  xShape,
                                   sal_Int16                               nPointerShape );
 
     /** Notify a new user paint color
diff --git a/slideshow/source/inc/mouseeventhandler.hxx b/slideshow/source/inc/mouseeventhandler.hxx
index 5886f29a2b1e..2a7d716e1170 100644
--- a/slideshow/source/inc/mouseeventhandler.hxx
+++ b/slideshow/source/inc/mouseeventhandler.hxx
@@ -59,7 +59,7 @@ namespace slideshow
                 false, possibly other, less prioritized handlers can be
                 called, too.
              */
-            virtual bool handleMousePressed( const ::com::sun::star::awt::MouseEvent& e ) = 0;
+            virtual bool handleMousePressed( const css::awt::MouseEvent& e ) = 0;
 
             /** Handle a mouse button released event.
 
@@ -74,7 +74,7 @@ namespace slideshow
                 false, possibly other, less prioritized handlers are
                 called, too.
              */
-            virtual bool handleMouseReleased( const ::com::sun::star::awt::MouseEvent& e ) = 0;
+            virtual bool handleMouseReleased( const css::awt::MouseEvent& e ) = 0;
 
             /** Handle a mouse was moved with a pressed button event.
 
@@ -89,7 +89,7 @@ namespace slideshow
                 false, possibly other, less prioritized handlers are
                 called, too.
              */
-            virtual bool handleMouseDragged( const ::com::sun::star::awt::MouseEvent& e ) = 0;
+            virtual bool handleMouseDragged( const css::awt::MouseEvent& e ) = 0;
 
             /** Handle a mouse was moved event.
 
@@ -104,7 +104,7 @@ namespace slideshow
                 false, possibly other, less prioritized handlers are
                 called, too.
              */
-            virtual bool handleMouseMoved( const ::com::sun::star::awt::MouseEvent& e ) = 0;
+            virtual bool handleMouseMoved( const css::awt::MouseEvent& e ) = 0;
         };
 
         typedef ::boost::shared_ptr< MouseEventHandler > MouseEventHandlerSharedPtr;
diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx
index 741e76ab3d7e..a0ed0d38d7ac 100644
--- a/slideshow/source/inc/shape.hxx
+++ b/slideshow/source/inc/shape.hxx
@@ -65,8 +65,7 @@ namespace slideshow
                 direct corresponding XShape (the background comes to
                 mind here).
              */
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShape > getXShape() const = 0;
+            virtual css::uno::Reference< css::drawing::XShape > getXShape() const = 0;
 
 
             // View layer methods
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
index f2bed3498fba..c4b23db7fbdc 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slideshow/source/inc/shapeattributelayer.hxx
@@ -133,13 +133,13 @@ namespace slideshow
                 layers are combined with this one (i.e. to overrule
                 lower layers, or how to combine the values). The
                 default is
-                ::com::sun::star::animations::AnimationAdditiveMode::BASE,
+                css::animations::AnimationAdditiveMode::BASE,
                 which means, take the value of the underlying layers,
                 or from the model shape itself.
 
                 @param nMode
                 Must be one of
-                ::com::sun::star::animations::AnimationAdditiveMode.
+                css::animations::AnimationAdditiveMode.
              */
             void setAdditiveMode( sal_Int16 nMode );
 
@@ -410,14 +410,14 @@ namespace slideshow
             /** Get the current char weight value for the whole shape.
 
                 @returns the value for the char weight. The value must
-                be out of the ::com::sun::star::awt::FontWeight
+                be out of the css::awt::FontWeight
                 constant group.
              */
             double getCharWeight() const;
             /** Set the char weight globally for the whole shape.
 
                 The value must be out of the
-                ::com::sun::star::awt::FontWeight constant group.
+                css::awt::FontWeight constant group.
              */
             void setCharWeight( const double& rStyle );
 
@@ -454,13 +454,13 @@ namespace slideshow
             /** Get the current text italic style for the whole shape.
 
                 @returns the italic style. The value returned is one
-                of the ::com::sun::star::awt::FontSlant enums
+                of the css::awt::FontSlant enums
              */
             sal_Int16 getCharPosture() const;
             /** Set the italic style globally for the whole shape.
 
                 The value must be one of the
-                ::com::sun::star::awt::FontSlant enums.
+                css::awt::FontSlant enums.
             */
             void setCharPosture( const sal_Int16& rStyle );
 
@@ -520,9 +520,9 @@ namespace slideshow
             double                                      mnCharScale;
             double                                      mnCharWeight;
 
-            ::com::sun::star::drawing::FillStyle        meFillStyle;
-            ::com::sun::star::drawing::LineStyle        meLineStyle;
-            ::com::sun::star::awt::FontSlant            meCharPosture;
+            css::drawing::FillStyle        meFillStyle;
+            css::drawing::LineStyle        meLineStyle;
+            css::awt::FontSlant            meCharPosture;
             sal_Int16                                   mnUnderlineMode;
 
             RGBColor                                    maDimColor;
diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx
index f05e4a01fba5..3c9b85b4ed47 100644
--- a/slideshow/source/inc/shapeimporter.hxx
+++ b/slideshow/source/inc/shapeimporter.hxx
@@ -67,12 +67,9 @@ public:
         When true, then the master page is imported. Otherwise, this
         object imports the draw page.
     */
-    ShapeImporter( const ::com::sun::star::uno::Reference<
-                         ::com::sun::star::drawing::XDrawPage >& xPage,
-                   const ::com::sun::star::uno::Reference<
-                         ::com::sun::star::drawing::XDrawPage >& xActualPage,
-                   const ::com::sun::star::uno::Reference<
-                         ::com::sun::star::drawing::XDrawPagesSupplier>& xPagesSupplier,
+    ShapeImporter( const css::uno::Reference< css::drawing::XDrawPage >& xPage,
+                   const css::uno::Reference< css::drawing::XDrawPage >& xActualPage,
+                   const css::uno::Reference< css::drawing::XDrawPagesSupplier>& xPagesSupplier,
                    const SlideShowContext&                       rContext,
                    sal_Int32                                     nOrdNumStart,
                    bool                                          bConvertingMasterPage );
@@ -97,45 +94,38 @@ public:
 
     double getImportedShapesCount() { return mnAscendingPrio; }
 private:
-    bool isSkip( ::com::sun::star::uno::Reference<
-                 ::com::sun::star::beans::XPropertySet> const& xPropSet,
+    bool isSkip( css::uno::Reference<css::beans::XPropertySet> const& xPropSet,
                  OUString const& shapeType,
-             ::com::sun::star::uno::Reference<
-             ::com::sun::star::drawing::XLayer> const& xLayer);
+                 css::uno::Reference<css::drawing::XLayer> const& xLayer);
 
     ShapeSharedPtr createShape(
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape> const& xCurrShape,
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> const& xPropSet,
+        css::uno::Reference<css::drawing::XShape> const& xCurrShape,
+        css::uno::Reference<css::beans::XPropertySet> const& xPropSet,
         OUString const& shapeType ) const;
 
-    void importPolygons(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xPropSet) ;
+    void importPolygons(css::uno::Reference< css::beans::XPropertySet > const& xPropSet) ;
 
     struct XShapesEntry
     {
         ShapeSharedPtr const mpGroupShape;
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::drawing::XShapes> const mxShapes;
+        css::uno::Reference<css::drawing::XShapes> const mxShapes;
         sal_Int32 const mnCount;
         sal_Int32 mnPos;
 
         explicit XShapesEntry( ShapeSharedPtr const& pGroupShape )
             : mpGroupShape(pGroupShape),
               mxShapes( pGroupShape->getXShape(),
-                        ::com::sun::star::uno::UNO_QUERY_THROW ),
+                        css::uno::UNO_QUERY_THROW ),
               mnCount(mxShapes->getCount()), mnPos(0) {}
-        explicit XShapesEntry( ::com::sun::star::uno::Reference<
-                      ::com::sun::star::drawing::XShapes> const& xShapes )
+        explicit XShapesEntry( css::uno::Reference<
+                      css::drawing::XShapes> const& xShapes )
             : mpGroupShape(), mxShapes(xShapes),
               mnCount(xShapes->getCount()), mnPos(0) {}
     };
     typedef ::std::stack<XShapesEntry> XShapesStack;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XDrawPage> mxPage;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XDrawPagesSupplier> mxPagesSupplier;
+    css::uno::Reference<css::drawing::XDrawPage> mxPage;
+    css::uno::Reference<css::drawing::XDrawPagesSupplier> mxPagesSupplier;
     const SlideShowContext&                   mrContext;
     PolyPolygonVector                         maPolygons;
     XShapesStack                              maShapesStack;
diff --git a/slideshow/source/inc/shapelistenereventhandler.hxx b/slideshow/source/inc/shapelistenereventhandler.hxx
index 07125e8730a5..b52c3d2c9886 100644
--- a/slideshow/source/inc/shapelistenereventhandler.hxx
+++ b/slideshow/source/inc/shapelistenereventhandler.hxx
@@ -48,15 +48,11 @@ namespace slideshow
         public:
             virtual ~ShapeListenerEventHandler() {}
 
-            virtual bool listenerAdded( const ::com::sun::star::uno::Reference<
-                                           ::com::sun::star::presentation::XShapeEventListener>& xListener,
-                                        const ::com::sun::star::uno::Reference<
-                                           ::com::sun::star::drawing::XShape>&                   xShape ) = 0;
+            virtual bool listenerAdded( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener,
+                                        const css::uno::Reference<css::drawing::XShape>&                   xShape ) = 0;
 
-            virtual bool listenerRemoved( const ::com::sun::star::uno::Reference<
-                                             ::com::sun::star::presentation::XShapeEventListener>& xListener,
-                                          const ::com::sun::star::uno::Reference<
-                                             ::com::sun::star::drawing::XShape>&                   xShape ) = 0;
+            virtual bool listenerRemoved( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener,
+                                          const css::uno::Reference<css::drawing::XShape>&                   xShape ) = 0;
         };
 
         typedef ::boost::shared_ptr< ShapeListenerEventHandler > ShapeListenerEventHandlerSharedPtr;
diff --git a/slideshow/source/inc/shapemanager.hxx b/slideshow/source/inc/shapemanager.hxx
index e0daad37b76d..1a81e024f7b5 100644
--- a/slideshow/source/inc/shapemanager.hxx
+++ b/slideshow/source/inc/shapemanager.hxx
@@ -89,8 +89,7 @@ namespace slideshow
                 should be looked up.
              */
             virtual boost::shared_ptr<Shape> lookupShape(
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::drawing::XShape > const & xShape ) const = 0;
+                css::uno::Reference< css::drawing::XShape > const & xShape ) const = 0;
 
             /** Register given shape as a hyperlink target
 
diff --git a/slideshow/source/inc/shapemaps.hxx b/slideshow/source/inc/shapemaps.hxx
index dc937a993cd6..82607d5df675 100644
--- a/slideshow/source/inc/shapemaps.hxx
+++ b/slideshow/source/inc/shapemaps.hxx
@@ -38,14 +38,12 @@ namespace slideshow
     namespace internal
     {
         /// Maps XShape to shape listener
-        typedef ::std::map< ::com::sun::star::uno::Reference<
-                                ::com::sun::star::drawing::XShape>,
+        typedef ::std::map< css::uno::Reference< css::drawing::XShape>,
                             boost::shared_ptr< ::cppu::OInterfaceContainerHelper >
                             >                  ShapeEventListenerMap;
 
         /// Maps XShape to mouse cursor
-        typedef ::std::map< ::com::sun::star::uno::Reference<
-                                ::com::sun::star::drawing::XShape>,
+        typedef ::std::map< css::uno::Reference< css::drawing::XShape>,
                             sal_Int16>         ShapeCursorMap;
     }
 }
diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
index 8b4fad5d9688..8c3b40f9d4a9 100644
--- a/slideshow/source/inc/slide.hxx
+++ b/slideshow/source/inc/slide.hxx
@@ -100,12 +100,10 @@ namespace slideshow
             virtual basegfx::B2IVector getSlideSize() const = 0;
 
             /// Gets the underlying API page
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XDrawPage > getXDrawPage() const = 0;
+            virtual css::uno::Reference< css::drawing::XDrawPage > getXDrawPage() const = 0;
 
             /// Gets the animation node.
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::animations::XAnimationNode > getXAnimationNode() const = 0;
+            virtual css::uno::Reference< css::animations::XAnimationNode > getXAnimationNode() const = 0;
 
             ///Gets the slide Polygons
             virtual PolyPolygonVector getPolygons() = 0;
@@ -188,12 +186,9 @@ namespace slideshow
             @param rUserEventQueue
             UserEeventQueue
         */
-        SlideSharedPtr createSlide( const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::drawing::XDrawPage >&          xDrawPage,
-                                   const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::drawing::XDrawPagesSupplier >& xDrawPages,
-                                    const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::animations::XAnimationNode >&  xRootNode,
+        SlideSharedPtr createSlide( const css::uno::Reference< css::drawing::XDrawPage >&          xDrawPage,
+                                    const css::uno::Reference< css::drawing::XDrawPagesSupplier >& xDrawPages,
+                                    const css::uno::Reference< css::animations::XAnimationNode >&  xRootNode,
                                     EventQueue&                                         rEventQueue,
                                     EventMultiplexer&                                   rEventMultiplexer,
                                     ScreenUpdater&                                      rScreenUpdater,
@@ -201,8 +196,7 @@ namespace slideshow
                                     UserEventQueue&                                     rUserEventQueue,
                                     CursorManager&                                      rCursorManager,
                                     const UnoViewContainer&                             rViewContainer,
-                                    const ::com::sun::star::uno::Reference<
-                                       ::com::sun::star::uno::XComponentContext >&      xContext,
+                                    const css::uno::Reference< css::uno::XComponentContext >&      xContext,
                                     const ShapeEventListenerMap&                        rShapeListenerMap,
                                     const ShapeCursorMap&                               rShapeCursorMap,
                                     const PolyPolygonVector&                            rPolyPolygonVector,
diff --git a/slideshow/source/inc/slidebitmap.hxx b/slideshow/source/inc/slidebitmap.hxx
index 63f6c3b1ee6f..cce00ae09c81 100644
--- a/slideshow/source/inc/slidebitmap.hxx
+++ b/slideshow/source/inc/slidebitmap.hxx
@@ -67,16 +67,14 @@ namespace slideshow
             void                move( const ::basegfx::B2DPoint& rNewPos );
             void                clip( const ::basegfx::B2DPolyPolygon& rClipPoly );
 
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XBitmap >    getXBitmap();
+            css::uno::Reference< css::rendering::XBitmap >    getXBitmap();
 
         private:
             ::basegfx::B2DPoint                                     maOutputPos;
             ::basegfx::B2DPolyPolygon                               maClipPoly;
 
             // TODO(Q2): Remove UNO bitmap as the transport medium
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XBitmap >      mxBitmap;
+            css::uno::Reference< css::rendering::XBitmap >          mxBitmap;
         };
 
         typedef ::boost::shared_ptr< SlideBitmap > SlideBitmapSharedPtr;
diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx
index ff2d0bb7c4c2..19b0739afdf2 100644
--- a/slideshow/source/inc/slideshowcontext.hxx
+++ b/slideshow/source/inc/slideshowcontext.hxx
@@ -89,8 +89,7 @@ namespace slideshow
                               UserEventQueue&                                   rUserEventQueue,
                               CursorManager&                                    rCursorManager,
                               const UnoViewContainer&                           rViewContainer,
-                              const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::uno::XComponentContext>&    rComponentContext );
+                              const css::uno::Reference< css::uno::XComponentContext>&    rComponentContext );
             void dispose();
 
             boost::shared_ptr<SubsettableShapeManager>&     mpSubsettableShapeManager;
@@ -101,8 +100,7 @@ namespace slideshow
             UserEventQueue&                                 mrUserEventQueue;
             CursorManager&                                  mrCursorManager;
             const UnoViewContainer&                         mrViewContainer;
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XComponentContext>   mxComponentContext;
+            css::uno::Reference< css::uno::XComponentContext>   mxComponentContext;
         };
     }
 }
diff --git a/slideshow/source/inc/slideview.hxx b/slideshow/source/inc/slideview.hxx
index 9b90487fd590..6296faebefd9 100644
--- a/slideshow/source/inc/slideview.hxx
+++ b/slideshow/source/inc/slideview.hxx
@@ -43,8 +43,7 @@ namespace slideshow
             Functor to call, when the UNO view signals a repaint.
         */
         UnoViewSharedPtr createSlideView(
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::presentation::XSlideShowView> const& xView,
+            css::uno::Reference< css::presentation::XSlideShowView> const& xView,
             EventQueue&                                                rEventQueue,
             EventMultiplexer&                                          rEventMultiplexer );
     }
diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx
index c97298ca9806..1d6da3d0fbcf 100644
--- a/slideshow/source/inc/soundplayer.hxx
+++ b/slideshow/source/inc/soundplayer.hxx
@@ -57,15 +57,14 @@ namespace slideshow
                 Reference to a component context, used to create the
                 needed services
 
-                @throws ::com::sun::star::lang::NoSupportException, if
+                @throws css::lang::NoSupportException, if
                 the sound file is invalid, or not supported by the
                 player service.
              */
             static ::boost::shared_ptr<SoundPlayer> create(
                 EventMultiplexer & rEventMultiplexer,
                 const OUString& rSoundURL,
-                const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XComponentContext>& rComponentContext );
+                const css::uno::Reference< css::uno::XComponentContext>& rComponentContext );
 
             virtual ~SoundPlayer();
 
@@ -93,14 +92,13 @@ namespace slideshow
             SoundPlayer(
                 EventMultiplexer & rEventMultiplexer,
                 const OUString& rSoundURL,
-                const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XComponentContext>& rComponentContext );
+                const css::uno::Reference< css::uno::XComponentContext>& rComponentContext );
 
             EventMultiplexer & mrEventMultiplexer;
             // TODO(Q3): obsolete when boost::enable_shared_ptr_from_this
             //           is available
             ::boost::shared_ptr<SoundPlayer> mThis;
-            ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
+            css::uno::Reference< css::media::XPlayer > mxPlayer;
         };
 
         typedef ::boost::shared_ptr< SoundPlayer > SoundPlayerSharedPtr;
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index cc8a8d350b7a..e518cfcf10b6 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -92,13 +92,11 @@ namespace com { namespace sun { namespace star { namespace uno {
 
         template <typename T>
         inline ::std::size_t hash_value(
-            ::com::sun::star::uno::Reference<T> const& x )
+            css::uno::Reference<T> const& x )
         {
             // normalize to object root, because _only_ XInterface is defined
             // to be stable during object lifetime:
-            ::com::sun::star::uno::Reference<
-                  ::com::sun::star::uno::XInterface> const xRoot(
-                      x, ::com::sun::star::uno::UNO_QUERY );
+            css::uno::Reference< css::uno::XInterface> const xRoot( x, css::uno::UNO_QUERY );
             return slideshow::internal::hash<void *>()(xRoot.get());
         }
 
@@ -124,49 +122,49 @@ namespace slideshow
 
         /// extract unary double value from Any
         bool extractValue( double&                              o_rValue,
-                           const ::com::sun::star::uno::Any&    rSourceAny,
+                           const css::uno::Any&                rSourceAny,
                            const boost::shared_ptr<Shape>&      rShape,
                            const basegfx::B2DVector&            rSlideBounds );
 
         /// extract int from Any
         bool extractValue( sal_Int32&                           o_rValue,
-                           const ::com::sun::star::uno::Any&    rSourceAny,
+                           const css::uno::Any&                 rSourceAny,
                            const boost::shared_ptr<Shape>&      rShape,
                            const basegfx::B2DVector&            rSlideBounds );
 
         /// extract enum/constant group value from Any
         bool extractValue( sal_Int16&                           o_rValue,
-                           const ::com::sun::star::uno::Any&    rSourceAny,
+                           const css::uno::Any&                 rSourceAny,
                            const boost::shared_ptr<Shape>&      rShape,
                            const basegfx::B2DVector&            rSlideBounds );
 
         /// extract color value from Any
         bool extractValue( RGBColor&                            o_rValue,
-                           const ::com::sun::star::uno::Any&    rSourceAny,
+                           const css::uno::Any&                 rSourceAny,
                            const boost::shared_ptr<Shape>&      rShape,
                            const basegfx::B2DVector&            rSlideBounds );
 
         /// extract color value from Any
         bool extractValue( HSLColor&                            o_rValue,
-                           const ::com::sun::star::uno::Any&    rSourceAny,
+                           const css::uno::Any&                 rSourceAny,
                            const boost::shared_ptr<Shape>&      rShape,
                            const basegfx::B2DVector&            rSlideBounds );
 
         /// extract plain string from Any
-        bool extractValue( OUString&                     o_rValue,
-                           const ::com::sun::star::uno::Any&    rSourceAny,
+        bool extractValue( OUString&                            o_rValue,
+                           const css::uno::Any&                 rSourceAny,
                            const boost::shared_ptr<Shape>&      rShape,
                            const basegfx::B2DVector&            rSlideBounds );
 
         /// extract bool value from Any
         bool extractValue( bool&                                o_rValue,
-                           const ::com::sun::star::uno::Any&    rSourceAny,
+                           const css::uno::Any&    rSourceAny,
                            const boost::shared_ptr<Shape>&      rShape,
                            const basegfx::B2DVector&            rSlideBounds );
 
         /// extract double 2-tuple from Any
         bool extractValue( basegfx::B2DTuple&                   o_rPair,
-                           const ::com::sun::star::uno::Any&    rSourceAny,
+                           const css::uno::Any&                 rSourceAny,
                            const boost::shared_ptr<Shape>&      rShape,
                            const basegfx::B2DVector&            rSlideBounds );
 
@@ -175,9 +173,8 @@ namespace slideshow
             @return true, if the sequence contains the specified
             element.
          */
-        bool findNamedValue( ::com::sun::star::uno::Sequence<
-                                 ::com::sun::star::beans::NamedValue > const& rSequence,
-                             const ::com::sun::star::beans::NamedValue& rSearchKey );
+        bool findNamedValue( css::uno::Sequence< css::beans::NamedValue > const& rSequence,
+                             const css::beans::NamedValue& rSearchKey );
 
         basegfx::B2DRange calcRelativeShapeBounds( const basegfx::B2DVector& rPageSize,
                                                    const basegfx::B2DRange&  rShapeBounds );
@@ -313,12 +310,12 @@ namespace slideshow
         template <typename ValueType>
         inline bool getPropertyValue(
             ValueType & rValue,
-            com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertySet> const & xPropSet,
+            css::uno::Reference<
+            css::beans::XPropertySet> const & xPropSet,
             OUString const & propName )
         {
             try {
-                const com::sun::star::uno::Any& a(
+                const css::uno::Any& a(
                     xPropSet->getPropertyValue( propName ) );
                 bool const bRet = (a >>= rValue);
 #if OSL_DEBUG_LEVEL > 0
@@ -332,11 +329,11 @@ namespace slideshow
 #endif
                 return bRet;
             }
-            catch (com::sun::star::uno::RuntimeException &)
+            catch (css::uno::RuntimeException &)
             {
                 throw;
             }
-            catch (com::sun::star::uno::Exception &)
+            catch (css::uno::Exception &)
             {
                 return false;
             }
@@ -344,17 +341,14 @@ namespace slideshow
 
         template <typename ValueType>
         inline bool getPropertyValue(
-            com::sun::star::uno::Reference< ValueType >& rIfc,
-            com::sun::star::uno::Reference<
-            com::sun::star::beans::XPropertySet> const & xPropSet,
+            css::uno::Reference< ValueType >& rIfc,
+            css::uno::Reference< css::beans::XPropertySet> const & xPropSet,
             OUString const & propName )
         {
             try
             {
-                const com::sun::star::uno::Any& a(
-                    xPropSet->getPropertyValue( propName ));
-                rIfc.set( a,
-                          com::sun::star::uno::UNO_QUERY );
+                const css::uno::Any& a(xPropSet->getPropertyValue( propName ));
+                rIfc.set( a, css::uno::UNO_QUERY );
 
                 bool const bRet = rIfc.is();
 #if OSL_DEBUG_LEVEL > 0
@@ -368,26 +362,24 @@ namespace slideshow
 #endif
                 return bRet;
             }
-            catch (com::sun::star::uno::RuntimeException &)
+            catch (css::uno::RuntimeException &)
             {
                 throw;
             }
-            catch (com::sun::star::uno::Exception &)
+            catch (css::uno::Exception &)
             {
                 return false;
             }
         }
 
         /// Get the content of the BoundRect shape property
-        basegfx::B2DRange getAPIShapeBounds( const ::com::sun::star::uno::Reference<
-                                                ::com::sun::star::drawing::XShape >& xShape );
+        basegfx::B2DRange getAPIShapeBounds( const css::uno::Reference< css::drawing::XShape >& xShape );
 
 /*
         TODO(F1): When ZOrder someday becomes usable enable this
 
         /// Get the content of the ZOrder shape property
-        double getAPIShapePrio( const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::drawing::XShape >& xShape );
+        double getAPIShapePrio( const css::uno::Reference< css::drawing::XShape >& xShape );
 */
 
         basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector&         rSize,
@@ -406,35 +398,34 @@ namespace slideshow
 
         @param rFunctor
         Functor to apply. The functor must have an appropriate
-        operator()( const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode >& ) member.
+        operator()( const css::uno::Reference< css::animations::XAnimationNode >& ) member.
 
         @return true, if the functor was successfully applied to
         all children, false otherwise.
     */
-    template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >&    xNode,
+    template< typename Functor > inline bool for_each_childNode( const css::uno::Reference< css::animations::XAnimationNode >&    xNode,
                                                                  Functor&                                                                                  rFunctor )
     {
         try
         {
             // get an XEnumerationAccess to the children
-            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+            css::uno::Reference< css::container::XEnumerationAccess >
                    xEnumerationAccess( xNode,
-                                       ::com::sun::star::uno::UNO_QUERY_THROW );
-            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+                                       css::uno::UNO_QUERY_THROW );
+            css::uno::Reference< css::container::XEnumeration >
                    xEnumeration( xEnumerationAccess->createEnumeration(),
-                                 ::com::sun::star::uno::UNO_QUERY_THROW );
+                                 css::uno::UNO_QUERY_THROW );
 
             while( xEnumeration->hasMoreElements() )
             {
-                ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+                css::uno::Reference< css::animations::XAnimationNode >
                            xChildNode( xEnumeration->nextElement(),
-                                      ::com::sun::star::uno::UNO_QUERY_THROW );
+                                      css::uno::UNO_QUERY_THROW );
                 rFunctor( xChildNode );
             }
                                                                                                                                                                                                                            return true;
         }
-        catch( ::com::sun::star::uno::Exception& )
+        catch( css::uno::Exception& )
         {
             return false;
         }
diff --git a/slideshow/source/inc/transitionfactory.hxx b/slideshow/source/inc/transitionfactory.hxx
index 9935740baf62..a2e50aa2b206 100644
--- a/slideshow/source/inc/transitionfactory.hxx
+++ b/slideshow/source/inc/transitionfactory.hxx
@@ -66,8 +66,7 @@ namespace slideshow
                 const AnimatableShapeSharedPtr&                         rShape,
                 const ShapeManagerSharedPtr&                            rShapeManager,
                 const ::basegfx::B2DVector&                             rSlideSize,
-                ::com::sun::star::uno::Reference<
-                    ::com::sun::star::animations::XTransitionFilter > const&  xTransition );
+                css::uno::Reference< css::animations::XTransitionFilter > const&  xTransition );
 
 
             /** Create a transition effect for slides.
@@ -103,8 +102,7 @@ namespace slideshow
                 const UnoViewContainer&                        rViewContainer,
                 ScreenUpdater&                                 rScreenUpdater,
                 EventMultiplexer&                              rEventMultiplexer,
-                const com::sun::star::uno::Reference<
-                      com::sun::star::presentation::XTransitionFactory>&
+                const css::uno::Reference< css::presentation::XTransitionFactory>&
                                                                xOptionalFactory,
                 sal_Int16                                      nTransitionType,
                 sal_Int16                                      nTransitionSubType,
diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx
index 84b8655b1dec..a7a6c7b5fa2e 100644
--- a/slideshow/source/inc/unoview.hxx
+++ b/slideshow/source/inc/unoview.hxx
@@ -48,7 +48,7 @@ namespace slideshow
         public:
             /** Retrieve the underlying UNO slide view.
              */
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowView > getUnoView() const = 0;
+            virtual css::uno::Reference< css::presentation::XSlideShowView > getUnoView() const = 0;
 
             /** Dispose view
 
diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx
index d7b0c6800504..a82e12eafc41 100644
--- a/slideshow/source/inc/unoviewcontainer.hxx
+++ b/slideshow/source/inc/unoviewcontainer.hxx
@@ -62,8 +62,7 @@ namespace slideshow
                 removed, and an empty shared_ptr otherwise (e.g. if
                 this view wasn't added in the first place)
             */
-            UnoViewSharedPtr removeView( const ::com::sun::star::uno::Reference<
-                                                     ::com::sun::star::presentation::XSlideShowView >& xView );
+            UnoViewSharedPtr removeView( const css::uno::Reference<css::presentation::XSlideShowView >& xView );
 
             /// Dispose all stored views. Implies clear().
             void dispose();
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index dd7ae4abf82b..00d6d955a64f 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -111,8 +111,7 @@ public:
     */
     void registerAnimationStartEvent(
         const EventSharedPtr&                             rEvent,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode>&    xNode );
+        const css::uno::Reference<css::animations::XAnimationNode>&    xNode );
 
     /** Register an event that will be fired when the given
         animation node ends its active duration.
@@ -123,8 +122,7 @@ public:
     */
     void registerAnimationEndEvent(
         const EventSharedPtr&                               rEvent,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode>&      xNode );
+        const css::uno::Reference<css::animations::XAnimationNode>&      xNode );
 
     /** Register an event that will be fired when audio output
         stopped for the given animation node.
@@ -135,8 +133,7 @@ public:
     */
     void registerAudioStoppedEvent(
         const EventSharedPtr&                               rEvent,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::animations::XAnimationNode>&      xNode );
+        const css::uno::Reference<css::animations::XAnimationNode>&      xNode );
 
     /** Register an event that is fired when a shape is clicked
 
diff --git a/slideshow/source/inc/view.hxx b/slideshow/source/inc/view.hxx
index 5264640d5993..bce9d0c75217 100644
--- a/slideshow/source/inc/view.hxx
+++ b/slideshow/source/inc/view.hxx
@@ -73,7 +73,7 @@ namespace slideshow
             /** Change the view's mouse cursor.
 
                 @param nPointerShape
-                One of the ::com::sun::star::awt::SystemPointer
+                One of the css::awt::SystemPointer
                 constant group members.
              */
             virtual void setCursorShape( sal_Int16 nPointerShape ) = 0;
diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx
index 5fa1cdb49a96..b3d3a8d647ad 100644
--- a/slideshow/source/inc/viewlayer.hxx
+++ b/slideshow/source/inc/viewlayer.hxx
@@ -129,7 +129,7 @@ namespace slideshow
             */
             virtual basegfx::B2DHomMatrix getTransformation() const = 0;
 
-            virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const = 0;
+            virtual css::geometry::IntegerSize2D getTranslationOffset() const = 0;
 
             /** Get the overall view transformation.