Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/1528 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/1528/1 RTL_CONSTASCII_(U)STRINGPARAM removed in avmedia Change-Id: Id9ae8600d7f688bd733148663ef501b6ba2bc7d1 --- M avmedia/source/framework/mediacontrol.cxx M avmedia/source/quicktime/framegrabber.mm M avmedia/source/quicktime/manager.mm M avmedia/source/quicktime/player.mm M avmedia/source/quicktime/window.mm 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 68b0cdd..ca2c9da 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -75,7 +75,7 @@ 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 @@ 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 97c1066..3e262f1 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -118,7 +118,7 @@ ::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 @@ 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 @@ 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 ae82ee4..fb9c41a 100644 --- a/avmedia/source/quicktime/manager.mm +++ b/avmedia/source/quicktime/manager.mm @@ -62,7 +62,7 @@ ::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 @@ 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 @@ 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 fb1f958..4755ad8 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -394,7 +394,7 @@ ::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 @@ 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 @@ 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 40dc13e..bdb4e08 100644 --- a/avmedia/source/quicktime/window.mm +++ b/avmedia/source/quicktime/window.mm @@ -317,7 +317,7 @@ ::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 @@ 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 @@ 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; } -- To view, visit https://gerrit.libreoffice.org/1528 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9ae8600d7f688bd733148663ef501b6ba2bc7d1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith <chrrossman...@web.de> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice