Remove more STRINGPARAM macros from filter

Also, remove some chained appends, and sanitize some functions call.

Change-Id: I5bfed073bd84e4dee4bc7e7b4715e413859beb50
Reviewed-on: https://gerrit.libreoffice.org/1772Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>

filter/source/config/cache/basecontainer.cxx

@@ -133,8 +133,7 @@ void BaseContainer::impl_initFlushMode()
     if (!m_pFlushCache)
         m_pFlushCache = m_rCache->clone();
     if (!m_pFlushCache)
-        throw css::uno::RuntimeException(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant create write copy of internal used cache on demand." )),
+        throw css::uno::RuntimeException( "Cant create write copy of internal used cache on demand.",
                 dynamic_cast< css::container::XNameAccess* >(this));
     // <- SAFE
 }
@@ -203,8 +202,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem ,
            css::uno::RuntimeException           )
 {
     if (sItem.isEmpty())
-        throw css::lang::IllegalArgumentException(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "empty value not allowed as item name." )),
+        throw css::lang::IllegalArgumentException("empty value not allowed as item name.",
             static_cast< css::container::XNameContainer* >(this),
             1);
 
@@ -267,8 +265,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem ,
            css::uno::RuntimeException            )
 {
     if (sItem.isEmpty())
-        throw css::lang::IllegalArgumentException(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "empty value not allowed as item name." )),
+        throw css::lang::IllegalArgumentException("empty value not allowed as item name.",
             static_cast< css::container::XNameContainer* >(this),
             1);
 
@@ -307,8 +304,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem)
            css::uno::RuntimeException            )
 {
     if (sItem.isEmpty())
-        throw css::container::NoSuchElementException(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An empty item cant be part of this cache!" )),
+        throw css::container::NoSuchElementException( "An empty item cant be part of this cache!",
                 css::uno::Reference< css::uno::XInterface >(static_cast< css::container::XNameAccess* >(this), css::uno::UNO_QUERY));
 
     css::uno::Any aValue;
@@ -506,7 +502,7 @@ void SAL_CALL BaseContainer::flush()
 
     if (!m_pFlushCache)
         throw css::lang::WrappedTargetRuntimeException(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant guarantee cache consistency. Special flush container does not exists!" )),
+                "Cant guarantee cache consistency. Special flush container does not exists!",
                 dynamic_cast< css::container::XNameAccess* >(this),
                 css::uno::Any());
 
@@ -528,8 +524,7 @@ void SAL_CALL BaseContainer::flush()
         // user whish to repair it now and calls flush()
         // later again ...
 
-        throw css::lang::WrappedTargetRuntimeException(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Flush rejected by internal container." )),
+        throw css::lang::WrappedTargetRuntimeException( "Flush rejected by internal container.",
                 dynamic_cast< css::container::XNameAccess* >(this),
                 css::uno::makeAny(ex));
     }

filter/source/config/cache/contenthandlerfactory.cxx

@@ -146,17 +146,17 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailab
 
 
 
-::rtl::OUString ContentHandlerFactory::impl_getImplementationName()
+OUString ContentHandlerFactory::impl_getImplementationName()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.ContentHandlerFactory" ));
+    return OUString( "com.sun.star.comp.filter.config.ContentHandlerFactory" );
 }
 
 
 
-css::uno::Sequence< ::rtl::OUString > ContentHandlerFactory::impl_getSupportedServiceNames()
+css::uno::Sequence< OUString > ContentHandlerFactory::impl_getSupportedServiceNames()
 {
-    css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
-    lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ContentHandlerFactory" ));
+    css::uno::Sequence< OUString > lServiceNames(1);
+    lServiceNames[0] = "com.sun.star.frame.ContentHandlerFactory";
     return lServiceNames;
 }
 

filter/source/config/cache/filtercache.cxx

@@ -671,8 +671,8 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
                 // special case. no exception - but not a valid item => set must be finalized or mandatory!
                 // Reject flush operation by throwing an exception. At least one item couldnt be flushed.
                 if (!xItem.is())
-                    throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant add item. Set is finalized or mandatory!" )),
-                                              css::uno::Reference< css::uno::XInterface >()                                   );
+                    throw css::uno::Exception("Cant add item. Set is finalized or mandatory!",
+                                              css::uno::Reference< css::uno::XInterface >());
 
                 CacheItemList::const_iterator pItem = rCache.find(sItem);
                 impl_saveItem(xItem, eType, pItem->second);
