From 0f867ad00c56059e347a9e60b50f29b04e9803a1 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 18 Dec 2014 13:22:48 +0100 Subject: dtrans: Use appropriate OUString functions on string constants Change-Id: I47f5431483f3dfce3bb4d1e956cbe3ab226a1cfc --- dtrans/source/cnttype/mcnttype.cxx | 4 ++-- dtrans/source/cnttype/mctfentry.cxx | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index c2ea09dfbc05..74022478ec9c 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -290,7 +290,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( ) { break; } - else if ( isInRange( m_nxtSym, OUString(TOKEN) + OUString(TSPECIALS) + OUString(SPACE) ) ) + else if ( isInRange( m_nxtSym, OUStringLiteral(TOKEN) + TSPECIALS + SPACE ) ) { pvalue += m_nxtSym; if ( m_nxtSym == "\"" ) @@ -329,7 +329,7 @@ void SAL_CALL CMimeContentType::comment( void ) { while ( !m_nxtSym.isEmpty( ) ) { - if ( isInRange( m_nxtSym, OUString(TOKEN) + OUString(SPACE) ) ) + if ( isInRange( m_nxtSym, OUStringLiteral(TOKEN) + SPACE ) ) getSym( ); else if ( m_nxtSym == ")" ) break; diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index 8164951d465a..afedf415d2a8 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -25,9 +25,6 @@ // some defines -// the service names -#define MIMECONTENTTYPEFACTORY_SERVICE_NAME "com.sun.star.datatransfer.MimeContentTypeFactory" - // the implementation names #define MIMECONTENTTYPEFACTORY_IMPL_NAME "com.sun.star.datatransfer.MimeCntTypeFactory" @@ -67,7 +64,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Cha if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, MIMECONTENTTYPEFACTORY_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString( MIMECONTENTTYPEFACTORY_SERVICE_NAME ); + aSNS.getArray( )[0] = "com.sun.star.datatransfer.MimeContentTypeFactory"; Reference< XSingleServiceFactory > xFactory ( createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), -- cgit