diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-30 11:44:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-30 12:54:40 +0000 |
| commit | 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch) | |
| tree | a1a95b8249052d846a997ad1729758168d6a3b24 /dtrans/source/win32 | |
| parent | f8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff) | |
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'dtrans/source/win32')
| -rw-r--r-- | dtrans/source/win32/ftransl/ftransl.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 4f64f15311c4..422ea63a79d4 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -39,7 +39,6 @@ #define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8 #define CPPUTYPE_OUSTR getCppuType( (const ::rtl::OUString*) 0 ) #define CPPUTYPE_SALINT32 getCppuType( ( sal_Int32 * ) 0 ) -#define OUSTR( str ) OUString( #str ) #define EMPTY_OUSTR OUString() const rtl::OUString Windows_FormatName ("windows_formatname"); @@ -126,7 +125,7 @@ Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataF try { Reference< XMimeContentTypeFactory > refXMimeCntFactory( m_SrvMgr->createInstance( - OUSTR( com.sun.star.datatransfer.MimeContentTypeFactory ) ), UNO_QUERY ); + "com.sun.star.datatransfer.MimeContentTypeFactory" ), UNO_QUERY ); if ( !refXMimeCntFactory.is( ) ) throw RuntimeException( ); @@ -140,10 +139,10 @@ Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataF // default is CF_TEXT aAny <<= static_cast< sal_Int32 >( CF_TEXT ); - if ( refXMimeCntType->hasParameter( OUSTR( charset ) ) ) + if ( refXMimeCntType->hasParameter( "charset" ) ) { // but maybe it is unicode text or oem text - OUString charset = refXMimeCntType->getParameterValue( OUSTR( charset ) ); + OUString charset = refXMimeCntType->getParameterValue( "charset" ); findStandardFormatIdForCharset( charset, aAny ); } } @@ -546,7 +545,7 @@ void SAL_CALL CDataFormatTranslator::findDataFlavorForNativeFormatName( const OU void SAL_CALL CDataFormatTranslator::findStandardFormatIdForCharset( const OUString& aCharset, Any& aAny ) const { - if ( aCharset.equalsIgnoreAsciiCase( OUSTR( utf-16 ) ) ) + if ( aCharset.equalsIgnoreAsciiCase( "utf-16" ) ) aAny <<= static_cast< sal_Int32 >( CF_UNICODETEXT ); else { @@ -610,7 +609,7 @@ void SAL_CALL CDataFormatTranslator::findStdFormatIdOrNativeFormatNameForFullMed inline sal_Bool CDataFormatTranslator::isTextPlainMediaType( const OUString& fullMediaType ) const { - return (fullMediaType.equalsIgnoreAsciiCase(OUSTR(text/plain))); + return fullMediaType.equalsIgnoreAsciiCase("text/plain"); } // ------------------------------------------------- |