diff options
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 14 | ||||
-rw-r--r-- | filter/source/config/cache/typedetection.cxx | 6 | ||||
-rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 8 | ||||
-rw-r--r-- | filter/source/pdf/pdffilter.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltfilter/OleHandler.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 18 |
8 files changed, 28 insertions, 28 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 716655e977ff..4ac6f7f0487c 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1689,7 +1689,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe if (pLocale == lLocales.end()) { #if OSL_DEBUG_LEVEL > 0 - if (sActLocale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("en-US"))) + if ( sActLocale == "en-US" ) return; ::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString()); diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 87702f7df27c..935ada0e0147 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -303,43 +303,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize #define COMP_HACK #ifdef COMP_HACK - if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer"))) + if ( sDocumentService == "writer" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" )); } else - if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("web"))) + if ( sDocumentService == "web" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" )); } else - if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("global"))) + if ( sDocumentService == "global" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" )); } else - if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc"))) + if ( sDocumentService == "calc" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )); } else - if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("draw"))) + if ( sDocumentService == "draw" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" )); } else - if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("impress"))) + if ( sDocumentService == "impress" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )); } else - if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("math"))) + if ( sDocumentService == "math" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" )); diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 397de51020c8..974cdac983e3 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -454,7 +454,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS { // We cant check a preselected type for a given stream! // So we must believe, that it can work ... - if (aParsedURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("private:stream"))) + if ( aParsedURL.Complete == "private:stream" ) bBreakDetection = sal_True; } @@ -813,9 +813,9 @@ namespace { if (rA == rB) return false; - if (rA.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector"))) + if ( rA == "com.sun.star.text.FormatDetector" ) return false; - if (rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector"))) + if ( rB == "com.sun.star.text.FormatDetector" ) return true; return rA < rB; } diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 64714042f7c9..18451904a632 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -131,9 +131,9 @@ OdfFlatXml::importer( for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++) { paramName = sourceData[paramIdx].Name; - if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream"))) + if ( paramName == "InputStream" ) sourceData[paramIdx].Value >>= inputStream; - else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) + else if ( paramName == "URL" ) sourceData[paramIdx].Value >>= url; } @@ -183,9 +183,9 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData, for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++) { paramName = sourceData[paramIdx].Name; - if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream"))) + if ( paramName == "OutputStream" ) sourceData[paramIdx].Value >>= outputStream; - else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) + else if ( paramName == "URL" ) sourceData[paramIdx].Value >>= targetURL; } diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 58b9afa66960..ef8120b0b93b 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -69,7 +69,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) pValue[ i ].Value >>= aFilterData; else if ( pValue[ i ].Name == "StatusIndicator" ) pValue[ i ].Value >>= xStatusIndicator; - else if( pValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) ) + else if ( pValue[i].Name == "InteractionHandler" ) pValue[i].Value >>= xIH; } diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index f2e0fc7159a3..c9413a69fdd3 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -471,7 +471,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) if( pOStm ) xOStm = Reference< XOutputStream >( new ::utl::OOutputStreamWrapper ( *pOStm ) ); } - else if( pValue[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) ) + else if ( pValue[ i ].Name == "FilterData" ) { pValue[ i ].Value >>= maFilterData; } diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index ec2565379ae2..e2226c099ad0 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -164,7 +164,7 @@ namespace XSLT void SAL_CALL OleHandler::insertByName(const OUString& streamName, const OString& content) { - if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso"))) + if ( streamName == "oledata.mso" ) { initRootStorageFromBase64(content); } @@ -178,7 +178,7 @@ namespace XSLT const OString SAL_CALL OleHandler::getByName(const OUString& streamName) { - if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso"))) + if ( streamName == "oledata.mso" ) { //get the length and seek to 0 Reference<XSeekable> xSeek (m_rootStream, UNO_QUERY); diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 687192efa6b7..b42e1f373b0a 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -284,13 +284,13 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) { aName = aSourceData[i].Name; Any value = aSourceData[i].Value; - if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream"))) + if ( aName == "InputStream" ) value >>= xInputStream; - else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName"))) + else if ( aName == "FileName" ) value >>= aFileName; - else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) + else if ( aName == "URL" ) value >>= aURL; - else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler"))) + else if ( aName == "InteractionHandler" ) value >>= xInterActionHandler; } OSL_ASSERT(xInputStream.is()); @@ -443,15 +443,15 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) for (sal_Int32 i = 0; i < nLength; i++) { aName = aSourceData[i].Name; - if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Indent"))) + if ( aName == "Indent" ) aSourceData[i].Value >>= bIndent; - if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_Public"))) + if ( aName == "DocType_Public" ) aSourceData[i].Value >>= aDoctypePublic; - if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_System"))) + if ( aName == "DocType_System" ) aSourceData[i].Value >>= aDoctypeSystem; - if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream"))) + if ( aName == "OutputStream" ) aSourceData[i].Value >>= m_rOutputStream; - else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) + else if ( aName == "URL" ) aSourceData[i].Value >>= sURL; } |