diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-14 13:13:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-19 10:29:30 +0200 |
commit | 2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (patch) | |
tree | fb31b64880b06b0e2bd867aa6216ae0259c7c091 /dtrans | |
parent | ccc297097891e62489e5d281a4ea128ec6b71361 (diff) |
remove most use of RTL_CONSTASCII_USTRINGPARAM macro
This is largely unnecessary when working with OUString
Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
Diffstat (limited to 'dtrans')
-rw-r--r-- | dtrans/source/win32/clipb/wcbentry.cxx | 4 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/dndentry.cxx | 4 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/source.cxx | 4 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/target.cxx | 4 | ||||
-rw-r--r-- | dtrans/source/win32/ftransl/ftranslentry.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index 6135f84e1dfe..e13a109a220b 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -77,9 +77,9 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sysdtrans_component_getFactory( const sal_Ch if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, WINCLIPBOARD_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( WINCLIPBOARD_SERVICE_NAME ) ); + aSNS.getArray( )[0] = OUString( WINCLIPBOARD_SERVICE_NAME ); - //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) ) + //OUString( FPS_IMPL_NAME ) Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), OUString::createFromAscii( pImplName ), diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx index 940b9bc213c2..8aadbed956c6 100644 --- a/dtrans/source/win32/dnd/dndentry.cxx +++ b/dtrans/source/win32/dnd/dndentry.cxx @@ -55,7 +55,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL dnd_component_getFactory( const sal_Char* pI if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, DNDSOURCE_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDSOURCE_SERVICE_NAME ) ); + aSNS.getArray( )[0] = OUString( DNDSOURCE_SERVICE_NAME ); xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), @@ -67,7 +67,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL dnd_component_getFactory( const sal_Char* pI else if( pSrvManager && ( 0 == rtl_str_compare( pImplName, DNDTARGET_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDTARGET_SERVICE_NAME ) ); + aSNS.getArray( )[0] = OUString( DNDTARGET_SERVICE_NAME ); xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index f4ce6b4aa50b..1335da549ea0 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -312,7 +312,7 @@ dwEffect // XServiceInfo OUString SAL_CALL DragSource::getImplementationName( ) throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM(DNDSOURCE_IMPL_NAME)); + return OUString(DNDSOURCE_IMPL_NAME); } // XServiceInfo sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) throw (RuntimeException) @@ -324,7 +324,7 @@ sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) thr Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames( ) throw (RuntimeException) { - OUString names[1]= {OUString(RTL_CONSTASCII_USTRINGPARAM(DNDSOURCE_SERVICE_NAME))}; + OUString names[1]= {OUString(DNDSOURCE_SERVICE_NAME)}; return Sequence<OUString>(names, 1); } diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index e127b3d5e7fd..14b79b809e39 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -244,7 +244,7 @@ DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams) // XServiceInfo OUString SAL_CALL DropTarget::getImplementationName( ) throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM(DNDTARGET_IMPL_NAME)); + return OUString(DNDTARGET_IMPL_NAME); } // XServiceInfo sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) throw (RuntimeException) @@ -256,7 +256,7 @@ sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) thr Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) throw (RuntimeException) { - OUString names[1]= {OUString(RTL_CONSTASCII_USTRINGPARAM(DNDTARGET_SERVICE_NAME))}; + OUString names[1]= {OUString(DNDTARGET_SERVICE_NAME)}; return Sequence<OUString>(names, 1); } diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index 2b04e1877c29..efa971528cff 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -79,7 +79,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) ); + aSNS.getArray( )[0] = OUString( SERVICE_NAME ); Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), |