summaryrefslogtreecommitdiff
path: root/dtrans/source/cnttype
diff options
context:
space:
mode:
Diffstat (limited to 'dtrans/source/cnttype')
-rw-r--r--dtrans/source/cnttype/mcnttfactory.cxx4
-rw-r--r--dtrans/source/cnttype/mcnttype.cxx26
-rw-r--r--dtrans/source/cnttype/wbench/testcnttype.cxx22
3 files changed, 26 insertions, 26 deletions
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index 71ca6d97950f..5c01ec700c94 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.cxx
@@ -59,7 +59,7 @@ namespace
Sequence< OUString > SAL_CALL MimeContentTypeFactory_getSupportedServiceNames( )
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory"));
+ aRet[0] = OUString("com.sun.star.datatransfer.MimeContentTypeFactory");
return aRet;
}
}
@@ -91,7 +91,7 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co
OUString SAL_CALL CMimeContentTypeFactory::getImplementationName( )
throw( RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( MIMECONTENTTYPEFACTORY_IMPL_NAME ));
+ return OUString( MIMECONTENTTYPEFACTORY_IMPL_NAME );
}
// -------------------------------------------------
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 14b20107a7d4..9b14b786bc0e 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -85,7 +85,7 @@ OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException)
OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException)
{
- return m_MediaType + OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + m_MediaSubtype;
+ return m_MediaType + OUString("/") + m_MediaSubtype;
}
//------------------------------------------------------------------------
@@ -206,7 +206,7 @@ void SAL_CALL CMimeContentType::type( void )
{
if ( isInRange( m_nxtSym, sToken ) )
m_MediaType += m_nxtSym;
- else if ( isInRange( m_nxtSym, OUString(RTL_CONSTASCII_USTRINGPARAM("/ ")) ) )
+ else if ( isInRange( m_nxtSym, OUString("/ ") ) )
break;
else
throw IllegalArgumentException( );
@@ -215,7 +215,7 @@ void SAL_CALL CMimeContentType::type( void )
// check FOLLOW( type )
skipSpaces( );
- acceptSym( OUString(RTL_CONSTASCII_USTRINGPARAM("/")) );
+ acceptSym( OUString("/") );
subtype( );
}
@@ -238,7 +238,7 @@ void SAL_CALL CMimeContentType::subtype( void )
{
if ( isInRange( m_nxtSym, sToken ) )
m_MediaSubtype += m_nxtSym;
- else if ( isInRange( m_nxtSym, OUString(RTL_CONSTASCII_USTRINGPARAM("; ")) ) )
+ else if ( isInRange( m_nxtSym, OUString("; ") ) )
break;
else
throw IllegalArgumentException( );
@@ -259,13 +259,13 @@ void SAL_CALL CMimeContentType::trailer( void )
rtl::OUString sToken(TOKEN);
while( !m_nxtSym.isEmpty( ) )
{
- if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM("(")) )
+ if ( m_nxtSym == OUString("(") )
{
getSym( );
comment( );
- acceptSym( OUString(RTL_CONSTASCII_USTRINGPARAM(")")) );
+ acceptSym( OUString(")") );
}
- else if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM(";")) )
+ else if ( m_nxtSym == OUString(";") )
{
// get the parameter name
getSym( );
@@ -277,7 +277,7 @@ void SAL_CALL CMimeContentType::trailer( void )
OUString pname = pName( );
skipSpaces();
- acceptSym( OUString(RTL_CONSTASCII_USTRINGPARAM("=")) );
+ acceptSym( OUString("=") );
// get the parameter value
skipSpaces( );
@@ -308,7 +308,7 @@ OUString SAL_CALL CMimeContentType::pName( )
{
if ( isInRange( m_nxtSym, sToken ) )
pname += m_nxtSym;
- else if ( isInRange( m_nxtSym, OUString(RTL_CONSTASCII_USTRINGPARAM("= ")) ) )
+ else if ( isInRange( m_nxtSym, OUString("= ") ) )
break;
else
throw IllegalArgumentException( );
@@ -328,7 +328,7 @@ OUString SAL_CALL CMimeContentType::pValue( )
rtl::OUString sToken(TOKEN);
// quoted pvalue
- if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
+ if ( m_nxtSym == OUString( "\"" ) )
{
getSym( );
pvalue = quotedPValue( );
@@ -375,7 +375,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
else if ( isInRange( m_nxtSym, rtl::OUString(TOKEN) + rtl::OUString(TSPECIALS) + rtl::OUString(SPACE) ) )
{
pvalue += m_nxtSym;
- if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
+ if ( m_nxtSym == OUString( "\"" ) )
bAfterQuoteSign = sal_True;
else
bAfterQuoteSign = sal_False;
@@ -401,7 +401,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( )
{
if ( isInRange( m_nxtSym, sToken ) )
pvalue += m_nxtSym;
- else if ( isInRange( m_nxtSym, OUString(RTL_CONSTASCII_USTRINGPARAM("; ")) ) )
+ else if ( isInRange( m_nxtSym, OUString("; ") ) )
break;
else
throw IllegalArgumentException( );
@@ -421,7 +421,7 @@ void SAL_CALL CMimeContentType::comment( void )
{
if ( isInRange( m_nxtSym, rtl::OUString(TOKEN) + rtl::OUString(SPACE) ) )
getSym( );
- else if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM(")")) )
+ else if ( m_nxtSym == OUString(")") )
break;
else
throw IllegalArgumentException( );
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index 011b2c467ea4..4c95f07ac749 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.cxx
@@ -93,7 +93,7 @@ void CheckMimeContentType( const OUString& aCntType, const OUString& aType, cons
pvalue = xMimeCntType->getParameterValue( param );
}
- pvalue = xMimeCntType->getParameterValue( OUString(RTL_CONSTASCII_USTRINGPARAM("aparam")) );
+ pvalue = xMimeCntType->getParameterValue( OUString("aparam") );
}
catch( IllegalArgumentException& )
{
@@ -175,32 +175,32 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& v
Reference< XMimeContentType > xMCntTyp = cnttypeFactory->createMimeContentType( OUString::createFromAscii( iter->c_str( ) ) );
- fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Type: %s\n")), xMCntTyp->getMediaType( ).getStr( ) );
- fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Subtype: %s\n")), xMCntTyp->getMediaSubtype( ).getStr( ) );
+ fwprintf( fstream, OUString("Type: %s\n"), xMCntTyp->getMediaType( ).getStr( ) );
+ fwprintf( fstream, OUString("Subtype: %s\n"), xMCntTyp->getMediaSubtype( ).getStr( ) );
Sequence< OUString > seqParam = xMCntTyp->getParameters( );
sal_Int32 nParams = seqParam.getLength( );
for ( sal_Int32 i = 0; i < nParams; i++ )
{
- fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("PName: %s\n")), seqParam[i].getStr( ) );
- fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("PValue: %s\n")), xMCntTyp->getParameterValue( seqParam[i] ).getStr( ) );
+ fwprintf( fstream, OUString("PName: %s\n"), seqParam[i].getStr( ) );
+ fwprintf( fstream, OUString("PValue: %s\n"), xMCntTyp->getParameterValue( seqParam[i] ).getStr( ) );
}
}
catch( IllegalArgumentException& ex )
{
- fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Fehlerhafter Content-Type gelesen!!!\n\n")) );
+ fwprintf( fstream, OUString("Fehlerhafter Content-Type gelesen!!!\n\n") );
}
catch( NoSuchElementException& )
{
- fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Parameterwert nicht vorhanden\n")) );
+ fwprintf( fstream, OUString("Parameterwert nicht vorhanden\n") );
}
catch( ... )
{
- fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Unbekannter Fehler!!!\n\n")) );
+ fwprintf( fstream, OUString("Unbekannter Fehler!!!\n\n") );
}
- fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("\n#############################################\n\n")) );
+ fwprintf( fstream, OUString("\n#############################################\n\n") );
}
fclose( fstream );
@@ -220,7 +220,7 @@ int SAL_CALL main( int nArgc, char* argv[] )
//-------------------------------------------------
// get the global service-manager
//-------------------------------------------------
- OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) );
+ OUString rdbName = OUString( RDB_SYSPATH );
Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
// Print a message if an error occurred.
@@ -240,7 +240,7 @@ int SAL_CALL main( int nArgc, char* argv[] )
}
Reference< XMimeContentTypeFactory >
- xMCntTypeFactory( g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory")) ), UNO_QUERY );
+ xMCntTypeFactory( g_xFactory->createInstance( OUString("com.sun.star.datatransfer.MimeContentTypeFactory") ), UNO_QUERY );
if ( !xMCntTypeFactory.is( ) )
{
generated by cgit (git 2.34.1) at 2024-07-26 02:41:56 +0000