[Libreoffice-commits] .: avmedia/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Sep 23 05:50:48 PDT 2012
avmedia/source/viewer/mediawindowbase_impl.hxx | 10 +++++-----
avmedia/source/win/framegrabber.cxx | 20 ++++++++++----------
avmedia/source/win/framegrabber.hxx | 12 ++++++------
avmedia/source/win/window.cxx | 12 ++++++------
avmedia/source/win/window.hxx | 6 +++---
5 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 588f01bf62e2c0dbc920eda007ea1b50d4ff0b3c
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date: Sat Sep 22 22:34:09 2012 -0300
End of ::rtl::OUString to OUString in avmedia
Change-Id: I1ac8f773ddb72b94d1371fe60948fb2782ddecd4
Reviewed-on: https://gerrit.libreoffice.org/675
Reviewed-by: Olivier Hallot <olivier.hallot at alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot at alta.org.br>
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index 683e6e2..c260114 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -64,11 +64,11 @@ namespace avmedia
virtual void cleanUp();
virtual void onURLChanged();
- 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);
- void setURL( const ::rtl::OUString& rURL, ::rtl::OUString const& rTempURL );
+ void setURL( const OUString& rURL, OUString const& rTempURL );
- const ::rtl::OUString& getURL() const;
+ const OUString& getURL() const;
bool isValid() const;
@@ -117,8 +117,8 @@ namespace avmedia
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > getPlayerWindow() const;
private:
- ::rtl::OUString maFileURL;
- ::rtl::OUString mTempFileURL;
+ OUString maFileURL;
+ OUString mTempFileURL;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > mxPlayerWindow;
MediaWindow* mpMediaWindow;
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 054664f..a938ead 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -78,13 +78,13 @@ FrameGrabber::~FrameGrabber()
// ------------------------------------------------------------------------------
-IMediaDet* FrameGrabber::implCreateMediaDet( const ::rtl::OUString& rURL ) const
+IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
{
IMediaDet* pDet = NULL;
if( SUCCEEDED( CoCreateInstance( CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, IID_IMediaDet, (void**) &pDet ) ) )
{
- rtl::OUString aLocalStr;
+ OUString aLocalStr;
if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr ) && !aLocalStr.isEmpty() )
{
@@ -101,7 +101,7 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const ::rtl::OUString& rURL ) const
// ------------------------------------------------------------------------------
-bool FrameGrabber::create( const ::rtl::OUString& rURL )
+bool FrameGrabber::create( const OUString& rURL )
{
// just check if a MediaDet interface can be created with the given URL
IMediaDet* pDet = implCreateMediaDet( rURL );
@@ -113,7 +113,7 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
pDet = NULL;
}
else
- maURL = ::rtl::OUString();
+ maURL = OUString();
return( maURL.getLength() > 0 );
}
@@ -218,15 +218,15 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
// ------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
+OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
+ return OUString( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
// ------------------------------------------------------------------------------
-sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME;
@@ -234,11 +234,11 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN
// ------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME ;
return aRet;
}
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 1168b32..a84c390 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -49,22 +49,22 @@ public:
FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
~FrameGrabber();
- bool create( const ::rtl::OUString& rURL );
+ bool create( const OUString& rURL );
// XFrameGrabber
virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
- ::rtl::OUString maURL;
+ OUString maURL;
- IMediaDet* implCreateMediaDet( const ::rtl::OUString& rURL ) const;
+ IMediaDet* implCreateMediaDet( const OUString& rURL ) const;
};
} // namespace win
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 22d223b..083dffa 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -677,15 +677,15 @@ void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
// ------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL Window::getImplementationName( )
+OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME ) );
+ return OUString( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME );
}
// ------------------------------------------------------------------------------
-sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_WIN_WINDOW_SERVICENAME;
@@ -693,11 +693,11 @@ sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
// ------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_WINDOW_SERVICENAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = AVMEDIA_WIN_WINDOW_SERVICENAME ;
return aRet;
}
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 4d4b83e..1ff6c4f 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -88,9 +88,9 @@ public:
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
public:
More information about the Libreoffice-commits
mailing list