com::sun::uno->css in avmedia and animations

Change-Id: Ie4365a488728c39fedacae7650b4b90260e7e44a
Reviewed-on: https://gerrit.libreoffice.org/17153
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

3 files changed, 14 insertions, 15 deletions

diff --git a/include/animations/animationnodehelper.hxx b/include/animations/animationnodehelper.hxx
index 840dadd7b683..364e0ad0847b 100644
--- a/include/animations/animationnodehelper.hxx
+++ b/include/animations/animationnodehelper.hxx
@@ -38,38 +38,37 @@ namespace anim
 
     /** pushes the given node to the given vector and recursivly calls itself for each child node.
     */
-    inline void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
-                                std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& rVector )
+    inline void create_deep_vector( const css::uno::Reference< css::animations::XAnimationNode >& xNode,
+                                std::vector< css::uno::Reference< css::animations::XAnimationNode > >& rVector )
     {
         rVector.push_back( xNode );
 
         try
         {
             // get an XEnumerationAccess to the children
-            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
-                  xEnumerationAccess( xNode,
-                                      ::com::sun::star::uno::UNO_QUERY );
+            css::uno::Reference< css::container::XEnumerationAccess >
+                  xEnumerationAccess( xNode, css::uno::UNO_QUERY );
 
             if( xEnumerationAccess.is() )
             {
-                ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+                css::uno::Reference< css::container::XEnumeration >
                       xEnumeration( xEnumerationAccess->createEnumeration(),
-                                    ::com::sun::star::uno::UNO_QUERY );
+                                    css::uno::UNO_QUERY );
 
                 if( xEnumeration.is() )
                 {
                     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 );
 
                         create_deep_vector( xChildNode, rVector );
                     }
                 }
             }
         }
-        catch( ::com::sun::star::uno::Exception& )
+        catch( css::uno::Exception& )
         {
         }
     }
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx
index 3eeb7078552b..72e2ecb64a57 100644
--- a/include/avmedia/mediawindow.hxx
+++ b/include/avmedia/mediawindow.hxx
@@ -103,9 +103,9 @@ namespace avmedia
         static void         executeFormatErrorBox( vcl::Window* pParent );
         static bool         isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = NULL );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 );
+        static css::uno::Reference< css::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const OUString& rURL, const OUString& rReferer,
+        static css::uno::Reference< css::graphic::XGraphic > grabFrame( const OUString& rURL, const OUString& rReferer,
             const OUString& sMimeType, double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME );
 
         static BitmapEx getAudioLogo();
@@ -115,8 +115,8 @@ namespace avmedia
         MediaWindow(const MediaWindow&) SAL_DELETED_FUNCTION;
         MediaWindow& operator =( const MediaWindow& ) SAL_DELETED_FUNCTION;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   mxIFace;
-        VclPtr<priv::MediaWindowImpl> mpImpl;
+        css::uno::Reference< css::uno::XInterface >   mxIFace;
+        VclPtr<priv::MediaWindowImpl>                 mpImpl;
     };
 }
 
diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx
index 590e8d0f1525..541c5d3c4d58 100644
--- a/include/avmedia/modeltools.hxx
+++ b/include/avmedia/modeltools.hxx
@@ -23,7 +23,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput);
 #endif
 
 bool AVMEDIA_DLLPUBLIC Embed3DModel(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel,
+    const css::uno::Reference< css::frame::XModel>& xModel,
     const OUString& rSourceURL, OUString& o_rEmbeddedURL);
 
 bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType);