From 50f5870632decd081d7396aef81d44c9523f2679 Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Fri, 14 Sep 2012 12:20:23 -0300 Subject: More ::rtl::OUString to OUString in avmedia Change-Id: I0e49d84b5a7aa47dc315735a8198ba7fdde0b4e7 Reviewed-on: https://gerrit.libreoffice.org/621 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot --- avmedia/source/framework/soundhandler.cxx | 28 ++++++++++++++-------------- avmedia/source/framework/soundhandler.hxx | 12 ++++++------ avmedia/source/gstreamer/gstframegrabber.cxx | 18 +++++++++--------- 3 files changed, 29 insertions(+), 29 deletions(-) (limited to 'avmedia') diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 6d35f88ca191..4a8acfc187ee 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -133,7 +133,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs } #define DECLARE_ASCII( SASCIIVALUE ) \ - ::rtl::OUString( SASCIIVALUE ) + OUString( SASCIIVALUE ) #define IMPLEMENTATIONNAME_SOUNDHANDLER DECLARE_ASCII("com.sun.star.comp.framework.SoundHandler") #define SERVICENAME_CONTENTHANDLER DECLARE_ASCII("com.sun.star.frame.ContentHandler") @@ -141,7 +141,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs /*===========================================================================================================*/ /* XServiceInfo */ /*===========================================================================================================*/ -::rtl::OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException ) { return impl_getStaticImplementationName(); } @@ -149,13 +149,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs /*===========================================================================================================*/ /* XServiceInfo */ /*===========================================================================================================*/ -sal_Bool SAL_CALL SoundHandler::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) { /* Set default return value. */ sal_Bool bReturn = sal_False ; /* Get names of all supported servicenames. */ - css::uno::Sequence< ::rtl::OUString > seqServiceNames = getSupportedServiceNames(); - const ::rtl::OUString* pArray = seqServiceNames.getConstArray(); + css::uno::Sequence < OUString > seqServiceNames = getSupportedServiceNames(); + const OUString* pArray = seqServiceNames.getConstArray(); sal_Int32 nCounter = 0; sal_Int32 nLength = seqServiceNames.getLength(); /* Search for right name in list. */ @@ -179,7 +179,7 @@ sal_Bool SAL_CALL SoundHandler::supportsService( const ::rtl::OUString& sService /*===========================================================================================================*/ /* XServiceInfo */ /*===========================================================================================================*/ -css::uno::Sequence< ::rtl::OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return impl_getStaticSupportedServiceNames(); } @@ -187,9 +187,9 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL SoundHandler::getSupportedService /*===========================================================================================================*/ /* Helper for XServiceInfo */ /*===========================================================================================================*/ -css::uno::Sequence< ::rtl::OUString > SoundHandler::impl_getStaticSupportedServiceNames() +css::uno::Sequence< OUString > SoundHandler::impl_getStaticSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 ); + css::uno::Sequence< OUString > seqServiceNames( 1 ); seqServiceNames.getArray() [0] = SERVICENAME_CONTENTHANDLER; return seqServiceNames; } @@ -197,7 +197,7 @@ css::uno::Sequence< ::rtl::OUString > SoundHandler::impl_getStaticSupportedServi /*===========================================================================================================*/ /* Helper for XServiceInfo */ /*===========================================================================================================*/ -::rtl::OUString SoundHandler::impl_getStaticImplementationName() +OUString SoundHandler::impl_getStaticImplementationName() { return IMPLEMENTATIONNAME_SOUNDHANDLER; } @@ -379,14 +379,14 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& @onerror We return nothing. @threadsafe yes *//*-*************************************************************************************************************/ -::rtl::OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) +OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) { // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown. - ::rtl::OUString sTypeName; + OUString sTypeName; // Analyze given descriptor to find filename or input stream or ... ::comphelper::MediaDescriptor aDescriptor(lDescriptor); - ::rtl::OUString sURL = aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString()); + OUString sURL = aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), OUString()); if ( (sURL.getLength() ) && @@ -397,7 +397,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& // I think we can the following ones: // a) look for given extension of url to map our type decision HARD CODED!!! // b) return preferred type every time... it's easy :-) - sTypeName = ::rtl::OUString("wav_Wave_Audio_File"); + sTypeName = "wav_Wave_Audio_File"; aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName; aDescriptor >> lDescriptor; } @@ -468,7 +468,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Ch css::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager; xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ; - if ( avmedia::SoundHandler::impl_getStaticImplementationName().equals( ::rtl::OUString::createFromAscii( pImplementationName ) ) ) + if ( avmedia::SoundHandler::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) xFactory = avmedia::SoundHandler::impl_createFactory( xServiceManager ); if ( xFactory.is() == sal_True ) diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 5fd9a4a5e34e..f3a6ff9a2df2 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -101,12 +101,12 @@ class SoundHandler : // interfaces virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException ); /* interface XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); /* Helper for XServiceInfo */ - static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); + static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); + static OUString SAL_CALL impl_getStaticImplementationName ( ); /* Helper for registry */ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); @@ -134,7 +134,7 @@ class SoundHandler : // interfaces //--------------------------------------------------------------------------------------------------------- // XExtendedFilterDetection //--------------------------------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- // protected methods diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 42236758da65..b33b909145b6 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -65,7 +65,7 @@ FrameGrabber::~FrameGrabber() // ------------------------------------------------------------------------------ -IMediaDet* FrameGrabber::implCreateMediaDet( const ::rtl::OUString& rURL ) const +IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const { IMediaDet* pDet = NULL; @@ -88,7 +88,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 ); @@ -100,7 +100,7 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL ) pDet = NULL; } else - maURL = ::rtl::OUString(); + maURL = OUString(); return( maURL.getLength() > 0 ); } @@ -205,15 +205,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_GST_FRAMEGRABBER_IMPLEMENTATIONNAME ) ); + return OUString( AVMEDIA_GST_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_GST_FRAMEGRABBER_SERVICENAME; @@ -221,11 +221,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_GST_FRAMEGRABBER_SERVICENAME ) ); + uno::Sequence< OUString > aRet(1); + aRet[0] = AVMEDIA_GST_FRAMEGRABBER_SERVICENAME ; return aRet; } -- cgit