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, 21 insertions, 21 deletions

diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index e98776a5bda4..695ee808af3e 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -346,11 +346,11 @@ void MediaControl::implUpdateToolboxes()
 
             switch( maItem.getZoom() )
             {
-                case( ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break;
-                case( ::com::sun::star::media::ZoomLevel_ORIGINAL ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break;
-                case( ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break;
-                case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break;
-                case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break;
+                case( css::media::ZoomLevel_ZOOM_1_TO_2 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break;
+                case( css::media::ZoomLevel_ORIGINAL ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break;
+                case( css::media::ZoomLevel_ZOOM_2_TO_1 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break;
+                case( css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break;
+                case( css::media::ZoomLevel_FIT_TO_WINDOW ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break;
 
                 default: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_INVALID; break;
             }
@@ -571,17 +571,17 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
     if( p )
     {
         MediaItem aExecItem;
-        ::com::sun::star::media::ZoomLevel eLevel;
+        css::media::ZoomLevel eLevel;
 
         switch( p->GetSelectEntryPos() )
         {
-            case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2; break;
-            case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = ::com::sun::star::media::ZoomLevel_ORIGINAL; break;
-            case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1; break;
-            case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
-            case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW; break;
+            case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break;
+            case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = css::media::ZoomLevel_ORIGINAL; break;
+            case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = css::media::ZoomLevel_ZOOM_2_TO_1; break;
+            case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
+            case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW; break;
 
-            default: eLevel = ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE; break;
+            default: eLevel = css::media::ZoomLevel_NOT_AVAILABLE; break;
         }
 
         aExecItem.setZoom( eLevel );
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 91fb5d0eea7f..cc7f22d625c3 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -59,7 +59,7 @@ struct MediaItem::Impl
     sal_Int16               m_nVolumeDB;
     bool                    m_bLoop;
     bool                    m_bMute;
-    ::com::sun::star::media::ZoomLevel m_eZoom;
+    css::media::ZoomLevel m_eZoom;
 
     explicit Impl(AVMediaSetMask nMaskSet)
         : m_nMaskSet( nMaskSet )
@@ -69,7 +69,7 @@ struct MediaItem::Impl
         , m_nVolumeDB( 0 )
         , m_bLoop( false )
         , m_bMute( false )
-        , m_eZoom( ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE )
+        , m_eZoom( css::media::ZoomLevel_NOT_AVAILABLE )
     {
     }
     Impl(Impl const& rOther)
@@ -322,13 +322,13 @@ sal_Int16 MediaItem::getVolumeDB() const
     return m_pImpl->m_nVolumeDB;
 }
 
-void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom )
+void MediaItem::setZoom( css::media::ZoomLevel eZoom )
 {
     m_pImpl->m_eZoom = eZoom;
     m_pImpl->m_nMaskSet |= AVMediaSetMask::ZOOM;
 }
 
-::com::sun::star::media::ZoomLevel MediaItem::getZoom() const
+css::media::ZoomLevel MediaItem::getZoom() const
 {
     return m_pImpl->m_eZoom;
 }
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 3ed91fddcab6..0da4018098ac 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -165,7 +165,7 @@ SoundHandler::~SoundHandler()
 }
 
 /*-************************************************************************************************************
-    @interface  ::com::sun::star::frame::XDispatch
+    @interface  css::frame::XDispatch
 
     @short      try to load audio file
     @descr      This method try to load given audio file by URL and play it. We use vcl/Sound class to do that.
@@ -242,7 +242,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
 }
 
 /*-************************************************************************************************************
-    @interface  ::com::sun::star::document::XExtendedFilterDetection
+    @interface  css::document::XExtendedFilterDetection
 
     @short      try to detect file (given as argument included in "lDescriptor")
     @descr      We try to detect, if given file could be handled by this class and is a well known one.
@@ -338,9 +338,9 @@ IMPL_LINK_NOARG_TYPED(SoundHandler, implts_PlayerNotify, Idle *, void)
 } // namespace framework
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_framework_SoundHandler_get_implementation(::com::sun::star::uno::XComponentContext*,
-                                                            ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*,
+                                                            css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new avmedia::SoundHandler);
 }