summaryrefslogtreecommitdiff
path: root/filter/source
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source')
-rw-r--r--filter/source/config/cache/filtercache.cxx2
-rw-r--r--filter/source/config/cache/lateinitlistener.cxx8
-rw-r--r--filter/source/config/cache/typedetection.cxx14
-rw-r--r--filter/source/flash/swfexporter.cxx5
-rw-r--r--filter/source/msfilter/eschesdo.cxx2
-rw-r--r--filter/source/svg/svgexport.cxx6
-rw-r--r--filter/source/svg/svgreader.cxx8
-rw-r--r--filter/source/t602/t602filter.cxx18
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx3
-rw-r--r--filter/source/xmlfilterdetect/filterdetect.cxx14
-rw-r--r--filter/source/xsltdialog/typedetectionimport.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx2
12 files changed, 34 insertions, 50 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 4ac6f7f0487c..9c2481a48816 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -435,7 +435,7 @@ CacheItem FilterCache::getItem( EItemType eType,
// In Standalone-Impress the module WriterWeb is not installed
// but it is there to load help pages
- bool bIsHelpFilter = sItem.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_web_HTML_help"));
+ bool bIsHelpFilter = sItem == "writer_web_HTML_help";
if ( !bIsHelpFilter && !impl_isModuleInstalled(sDocService) )
{
diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx
index 3d4492206b5c..4a4cddb52821 100644
--- a/filter/source/config/cache/lateinitlistener.cxx
+++ b/filter/source/config/cache/lateinitlistener.cxx
@@ -80,11 +80,7 @@ void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aE
// a) indicate completed open of the first document in which case launch thread
// b) indicate close of application without any documents opened, in which case skip launching thread but drop references break cyclic dependencies in
// case of e.g. cancel from open/new database wizard or impress wizard
- if (
- (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnNew"))) ||
- (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnLoad"))) ||
- (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnCloseApp")))
- )
+ if ( aEvent.EventName == "OnNew" || aEvent.EventName == "OnLoad" || aEvent.EventName == "OnCloseApp" )
{
// this thread must be started one times only ...
// cancel listener connection before!
@@ -108,7 +104,7 @@ void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aE
aLock.clear();
// <- SAFE
- if (!aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnCloseApp")))
+ if ( aEvent.EventName != "OnCloseApp" )
{
rtl::Reference< LateInitThread >(new LateInitThread())->launch();
//TODO: a protocol is missing how to join with the launched
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 974cdac983e3..5b57dc90414b 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -251,21 +251,13 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip
// one type TextAscii and two filters registered for these one type.
// But then we loose automatic opening of CSV files in calc instead of opening these files
// inside writer.
- if (
- (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))) &&
- (
- (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_Text"))) ||
- (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_Text_encoded")))
- )
- )
+ if ( sDocumentService == "com.sun.star.sheet.SpreadsheetDocument"
+ && ( sRealType == "writer_Text" || sRealType == "writer_Text_encoded" ) )
{
sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_Text_txt_csv_StarCalc" ));
}
else
- if (
- (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument"))) &&
- (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc_Text_txt_csv_StarCalc")))
- )
+ if ( sDocumentService == "com.sun.star.text.TextDocument" && sRealType == "calc_Text_txt_csv_StarCalc" )
{
sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_Text" ));
}
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 0f3567be4aec..5b9dbcdd2b56 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -517,7 +517,7 @@ void FlashExporter::exportShapes( Reference< XShapes >& xShapes, bool bStream, b
if( xShape.is() )
{
Reference< XShapes > xShapes2( xShape, UNO_QUERY );
- if( xShapes2.is() && xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GroupShape")))
+ if( xShapes2.is() && xShape->getShapeType() == "com.sun.star.drawing.GroupShape" )
// export the contents of group shapes, but we only ever stream at the top
// recursive level anyway, so pass false for streaming.
exportShapes( xShapes2, false, bMaster);
@@ -605,8 +605,7 @@ void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster )
GDIMetaFile aMtf;
Reference< XComponent > xComponent( xShape, UNO_QUERY );
- bool bIsOleObject = xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape"))
- || xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape"));
+ bool bIsOleObject = xShape->getShapeType() == "com.sun.star.presentation.OLE2Shape" || xShape->getShapeType() == "com.sun.star.drawing.OLE2Shape";
getMetaFile( xComponent, aMtf );
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 08ef01dd6a97..ebb7367c8c2d 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -248,7 +248,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
rtl::OUString sCustomShapeType;
MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType );
- if ( sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-502ad400" ) ) || sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-60da8460" ) ) )
+ if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" )
{
ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index c9413a69fdd3..6c38cedc7c69 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1434,9 +1434,9 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
OUString aShapeClass = implGetClassFromShape( rxShape );
if( mbPresentation )
{
- sal_Bool bIsPageNumber = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Slide_Number" ) );
- sal_Bool bIsFooter = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Footer" ) );
- sal_Bool bIsDateTime = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Date/Time" ) );
+ sal_Bool bIsPageNumber = aShapeClass == "Slide_Number";
+ sal_Bool bIsFooter = aShapeClass == "Footer";
+ sal_Bool bIsDateTime = aShapeClass == "Date/Time";
if( bIsPageNumber || bIsDateTime || bIsFooter )
{
// to notify to the SVGActionWriter::ImplWriteActions method
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index cc0e950a8383..f6dc66844429 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -181,7 +181,7 @@ struct AnnotatingVisitor
{
const rtl::OUString sValue(xNode->getNodeValue());
ElementRefMapType::iterator aFound=maGradientIdMap.end();
- if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
+ if ( sValue.copy(0,1) == "#" )
aFound = maGradientIdMap.find(sValue.copy(1));
else
aFound = maGradientIdMap.find(sValue);
@@ -219,7 +219,7 @@ struct AnnotatingVisitor
{
const rtl::OUString sValue(xNode->getNodeValue());
ElementRefMapType::iterator aFound=maGradientIdMap.end();
- if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
+ if ( sValue.copy(0,1) == "#" )
aFound = maGradientIdMap.find(sValue.copy(1));
else
aFound = maGradientIdMap.find(sValue);
@@ -826,7 +826,7 @@ struct AnnotatingVisitor
case XML_HREF:
{
ElementRefMapType::iterator aFound=maStopIdMap.end();
- if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
+ if ( sValue.copy(0,1) == "#" )
aFound = maStopIdMap.find(sValue.copy(1));
else
aFound = maStopIdMap.find(sValue);
@@ -2430,7 +2430,7 @@ struct ShapeRenderingVisitor
aFont.SetColor(getVclColor(maCurrState.maFillColor));
aFont.SetFillColor(getVclColor(maCurrState.maFillColor));
- if( !maCurrState.maFontStyle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("normal")) )
+ if( maCurrState.maFontStyle != "normal" )
aFont.SetItalic(ITALIC_NORMAL); // TODO: discriminate
if( maCurrState.mnFontWeight != 400.0 )
aFont.SetWeight(WEIGHT_BOLD); // TODO: discriminate
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 8556e14e1663..78f44f8893af 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -155,19 +155,18 @@ T602ImportFilter::~T602ImportFilter()
const PropertyValue * pValue = Descriptor.getConstArray();
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= mxInputStream;
-/* else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "FilterName" ) ) )
+/* else if ( pValue[i].Name == "FilterName" )
pValue[i].Value >>= aFilterName;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) )
+ else if ( pValue[i].Name == "TypeName" )
pValue[i].Value >>= aTypeName; */
}
if (!mxInputStream.is())
return ::rtl::OUString();
-/* if ( aFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "T602Document" ) ) ||
- aTypeName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_T602_Document" ) ) )
+/* if ( aFilterName == "T602Document" || aTypeName == "writer_T602_Document" )
// preselection by type (extension) or filter name: no reason to check type
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_T602_Document" ) ); */
@@ -210,7 +209,7 @@ void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments )
nLength = aAnySeq.getLength();
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+ if ( pValue[i].Name == "Type" )
{
pValue[i].Value >>= msFilterName;
break;
@@ -262,7 +261,7 @@ sal_Bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star
OUString sURL;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= mxInputStream;
}
@@ -893,8 +892,7 @@ OUString T602ImportFilter_getImplementationName ()
sal_Bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName )
throw (RuntimeException)
{
- return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
- ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
+ return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
}
Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( )
@@ -1221,7 +1219,7 @@ OUString T602ImportFilterDialog_getImplementationName ()
sal_Bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName )
throw (RuntimeException)
{
- return ( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) ) );
+ return ServiceName == SERVICE_NAME;
}
Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( )
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 0117668f4722..dfa2ca5dbd62 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -391,8 +391,7 @@ OUString XmlFilterAdaptor_getImplementationName ()
sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName )
throw (RuntimeException)
{
- return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
- ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) );
+ return ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2;
}
Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( )
throw (RuntimeException)
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index 8060a6b5c03e..66c07da73102 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -154,15 +154,15 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
sal_Int32 location=nLength;
for (sal_Int32 i = 0 ; i < nLength; i++)
{
- if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ))
+ if ( pValue[i].Name == "TypeName" )
{
location=i;
}
- else if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ))
+ else if ( pValue[i].Name == "URL" )
{
pValue[i].Value >>= sUrl;
}
- else if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ))
+ else if ( pValue[i].Name == "InputStream" )
{
pValue[i].Value >>= xInStream ;
}
@@ -207,7 +207,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm)
{
::rtl::OUString tmpStr;
lProps[j].Value >>=tmpStr;
- if ((lProps[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ClipboardFormat"))) && !tmpStr.isEmpty())
+ if ( lProps[j].Name == "ClipboardFormat" && !tmpStr.isEmpty() )
{
sTypeName = supportedByType(tmpStr,resultString, myTypes[i]);
}
@@ -248,18 +248,18 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments )
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+ if ( pValue[i].Name == "Type" )
{
pValue[i].Value >>= msFilterName;
}
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "UserData" ) ) )
+ else if ( pValue[i].Name == "UserData" )
{
pValue[i].Value >>= msUserData;
}
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TemplateName" ) ) )
+ else if ( pValue[i].Name == "TemplateName" )
{
pValue[i].Value>>=msTemplateName;
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 1cb2cb41a2d1..3d3b937fe333 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -254,7 +254,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const
if( maStack.empty() )
{
// #109668# support legacy name as well on import
- if( aName == sRootNode || aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oor:node")) )
+ if( aName == sRootNode || aName == "oor:node" )
{
eNewState = e_Root;
}
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index d17b0b8b6e4c..4950c47e2d53 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1161,7 +1161,7 @@ void XMLFilterSettingsDialog::initFilterList()
continue;
// if this is not an XSLTFilter entry, skip it
- if( !aUserData[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) ) )
+ if( aUserData[0] != "com.sun.star.documentconversion.XSLTFilter" )
continue;
// get filter information from userdata
generated by cgit (git 2.34.1) at 2024-07-13 09:48:22 +0000