[Libreoffice-commits] .: avmedia/inc avmedia/source

[Libreoffice Gerrit user]

 avmedia/inc/avmedia/mediaitem.hxx         |   12 ++++++------
 avmedia/inc/avmedia/mediaplayer.hxx       |    4 ++--
 avmedia/inc/avmedia/mediawindow.hxx       |   14 +++++++-------
 avmedia/source/framework/mediacontrol.cxx |    2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit cbc44df67cfd13849f3de85edcdd39b5fec8b06c
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date:   Thu Sep 13 12:17:40 2012 -0300

    ::rtl::OUString to OUString in avmedia
    
    Change-Id: If4a7bef339a626fbfa9f0c1cc76801e77626f38f
    Reviewed-on: https://gerrit.libreoffice.org/609
    Reviewed-by: Olivier Hallot <olivier.hallot at alta.org.br>
    Tested-by: Olivier Hallot <olivier.hallot at alta.org.br>

diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index c4121a1..d286edd 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -114,11 +114,11 @@ public:
     void                    setZoom( ::com::sun::star::media::ZoomLevel eZoom );
     ::com::sun::star::media::ZoomLevel  getZoom() const;
 
-    void                    setURL( const ::rtl::OUString& rURL,
-                                    ::rtl::OUString const*const pTempURL);
-    const ::rtl::OUString&  getURL() const;
+    void                    setURL( const OUString& rURL,
+                                    OUString const*const pTempURL);
+    const OUString&  getURL() const;
 
-    const ::rtl::OUString&  getTempURL() const;
+    const OUString&  getTempURL() const;
 
 private:
 
@@ -131,8 +131,8 @@ typedef ::avmedia::MediaItem avmedia_MediaItem;
 bool AVMEDIA_DLLPUBLIC EmbedMedia(
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>
             const& xModel,
-        ::rtl::OUString const& rSourceURL,
-        ::rtl::OUString & o_rEmbeddedURL);
+        OUString const& rSourceURL,
+        OUString & o_rEmbeddedURL);
 
 }
 
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index b7d262f..d54565d 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -72,8 +72,8 @@ public:
                             MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent );
                             ~MediaFloater();
 
-    void                    setURL( const ::rtl::OUString& rURL, bool bPlayImmediately );
-    const ::rtl::OUString&  getURL() const;
+    void                    setURL( const OUString& rURL, bool bPlayImmediately );
+    const OUString&         getURL() const;
 
     void                    dispatchCurrentURL();
 
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index ab9bae2..696e2e4 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -63,7 +63,7 @@ namespace rtl { class OUString; }
 
 namespace avmedia
 {
-    typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > FilterNameVector;
+    typedef ::std::vector< ::std::pair< OUString, OUString > > FilterNameVector;
 
     class MediaItem;
 
@@ -79,8 +79,8 @@ namespace avmedia
                             MediaWindow( Window* parent, bool bInternalMediaControl );
         virtual             ~MediaWindow();
 
-        void                setURL( const ::rtl::OUString& rURL );
-        const ::rtl::OUString&  getURL() const;
+        void                setURL( const OUString& rURL );
+        const OUString&     getURL() const;
 
         bool                isValid() const;
         Size                getPreferredSize() const;
@@ -121,13 +121,13 @@ namespace avmedia
         /// @param o_pbLink if not 0, this is an "insert" dialog: display link
         ///                 checkbox and store its state in *o_pbLink
         static bool         executeMediaURLDialog( Window* pParent,
-                ::rtl::OUString& rURL, bool *const o_pbLink );
+                OUString& rURL, bool *const o_pbLink );
         static void         executeFormatErrorBox( Window* pParent );
-        static bool         isMediaURL( const ::rtl::OUString& rURL, bool bDeep = false, Size* pPreferredSizePixel = NULL );
+        static bool         isMediaURL( const OUString& rURL, bool bDeep = false, Size* pPreferredSizePixel = NULL );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+        static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL );
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const ::rtl::OUString& rURL,
+        static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const OUString& rURL,
                                                                                                   bool bAllowToCreateReplacementGraphic = false,
                                                                                                   double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME );
 
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index decf7be..98315ce 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -497,7 +497,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p )
         {
             case( AVMEDIA_TOOLBOXITEM_OPEN ):
             {
-                ::rtl::OUString aURL;
+                OUString aURL;
 
                  if (::avmedia::MediaWindow::executeMediaURLDialog(
                              GetParent(), aURL, 0))