@@ -688,8 +688,8 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
                 // special case. no exception - but not a valid item => it must be finalized or mandatory!
                 // Reject flush operation by throwing an exception. At least one item couldnt be flushed.
                 if (!xItem.is())
-                    throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant change item. Its finalized or mandatory!" )),
-                                              css::uno::Reference< css::uno::XInterface >()                                    );
+                    throw css::uno::Exception("Cant change item. Its finalized or mandatory!",
+                                              css::uno::Reference< css::uno::XInterface >());
 
                 CacheItemList::const_iterator pItem = rCache.find(sItem);
                 impl_saveItem(xItem, eType, pItem->second);
@@ -782,8 +782,8 @@ const CacheItemList& FilterCache::impl_getItemList(EItemType eType) const
 
     }
 
-    throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )),
-                                            css::uno::Reference< css::uno::XInterface >()                      );
+    throw css::uno::Exception("unknown sub container requested.",
+                                            css::uno::Reference< css::uno::XInterface >());
     // <- SAFE ----------------------------------
 }
 
@@ -802,8 +802,8 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType)
 
     }
 
-    throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )),
-                                            css::uno::Reference< css::uno::XInterface >()                      );
+    throw css::uno::Exception("unknown sub container requested.",
+                                            css::uno::Reference< css::uno::XInterface >());
     // <- SAFE ----------------------------------
 }
 
@@ -825,7 +825,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
                 return m_xConfigTypes;
             sPath           = CFGPACKAGE_TD_TYPES;
             pConfig         = &m_xConfigTypes;
-            sRtlLog         = ::rtl::OString("framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_TYPES)");
+            sRtlLog         = "framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_TYPES)";
         }
         break;
 
@@ -835,7 +835,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
                 return m_xConfigFilters;
             sPath           = CFGPACKAGE_TD_FILTERS;
             pConfig         = &m_xConfigFilters;
-            sRtlLog         = ::rtl::OString("framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_FILTERS)");
+            sRtlLog         = "framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_FILTERS)";
         }
         break;
 
@@ -845,7 +845,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
                 return m_xConfigOthers;
             sPath   = CFGPACKAGE_TD_OTHERS;
             pConfig = &m_xConfigOthers;
-            sRtlLog = ::rtl::OString("framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_OTHERS)");
+            sRtlLog = "framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_OTHERS)";
         }
         break;
 
@@ -855,11 +855,11 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
             // the old configuration format only. Its not cached!
             sPath   = CFGPACKAGE_TD_OLD;
             pConfig = &xOld;
-            sRtlLog = ::rtl::OString("framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_OLD)");
+            sRtlLog = "framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_OLD)";
         }
         break;
 
-        default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "These configuration node isnt supported here for open!" )), 0);
+        default : throw css::uno::Exception("These configuration node isnt supported here for open!", 0);
     }
 
     {
@@ -1035,7 +1035,7 @@ void FilterCache::impl_validateAndOptimize()
         throw css::document::CorruptedFilterConfigurationException(
                 "filter configuration: the list of types or filters is empty",
                 css::uno::Reference< css::uno::XInterface >(),
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." )));
+                "The list of types or filters is empty." );
     }
 
     // Create a log for all detected problems, which
@@ -1334,7 +1334,7 @@ void FilterCache::impl_addItem2FlushList(      EItemType        eType,
                 pList = &m_lChangedDetectServices;
                 break;
 
-        default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unsupported item type" )), 0);
+        default : throw css::uno::Exception("unsupported item type", 0);
     }
 
     OUStringList::const_iterator pItem = ::std::find(pList->begin(), pList->end(), sItem);
@@ -2343,9 +2343,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
     css::uno::Reference< css::container::XNameAccess > xItem;
     xSet->getByName(sItem) >>= xItem;
     if (!xItem.is())
-        throw css::uno::Exception(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant read old item." )),
-                css::uno::Reference< css::uno::XInterface >());
+        throw css::uno::Exception("Cant read old item.", css::uno::Reference< css::uno::XInterface >());
 
     CacheItem aItem;
     aItem[PROPNAME_NAME] <<= sItem;
@@ -2359,16 +2357,14 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
     // Data
     ::rtl::OUString sData;
     OUStringList    lData;
-    xItem->getByName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ))) >>= sData;
+    xItem->getByName( "Data" ) >>= sData;
     lData = impl_tokenizeString(sData, (sal_Unicode)',');
     if (
         (sData.isEmpty()) ||
         (lData.size()<1    )
        )
     {
-        throw css::uno::Exception(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant read old item property DATA." )),
-                css::uno::Reference< css::uno::XInterface >());
+        throw css::uno::Exception( "Cant read old item property DATA.", css::uno::Reference< css::uno::XInterface >());
     }
 
     sal_Int32 nProp = 0;
@@ -2465,7 +2461,7 @@ sal_Bool FilterCache::impl_isModuleInstalled(const ::rtl::OUString& sModule)
         m_xModuleCfg = css::uno::Reference< css::container::XNameAccess >(
                             ::comphelper::ConfigurationHelper::openConfig(
                                 comphelper::getComponentContext(m_xSMGR),
-                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office/Factories" )),
+                                "org.openoffice.Setup/Office/Factories",
                                 ::comphelper::ConfigurationHelper::E_READONLY),
                             css::uno::UNO_QUERY_THROW);
     }

filter/source/config/cache/frameloaderfactory.cxx

@@ -143,17 +143,17 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableS
 
 
 
-::rtl::OUString FrameLoaderFactory::impl_getImplementationName()
+OUString FrameLoaderFactory::impl_getImplementationName()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FrameLoaderFactory" ));
+    return OUString( "com.sun.star.comp.filter.config.FrameLoaderFactory" );
 }
 
 
 
-css::uno::Sequence< ::rtl::OUString > FrameLoaderFactory::impl_getSupportedServiceNames()
+css::uno::Sequence< OUString > FrameLoaderFactory::impl_getSupportedServiceNames()
 {
-    css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
-    lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.FrameLoaderFactory" ));
+    css::uno::Sequence< OUString > lServiceNames(1);
+    lServiceNames[0] = "com.sun.star.frame.FrameLoaderFactory";
     return lServiceNames;
 }
 

filter/source/config/cache/typedetection.cxx

@@ -242,7 +242,7 @@ struct EqualByName : public std::binary_function<FlatDetectionInfo, FlatDetectio
     ::rtl::OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString());
 
 #if OSL_DEBUG_LEVEL > 0
-    if (stlDescriptor.find(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ))) != stlDescriptor.end())
+    if (stlDescriptor.find( "FileName" ) != stlDescriptor.end())
         OSL_FAIL("Detect using of deprecated and already unsupported MediaDescriptor property \"FileName\"!");
 #endif
 
@@ -1136,7 +1136,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript
     if (
         (sURL.isEmpty()                                     ) || // "non existing file" ?
         (!xStream.is()                                         ) || // non existing file !
-        (sURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("private:stream")))    // not a good idea .-)
+        (sURL.equalsIgnoreAsciiCase("private:stream"))    // not a good idea .-)
        )
         return ::rtl::OUString();
 
@@ -1263,17 +1263,17 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor(      ::comphelper
 
 
 
-::rtl::OUString TypeDetection::impl_getImplementationName()
+OUString TypeDetection::impl_getImplementationName()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.TypeDetection" ));
+    return OUString( "com.sun.star.comp.filter.config.TypeDetection" );
 }
 
 
 
-css::uno::Sequence< ::rtl::OUString > TypeDetection::impl_getSupportedServiceNames()
+css::uno::Sequence< OUString > TypeDetection::impl_getSupportedServiceNames()
 {
-    css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
-    lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ));
+    css::uno::Sequence< OUString > lServiceNames(1);
+    lServiceNames[0] = OUString( "com.sun.star.document.TypeDetection" );
     return lServiceNames;
 }
 

filter/source/flash/swfdialog.cxx

@@ -48,7 +48,7 @@ using namespace ::com::sun::star::document;
 OUString SWFDialog_getImplementationName ()
     throw (RuntimeException)
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    return OUString ( SERVICE_NAME );
 }
 
 // -----------------------------------------------------------------------------
@@ -67,7 +67,7 @@ Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
 {
     Sequence < OUString > aRet(1);
     OUString* pArray = aRet.getArray();
-    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    pArray[0] =  OUString ( SERVICE_NAME );
     return aRet;
 }
 
@@ -239,7 +239,7 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
     if( i == nCount )
         maMediaDescriptor.realloc( ++nCount );
 
-    maMediaDescriptor[ i ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "FilterData" ) );
+    maMediaDescriptor[ i ].Name = "FilterData";
     maMediaDescriptor[ i ].Value <<= maFilterData;
 
     return maMediaDescriptor;

