[Libreoffice-commits] .: 2 commits - basctl/source chart2/source comphelper/source cui/source dbaccess/source desktop/source embeddedobj/source embeddedobj/test embedserv/source extensions/source filter/source forms/source fpicker/source framework/source i18npool/source linguistic/source odk/examples oox/source package/source pyuno/source reportdesign/source sax/source scripting/source sc/source sdext/source sd/Library_sd.mk sd/source sfx2/source sfx2/workben svl/source svtools/source svx/source svx/workben sw/source toolkit/source ucb/source unotools/source vcl/aqua vcl/generic vcl/source vcl/unx writerfilter/source writerperfect/source xmloff/source xmlscript/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Apr 6 05:30:15 PDT 2012
basctl/source/basicide/moduldl2.cxx | 2
chart2/source/controller/main/ElementSelector.cxx | 2
chart2/source/controller/main/ShapeToolbarController.cxx | 12
chart2/source/controller/main/UndoCommandDispatch.cxx | 2
chart2/source/tools/DataSourceHelper.cxx | 16
chart2/source/tools/InternalDataProvider.cxx | 2
chart2/source/view/main/ChartView.cxx | 8
comphelper/source/misc/mimeconfighelper.cxx | 12
cui/source/customize/cfg.cxx | 24
cui/source/customize/selector.cxx | 6
cui/source/options/treeopt.cxx | 10
dbaccess/source/core/dataaccess/ContentHelper.cxx | 16
dbaccess/source/core/dataaccess/databasecontext.cxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/dataaccess/documentcontainer.cxx | 4
dbaccess/source/core/dataaccess/documentdefinition.cxx | 14
dbaccess/source/core/dataaccess/intercept.cxx | 2
dbaccess/source/core/recovery/settingsimport.cxx | 6
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 6
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 4
dbaccess/source/filter/xml/xmlfilter.cxx | 6
dbaccess/source/ui/browser/sbagrid.cxx | 8
dbaccess/source/ui/control/opendoccontrols.cxx | 2
desktop/source/app/app.cxx | 2
desktop/source/app/cmdlineargs.cxx | 2
desktop/source/app/officeipcthread.cxx | 2
desktop/source/migration/migration.cxx | 2
desktop/source/migration/services/basicmigration.cxx | 2
desktop/source/migration/services/oo3extensionmigration.cxx | 4
desktop/source/migration/services/wordbookmigration.cxx | 2
embeddedobj/source/commonembedding/miscobj.cxx | 18
embeddedobj/source/commonembedding/persistence.cxx | 36 -
embeddedobj/source/commonembedding/xfactory.cxx | 4
embeddedobj/source/general/docholder.cxx | 6
embeddedobj/source/general/intercept.cxx | 2
embeddedobj/source/general/xcreator.cxx | 2
embeddedobj/source/msole/oleembed.cxx | 2
embeddedobj/source/msole/olepersist.cxx | 12
embeddedobj/source/msole/ownview.cxx | 2
embeddedobj/source/msole/xolefactory.cxx | 2
embeddedobj/test/mtexecutor/mainthreadexecutor.cxx | 2
embedserv/source/embed/docholder.cxx | 2
embedserv/source/embed/intercept.cxx | 2
extensions/source/propctrlr/formgeometryhandler.cxx | 4
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/update/check/updatecheckjob.cxx | 4
filter/source/filtertracer/filtertracer.cxx | 14
filter/source/flash/swfdialog.cxx | 4
filter/source/msfilter/escherex.cxx | 30 -
filter/source/pdf/pdfdialog.cxx | 4
filter/source/pdf/pdfexport.cxx | 108 +--
filter/source/pdf/pdffilter.cxx | 6
filter/source/placeware/filter.cxx | 2
filter/source/svg/svgexport.cxx | 4
filter/source/svg/svgfilter.cxx | 4
filter/source/svg/svgimport.cxx | 4
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 34 -
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 2
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 12
forms/source/richtext/richtextcontrol.cxx | 6
forms/source/richtext/specialdispatchers.cxx | 2
fpicker/source/office/OfficeFilePicker.cxx | 6
fpicker/source/office/commonpicker.cxx | 2
framework/source/fwe/xml/menudocumenthandler.cxx | 54 -
framework/source/fwi/uielement/constitemcontainer.cxx | 4
framework/source/fwi/uielement/itemcontainer.cxx | 4
framework/source/fwi/uielement/rootitemcontainer.cxx | 2
framework/source/helper/uielementwrapperbase.cxx | 4
framework/source/uielement/addonstoolbarwrapper.cxx | 2
framework/source/uielement/buttontoolbarcontroller.cxx | 6
framework/source/uielement/fontsizemenucontroller.cxx | 2
framework/source/uielement/langselectionmenucontroller.cxx | 6
framework/source/uielement/toolbarsmenucontroller.cxx | 4
framework/source/uifactory/addonstoolboxfactory.cxx | 6
framework/source/uifactory/windowcontentfactorymanager.cxx | 4
i18npool/source/isolang/isolang.cxx | 2
i18npool/source/numberformatcode/numberformatcode.cxx | 22
linguistic/source/lngprophelp.cxx | 22
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx | 6
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx | 2
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 20
oox/source/core/filterdetect.cxx | 4
oox/source/docprop/ooxmldocpropimport.cxx | 2
oox/source/drawingml/graphicshapecontext.cxx | 6
oox/source/dump/dffdumper.cxx | 8
oox/source/dump/dumperbase.cxx | 70 +-
oox/source/dump/oledumper.cxx | 68 +-
oox/source/dump/pptxdumper.cxx | 4
oox/source/export/drawingml.cxx | 10
oox/source/export/shapes.cxx | 6
oox/source/ppt/timenode.cxx | 2
oox/source/ppt/timenodelistcontext.cxx | 2
oox/source/vml/vmlformatting.cxx | 2
package/source/xstor/ocompinstream.cxx | 14
package/source/xstor/owriteablestream.cxx | 32 -
package/source/xstor/xfactory.cxx | 2
package/source/xstor/xstorage.cxx | 30 -
package/source/zippackage/ZipPackage.cxx | 34 -
package/source/zippackage/ZipPackageFolder.cxx | 6
package/source/zippackage/ZipPackageStream.cxx | 24
pyuno/source/module/pyuno_runtime.cxx | 10
reportdesign/source/core/api/ReportDefinition.cxx | 2
reportdesign/source/filter/xml/xmlfilter.cxx | 8
sax/source/expatwrap/sax_expat.cxx | 2
sax/source/fastparser/facreg.cxx | 4
sc/source/core/tool/addinhelpid.cxx | 4
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/unoobj/celllistsource.cxx | 2
sc/source/ui/unoobj/cellvaluebinding.cxx | 2
sc/source/ui/unoobj/dapiuno.cxx | 12
sc/source/ui/unoobj/docuno.cxx | 16
sc/source/ui/unoobj/fmtuno.cxx | 20
sc/source/ui/unoobj/funcuno.cxx | 4
sc/source/ui/unoobj/nameuno.cxx | 10
sc/source/ui/unoobj/styleuno.cxx | 4
scripting/source/stringresource/stringresource.cxx | 2
sd/Library_sd.mk | 1
sd/source/core/CustomAnimationEffect.cxx | 22
sd/source/core/CustomAnimationPreset.cxx | 2
sd/source/core/TransitionPreset.cxx | 2
sd/source/filter/eppt/pptexanimations.cxx | 40 -
sd/source/filter/eppt/pptx-epptooxml.cxx | 22
sd/source/filter/eppt/pptx-text.cxx | 28
sd/source/filter/html/HtmlOptionsDialog.cxx | 4
sd/source/filter/html/htmlex.cxx | 54 -
sd/source/filter/ppt/pptinanimations.cxx | 4
sd/source/ui/inc/unokywds.hxx | 300 ++++------
sd/source/ui/unoidl/unokywds.cxx | 37 -
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/unoidl/unoobj.cxx | 8
sd/source/ui/view/ViewShellBase.cxx | 2
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/frmview.cxx | 84 +-
sd/source/ui/view/outlview.cxx | 2
sdext/source/pdfimport/filterdet.cxx | 14
sdext/source/pdfimport/pdfiadaptor.cxx | 16
sdext/source/presenter/PresenterScreen.cxx | 4
sfx2/source/appl/appserv.cxx | 2
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/recfloat.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/docfac.cxx | 2
sfx2/source/doc/doctemplates.cxx | 2
sfx2/source/doc/graphhelp.cxx | 8
sfx2/source/doc/guisaveas.cxx | 16
sfx2/source/doc/objstor.cxx | 4
sfx2/source/toolbox/tbxitem.cxx | 2
sfx2/source/view/viewprn.cxx | 2
sfx2/source/view/viewsh.cxx | 18
sfx2/workben/custompanel/ctp_factory.cxx | 2
svl/source/items/srchitem.cxx | 24
svtools/source/filter/jpeg/jpeg.cxx | 2
svtools/source/uno/toolboxcontroller.cxx | 2
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 4
svx/source/form/fmcontrollayout.cxx | 4
svx/source/form/formcontrolfactory.cxx | 2
svx/source/form/formcontroller.cxx | 4
svx/source/gengal/gengal.cxx | 8
svx/source/tbxctrls/grafctrl.cxx | 6
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/tbxctrls/tbunocontroller.cxx | 4
svx/source/unodraw/UnoGraphicExporter.cxx | 40 -
svx/source/unodraw/unopage.cxx | 2
svx/source/unodraw/unoshap2.cxx | 18
svx/source/unogallery/unogalthemeprovider.cxx | 2
svx/source/xml/xmlxtimp.cxx | 12
svx/source/xoutdev/xattr.cxx | 8
svx/source/xoutdev/xattrbmp.cxx | 6
svx/workben/msview/xmlconfig.cxx | 16
sw/source/core/unocore/unocrsrhelper.cxx | 6
sw/source/filter/xml/xmlimp.cxx | 12
sw/source/ui/lingu/olmenu.cxx | 2
sw/source/ui/uiview/view.cxx | 22
sw/source/ui/uno/SwXFilterOptions.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 2
sw/source/ui/vba/vbapagesetup.cxx | 2
sw/source/ui/vba/vbaselection.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 8
toolkit/source/awt/vclxwindow1.cxx | 4
ucb/source/ucp/cmis/cmis_content.cxx | 34 -
ucb/source/ucp/ext/ucpext_content.cxx | 18
ucb/source/ucp/gio/gio_content.cxx | 48 -
ucb/source/ucp/gvfs/gvfs_content.cxx | 10
ucb/source/ucp/odma/odma_content.cxx | 6
ucb/source/ucp/webdav/ContentProperties.cxx | 2
ucb/source/ucp/webdav/webdavcontent.cxx | 8
unotools/source/config/fontcfg.cxx | 8
unotools/source/config/xmlaccelcfg.cxx | 14
vcl/aqua/source/gdi/salprn.cxx | 2
vcl/generic/fontmanager/fontmanager.cxx | 50 -
vcl/source/app/svdata.cxx | 2
vcl/source/gdi/print3.cxx | 16
vcl/source/window/printdlg.cxx | 48 -
vcl/unx/kde/UnxCommandThread.cxx | 22
vcl/unx/kde/UnxFilePicker.cxx | 4
writerfilter/source/dmapper/DomainMapper.cxx | 4
writerfilter/source/dmapper/MeasureHandler.cxx | 2
writerfilter/source/dmapper/StyleSheetTable.cxx | 2
writerfilter/source/filter/WriterFilterDetection.cxx | 10
writerperfect/source/wpdimp/WordPerfectImportFilter.cxx | 2
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 4
xmloff/source/core/DocumentSettingsContext.cxx | 4
xmloff/source/core/xmlexp.cxx | 4
xmloff/source/draw/animationimport.cxx | 4
xmloff/source/forms/elementimport.cxx | 2
xmloff/source/style/xmlstyle.cxx | 2
xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 14
207 files changed, 1187 insertions(+), 1233 deletions(-)
New commits:
commit 8a01ee624318ac08800af89d988971114637a04e
Author: Szabolcs Dezsi <dezsiszabi at hotmail.com>
Date: Fri Apr 6 14:28:18 2012 +0200
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:
find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 913de2d..d0fe408 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -948,7 +948,7 @@ void LibPage::InsertLib()
if ( bReplace )
{
// check, if the library is the Standard library
- if ( aLibName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) )
+ if ( aLibName == "Standard" )
{
ErrorBox( this, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_REPLACESTDLIB ) ) ).Execute();
continue;
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 71e84b3..cbd4928 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -307,7 +307,7 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat
if( m_apSelectorListBox.get() )
{
SolarMutexGuard aSolarMutexGuard;
- if( rEvent.FeatureURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ChartElementSelector" ) ) )
+ if ( rEvent.FeatureURL.Path == "ChartElementSelector" )
{
Reference< frame::XController > xChartController;
rEvent.State >>= xChartController;
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index 565eaf0..1a655fa 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -135,37 +135,37 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments
break;
}
}
- if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:BasicShapes" ) ) )
+ if ( m_aCommandURL == ".uno:BasicShapes" )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BasicShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_BASIC;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
- else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SymbolShapes" ) ) )
+ else if ( m_aCommandURL == ".uno:SymbolShapes" )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SymbolShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_SYMBOL;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
- else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:ArrowShapes" ) ) )
+ else if ( m_aCommandURL == ".uno:ArrowShapes" )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ArrowShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_ARROW;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox) );
}
- else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:FlowChartShapes" ) ) )
+ else if ( m_aCommandURL == ".uno:FlowChartShapes" )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FlowChartShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_FLOWCHART;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
- else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:CalloutShapes" ) ) )
+ else if ( m_aCommandURL == ".uno:CalloutShapes" )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CalloutShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_CALLOUT;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
- else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:StarShapes" ) ) )
+ else if ( m_aCommandURL == ".uno:StarShapes" )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StarShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_STAR;
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index f1dbf03..4c29848 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -111,7 +111,7 @@ void SAL_CALL UndoCommandDispatch::dispatch(
SolarMutexGuard aSolarGuard;
try
{
- if( URL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" )))
+ if ( URL.Path == "Undo" )
m_xUndoManager->undo();
else
m_xUndoManager->redo();
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index ac11380..db49b7d 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -201,25 +201,25 @@ void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue
for(sal_Int32 i=0; i<rArguments.getLength(); ++i, ++pArguments)
{
const beans::PropertyValue& aProperty = *pArguments;
- if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataRowSource" ) ))
+ if ( aProperty.Name == "DataRowSource" )
{
::com::sun::star::chart::ChartDataRowSource eRowSource;
if( aProperty.Value >>= eRowSource )
bUseColumns = (eRowSource==::com::sun::star::chart::ChartDataRowSource_COLUMNS);
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstCellAsLabel" ) ))
+ else if ( aProperty.Name == "FirstCellAsLabel" )
{
aProperty.Value >>= bFirstCellAsLabel;
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasCategories" ) ))
+ else if ( aProperty.Name == "HasCategories" )
{
aProperty.Value >>= bHasCategories;
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRangeRepresentation" ) ))
+ else if ( aProperty.Name == "CellRangeRepresentation" )
{
aProperty.Value >>= rRangeRepresentation;
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) ))
+ else if ( aProperty.Name == "SequenceMapping" )
{
aProperty.Value >>= rSequenceMapping;
}
@@ -383,19 +383,19 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
for(sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments)
{
const beans::PropertyValue& aProperty = *pArguments;
- if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataRowSource" ) ))
+ if ( aProperty.Name == "DataRowSource" )
{
bHasDataRowSource =
(aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(
::getCppuType( reinterpret_cast<
const ::com::sun::star::chart::ChartDataRowSource * >(0))));
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstCellAsLabel" ) ))
+ else if ( aProperty.Name == "FirstCellAsLabel" )
{
bHasFirstCellAsLabel =
(aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType()));
}
- else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRangeRepresentation" ) ))
+ else if ( aProperty.Name == "CellRangeRepresentation" )
{
::rtl::OUString aRange;
bHasCellRangeRepresentation =
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 09dfd05..48e7cb6 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -767,7 +767,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
sal_Int32 nIndex = aRangeRepresentation.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
return lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::valueOf( nIndex ));
}
- else if( aRangeRepresentation.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "last" )))
+ else if ( aRangeRepresentation == "last" )
{
sal_Int32 nIndex = (m_bDataInColumns
? m_aInternalData.getColumnCount()
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index d8f5187..250332f 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2883,13 +2883,13 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName
beans::PropertyValue* pDataValues = aZoomFactors.getArray();
while( nFilterArgs-- )
{
- if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleXNumerator" ) ) )
+ if ( pDataValues->Name == "ScaleXNumerator" )
pDataValues->Value >>= m_nScaleXNumerator;
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleXDenominator" ) ) )
+ else if ( pDataValues->Name == "ScaleXDenominator" )
pDataValues->Value >>= m_nScaleXDenominator;
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleYNumerator" ) ) )
+ else if ( pDataValues->Name == "ScaleYNumerator" )
pDataValues->Value >>= m_nScaleYNumerator;
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleYDenominator" ) ) )
+ else if ( pDataValues->Name == "ScaleYDenominator" )
pDataValues->Value >>= m_nScaleYDenominator;
pDataValues++;
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 81ef3ba..dad64b3 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -217,7 +217,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto
if ( aFilterAnyData >>= aFilterData )
{
for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
- if ( aFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) )
+ if ( aFilterData[nInd].Name == "DocumentService" )
aFilterData[nInd].Value >>= aDocServiceName;
}
}
@@ -322,7 +322,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi
{
aResult[nInd + 1].Name = aObjPropNames[nInd];
- if ( aObjPropNames[nInd].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectVerbs" ) ) )
+ if ( aObjPropNames[nInd] == "ObjectVerbs" )
{
uno::Sequence< ::rtl::OUString > aVerbShortcuts;
if ( xObjectProps->getByName( aObjPropNames[nInd] ) >>= aVerbShortcuts )
@@ -586,7 +586,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
::rtl::OUString aFilterName;
for ( sal_Int32 nInd = 0; nInd < aMediaDescr.getLength(); nInd++ )
- if ( aMediaDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ if ( aMediaDescr[nInd].Name == "FilterName" )
aMediaDescr[nInd].Value >>= aFilterName;
if ( aFilterName.isEmpty() )
@@ -608,7 +608,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
// get FilterName
for ( sal_Int32 nInd = 0; nInd < aTempMD.getLength(); nInd++ )
- if ( aTempMD[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ if ( aTempMD[nInd].Name == "FilterName" )
aTempMD[nInd].Value >>= aFilterName;
if ( !aFilterName.isEmpty() )
@@ -650,7 +650,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
{
::rtl::OUString aDocName;
for ( sal_Int32 nInd = 0; nInd < aObject.getLength(); nInd++ )
- if ( aObject[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectDocumentServiceName" ) ) )
+ if ( aObject[nInd].Name == "ObjectDocumentServiceName" )
{
aObject[nInd].Value >>= aDocName;
break;
@@ -661,7 +661,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
sal_Bool bNeedsAddition = sal_True;
for ( sal_Int32 nMedInd = 0; nMedInd < aMediaDescr.getLength(); nMedInd++ )
- if ( aMediaDescr[nMedInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) )
+ if ( aMediaDescr[nMedInd].Name == "DocumentService" )
{
aMediaDescr[nMedInd].Value <<= aDocName;
bNeedsAddition = sal_False;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a941f4f..cf27750 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -418,27 +418,27 @@ OUString GetModuleName( const OUString& aModuleId )
if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) ||
aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.text.WebDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/Web"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Draw"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Impress"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Calc"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.script.BasicIDE" ) ) )
+ else if ( aModuleId == "com.sun.star.script.BasicIDE" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Basic"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.formula.FormulaProperties" ) ) )
+ else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Math"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.RelationDesign" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.RelationDesign" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Relation Design"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.QueryDesign" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.QueryDesign" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Query Design"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.TableDesign" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.TableDesign" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Table Design"));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.DataSourceBrowser" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.DataSourceBrowser" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Data Source Browser" ));
- else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.DatabaseDocument" ) ) )
+ else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" )
return OUString(RTL_CONSTASCII_USTRINGPARAM("Database" ));
return ::rtl::OUString();
@@ -463,7 +463,7 @@ OUString GetUIModuleName( const OUString& aModuleId, const uno::Reference< css::
OUString aUIName;
for ( sal_Int32 i = 0; i < aSeq.getLength(); ++i )
{
- if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryUIName" ) ))
+ if ( aSeq[i].Name == "ooSetupFactoryUIName" )
{
aSeq[i].Value >>= aModuleUIName;
break;
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 4b6159f..de928dd 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -345,12 +345,12 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
// then the user & share are added at depth=1
)
{
- if ( sUIName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) )
+ if ( sUIName == "user" )
{
sUIName = m_sMyMacros;
bIsRootNode = sal_True;
}
- else if ( sUIName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "share" ) ) )
+ else if ( sUIName == "share" )
{
sUIName = m_sProdMacros;
bIsRootNode = sal_True;
@@ -743,7 +743,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
{
for ( sal_Int32 k = 0; k < aPropSeq.getLength(); ++k )
{
- if ( aPropSeq[k].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) ) )
+ if ( aPropSeq[k].Name == "Name" )
{
aPropSeq[k].Value >>= aLabel;
break;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index ed19976..72a41ce 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1699,7 +1699,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
SfxModule* pSwMod = (*(SfxModule**) GetAppData(SHL_WRITER));
if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) )
+ if ( aFactory == "com.sun.star.text.WebDocument" )
setGroupName( C2U("WriterWeb"), rTextArray.GetString(0) );
else
setGroupName( C2U("Writer"), rTextArray.GetString(0) );
@@ -1740,7 +1740,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// Calc options
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ))
+ if ( aFactory == "com.sun.star.sheet.SpreadsheetDocument" )
{
if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) )
{
@@ -1767,7 +1767,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) );
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ))
+ if ( aFactory == "com.sun.star.presentation.PresentationDocument" )
{
if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) )
{
@@ -1791,7 +1791,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// Draw options
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ))
+ if ( aFactory == "com.sun.star.drawing.DrawingDocument" )
{
if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) )
{
@@ -1815,7 +1815,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// Math options
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
{
- if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.formula.FormulaProperties" ) ))
+ if ( aFactory == "com.sun.star.formula.FormulaProperties" )
{
if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) )
{
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 975b612..6083340 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -357,7 +357,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
{
const PropertyValue& rValue = pValues[ n ];
- if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
+ if ( rValue.Name == "ContentType" )
{
// Read-only property!
aRet[ n ] <<= IllegalAccessException(
@@ -366,7 +366,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
),
static_cast< cppu::OWeakObject * >( this ) );
}
- else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
+ else if ( rValue.Name == "IsDocument" )
{
// Read-only property!
aRet[ n ] <<= IllegalAccessException(
@@ -375,7 +375,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
),
static_cast< cppu::OWeakObject * >( this ) );
}
- else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
+ else if ( rValue.Name == "IsFolder" )
{
// Read-only property!
aRet[ n ] <<= IllegalAccessException(
@@ -384,7 +384,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
),
static_cast< cppu::OWeakObject * >( this ) );
}
- else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+ else if ( rValue.Name == "Title" )
{
rtl::OUString aNewValue;
if ( rValue.Value >>= aNewValue )
@@ -462,19 +462,19 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >&
// Process Core properties.
- if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
+ if ( rProp.Name == "ContentType" )
{
xRow->appendString ( rProp, getContentType() );
}
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+ else if ( rProp.Name == "Title" )
{
xRow->appendString ( rProp, m_pImpl->m_aProps.aTitle );
}
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
+ else if ( rProp.Name == "IsDocument" )
{
xRow->appendBoolean( rProp, m_pImpl->m_aProps.bIsDocument );
}
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
+ else if ( rProp.Name == "IsFolder" )
{
xRow->appendBoolean( rProp, m_pImpl->m_aProps.bIsFolder );
}
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 74e5fc2..48f1212 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -411,7 +411,7 @@ void ODatabaseContext::setTransientProperties(const ::rtl::OUString& _sURL, ODat
const PropertyValue* pPropsEnd = rSessionPersistentProps.getConstArray() + rSessionPersistentProps.getLength();
for ( ; pProp != pPropsEnd; ++pProp )
{
- if ( pProp->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AuthFailedPassword" ) ) )
+ if ( pProp->Name == "AuthFailedPassword" )
{
OSL_VERIFY( pProp->Value >>= sAuthFailedPassword );
}
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 72f4eb9..27dbacc 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2060,7 +2060,7 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( cons
::comphelper::NamedValueCollection aInitArgs( _Arguments );
aInitArgs.put( "Frame", _Frame );
- if ( _ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) ) )
+ if ( _ViewName == "Preview" )
aInitArgs.put( "Preview", sal_Bool( sal_True ) );
Reference< XInitialization > xInitController( xController, UNO_QUERY_THROW );
xInitController->initialize( aInitArgs.getWrappedPropertyValues() );
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index d34a125..85c615d 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -454,7 +454,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
// Unreachable
}
}
- else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "insert" ) ) )
+ else if ( aCommand.Name == "insert" )
{
//////////////////////////////////////////////////////////////////
// insert
@@ -473,7 +473,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
// Unreachable
}
}
- else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "delete" ) ) )
+ else if ( aCommand.Name == "delete" )
{
//////////////////////////////////////////////////////////////////
// delete
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 5fafb3d..f8393f1 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -851,7 +851,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons
if ( lcl_extractOpenMode( pIter->Value, nOpenMode ) )
continue;
- if ( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MacroExecutionMode" ) ) )
+ if ( pIter->Name == "MacroExecutionMode" )
{
sal_Int16 nMacroExecMode( !aDocumentMacroMode ? MacroExecMode::USE_CONFIG : *aDocumentMacroMode );
OSL_VERIFY( pIter->Value >>= nMacroExecMode );
@@ -1054,7 +1054,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
if ( m_bInExecute )
return aRet;
- if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "copyTo" ) ) )
+ if ( aCommand.Name == "copyTo" )
{
Sequence<Any> aIni;
aCommand.Argument >>= aIni;
@@ -1076,11 +1076,11 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
xStorage->copyElementTo(m_pImpl->m_aProps.sPersistentName,xDest,sPersistentName);
}
- else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preview" ) ) )
+ else if ( aCommand.Name == "preview" )
{
onCommandPreview(aRet);
}
- else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "insert" ) ) )
+ else if ( aCommand.Name == "insert" )
{
Sequence<Any> aIni;
aCommand.Argument >>= aIni;
@@ -1105,7 +1105,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
{
onCommandGetDocumentProperties( aRet );
}
- else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "delete" ) ) )
+ else if ( aCommand.Name == "delete" )
{
//////////////////////////////////////////////////////////////////
// delete
@@ -1130,11 +1130,11 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
{
aRet <<= impl_close_throw();
}
- else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "show" ) ) )
+ else if ( aCommand.Name == "show" )
{
impl_showOrHideComponent_throw( true );
}
- else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "hide" ) ) )
+ else if ( aCommand.Name == "hide" )
{
impl_showOrHideComponent_throw( false );
}
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 1ec11d0..9ad0727 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -158,7 +158,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
while( nInd < aNewArgs.getLength() )
{
- if ( aNewArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SaveTo" ) ) )
+ if ( aNewArgs[nInd].Name == "SaveTo" )
{
aNewArgs[nInd].Value <<= sal_True;
break;
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index fd46b17..3b22a20 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -154,7 +154,7 @@ namespace dbaccess
::rtl::OUString sLocalName;
split( i_rElementName, sNamespace, sLocalName );
- if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item-set" ) ) )
+ if ( sLocalName == "config-item-set" )
return new ConfigItemSetImport( m_rSettings );
#if OSL_DEBUG_LEVEL > 0
@@ -273,9 +273,9 @@ namespace dbaccess
::rtl::OUString sLocalName;
split( i_rElementName, sNamespace, sLocalName );
- if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item-set" ) ) )
+ if ( sLocalName == "config-item-set" )
return new ConfigItemSetImport( m_aChildSettings );
- if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item" ) ) )
+ if ( sLocalName == "config-item" )
return new ConfigItemImport( m_aChildSettings );
#if OSL_DEBUG_LEVEL > 0
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 0f05195..a8d2896 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -334,7 +334,7 @@ namespace dbaccess
if ( m_aStates.empty() )
{
- if ( i_Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "office:settings" ) ) )
+ if ( i_Name == "office:settings" )
{
pNewState = new OfficeSettingsImport( m_aSettings );
}
@@ -503,7 +503,7 @@ namespace dbaccess
break;
case REPORT:
- if ( sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.report.ReportDefinition" ) ) )
+ if ( sModuleIdentifier == "com.sun.star.report.ReportDefinition" )
{
// it's an SRB report designer
m_aCompDesc.bForEditing = true;
@@ -516,7 +516,7 @@ namespace dbaccess
break;
default:
- if ( sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.RelationDesign" ) ) )
+ if ( sModuleIdentifier == "com.sun.star.sdb.RelationDesign" )
{
m_eType = RELATION_DESIGN;
m_aCompDesc.bForEditing = true;
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index b5208f4..b2dfb33 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -109,7 +109,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
sURL.append(sDatabaseName);
}
}
- else if ( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "jdbc:oracle:thin" ) ) )
+ else if ( sType == "jdbc:oracle:thin" )
{
sURL.appendAscii("jdbc:oracle:thin:@");
sURL.append(sHostName);
@@ -124,7 +124,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
sURL.append(sDatabaseName);
}
}
- else if ( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:address:ldap" ) ) )
+ else if ( sType == "sdbc:address:ldap" )
{
sURL.appendAscii("sdbc:address:ldap:");
sURL.append(sHostName);
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 6135069..aa7825e 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -555,11 +555,11 @@ void ODBFilter::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
const PropertyValue *pEnd = pIter + aViewProps.getLength();
for (; pIter != pEnd; ++pIter)
{
- if ( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "Queries" ) ) )
+ if ( pIter->Name == "Queries" )
{
fillPropertyMap(pIter->Value,m_aQuerySettings);
}
- else if ( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "Tables" ) ) )
+ else if ( pIter->Name == "Tables" )
{
fillPropertyMap(pIter->Value,m_aTablesSettings);
}
@@ -572,7 +572,7 @@ void ODBFilter::SetConfigurationSettings(const Sequence<PropertyValue>& aConfigP
const PropertyValue *pEnd = pIter + aConfigProps.getLength();
for (; pIter != pEnd; ++pIter)
{
- if ( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "layout-settings" ) ) )
+ if ( pIter->Name == "layout-settings" )
{
Sequence<PropertyValue> aWindows;
pIter->Value >>= aWindows;
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 534a1a8..6317883 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -447,13 +447,13 @@ IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ )
SbaXGridPeer::DispatchType SbaXGridPeer::classifyDispatchURL( const URL& _rURL )
{
DispatchType eURLType = dtUnknown;
- if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GridSlots/BrowserAttribs" ) ) )
+ if ( _rURL.Complete == ".uno:GridSlots/BrowserAttribs" )
eURLType = dtBrowserAttribs;
- else if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GridSlots/RowHeight" ) ) )
+ else if ( _rURL.Complete == ".uno:GridSlots/RowHeight" )
eURLType = dtRowHeight;
- else if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GridSlots/ColumnAttribs" ) ) )
+ else if ( _rURL.Complete == ".uno:GridSlots/ColumnAttribs" )
eURLType = dtColumnAttribs;
- else if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GridSlots/ColumnWidth" ) ) )
+ else if ( _rURL.Complete == ".uno:GridSlots/ColumnWidth" )
eURLType = dtColumnWidth;
return eURLType;
}
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 71fd695..12ca306 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -105,7 +105,7 @@ namespace dbaui
for ( sal_Int32 i=0; i<nCount; ++i )
{
::rtl::OUString sPropertyName( aProperties[i].Name );
- if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Label" ) ) )
+ if ( sPropertyName == "Label" )
{
aProperties[i].Value >>= sLabel;
break;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 0a448c1..6df1561 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2425,7 +2425,7 @@ void Desktop::OpenClients()
OUString aPreloadData;
aPerfTuneIniFile.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "QuickstartPreloadConfiguration" )), aPreloadData, aDefault );
- if ( aPreloadData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) ))
+ if ( aPreloadData == "1" )
{
if ( rArgs.IsWriter() ||
rArgs.IsCalc() ||
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 037c716..e62315b 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -480,7 +480,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
#endif
SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_False );
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "quickstart=no" )))
+ else if ( oArg == "quickstart=no" )
{
SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_True );
SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_False );
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 8ca6083..58daf1f 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -478,7 +478,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
OUString aUserInstallPathHashCode;
- if ( aPreloadData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) ))
+ if ( aPreloadData == "1" )
{
sal_Char szBuffer[32];
sprintf( szBuffer, "%d", SUPD );
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 496d239..d0efd58 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -107,7 +107,7 @@ static const char XDG_CONFIG_PART[] = "/.config";
{
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) ))
+ if ( aPropSeq[i].Name == "Label" )
{
aPropSeq[i].Value >>= aStr;
break;
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 1ac73ac..a2a7b9b 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -209,7 +209,7 @@ namespace migration
{
beans::NamedValue aValue;
*pIter >>= aValue;
- if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
+ if ( aValue.Name == "UserData" )
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 563ed14..64b4a6e 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -413,14 +413,14 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro
{
beans::NamedValue aValue;
*pIter >>= aValue;
- if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
+ if ( aValue.Name == "UserData" )
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
OSL_FAIL( "ExtensionMigration::initialize: argument UserData has wrong type!" );
}
}
- else if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExtensionBlackList" ) ) )
+ else if ( aValue.Name == "ExtensionBlackList" )
{
Sequence< ::rtl::OUString > aBlackList;
if ( (aValue.Value >>= aBlackList ) && ( aBlackList.getLength() > 0 ))
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 3a30754..2d274d1 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -277,7 +277,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
{
beans::NamedValue aValue;
*pIter >>= aValue;
- if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
+ if ( aValue.Name == "UserData" )
{
if ( !(aValue.Value >>= m_sSourceDir) )
{
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 475fd87..ae8f302 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -114,15 +114,15 @@ void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedVa
// TODO/LATER: in future UI names can be also provided here
for ( sal_Int32 nInd = 0; nInd < aObjectProps.getLength(); nInd++ )
{
- if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ClassID" ) ) )
+ if ( aObjectProps[nInd].Name == "ClassID" )
aObjectProps[nInd].Value >>= m_aClassID;
- else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectDocumentServiceName" ) ) )
+ else if ( aObjectProps[nInd].Name == "ObjectDocumentServiceName" )
aObjectProps[nInd].Value >>= m_aDocServiceName;
- else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectDocumentFilterName" ) ) )
+ else if ( aObjectProps[nInd].Name == "ObjectDocumentFilterName" )
aObjectProps[nInd].Value >>= m_aPresetFilterName;
- else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectMiscStatus" ) ) )
+ else if ( aObjectProps[nInd].Name == "ObjectMiscStatus" )
aObjectProps[nInd].Value >>= m_nMiscStatus;
- else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectVerbs" ) ) )
+ else if ( aObjectProps[nInd].Name == "ObjectVerbs" )
aObjectProps[nInd].Value >>= m_aObjectVerbs;
}
@@ -232,9 +232,9 @@ void OCommonEmbeddedObject::LinkInit_Impl(
// setPersistance has no effect on own links, so the complete initialization must be done here
for ( sal_Int32 nInd = 0; nInd < aMediaDescr.getLength(); nInd++ )
- if ( aMediaDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( aMediaDescr[nInd].Name == "URL" )
aMediaDescr[nInd].Value >>= m_aLinkURL;
- else if ( aMediaDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ else if ( aMediaDescr[nInd].Name == "FilterName" )
aMediaDescr[nInd].Value >>= m_aLinkFilterName;
OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!\n" );
@@ -251,12 +251,12 @@ void OCommonEmbeddedObject::LinkInit_Impl(
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
for ( sal_Int32 nObjInd = 0; nObjInd < aObjectDescr.getLength(); nObjInd++ )
- if ( aObjectDescr[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
+ if ( aObjectDescr[nObjInd].Name == "OutplaceDispatchInterceptor" )
{
aObjectDescr[nObjInd].Value >>= xDispatchInterceptor;
break;
}
- else if ( aObjectDescr[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Parent" ) ) )
+ else if ( aObjectDescr[nObjInd].Name == "Parent" )
{
aObjectDescr[nObjInd].Value >>= m_xParent;
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 654e221..526688a 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -110,7 +110,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans:
for ( sal_Int32 nInd = 0; nInd < nLength; nInd++ )
{
aResult[nInd].Name = aOrig[nInd].Name;
- if ( aResult[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AsTemplate" ) ) )
+ if ( aResult[nInd].Name == "AsTemplate" )
{
aResult[nInd].Value <<= sal_True;
bAsTemplateSet = sal_True;
@@ -1013,32 +1013,32 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
m_bReadOnly = sal_False;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
+ if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
// TODO: use lObjArgs for StoreVisualReplacement
for ( sal_Int32 nObjInd = 0; nObjInd < lObjArgs.getLength(); nObjInd++ )
- if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
+ if ( lObjArgs[nObjInd].Name == "OutplaceDispatchInterceptor" )
{
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
if ( lObjArgs[nObjInd].Value >>= xDispatchInterceptor )
m_pDocHolder->SetOutplaceDispatchInterceptor( xDispatchInterceptor );
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DefaultParentBaseURL" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "DefaultParentBaseURL" )
{
lObjArgs[nObjInd].Value >>= m_aDefaultParentBaseURL;
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Parent" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "Parent" )
{
lObjArgs[nObjInd].Value >>= m_xParent;
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IndividualMiscStatus" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "IndividualMiscStatus" )
{
sal_Int64 nMiscStatus=0;
lObjArgs[nObjInd].Value >>= nMiscStatus;
m_nMiscStatus |= nMiscStatus;
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CloneFrom" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "CloneFrom" )
{
uno::Reference < embed::XEmbeddedObject > xObj;
lObjArgs[nObjInd].Value >>= xObj;
@@ -1049,7 +1049,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
m_nClonedMapUnit = xObj->getMapUnit( embed::Aspects::MSOLE_CONTENT );
}
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceFrameProperties" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "OutplaceFrameProperties" )
{
uno::Sequence< uno::Any > aOutFrameProps;
uno::Sequence< beans::NamedValue > aOutFramePropsTyped;
@@ -1073,19 +1073,19 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
else
OSL_FAIL( "OCommonEmbeddedObject::setPersistentEntry: illegal type for argument 'OutplaceFrameProperties'!" );
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ModuleName" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "ModuleName" )
{
lObjArgs[nObjInd].Value >>= m_aModuleName;
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbeddedScriptSupport" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "EmbeddedScriptSupport" )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_bEmbeddedScriptSupport );
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentRecoverySupport" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "DocumentRecoverySupport" )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_bDocumentRecoverySupport );
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RecoveryStorage" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "RecoveryStorage" )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_xRecoveryStorage );
}
@@ -1219,7 +1219,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
// StoreVisualReplacement and VisualReplacement args have no sence here
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
+ if ( lObjArgs[nInd].Name == "CanTryOptimization" )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1352,7 +1352,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
// StoreVisualReplacement and VisualReplacement args have no sence here
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
+ if ( lObjArgs[nInd].Name == "CanTryOptimization" )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1703,13 +1703,13 @@ void SAL_CALL OCommonEmbeddedObject::reload(
::rtl::OUString aNewLinkFilter;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
{
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( lArguments[nInd].Name == "URL" )
{
// the new URL
lArguments[nInd].Value >>= m_aLinkURL;
m_aLinkFilterName = ::rtl::OUString();
}
- else if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ else if ( lArguments[nInd].Name == "FilterName" )
{
lArguments[nInd].Value >>= aNewLinkFilter;
m_aLinkFilterName = ::rtl::OUString();
@@ -1746,7 +1746,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
// TODO: use lObjArgs for StoreVisualReplacement
for ( sal_Int32 nObjInd = 0; nObjInd < lObjArgs.getLength(); nObjInd++ )
- if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
+ if ( lObjArgs[nObjInd].Name == "OutplaceDispatchInterceptor" )
{
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
if ( lObjArgs[nObjInd].Value >>= xDispatchInterceptor )
@@ -1762,7 +1762,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
m_bReadOnly = sal_False;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
+ if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
if ( bOldReadOnlyValue != m_bReadOnly && !m_bIsLink )
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 56662e9..3bef21d 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -356,7 +356,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
// check if there is URL, URL must exist
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( aTempMedDescr[nInd].Name == "URL" )
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
@@ -422,7 +422,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( aTempMedDescr[nInd].Name == "URL" )
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 0d4a43e..b8930ef 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -617,7 +617,7 @@ void DocumentHolder::FindConnectPoints(
xMenu->getByIndex( nInd ) >>= aProps;
rtl::OUString aCommand;
for ( sal_Int32 nSeqInd = 0; nSeqInd < aProps.getLength(); nSeqInd++ )
- if ( aProps[nSeqInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandURL" ) ) )
+ if ( aProps[nSeqInd].Name == "CommandURL" )
{
aProps[nSeqInd].Value >>= aCommand;
break;
@@ -626,9 +626,9 @@ void DocumentHolder::FindConnectPoints(
if ( aCommand.isEmpty() )
throw uno::RuntimeException();
- if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:PickList" ) ) )
+ if ( aCommand == ".uno:PickList" )
nConnectPoints[0] = nInd;
- else if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:WindowList" ) ) )
+ else if ( aCommand == ".uno:WindowList" )
nConnectPoints[1] = nInd;
}
}
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index f892e3b..8c9be50 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -170,7 +170,7 @@ Interceptor::dispatch(
while( nInd < aNewArgs.getLength() )
{
- if ( aNewArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SaveTo" ) ) )
+ if ( aNewArgs[nInd].Name == "SaveTo" )
{
aNewArgs[nInd].Value <<= sal_True;
break;
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 607fe22..1a4a5b2 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -367,7 +367,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
// check if there is URL, URL must exist
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( aTempMedDescr[nInd].Name == "URL" )
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 04d20ca..268b3ef 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -293,7 +293,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
if ( aFilterAnyData >>= aFilterData )
{
for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
- if ( aFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) )
+ if ( aFilterData[nInd].Name == "DocumentService" )
aFilterData[nInd].Value >>= aDocServiceName;
}
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 196dba9..6840fe6 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -1130,11 +1130,11 @@ void OleEmbeddedObject::StoreToLocation_Impl(
uno::Reference< io::XStream > xCachedVisualRepresentation;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StoreVisualReplacement" ) ) )
+ if ( lObjArgs[nInd].Name == "StoreVisualReplacement" )
lObjArgs[nInd].Value >>= bStoreVis;
- else if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VisualReplacement" ) ) )
+ else if ( lObjArgs[nInd].Name == "VisualReplacement" )
lObjArgs[nInd].Value >>= xCachedVisualRepresentation;
- else if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
+ else if ( lObjArgs[nInd].Name == "CanTryOptimization" )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1391,7 +1391,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
m_bReadOnly = sal_False;
sal_Int32 nInd = 0;
for ( nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
+ if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
#ifdef WNT
@@ -1401,7 +1401,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
SwitchOwnPersistence( xStorage, sEntName );
for ( nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StoreVisualReplacement" ) ) )
+ if ( lObjArgs[nInd].Name == "StoreVisualReplacement" )
lObjArgs[nInd].Value >>= m_bStoreVisRepl;
#ifdef WNT
@@ -1469,7 +1469,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
// use URL ( may be content or stream later ) from MediaDescriptor to initialize object
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( lArguments[nInd].Name == "URL" )
lArguments[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 9138126..063bb0d 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -239,7 +239,7 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
::rtl::OUString aFilterName;
for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ )
- if ( aArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ if ( aArgs[nInd].Name == "FilterName" )
aArgs[nInd].Value >>= aFilterName;
if ( aFilterName.isEmpty() && !aTypeName.isEmpty() )
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index 8fac58e..27cd101 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -121,7 +121,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CloneFrom" ) ) )
+ if ( lObjArgs[nInd].Name == "CloneFrom" )
{
try
{
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index a462b2e..952eca3 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -65,7 +65,7 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named
sal_Int32 nValuesSize = 0;
for ( sal_Int32 nInd = 0; nInd < aArguments.getLength(); nInd++ )
- if ( aArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JobToExecute" ) ) )
+ if ( aArguments[nInd].Name == "JobToExecute" )
aArguments[nInd].Value >>= xJob;
else
{
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index d6b3e23..67afa03 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -1158,7 +1158,7 @@ HRESULT DocumentHolder::GetDocumentBorder( RECT *pRect )
{
uno::Sequence< beans::PropertyValue > aArgs = m_xDocument->getArgs();
for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ )
- if ( aArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentBorder" ) ) )
+ if ( aArgs[nInd].Name == "DocumentBorder" )
{
uno::Sequence< sal_Int32 > aRect;
if ( ( aArgs[nInd].Value >>= aRect ) && aRect.getLength() == 4 )
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index f620857..964096e 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -213,7 +213,7 @@ Interceptor::dispatch(
while( nInd < aNewArgs.getLength() )
{
- if ( aNewArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SaveTo" ) ) )
+ if ( aNewArgs[nInd].Name == "SaveTo" )
{
aNewArgs[nInd].Value <<= sal_True;
break;
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 89b1486..2fc5f76 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -740,13 +740,13 @@ namespace pcr
::std::vector< EventTranslation > aEventTranslations;
aEventTranslations.reserve(2);
- if ( _event.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Position" ) ) )
+ if ( _event.PropertyName == "Position" )
{
AwtPoint aPos = m_xShape->getPosition();
aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONX, makeAny( aPos.X ) ) );
aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONY, makeAny( aPos.Y ) ) );
}
- else if ( _event.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
+ else if ( _event.PropertyName == "Size" )
{
AwtSize aSize = m_xShape->getSize();
aEventTranslations.push_back( EventTranslation( PROPERTY_WIDTH, makeAny( aSize.Width ) ) );
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 4f62577..0b46635 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -746,7 +746,7 @@ namespace pcr
{
if ( _rEvent.Source == m_xModel )
{
- if ( _rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) )
+ if ( _rEvent.PropertyName == "IsReadOnly" )
impl_updateReadOnlyView_nothrow();
return;
}
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 4b912fa..2b7aa0a 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -199,14 +199,14 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
{
for ( sal_Int32 n=namedValues.getLength(); n-- > 0; )
{
- if ( namedValues[ n ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DynamicData" ) ) )
+ if ( namedValues[ n ].Name == "DynamicData" )
{
uno::Sequence<beans::NamedValue> aListProp;
if ( namedValues[n].Value >>= aListProp )
{
for ( sal_Int32 i=aListProp.getLength(); i-- > 0; )
{
- if ( aListProp[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "updateList" ) ) )
+ if ( aListProp[ i ].Name == "updateList" )
{
handleExtensionUpdates( aListProp );
return uno::Any();
diff --git a/filter/source/filtertracer/filtertracer.cxx b/filter/source/filtertracer/filtertracer.cxx
index cfe6d5d..7278125 100644
--- a/filter/source/filtertracer/filtertracer.cxx
+++ b/filter/source/filtertracer/filtertracer.cxx
@@ -116,19 +116,19 @@ void SAL_CALL FilterTracer::initialize( const SEQ( NMSP_UNO::Any )& aArguments )
for ( i = 0; i < aParameter.getLength(); i++ )
{
const NMSP_BEANS::PropertyValue& rProp = aParameter[ i ];
- if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LogLevel" ) ) )
+ if ( rProp.Name == "LogLevel" )
rProp.Value >>= mnLogLevel;
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ClassFilter" ) ) )
+ else if ( rProp.Name == "ClassFilter" )
rProp.Value >>= msClassFilter;
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MethodFilter" ) ) )
+ else if ( rProp.Name == "MethodFilter" )
rProp.Value >>= msMethodFilter;
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MessageFilter" ) ) )
+ else if ( rProp.Name == "MessageFilter" )
rProp.Value >>= msMessageFilter;
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) )
+ else if ( rProp.Name == "OutputStream" )
rProp.Value >>= mxOutputStream;
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ else if ( rProp.Name == "URL" )
rProp.Value >>= msURL;
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentHandler" ) ) )
+ else if ( rProp.Name == "DocumentHandler" )
rProp.Value >>= mxDocumentHandler;
}
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 996befa..be19e1b 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -241,7 +241,7 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
for( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
{
- if( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
+ if ( maMediaDescriptor[ i ].Name == "FilterData" )
break;
}
@@ -263,7 +263,7 @@ void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
for( sal_Int32 i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
{
- if( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
+ if ( maMediaDescriptor[ i ].Name == "FilterData" )
{
maMediaDescriptor[ i ].Value >>= maFilterData;
break;
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 94cf7df..56a7c26 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -753,33 +753,33 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
/* todo:
calculate the best option for ArrowLenght and ArrowWidth
*/
- if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Arrow concave" ) ) )
+ if ( aApiName == "Arrow concave" )
reLineEnd = ESCHER_LineArrowStealthEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Square 45" ) ) )
+ else if ( aApiName == "Square 45" )
reLineEnd = ESCHER_LineArrowDiamondEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Small Arrow" ) ) )
+ else if ( aApiName == "Small Arrow" )
reLineEnd = ESCHER_LineArrowEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Dimension Lines" ) ) )
+ else if ( aApiName == "Dimension Lines" )
{
rnArrowLength = 0;
rnArrowWidth = 2;
reLineEnd = ESCHER_LineArrowOvalEnd;
}
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Double Arrow" ) ) )
+ else if ( aApiName == "Double Arrow" )
reLineEnd = ESCHER_LineArrowEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rounded short Arrow" ) ) )
+ else if ( aApiName == "Rounded short Arrow" )
reLineEnd = ESCHER_LineArrowEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Symmetric Arrow" ) ) )
+ else if ( aApiName == "Symmetric Arrow" )
reLineEnd = ESCHER_LineArrowEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Line Arrow" ) ) )
+ else if ( aApiName == "Line Arrow" )
reLineEnd = ESCHER_LineArrowOpenEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rounded large Arrow" ) ) )
+ else if ( aApiName == "Rounded large Arrow" )
reLineEnd = ESCHER_LineArrowEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Circle" ) ) )
+ else if ( aApiName == "Circle" )
reLineEnd = ESCHER_LineArrowOvalEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Square" ) ) )
+ else if ( aApiName == "Square" )
reLineEnd = ESCHER_LineArrowDiamondEnd;
- else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Arrow" ) ) )
+ else if ( aApiName == "Arrow" )
reLineEnd = ESCHER_LineArrowEnd;
}
else if ( comphelper::string::getTokenCount(aArrowStartName, ' ') == 2 )
@@ -3258,18 +3258,18 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
for ( i = 0; i < nCount; i++ )
{
const beans::PropertyValue& rProp = aGeoPropSeq[ i ];
- if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
+ if ( rProp.Name == "Type" )
{
if ( rProp.Value >>= rShapeType )
eShapeType = EnhancedCustomShapeTypeNames::Get( rShapeType );
}
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MirroredX" ) ) )
+ else if ( rProp.Name == "MirroredX" )
{
sal_Bool bMirroredX = sal_Bool();
if ( ( rProp.Value >>= bMirroredX ) && bMirroredX )
nMirrorFlags |= SHAPEFLAG_FLIPH;
}
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MirroredY" ) ) )
+ else if ( rProp.Name == "MirroredY" )
{
sal_Bool bMirroredY = sal_Bool();
if ( ( rProp.Value >>= bMirroredY ) && bMirroredY )
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index a517293..3bf1c3d 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -182,7 +182,7 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues()
for( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
{
- if( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
+ if ( maMediaDescriptor[ i ].Name == "FilterData" )
break;
}
@@ -204,7 +204,7 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
for( sal_Int32 i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
{
- if( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
+ if ( maMediaDescriptor[ i ].Name == "FilterData" )
{
maMediaDescriptor[ i ].Value >>= maFilterData;
break;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index b927ae6..b6f628e 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -184,11 +184,11 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
for( sal_Int32 nData = 0, nDataCount = rRenderOptions.getLength(); nData < nDataCount; ++nData )
{
- if( rRenderOptions[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFirstPage" ) ) )
+ if ( rRenderOptions[ nData ].Name == "IsFirstPage" )
pFirstPage = &rRenderOptions[ nData ].Value;
- else if( rRenderOptions[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsLastPage" ) ) )
+ else if ( rRenderOptions[ nData ].Name == "IsLastPage" )
pLastPage = &rRenderOptions[ nData ].Value;
- else if( rRenderOptions[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportNotesPages" ) ) )
+ else if ( rRenderOptions[ nData ].Name == "ExportNotesPages" )
rRenderOptions[ nData ].Value >>= bExportNotesPages;
}
@@ -211,7 +211,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
for( sal_Int32 nProperty = 0, nPropertyCount = aRenderer.getLength(); nProperty < nPropertyCount; ++nProperty )
{
- if( aRenderer[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageSize" ) ) )
+ if ( aRenderer[ nProperty ].Name == "PageSize" )
aRenderer[ nProperty].Value >>= aPageSize;
}
@@ -361,7 +361,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
Sequence< beans::PropertyValue > aFilterData;
xFilterFactory->getByName( aFilterName ) >>= aFilterData;
for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
- if ( aFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
+ if ( aFilterData[nInd].Name == "Type" )
aFilterData[nInd].Value >>= aTypeName;
if ( !aTypeName.isEmpty() )
@@ -374,7 +374,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
Sequence< beans::PropertyValue > aTypeData;
xTypeDetection->getByName( aTypeName ) >>= aTypeData;
for ( sal_Int32 nInd = 0; nInd < aTypeData.getLength(); nInd++ )
- if ( aTypeData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
+ if ( aTypeData[nInd].Name == "MediaType" )
aTypeData[nInd].Value >>= aDocMimetype;
}
}
@@ -453,107 +453,107 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
for( sal_Int32 nData = 0, nDataCount = rFilterData.getLength(); nData < nDataCount; ++nData )
{
- if( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageRange" ) ) )
+ if ( rFilterData[ nData ].Name == "PageRange" )
rFilterData[ nData ].Value >>= aPageRange;
- else if( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Selection" ) ) )
+ else if ( rFilterData[ nData ].Name == "Selection" )
rFilterData[ nData ].Value >>= aSelection;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseLosslessCompression" ) ) )
+ else if ( rFilterData[ nData ].Name == "UseLosslessCompression" )
rFilterData[ nData ].Value >>= mbUseLosslessCompression;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Quality" ) ) )
+ else if ( rFilterData[ nData ].Name == "Quality" )
rFilterData[ nData ].Value >>= mnQuality;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReduceImageResolution" ) ) )
+ else if ( rFilterData[ nData ].Name == "ReduceImageResolution" )
rFilterData[ nData ].Value >>= mbReduceImageResolution;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsSkipEmptyPages" ) ) )
+ else if ( rFilterData[ nData ].Name == "IsSkipEmptyPages" )
rFilterData[ nData ].Value >>= mbSkipEmptyPages;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MaxImageResolution" ) ) )
+ else if ( rFilterData[ nData ].Name == "MaxImageResolution" )
rFilterData[ nData ].Value >>= mnMaxImageResolution;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseTaggedPDF" ) ) )
+ else if ( rFilterData[ nData ].Name == "UseTaggedPDF" )
rFilterData[ nData ].Value >>= mbUseTaggedPDF;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SelectPdfVersion" ) ) )
+ else if ( rFilterData[ nData ].Name == "SelectPdfVersion" )
rFilterData[ nData ].Value >>= mnPDFTypeSelection;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportNotes" ) ) )
+ else if ( rFilterData[ nData ].Name == "ExportNotes" )
rFilterData[ nData ].Value >>= mbExportNotes;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportNotesPages" ) ) )
+ else if ( rFilterData[ nData ].Name == "ExportNotesPages" )
rFilterData[ nData ].Value >>= mbExportNotesPages;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbedStandardFonts" ) ) )
+ else if ( rFilterData[ nData ].Name == "EmbedStandardFonts" )
rFilterData[ nData ].Value >>= mbEmbedStandardFonts;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseTransitionEffects" ) ) )
+ else if ( rFilterData[ nData ].Name == "UseTransitionEffects" )
rFilterData[ nData ].Value >>= mbUseTransitionEffects;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportFormFields" ) ) )
+ else if ( rFilterData[ nData ].Name == "ExportFormFields" )
rFilterData[ nData ].Value >>= mbExportFormFields;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FormsType" ) ) )
+ else if ( rFilterData[ nData ].Name == "FormsType" )
rFilterData[ nData ].Value >>= mnFormsFormat;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AllowDuplicateFieldNames" ) ) )
+ else if ( rFilterData[ nData ].Name == "AllowDuplicateFieldNames" )
rFilterData[ nData ].Value >>= mbAllowDuplicateFieldNames;
//viewer properties
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HideViewerToolbar" ) ) )
+ else if ( rFilterData[ nData ].Name == "HideViewerToolbar" )
rFilterData[ nData ].Value >>= mbHideViewerToolbar;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HideViewerMenubar" ) ) )
+ else if ( rFilterData[ nData ].Name == "HideViewerMenubar" )
rFilterData[ nData ].Value >>= mbHideViewerMenubar;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HideViewerWindowControls" ) ) )
+ else if ( rFilterData[ nData ].Name == "HideViewerWindowControls" )
rFilterData[ nData ].Value >>= mbHideViewerWindowControls;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResizeWindowToInitialPage" ) ) )
+ else if ( rFilterData[ nData ].Name == "ResizeWindowToInitialPage" )
rFilterData[ nData ].Value >>= mbFitWindow;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CenterWindow" ) ) )
+ else if ( rFilterData[ nData ].Name == "CenterWindow" )
rFilterData[ nData ].Value >>= mbCenterWindow;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OpenInFullScreenMode" ) ) )
+ else if ( rFilterData[ nData ].Name == "OpenInFullScreenMode" )
rFilterData[ nData ].Value >>= mbOpenInFullScreenMode;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DisplayPDFDocumentTitle" ) ) )
+ else if ( rFilterData[ nData ].Name == "DisplayPDFDocumentTitle" )
rFilterData[ nData ].Value >>= mbDisplayPDFDocumentTitle;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InitialView" ) ) )
+ else if ( rFilterData[ nData ].Name == "InitialView" )
rFilterData[ nData ].Value >>= mnPDFDocumentMode;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Magnification" ) ) )
+ else if ( rFilterData[ nData ].Name == "Magnification" )
rFilterData[ nData ].Value >>= mnPDFDocumentAction;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Zoom" ) ) )
+ else if ( rFilterData[ nData ].Name == "Zoom" )
rFilterData[ nData ].Value >>= mnZoom;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InitialPage" ) ) )
+ else if ( rFilterData[ nData ].Name == "InitialPage" )
rFilterData[ nData ].Value >>= mnInitialPage;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageLayout" ) ) )
+ else if ( rFilterData[ nData ].Name == "PageLayout" )
rFilterData[ nData ].Value >>= mnPDFPageLayout;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstPageOnLeft" ) ) )
+ else if ( rFilterData[ nData ].Name == "FirstPageOnLeft" )
rFilterData[ nData ].Value >>= aContext.FirstPageLeft;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsAddStream" ) ) )
+ else if ( rFilterData[ nData ].Name == "IsAddStream" )
rFilterData[ nData ].Value >>= mbAddStream;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Watermark" ) ) )
+ else if ( rFilterData[ nData ].Name == "Watermark" )
{
maWatermark = rFilterData[ nData ].Value;
mbWatermark = sal_True;
}
//now all the security related properties...
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EncryptFile" ) ) )
+ else if ( rFilterData[ nData ].Name == "EncryptFile" )
rFilterData[ nData ].Value >>= mbEncrypt;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentOpenPassword" ) ) )
+ else if ( rFilterData[ nData ].Name == "DocumentOpenPassword" )
rFilterData[ nData ].Value >>= aOpenPassword;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RestrictPermissions" ) ) )
+ else if ( rFilterData[ nData ].Name == "RestrictPermissions" )
rFilterData[ nData ].Value >>= mbRestrictPermissions;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PermissionPassword" ) ) )
+ else if ( rFilterData[ nData ].Name == "PermissionPassword" )
rFilterData[ nData ].Value >>= aPermissionPassword;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreparedPasswords" ) ) )
+ else if ( rFilterData[ nData ].Name == "PreparedPasswords" )
rFilterData[ nData ].Value >>= xEnc;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreparedPermissionPassword" ) ) )
+ else if ( rFilterData[ nData ].Name == "PreparedPermissionPassword" )
rFilterData[ nData ].Value >>= aPreparedPermissionPassword;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Printing" ) ) )
+ else if ( rFilterData[ nData ].Name == "Printing" )
rFilterData[ nData ].Value >>= mnPrintAllowed;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Changes" ) ) )
+ else if ( rFilterData[ nData ].Name == "Changes" )
rFilterData[ nData ].Value >>= mnChangesAllowed;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EnableCopyingOfContent" ) ) )
+ else if ( rFilterData[ nData ].Name == "EnableCopyingOfContent" )
rFilterData[ nData ].Value >>= mbCanCopyOrExtract;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EnableTextAccessForAccessibilityTools" ) ) )
+ else if ( rFilterData[ nData ].Name == "EnableTextAccessForAccessibilityTools" )
rFilterData[ nData ].Value >>= mbCanExtractForAccessibility;
//--->i56629 links extra (relative links and other related stuff)
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportLinksRelativeFsys" ) ) )
+ else if ( rFilterData[ nData ].Name == "ExportLinksRelativeFsys" )
rFilterData[ nData ].Value >>= mbExportRelativeFsysLinks;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PDFViewSelection" ) ) )
+ else if ( rFilterData[ nData ].Name == "PDFViewSelection" )
rFilterData[ nData ].Value >>= mnDefaultLinkAction;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConvertOOoTargetToPDFTarget" ) ) )
+ else if ( rFilterData[ nData ].Name == "ConvertOOoTargetToPDFTarget" )
rFilterData[ nData ].Value >>= mbConvertOOoTargetToPDFTarget;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportBookmarksToPDFDestination" ) ) )
+ else if ( rFilterData[ nData ].Name == "ExportBookmarksToPDFDestination" )
rFilterData[ nData ].Value >>= mbExportBmkToDest;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportBookmarks" ) ) )
+ else if ( rFilterData[ nData ].Name == "ExportBookmarks" )
rFilterData[ nData ].Value >>= mbExportBookmarks;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportHiddenSlides" ) ) )
+ else if ( rFilterData[ nData ].Name == "ExportHiddenSlides" )
rFilterData[ nData ].Value >>= mbExportHiddenSlides;
- else if ( rFilterData[ nData ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OpenBookmarkLevels" ) ) )
+ else if ( rFilterData[ nData ].Name == "OpenBookmarkLevels" )
rFilterData[ nData ].Value >>= mnOpenBookmarkLevels;
}
aContext.URL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index a42633c..58b9afa 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -63,11 +63,11 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
for ( sal_Int32 i = 0 ; ( i < nLength ) && !xOStm.is(); ++i)
{
- if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) )
+ if ( pValue[ i ].Name == "OutputStream" )
pValue[ i ].Value >>= xOStm;
- else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
+ else if ( pValue[ i ].Name == "FilterData" )
pValue[ i ].Value >>= aFilterData;
- else if ( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) )
+ else if ( pValue[ i ].Name == "StatusIndicator" )
pValue[ i ].Value >>= xStatusIndicator;
else if( pValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
pValue[i].Value >>= xIH;
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index bba8fd6..8e207dc 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -109,7 +109,7 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Se
{
pValue[i].Value >>= xInteractionHandler;
}
- else if ( pValue[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "StatusIndicator" ) ) )
+ else if ( pValue[i].Name == "StatusIndicator" )
{
pValue[i].Value >>= xStatusIndicator;
}
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index df104a4..f2e0fc7 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -459,9 +459,9 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
for ( sal_Int32 i = 0 ; i < nLength; ++i)
{
- if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) )
+ if ( pValue[ i ].Name == "OutputStream" )
pValue[ i ].Value >>= xOStm;
- else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileName" ) ) )
+ else if ( pValue[ i ].Name == "FileName" )
{
::rtl::OUString aFileName;
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index a77e9b3..ed8e088 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -170,7 +170,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
for ( sal_Int32 i = 0 ; i < nLength; ++i)
{
- if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PagePos" ) ) )
+ if ( pValue[ i ].Name == "PagePos" )
{
pValue[ i ].Value >>= nPageToExport;
}
@@ -273,7 +273,7 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip
const sal_Int32 nAttribs = io_rDescriptor.getLength();
for( sal_Int32 i = 0; i < nAttribs; i++ )
{
- if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) )
+ if ( pAttribs[i].Name == "InputStream" )
pAttribs[i].Value >>= xInput;
}
diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
index de2a762..a0582ce 100644
--- a/filter/source/svg/svgimport.cxx
+++ b/filter/source/svg/svgimport.cxx
@@ -61,11 +61,11 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
const beans::PropertyValue* pAttribs = rDescriptor.getConstArray();
for ( sal_Int32 i=0 ; i<nLength; ++i, ++pAttribs )
{
- if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) )
+ if ( pAttribs->Name == "InputStream" )
{
pAttribs->Value >>= xInputStream;
}
- else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) )
+ else if ( pAttribs->Name == "StatusIndicator" )
pAttribs->Value >>= xStatus;
}
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 0bc05d6..d17b0b8 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -413,7 +413,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn
for( nValue = 0; nValue < nValueCount; nValue++, pValues++ )
{
- if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) )
+ if ( pValues->Name == "UIName" )
{
OUString aInterfaceName;
pValues->Value >>= aInterfaceName;
@@ -745,7 +745,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
for( nIndex = 0; nIndex < nCount; nIndex++ )
{
OUString aName( aSequence[nIndex].Name );
- if( aSequence[nIndex].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Types" ) ) )
+ if ( aSequence[nIndex].Name == "Types" )
{
Sequence< OUString > aTypes;
if( aSequence[nIndex].Value >>= aTypes )
@@ -859,7 +859,7 @@ void XMLFilterSettingsDialog::onDelete()
for( nValue = 0; (nValue < nValueCount) && !bTypeStillUsed; nValue++, pValues++ )
{
- if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
+ if ( pValues->Name == "Type" )
{
OUString aType;
pValues->Value >>= aType;
@@ -1113,39 +1113,39 @@ void XMLFilterSettingsDialog::initFilterList()
for( nValue = 0; nValue < nValueCount; nValue++, pValues++ )
{
- if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
+ if ( pValues->Name == "Type" )
{
pValues->Value >>= pTempFilter->maType;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) )
+ else if ( pValues->Name == "UIName" )
{
pValues->Value >>= pTempFilter->maInterfaceName;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) )
+ else if ( pValues->Name == "DocumentService" )
{
pValues->Value >>= pTempFilter->maDocumentService;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterService" ) ) )
+ else if ( pValues->Name == "FilterService" )
{
pValues->Value >>= aFilterService;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Flags" ) ) )
+ else if ( pValues->Name == "Flags" )
{
pValues->Value >>= pTempFilter->maFlags;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
+ else if ( pValues->Name == "UserData" )
{
pValues->Value >>= aUserData;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileFormatVersion" ) ) )
+ else if ( pValues->Name == "FileFormatVersion" )
{
pValues->Value >>= pTempFilter->maFileFormatVersion;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TemplateName" ) ) )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list