diff options
author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-01 18:46:33 +0100 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-01-01 21:03:14 +0000 |
commit | ffaf6adba6da2af0bd9ceb7f94b4e4eff055ae20 (patch) | |
tree | fa1f4ddcb2b14fde1d8b3896b84734cd8b1179f0 /avmedia | |
parent | MAKE not GNUMAKE (diff) | |
download | core-ffaf6adba6da2af0bd9ceb7f94b4e4eff055ae20.tar.gz core-ffaf6adba6da2af0bd9ceb7f94b4e4eff055ae20.zip |
RTL_CONSTASCII_(U)STRINGPARAM removed in avmedia
Change-Id: Id9ae8600d7f688bd733148663ef501b6ba2bc7d1
Reviewed-on: https://gerrit.libreoffice.org/1528
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/quicktime/framegrabber.mm | 6 | ||||
-rw-r--r-- | avmedia/source/quicktime/manager.mm | 6 | ||||
-rw-r--r-- | avmedia/source/quicktime/player.mm | 6 | ||||
-rw-r--r-- | avmedia/source/quicktime/window.mm | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 68b0cdda5593..ca2c9da2adc3 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -75,7 +75,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : meControlStyle( eControlStyle ), mbLocked( false ) { - const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) ); + const String aTimeText( " 00:00:00/00:00:00 " ); SetBackground(); SetPaintTransparent( sal_True ); @@ -415,7 +415,7 @@ void MediaControl::implUpdateTimeField( double fCurTime ) const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData(); aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) ); - aTimeString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " )); + aTimeString.AppendAscii( " / " ); aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) ); if( maTimeEdit.GetText() != aTimeString ) diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index 97c1066adb0d..3e262f1e24e4 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -118,7 +118,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME ) ); + return ::rtl::OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME ); } // ------------------------------------------------------------------------------ @@ -126,7 +126,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ) ); + return ( ServiceName == AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ); } // ------------------------------------------------------------------------------ @@ -135,7 +135,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames throw (uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ) ); + aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ); return aRet; } diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm index ae82ee4f75c1..fb9c41af3132 100644 --- a/avmedia/source/quicktime/manager.mm +++ b/avmedia/source/quicktime/manager.mm @@ -62,7 +62,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU ::rtl::OUString SAL_CALL Manager::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) ); + return ::rtl::OUString( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ); } // ------------------------------------------------------------------------------ @@ -70,7 +70,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) ); + return ( ServiceName == AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ); } // ------------------------------------------------------------------------------ @@ -79,7 +79,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( ) throw (uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) ); + aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ); return aRet; } diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index fb1f9581ef3d..4755ad88601c 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -394,7 +394,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) ::rtl::OUString SAL_CALL Player::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME ) ); + return ::rtl::OUString( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME ); } // ------------------------------------------------------------------------------ @@ -402,7 +402,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ) ); + return ( ServiceName == AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ); } // ------------------------------------------------------------------------------ @@ -411,7 +411,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( ) throw (uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ) ); + aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ); return aRet; } diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm index 40dc13e96dbe..bdb4e08ba4ce 100644 --- a/avmedia/source/quicktime/window.mm +++ b/avmedia/source/quicktime/window.mm @@ -317,7 +317,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis ::rtl::OUString SAL_CALL Window::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME ) ); + return ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME ); } // ------------------------------------------------------------------------------ @@ -325,7 +325,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ) ); + return ( ServiceName == AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ); } // ------------------------------------------------------------------------------ @@ -334,7 +334,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) throw (uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ) ); + aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ); return aRet; } |