filter/source/flash/swffilter.cxx

@@ -329,7 +329,7 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
 
     const sal_Int32 nPageCount = xDrawPages->getCount();
     if ( mxStatusIndicator.is() )
-        mxStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "Saving :" )), nPageCount);
+        mxStatusIndicator->start( "Saving :", nPageCount);
 
     for(sal_Int32 nPage = 0; nPage < nPageCount; nPage++)
     {
@@ -451,7 +451,7 @@ void SAL_CALL FlashExportFilter::initialize( const ::com::sun::star::uno::Sequen
 OUString FlashExportFilter_getImplementationName ()
     throw (RuntimeException)
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Impress.FlashExportFilter" ) );
+    return OUString ( "com.sun.star.comp.Impress.FlashExportFilter" );
 }
 
 // -----------------------------------------------------------------------------
@@ -471,7 +471,7 @@ Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames(  )
 {
     Sequence < OUString > aRet(1);
     OUString* pArray = aRet.getArray();
-    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    pArray[0] =  OUString ( SERVICE_NAME );
     return aRet;
 }
 #undef SERVICE_NAME

filter/source/flash/swfwriter1.cxx

@@ -866,12 +866,12 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
     Sequence< PropertyValue > aFilterData(nJPEGQualityLevel != -1);
     if( nJPEGQualityLevel != -1 )
     {
-        aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Quality"));
+        aFilterData[0].Name = "Quality";
         aFilterData[0].Value <<= nJPEGQualityLevel;
     }
 
     if( aFilter.ExportGraphic( aGraphic, String(), aDstStm,
-                                aFilter.GetExportFormatNumberForShortName( OUString( RTL_CONSTASCII_USTRINGPARAM( JPG_SHORTNAME ) ) ), &aFilterData ) == ERRCODE_NONE )
+                                aFilter.GetExportFormatNumberForShortName( OUString(JPG_SHORTNAME) ), &aFilterData ) == ERRCODE_NONE )
     {
         pJpgData = reinterpret_cast<const sal_uInt8*>(aDstStm.GetData());
         nJpgDataLength = aDstStm.Seek( STREAM_SEEK_TO_END );
@@ -1640,7 +1640,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                 const sal_uInt8*                pData = pA->GetData();
                 String                      aSkipComment;
 
-                if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
+                if( pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN") )
                 {
                     const MetaGradientExAction* pGradAction = NULL;
                     sal_Bool                    bDone = sal_False;
@@ -1652,7 +1652,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                         if( pAction->GetType() == META_GRADIENTEX_ACTION )
                             pGradAction = (const MetaGradientExAction*) pAction;
                         else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
-                                 ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
+                                 ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END") ) )
                         {
                             bDone = sal_True;
                         }
@@ -1661,8 +1661,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                     if( pGradAction )
                         Impl_writeGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient());
                 }
-                else if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) &&
-                         pData )
+                else if( pA->GetComment().equalsIgnoreAsciiCase("XPATHFILL_SEQ_BEGIN") &&  pData )
                 {
 
                     // this comment encapsulates all high level information for a filling that caused
@@ -1685,15 +1684,14 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                             pAction = rMtf.GetAction( i );
 
                             if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
-                                     ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
+                                     ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCase("XPATHFILL_SEQ_END") ) )
                             {
                                 bDone = sal_True;
                             }
                         }
                     }
                 }
-                else if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) &&
-                         pData )
+                else if( pA->GetComment().equalsIgnoreAsciiCase("XPATHSTROKE_SEQ_BEGIN") && pData )
                 {
 
                     // this comment encapsulates all high level information for a filling that caused
@@ -1716,7 +1714,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                             pAction = rMtf.GetAction( i );
 
                             if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
-                                     ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) )
+                                     ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCase("XPATHSTROKE_SEQ_END") ) )
                             {
                                 bDone = sal_True;
                             }

filter/source/graphicfilter/egif/egif.cxx

@@ -108,7 +108,7 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC
     m_pAcc = NULL;
 
     if ( pFilterConfigItem )
-        nInterlaced = pFilterConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 );
+        nInterlaced = pFilterConfigItem->ReadInt32( "Interlaced", 0 );
 
     m_rGIF.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 

filter/source/graphicfilter/eps/eps.cxx

