mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTL_CONSTASCII_(U)STRINGPARAM removed in avmedia

Browse Source 
Change-Id: Id9ae8600d7f688bd733148663ef501b6ba2bc7d1
Reviewed-on: https://gerrit.libreoffice.org/1528
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Chr. Rossmanith
2013-01-01 18:46:33 +01:00
committed by Norbert Thiebaud
parent cdb86989d1
commit ffaf6adba6
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avmedia/source/framework/mediacontrol.cxx
View File

@@ -75,7 +75,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
meControlStyle( eControlStyle ), meControlStyle( eControlStyle ),
mbLocked( false ) mbLocked( false )
{ {
const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) ); const String aTimeText( " 00:00:00/00:00:00 " );
SetBackground(); SetBackground();
SetPaintTransparent( sal_True ); SetPaintTransparent( sal_True );
@@ -415,7 +415,7 @@ void MediaControl::implUpdateTimeField( double fCurTime )
const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData(); const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) ); 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() ) )) ); aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) );
if( maTimeEdit.GetText() != aTimeString ) if( maTimeEdit.GetText() != aTimeString )

6
avmedia/source/quicktime/framegrabber.mm
View File

@@ -118,7 +118,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( ) ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException) 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 ) sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException) 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) throw (uno::RuntimeException)
{ {
uno::Sequence< ::rtl::OUString > aRet(1); 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; return aRet;
} }

6
avmedia/source/quicktime/manager.mm
View File

@@ -62,7 +62,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
::rtl::OUString SAL_CALL Manager::getImplementationName( ) ::rtl::OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException) 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 ) sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException) 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) throw (uno::RuntimeException)
{ {
uno::Sequence< ::rtl::OUString > aRet(1); 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; return aRet;
} }

6
avmedia/source/quicktime/player.mm
View File

@@ -394,7 +394,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
::rtl::OUString SAL_CALL Player::getImplementationName( ) ::rtl::OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException) 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 ) sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException) 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) throw (uno::RuntimeException)
{ {
uno::Sequence< ::rtl::OUString > aRet(1); 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; return aRet;
} }

6
avmedia/source/quicktime/window.mm
View File

@@ -317,7 +317,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
::rtl::OUString SAL_CALL Window::getImplementationName( ) ::rtl::OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException) 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 ) sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException) 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) throw (uno::RuntimeException)
{ {
uno::Sequence< ::rtl::OUString > aRet(1); 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; return aRet;
} }