@@ -298,10 +298,10 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
 
         if( pResMgr )
         {
-            String aPreviewStr( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) );
-            String aVersionStr( RTL_CONSTASCII_USTRINGPARAM( "Version" ) );
-            String aColorStr( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) );
-            String aComprStr( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) );
+            String aPreviewStr( "Preview" );
+            String aVersionStr( "Version" );
+            String aColorStr( "ColorFormat" );
+            String aComprStr( "CompressionMode" );
 #ifdef UNX // don't put binary tiff preview ahead of postscript code by default on unix as ghostscript is unable to read it
             mnPreview = pFilterConfigItem->ReadInt32( aPreviewStr, 0 );
 #else
@@ -316,7 +316,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
 #else
             mbCompression = pFilterConfigItem->ReadInt32( aComprStr, 1 ) == 1;
 #endif
-            String sTextMode( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) );
+            String sTextMode( "TextMode" );
             mnTextMode = pFilterConfigItem->ReadInt32( sTextMode, 0 );
             if ( mnTextMode > 2 )
                 mnTextMode = 0;
@@ -468,12 +468,9 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
     ImplWriteLong( aSizePoint.Width() );
     ImplWriteLong( aSizePoint.Height() ,PS_RET );
     ImplWriteLine( "%%Pages: 0" );
-    ::rtl::OUStringBuffer aCreator;
-    aCreator.appendAscii( RTL_CONSTASCII_STRINGPARAM( "%%Creator: " ) );
-    aCreator.append( utl::ConfigManager::getProductName() );
-    aCreator.appendAscii( RTL_CONSTASCII_STRINGPARAM( " " ) );
-    aCreator.append( utl::ConfigManager::getProductVersion() );
-    ImplWriteLine( ::rtl::OUStringToOString( aCreator.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr() );
+    OUString aCreator( "%%Creator: " + utl::ConfigManager::getProductName() + " " +
+                       utl::ConfigManager::getProductVersion() );
+    ImplWriteLine( OUStringToOString( aCreator, RTL_TEXTENCODING_UTF8 ).getStr() );
     ImplWriteLine( "%%Title: none" );
     ImplWriteLine( "%%CreationDate: none" );
 
@@ -1222,7 +1219,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             case META_COMMENT_ACTION:
             {
                 const MetaCommentAction* pA = (const MetaCommentAction*) pMA;
-                if ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
+                if ( pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN") )
                 {
                     const MetaGradientExAction* pGradAction = NULL;
                     while( ++nCurAction < nCount )
@@ -1231,7 +1228,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                         if( pAction->GetType() == META_GRADIENTEX_ACTION )
                             pGradAction = (const MetaGradientExAction*) pAction;
                         else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
-                                 ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
+                                 ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END") ) )
                         {
                             break;
                         }
@@ -1239,7 +1236,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                     if( pGradAction )
                         ImplWriteGradient( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), rVDev );
                 }
-                else if ( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) )
+                else if ( pA->GetComment().equals("XPATHFILL_SEQ_END") )
                 {
                     if ( aFillPath.Count() )
                     {
@@ -1256,9 +1253,9 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                         sal_Bool        bSkipSequence = sal_False;
                         rtl::OString sSeqEnd;
 
-                        if( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM( "XPATHSTROKE_SEQ_BEGIN" )) )
+                        if( pA->GetComment().equals( "XPATHSTROKE_SEQ_BEGIN" ) )
                         {
-                            sSeqEnd = rtl::OString(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END"));
+                            sSeqEnd = "XPATHSTROKE_SEQ_END";
                             SvtGraphicStroke aStroke;
                             aMemStm >> aStroke;
 
@@ -1292,9 +1289,9 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                                 ImplPolyLine( aPath );
                             }
                         }
-                        else if (pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")))
+                        else if (pA->GetComment().equals("XPATHFILL_SEQ_BEGIN"))
                         {
-                            sSeqEnd = rtl::OString(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END"));
+                            sSeqEnd = "XPATHFILL_SEQ_END";
                             SvtGraphicFill aFill;
                             aMemStm >> aFill;
                             switch( aFill.getFillType() )
@@ -1363,7 +1360,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                                             break;
                                             case META_COMMENT_ACTION :
                                             {
-                                                if (((const MetaCommentAction*)pAction)->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")))
+                                                if (((const MetaCommentAction*)pAction)->GetComment().equals("XPATHFILL_SEQ_END"))
                                                     bOk = sal_False;
                                             }
                                             break;