# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License or as specified alternatively below. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # # Major Contributor(s): # Copyright (C) 2012 Matúš Kukan (initial developer) # # All Rights Reserved. # # For minor contributions see the git repository. # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 3 or later (the "GPLv3+"), or # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. $(eval $(call gb_Library_Library,ucpodma1)) $(eval $(call gb_Library_set_componentfile,ucpodma1,ucb/source/ucp/odma/ucpodma1)) $(eval $(call gb_Library_use_api,ucpodma1,\ offapi \ udkapi \ )) $(eval $(call gb_Library_use_libraries,ucpodma1,\ cppu \ cppuhelper \ sal \ salhelper \ ucbhelper \ $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_static_libraries,ucpodma1,\ odma_lib \ )) $(eval $(call gb_Library_add_exception_objects,ucpodma1,\ ucb/source/ucp/odma/odma_contentcaps \ ucb/source/ucp/odma/odma_content \ ucb/source/ucp/odma/odma_datasupplier \ ucb/source/ucp/odma/odma_inputstream \ ucb/source/ucp/odma/odma_provider \ ucb/source/ucp/odma/odma_resultset \ ucb/source/ucp/odma/odma_services \ )) # vim: set noet sw=4 ts=4: n> LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 15:05:52 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 15:07:41 +0200
commit743f22045c4ec08c46c259fc0ba240194a391457 (patch)
treefaed42bb31c4ee767619eb5c3ebd4dec0a41fa03
parent0c6ebe5d225d6a655f078977455cec6d0a3afa6e (diff)
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 )/' \{\} \;
Diffstat
-rw-r--r--basic/source/uno/namecont.cxx4
-rw-r--r--canvas/source/tools/parametricpolypolygon.cxx20
-rw-r--r--chart2/source/controller/main/ChartDropTargetHelper.cxx2
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.cxx2
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx2
-rw-r--r--configmgr/source/components.cxx2
-rw-r--r--configmgr/source/type.cxx6
-rw-r--r--connectivity/source/commontools/dbtools2.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.cxx8
-rw-r--r--connectivity/source/drivers/postgresql/pq_xkeys.cxx4
-rw-r--r--cppu/source/uno/lbenv.cxx4
-rw-r--r--cppuhelper/source/component_context.cxx12
-rw-r--r--cui/source/dialogs/SpellDialog.cxx2
-rw-r--r--cui/source/factory/dlgfact.cxx8
-rw-r--r--cui/source/tabpages/numpages.cxx12
-rw-r--r--dbaccess/source/core/dataaccess/ContentHelper.cxx2
-rw-r--r--dbaccess/source/core/misc/DatabaseDataProvider.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlDataSource.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx10
-rw-r--r--dbaccess/source/ui/app/AppController.cxx6
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx2
-rw-r--r--dbaccess/source/ui/misc/dsmeta.cxx4
-rw-r--r--desktop/source/app/configinit.cxx2
-rw-r--r--desktop/source/app/desktopcontext.cxx2
-rw-r--r--desktop/source/deployment/manager/dp_managerfac.cxx6
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx10
-rw-r--r--desktop/source/migration/migration.cxx16
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx10
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx8
-rw-r--r--editeng/source/uno/unofield.cxx16
-rw-r--r--editeng/source/uno/unonrule.cxx32
-rw-r--r--filter/source/config/cache/filtercache.cxx2
-rw-r--r--filter/source/config/cache/filterfactory.cxx14
-rw-r--r--filter/source/config/cache/typedetection.cxx6
-rw-r--r--filter/source/odfflatxml/OdfFlatXml.cxx8
-rw-r--r--filter/source/pdf/pdffilter.cxx2
-rw-r--r--filter/source/svg/svgexport.cxx2
-rw-r--r--filter/source/xsltfilter/OleHandler.cxx4
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx18
-rw-r--r--forms/source/xforms/xpathlib/extension.cxx4
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx42
-rw-r--r--framework/source/classes/fwktabwindow.cxx12
-rw-r--r--framework/source/dispatch/closedispatcher.cxx8
-rw-r--r--framework/source/dispatch/dispatchprovider.cxx2
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx2
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx12
-rw-r--r--framework/source/fwi/uielement/constitemcontainer.cxx2
-rw-r--r--framework/source/helper/titlebarupdate.cxx8
-rw-r--r--framework/source/helper/uiconfigelementwrapperbase.cxx14
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx8
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx4
-rw-r--r--framework/source/lomenubar/FrameJob.cxx4
-rw-r--r--framework/source/services/autorecovery.cxx32
-rw-r--r--framework/source/services/sessionlistener.cxx10
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx6
-rw-r--r--framework/source/uiconfiguration/moduleuicfgsupplier.cxx2
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx2
-rw-r--r--framework/source/uielement/menubarmanager.cxx4
-rw-r--r--framework/source/uielement/menubarwrapper.cxx2
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/statusbarmanager.cxx12
-rw-r--r--framework/source/uielement/toolbarmanager.cxx28
-rw-r--r--framework/source/uifactory/menubarfactory.cxx8
-rw-r--r--i18npool/source/calendar/calendar_gregorian.cxx2
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_asian.cxx4
-rw-r--r--i18npool/source/localedata/LocaleNode.cxx30
-rw-r--r--linguistic/source/convdic.cxx2
-rw-r--r--linguistic/source/lngprophelp.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpfilter.cxx14
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx8
-rw-r--r--odk/examples/cpp/complextoolbarcontrols/MyListener.cxx6
-rw-r--r--odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx2
-rw-r--r--oox/source/drawingml/shape.cxx4
-rw-r--r--oox/source/export/chartexport.cxx12
-rw-r--r--oox/source/ole/axfontdata.cxx2
-rw-r--r--oox/source/ole/olehelper.cxx4
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx6
-rw-r--r--oox/source/vml/vmlshape.cxx4
-rw-r--r--package/source/zippackage/ZipPackageFolder.cxx6
-rw-r--r--reportdesign/source/filter/xml/dbloader2.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx22
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx14
-rw-r--r--reportdesign/source/ui/misc/statusbarcontroller.cxx8
-rw-r--r--reportdesign/source/ui/misc/toolboxcontroller.cxx14
-rw-r--r--sal/qa/rtl/bootstrap/bootstrap_process.cxx12
-rw-r--r--sal/test/unloading/unloadTest.cxx2
-rw-r--r--sc/source/core/data/documen5.cxx8
-rw-r--r--sc/source/core/data/tabprotection.cxx4
-rw-r--r--sc/source/core/tool/appoptio.cxx2
-rw-r--r--sc/source/core/tool/interpr1.cxx20
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx2
-rw-r--r--sc/source/ui/dbgui/foptmgr.cxx2
-rw-r--r--sc/source/ui/docshell/dbdocfun.cxx2
-rw-r--r--sc/source/ui/namedlg/namemgrtable.cxx2
-rw-r--r--sc/source/ui/undo/undoutil.cxx2
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx26
-rw-r--r--sc/source/ui/unoobj/docuno.cxx2
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx4
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx20
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx6
-rw-r--r--scripting/source/basprov/basmethnode.cxx2
-rw-r--r--scripting/source/dlgprov/dlgprov.cxx4
-rw-r--r--sd/source/core/stlfamily.cxx2
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx10
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx16
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx38
-rw-r--r--sd/source/ui/dlg/dlgass.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx30
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx4
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx20
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx10
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx12
-rw-r--r--sdext/source/minimizer/fileopendialog.cxx2
-rw-r--r--sdext/source/minimizer/informationdialog.cxx2
-rw-r--r--sdext/source/pdfimport/test/tests.cxx2
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.cxx4
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx4
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx14
-rw-r--r--sfx2/source/appl/appuno.cxx108
-rw-r--r--sfx2/source/appl/sfxhelp.cxx6
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx4
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx24
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx2
-rw-r--r--sfx2/source/doc/plugin.cxx12
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx32
-rw-r--r--sfx2/source/notify/eventsupplier.cxx26
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx6
-rw-r--r--sfx2/source/view/viewprn.cxx10
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx2
-rw-r--r--sot/source/sdstor/ucbstorage.cxx6
-rw-r--r--stoc/source/inspect/introspection.cxx8
-rw-r--r--stoc/source/javavm/javavm.cxx8
-rw-r--r--stoc/source/security/access_controller.cxx10
-rw-r--r--stoc/source/security/permissions.cxx4
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx10
-rw-r--r--stoc/source/tdmanager/tdmgr.cxx30
-rw-r--r--stoc/test/security/test_security.cxx2
-rw-r--r--stoc/test/testiadapter.cxx80
-rw-r--r--svl/source/fsstor/fsstorage.cxx4
-rw-r--r--svl/source/items/macitem.cxx4
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.cxx6
-rw-r--r--svtools/source/filter/exportdialog.cxx34
-rw-r--r--svtools/source/graphic/provider.cxx8
-rw-r--r--svtools/source/uno/contextmenuhelper.cxx2
-rw-r--r--svtools/source/uno/popupmenucontrollerbase.cxx4
-rw-r--r--svtools/source/uno/statusbarcontroller.cxx10
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx8
-rw-r--r--svtools/source/uno/unogridcolumnfacade.cxx4
-rw-r--r--svx/source/dialog/rubydialog.cxx14
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx12
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/form/fmdmod.cxx2
-rw-r--r--svx/source/table/tabledesign.cxx2
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx14
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx2
-rw-r--r--svx/source/unodraw/unomod.cxx6
-rw-r--r--svx/source/unodraw/unomtabl.cxx2
-rw-r--r--svx/workben/msview/xmlconfig.cxx10
-rw-r--r--sw/qa/extras/rtftok/rtftok.cxx8
-rw-r--r--sw/source/core/edit/edlingu.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx10
-rw-r--r--sw/source/core/unocore/unoobj.cxx14
-rw-r--r--sw/source/core/unocore/unorefmk.cxx8
-rw-r--r--sw/source/core/unocore/unostyle.cxx2
-rw-r--r--sw/source/core/unocore/unotext.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx40
-rw-r--r--sw/source/ui/app/docsh2.cxx4
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx12
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx2
-rw-r--r--sw/source/ui/lingu/olmenu.cxx2
-rw-r--r--sw/source/ui/uno/swdetect.cxx20
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.cxx2
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx4
-rw-r--r--sw/source/ui/vba/vbatables.cxx2
-rw-r--r--sw/source/ui/vba/vbaview.cxx8
-rw-r--r--tools/source/fsys/urlobj.cxx4
-rw-r--r--ucb/source/core/provprox.cxx2
-rw-r--r--ucb/source/ucp/file/bc.cxx24
-rw-r--r--ucb/source/ucp/file/filglob.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpurl.cxx2
-rw-r--r--ucb/source/ucp/odma/odma_content.cxx6
-rw-r--r--unotools/source/config/moduleoptions.cxx16
-rw-r--r--unoxml/source/dom/saxbuilder.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbadialogbase.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbaglobalbase.cxx4
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx2
-rw-r--r--vcl/source/app/svmain.cxx2
-rw-r--r--vcl/source/control/edit.cxx2
-rw-r--r--vcl/source/gdi/print3.cxx2
-rw-r--r--vcl/source/window/arrange.cxx6
-rw-r--r--vcl/source/window/window4.cxx6
-rw-r--r--vcl/unx/generic/app/saldata.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx36
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.cxx2
-rw-r--r--writerfilter/source/dmapper/PropertyMapHelper.cxx2
-rw-r--r--writerfilter/source/filter/WriterFilterDetection.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx24
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.cxx36
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx14
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx4
-rw-r--r--xmloff/source/chart/SchXMLTools.cxx14
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx2
-rw-r--r--xmloff/source/core/RDFaImportHelper.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx2
-rw-r--r--xmloff/source/core/xmlimp.cxx2
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx8
-rw-r--r--xmloff/source/style/xmlstyle.cxx8
-rw-r--r--xmloff/source/text/txtfldi.cxx8
-rw-r--r--xmloff/source/xforms/xformsexport.cxx6
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx78
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_import.cxx240
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_import.cxx4
-rw-r--r--xmlscript/source/xmlmod_imexp/xmlmod_import.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx2
219 files changed, 1130 insertions, 1130 deletions
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 7dc31025da72..9bb8782cd016 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -3344,11 +3344,11 @@ Reference< deployment::XPackage > ScriptSubPackageIterator::implDetectScriptPack
{
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType();
rtl::OUString aMediaType = xPackageTypeInfo->getMediaType();
- if( aMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sBasicLibMediaType)) )
+ if ( aMediaType == sBasicLibMediaType )
{
xScriptPackage = xPackage;
}
- else if( aMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sDialogLibMediaType)) )
+ else if ( aMediaType == sDialogLibMediaType )
{
rbPureDialogLib = true;
xScriptPackage = xPackage;
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index b395b20cc2e6..45e9c0d9b735 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -83,46 +83,46 @@ namespace canvas
beans::PropertyValue aProp;
if( (rArgs[i] >>= aProp) )
{
- if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Colors")) )
+ if ( aProp.Name == "Colors" )
{
aProp.Value >>= colorSequence;
}
- else if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Stops")) )
+ else if ( aProp.Name == "Stops" )
{
aProp.Value >>= colorStops;
}
- else if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AspectRatio")) )
+ else if ( aProp.Name == "AspectRatio" )
{
aProp.Value >>= fAspectRatio;
}
}
}
- if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LinearGradient")) )
+ if ( rServiceName == "LinearGradient" )
{
return createLinearHorizontalGradient(rDevice, colorSequence, colorStops);
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EllipticalGradient")) )
+ else if ( rServiceName == "EllipticalGradient" )
{
return createEllipticalGradient(rDevice, colorSequence, colorStops, fAspectRatio);
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RectangularGradient")) )
+ else if ( rServiceName == "RectangularGradient" )
{
return createRectangularGradient(rDevice, colorSequence, colorStops, fAspectRatio);
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VerticalLineHatch")) )
+ else if ( rServiceName == "VerticalLineHatch" )
{
// TODO: NYI
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OrthogonalLinesHatch")) )
+ else if ( rServiceName == "OrthogonalLinesHatch" )
{
// TODO: NYI
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ThreeCrossingLinesHatch")) )
+ else if ( rServiceName == "ThreeCrossingLinesHatch" )
{
// TODO: NYI
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FourCrossingLinesHatch")) )
+ else if ( rServiceName == "FourCrossingLinesHatch" )
{
// TODO: NYI
}
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 007bbf1b4c54..17d413aee3be 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -150,7 +150,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
beans::PropertyValue * pCellRange = 0;
for( sal_Int32 i=0; i<aArguments.getLength(); ++i )
{
- if( aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+ if ( aArguments[i].Name == "CellRangeRepresentation" )
{
pCellRange = (aArguments.getArray() + i);
aArguments[i].Value >>= aOldRange;
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 3e1b1d05c55f..33af33fd44aa 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -158,7 +158,7 @@ Sequence< Reference< frame::XDispatch > > CommandDispatchContainer::getDispatche
for( sal_Int32 nPos = 0; nPos < nCount; ++nPos )
{
- if( aDescriptors[ nPos ].FrameName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_self")))
+ if ( aDescriptors[ nPos ].FrameName == "_self" )
aRet[ nPos ] = getDispatchForURL( aDescriptors[ nPos ].FeatureURL );
}
return aRet;
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index e97e82d00169..8bcdb3ce157e 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -312,7 +312,7 @@ void SAL_CALL ChartModel::storeToURL(
uno::Sequence< beans::PropertyValue > aReducedMediaDescriptor(
aMediaDescriptorHelper.getReducedForModel() );
- if( rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("private:stream")))
+ if ( rURL == "private:stream" )
{
try
{
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 6f1850897c7c..b3767eeae973 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -543,7 +543,7 @@ Components::Components(
if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xcsxcu"))) {
parseXcsXcuLayer(layer, url);
layer += 2; //TODO: overflow
- } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("bundledext")))
+ } else if ( type == "bundledext" )
{
parseXcsXcuIniLayer(layer, url, false);
layer += 2; //TODO: overflow
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index 86a2e6dabced..0fae6abfdf92 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -156,13 +156,13 @@ Type getDynamicType(css::uno::Any const & value) {
RTL_CONSTASCII_STRINGPARAM("[]boolean")))
{
return TYPE_BOOLEAN_LIST;
- } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]short")))
+ } else if ( name == "[]short" )
{
return TYPE_SHORT_LIST;
- } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]long")))
+ } else if ( name == "[]long" )
{
return TYPE_INT_LIST;
- } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]hyper")))
+ } else if ( name == "[]hyper" )
{
return TYPE_LONG_LIST;
} else if (name.equalsAsciiL(
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 1ad898560b73..db7ce81152c6 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -868,7 +868,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc
const PropertyValue* pEnd = pIter + aArgs.getLength();
for(;pIter != pEnd;++pIter)
{
- if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ComponentData")) )
+ if ( pIter->Name == "ComponentData" )
{
Sequence<PropertyValue> aDocumentContext;
pIter->Value >>= aDocumentContext;
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 896d34fcd89c..815e752c4f7e 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -121,9 +121,9 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro
}
}
- if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise")))
+ if ( url == "sdbc:address:evolution:groupwise" )
setSDBCAddressType(SDBCAddress::EVO_GWISE);
- else if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))
+ else if ( url == "sdbc:address:evolution:ldap" )
setSDBCAddressType(SDBCAddress::EVO_LDAP);
else
setSDBCAddressType(SDBCAddress::EVO_LOCAL);
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index b1b5784086ef..8aebe8e09b7e 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -195,11 +195,11 @@ namespace connectivity
for (;pIter != pEnd; ++pIter)
{
- if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Storage")) )
+ if ( pIter->Name == "Storage" )
{
xStorage.set(pIter->Value,UNO_QUERY);
}
- else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+ else if ( pIter->Name == "URL" )
{
pIter->Value >>= sURL;
}
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 8fb63829bbb0..c148646e704d 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -181,13 +181,13 @@ static sal_Int32 readLogLevelFromConfiguration()
OUString str;
if( bootstrapHandle.getFrom( ASCII_STR( "PQ_LOGLEVEL" ), str ) )
{
- if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NONE")) )
+ if ( str == "NONE" )
loglevel = LogLevel::NONE;
- else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ERROR")) )
+ else if ( str == "ERROR" )
loglevel = LogLevel::ERROR;
- else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SQL")) )
+ else if ( str == "SQL" )
loglevel = LogLevel::SQL;
- else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("INFO")) )
+ else if ( str == "INFO" )
loglevel = LogLevel::INFO;
else
{
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 9ad71b10c82c..314924d9d672 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -117,9 +117,9 @@ Keys::~Keys()
static sal_Int32 string2keytype( const rtl::OUString &type )
{
sal_Int32 ret = com::sun::star::sdbcx::KeyType::UNIQUE;
- if( type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("p")) )
+ if ( type == "p" )
ret = com::sun::star::sdbcx::KeyType::PRIMARY;
- else if( type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("f")) )
+ else if ( type == "f" )
ret = com::sun::star::sdbcx::KeyType::FOREIGN;
return ret;
}
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 0fc5239fddb9..7a4d493ccc76 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1065,7 +1065,7 @@ static bool loadEnv(OUString const & cLibStem,
oslModule hMod;
uno_initEnvironmentFunc fpInit = NULL;
- if (cLibStem.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno")) )
+ if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" )
fpInit = CPPU_ENV_uno_initEnvironment;
else
{
@@ -1116,7 +1116,7 @@ static uno_Environment * initDefaultEnvironment(
OUString envTypeName = cppu::EnvDcp::getTypeName(rEnvDcp);
// create default environment
- if (envTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+ if ( envTypeName == UNO_LB_UNO )
{
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
that->computeObjectIdentifier = unoenv_computeObjectIdentifier;
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 6c795dec88cc..6ca08be08580 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -524,7 +524,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
SAL_THROW( (RuntimeException) )
{
#ifdef CONTEXT_DIAG
- if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dump_maps") ))
+ if ( rName == "dump_maps" )
{
::fprintf( stderr, ">>> dumping out ComponentContext %p m_map:\n", this );
typedef ::std::map< OUString, ContextEntry * > t_sorted; // sorted map
@@ -653,7 +653,7 @@ Any ComponentContext::getValueByName( OUString const & rName )
throw (RuntimeException)
{
// to determine the root context:
- if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_root") ))
+ if ( rName == "_root" )
{
if (m_xDelegate.is())
return m_xDelegate->getValueByName( rName );
@@ -723,15 +723,15 @@ void ComponentContext::disposing()
pEntry->value >>= xComp;
if (xComp.is())
{
- if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(TDMGR_SINGLETON) ))
+ if ( iPos->first == TDMGR_SINGLETON )
{
xTDMgr = xComp;
}
- else if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(AC_SINGLETON) ))
+ else if ( iPos->first == AC_SINGLETON )
{
xAC = xComp;
}
- else if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(AC_POLICY) ))
+ else if ( iPos->first == AC_POLICY )
{
xPolicy = xComp;
}
@@ -770,7 +770,7 @@ ComponentContext::ComponentContext(
{
ContextEntry_Init const & rEntry = pEntries[ nPos ];
- if (rEntry.name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SMGR_SINGLETON) ))
+ if ( rEntry.name == SMGR_SINGLETON )
{
rEntry.value >>= m_xSMgr;
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 570e7eba404c..23b3aa4ddaf8 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1231,7 +1231,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
sal_Int32 i = 0;
while ( sFullCommentURL.isEmpty() && i < aProperties.getLength() )
{
- if ( aProperties[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FullCommentURL")) )
+ if ( aProperties[i].Name == "FullCommentURL" )
{
uno::Any aValue = aProperties[i].Value;
aValue >>= sFullCommentURL;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index f4c570b33482..bcb26fdf2715 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1881,11 +1881,11 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia
const SvObjectServerList* pList )
{
InsertObjectDialog_Impl* pDlg=0;
- if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObject")) )
+ if ( rCommand == ".uno:InsertObject" )
pDlg = new SvInsertOleDlg( pParent, xStor, pList );
- else if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertPlugin")) )
+ else if ( rCommand == ".uno:InsertPlugin" )
pDlg = new SvInsertPlugInDialog( pParent, xStor );
- else if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObjectFloatingFrame")) )
+ else if ( rCommand == ".uno:InsertObjectFloatingFrame" )
pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor );
if ( pDlg )
@@ -1900,7 +1900,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p
const Reference < com::sun::star::embed::XEmbeddedObject >& xObj )
{
InsertObjectDialog_Impl* pDlg=0;
- if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObjectFloatingFrame")) )
+ if ( rCommand == ".uno:InsertObjectFloatingFrame" )
{
pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e5b8a6cb283e..e85b5fdab550 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -128,17 +128,17 @@ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& r
SvxNumSettings_ImplPtr pNew = new SvxNumSettings_Impl;
for(sal_Int32 j = 0; j < rLevelProps.getLength(); j++)
{
- if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cNumberingType)))
+ if ( pValues[j].Name == cNumberingType )
pValues[j].Value >>= pNew->nNumberType;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cPrefix)))
+ else if ( pValues[j].Name == cPrefix )
pValues[j].Value >>= pNew->sPrefix;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cSuffix)))
+ else if ( pValues[j].Name == cSuffix )
pValues[j].Value >>= pNew->sSuffix;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cParentNumbering)))
+ else if ( pValues[j].Name == cParentNumbering )
pValues[j].Value >>= pNew->nParentNumbering;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletChar)))
+ else if ( pValues[j].Name == cBulletChar )
pValues[j].Value >>= pNew->sBulletChar;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletFontName)))
+ else if ( pValues[j].Name == cBulletFontName )
pValues[j].Value >>= pNew->sBulletFont;
}
return pNew;
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 608334026190..8e959d9cae65 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -322,7 +322,7 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) t
for(;pBegin != pEnd;++pBegin)
{
*pBegin >>= aValue;
- if ( aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Parent")) )
+ if ( aValue.Name == "Parent" )
{
m_xParentContainer.set(aValue.Value,UNO_QUERY);
}
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 36fa23690f76..255fd9339247 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -177,21 +177,21 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
const beans::PropertyValue* pArgEnd = pArgIter + _aArguments.getLength();
for(;pArgIter != pArgEnd;++pArgIter)
{
- if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")) )
+ if ( pArgIter->Name == "DataRowSource" )
{
::com::sun::star::chart::ChartDataRowSource eRowSource = ::com::sun::star::chart::ChartDataRowSource_COLUMNS;
pArgIter->Value >>= eRowSource;
if ( eRowSource != ::com::sun::star::chart::ChartDataRowSource_COLUMNS )
return sal_False;
}
- else if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")) )
+ else if ( pArgIter->Name == "CellRangeRepresentation" )
{
::rtl::OUString sRange;
pArgIter->Value >>= sRange;
if ( !sRange.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("all")) )
return sal_False;
}
- else if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")) )
+ else if ( pArgIter->Name == "FirstCellAsLabel" )
{
sal_Bool bFirstCellAsLabel = sal_True;
pArgIter->Value >>= bFirstCellAsLabel;
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index c2130d19efec..1ae1ad36f302 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -144,13 +144,13 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
break;
case XML_TOK_BOOLEAN_COMPARISON_MODE:
aProperty.Name = PROPERTY_BOOLEANCOMPARISONMODE;
- if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) )
+ if ( sValue == "equal-integer" )
aProperty.Value <<= sal_Int32(0);
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("is-boolean")) )
+ else if ( sValue == "is-boolean" )
aProperty.Value <<= sal_Int32(1);
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-boolean")) )
+ else if ( sValue == "equal-boolean" )
aProperty.Value <<= sal_Int32(2);
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-use-only-zero")) )
+ else if ( sValue == "equal-use-only-zero" )
aProperty.Value <<= sal_Int32(3);
break;
case XML_TOK_USE_CATALOG:
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 06ad47712ed4..ca93c9007269 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -402,15 +402,15 @@ void ODBExport::exportDataSource()
{
sal_Int32 nValue = 0;
aValue >>= nValue;
- if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")) )
+ if ( sValue == "0" )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-integer"));
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1")) )
+ else if ( sValue == "1" )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("is-boolean"));
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")) )
+ else if ( sValue == "2" )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-boolean"));
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("3")) )
+ else if ( sValue == "3" )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-use-only-zero"));
- if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) )
+ if ( sValue == "equal-integer" )
continue;
eToken = XML_BOOLEAN_COMPARISON_MODE;
}
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index bc059d3d317d..d2c7266a6f35 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1114,7 +1114,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
const PropertyValue* pEnd = pIter + aArgs.getLength();
for( ; pIter != pEnd ; ++pIter)
{
- if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FormatStringId")) )
+ if ( pIter->Name == "FormatStringId" )
{
SotFormatStringId nFormatId = 0;
if ( pIter->Value >>= nFormatId )
@@ -2886,7 +2886,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
const NamedValue* pEnd = pIter + aCurrentSelection.getLength();
for(;pIter != pEnd;++pIter)
{
- if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Type")) )
+ if ( pIter->Name == "Type" )
{
sal_Int32 nType = 0;
pIter->Value >>= nType;
@@ -2894,7 +2894,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
throw IllegalArgumentException();
eType = static_cast< ElementType >( nType );
}
- else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Selection")) )
+ else if ( pIter->Name == "Selection" )
pIter->Value >>= aSelection;
}
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 3ecb7d9ebdbd..cd01aa152794 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -112,7 +112,7 @@ namespace dbaui
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
- if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:DBNewForm")) )
+ if ( m_aCommandURL == ".uno:DBNewForm" )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewForm")) ,sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewView")) ,sal_True));
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index afc4f109f0ab..0d7828fd457f 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -153,9 +153,9 @@ namespace dbaui
{
::rtl::OUString sAuth;
aMetaData.get("Authentication") >>= sAuth;
- if ( sAuth.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserPassword")) )
+ if ( sAuth == "UserPassword" )
aInit = AuthUserPwd;
- else if ( sAuth.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Password")) )
+ else if ( sAuth == "Password" )
aInit = AuthPwd;
}
s_aSupport.insert(Supported::value_type(*pIter,aInit));
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index f4e1044acea9..a51dd36ffef1 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -124,7 +124,7 @@ private:
uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName)
throw (uno::RuntimeException)
{
- if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CONFIG_ERROR_HANDLER)) )
+ if ( aName == CONFIG_ERROR_HANDLER )
{
if ( !m_xHandler.is() )
m_xHandler = ConfigurationErrorHandler::getDefaultInteractionHandler();
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 82338f3d504f..0627da3cc778 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -48,7 +48,7 @@ Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) throw (Runtim
{
Any retVal;
- if (Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(JAVA_INTERACTION_HANDLER_NAME)))
+ if ( Name == JAVA_INTERACTION_HANDLER_NAME )
{
retVal = makeAny( Reference< XInteractionHandler >( new svt::JavaInteractionHandler()) );
}
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 9061f044f8e8..5312923cbb68 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -148,11 +148,11 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context )
{
OSL_ASSERT( insertion.first->second.get() == xRet );
// hold user, shared mgrs for whole process: live deployment
- if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") ))
+ if ( context == "user" )
m_xUserMgr = xRet;
- else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") ))
+ else if ( context == "shared" )
m_xSharedMgr = xRet;
- else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled") ))
+ else if ( context == "bundled" )
m_xBundledMgr = xRet;
}
else
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 8b84ec5d565c..fef95a8215ce 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -94,15 +94,15 @@ PackageRegistryBackend::PackageRegistryBackend(
if (readOnly)
m_readOnly = *readOnly;
- if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") ))
+ if ( m_context == "user" )
m_eContext = CONTEXT_USER;
- else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") ))
+ else if ( m_context == "shared" )
m_eContext = CONTEXT_SHARED;
- else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled") ))
+ else if ( m_context == "bundled" )
m_eContext = CONTEXT_BUNDLED;
- else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") ))
+ else if ( m_context == "tmp" )
m_eContext = CONTEXT_TMP;
- else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") ))
+ else if ( m_context == "bundled_prereg" )
m_eContext = CONTEXT_BUNDLED_PREREG;
else if (m_context.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.tdoc:/") ))
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index d0efd587ad81..eca75099bd58 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -1080,9 +1080,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
{
for(int i=0; i<aProp.getLength(); ++i)
{
- if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
aProp[i].Value >>= aMigrationItem.m_sCommandURL;
- else if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
}
@@ -1098,9 +1098,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
{
for(int i=0; i<aProp.getLength(); ++i)
{
- if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
aProp[i].Value >>= aMigrationItem.m_sCommandURL;
- else if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
}
@@ -1209,11 +1209,11 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j)
{
::rtl::OUString sPropName = aPropSeq[j].Name;
- if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+ if ( sPropName == ITEM_DESCRIPTOR_COMMANDURL )
aPropSeq[j].Value >>= sCommandURL;
- else if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)))
+ else if ( sPropName == ITEM_DESCRIPTOR_LABEL )
aPropSeq[j].Value >>= sLabel;
- else if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+ else if ( sPropName == ITEM_DESCRIPTOR_CONTAINER )
aPropSeq[j].Value >>= xChild;
}
@@ -1250,7 +1250,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
xTemp->getByIndex(i) >>= aTempPropSeq;
for (sal_Int32 j=0; j<aTempPropSeq.getLength(); ++j)
{
- if (aTempPropSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+ if ( aTempPropSeq[j].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aTempPropSeq[j].Value >>= sCmd;
break;
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index b2946aff500e..e997736417c3 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -276,7 +276,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
for(;pIter != pEnd;++pIter)
{
*pIter >>= aValue;
- if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OldConfiguration")))
+ if ( aValue.Name == "OldConfiguration" )
{
sal_Bool bSuccess = aValue.Value >>= aOldConfigValues;
OSL_ENSURE(bSuccess == sal_True, "[Service implementation " IMPL_NAME
@@ -287,7 +287,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
const css::beans::NamedValue* pEnd2 = pIter2 + aOldConfigValues.getLength();
for(;pIter2 != pEnd2;++pIter2)
{
- if ( pIter2->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("org.openoffice.Office.Java")) )
+ if ( pIter2->Name == "org.openoffice.Office.Java" )
{
pIter2->Value >>= m_xLayer;
break;
@@ -295,7 +295,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
}
}
}
- else if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserData")))
+ else if ( aValue.Name == "UserData" )
{
if ( !(aValue.Value >>= m_sUserDir) )
{
@@ -418,9 +418,9 @@ void SAL_CALL JavaMigration::overrideProperty(
MalformedDataException,
WrappedTargetException )
{
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enable")))
+ if ( aName == "Enable" )
m_aStack.push(TElementStack::value_type(aName,ENABLE_JAVA));
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserClassPath")))
+ else if ( aName == "UserClassPath" )
m_aStack.push(TElementStack::value_type(aName, USER_CLASS_PATH));
}
// -----------------------------------------------------------------------------
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 7b48403cdb12..bc2fda67839c 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -483,7 +483,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
xExtensionManager->reinstallDeployedExtensions(
repository, Reference<task::XAbortChannel>(), xCmdEnv);
}
- else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("list") ))
+ else if ( subCommand == "list" )
{
::std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
::comphelper::sequenceToContainer(vecExtUnaccepted,
@@ -572,7 +572,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
printf_packages(allExtensions, vecUnaccepted, xCmdEnv );
}
- else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("validate") ))
+ else if ( subCommand == "validate" )
{
::std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
::comphelper::sequenceToContainer(
@@ -610,7 +610,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
extension, Reference<task::XAbortChannel>(), xCmdEnv);
}
}
- else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("gui") ))
+ else if ( subCommand == "gui" )
{
Reference<ui::dialogs::XAsynchronousExecutableDialog> xDialog(
deployment::ui::PackageManagerDialog::createAndInstall(
@@ -626,7 +626,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
xDialog->startExecuteModal(xListener);
dialogEnded.wait();
}
- else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("sync")))
+ else if ( subCommand == "sync" )
{
if (! dp_misc::office_is_running())
{
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 8621dc16fb4b..10380668c053 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -1127,27 +1127,27 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
sal_Int32 nId = ID_UNKNOWN;
- if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DateTime") ) )
+ if ( aFieldType == "DateTime" )
{
nId = ID_DATEFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL") ) )
+ else if ( aFieldType == "URL" )
{
nId = ID_URLFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageNumber") ) )
+ else if ( aFieldType == "PageNumber" )
{
nId = ID_PAGEFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageCount") ) )
+ else if ( aFieldType == "PageCount" )
{
nId = ID_PAGESFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SheetName") ) )
+ else if ( aFieldType == "SheetName" )
{
nId = ID_TABLEFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FileName") ) )
+ else if ( aFieldType == "FileName" )
{
nId = ID_EXT_FILEFIELD;
}
@@ -1158,11 +1158,11 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
{
nId = ID_FILEFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Author") ) )
+ else if ( aFieldType == "Author" )
{
nId = ID_AUTHORFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Measure") ) )
+ else if ( aFieldType == "Measure" )
{
nId = ID_MEASUREFIELD;
}
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 16f8c6a790c8..bd171da234ee 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -290,7 +290,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
const OUString& rPropName = rProp.Name;
const Any& aVal = rProp.Value;
- if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_NUMBERINGTYPE)))
+ if ( rPropName == UNO_NAME_NRULE_NUMBERINGTYPE )
{
sal_Int16 nSet = sal_Int16();
aVal >>= nSet;
@@ -311,7 +311,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_PREFIX)))
+ else if ( rPropName == UNO_NAME_NRULE_PREFIX )
{
OUString aPrefix;
if( aVal >>= aPrefix )
@@ -320,7 +320,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_SUFFIX)))
+ else if ( rPropName == UNO_NAME_NRULE_SUFFIX )
{
OUString aSuffix;
if( aVal >>= aSuffix )
@@ -329,7 +329,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLETID)))
+ else if ( rPropName == UNO_NAME_NRULE_BULLETID )
{
sal_Int16 nSet = sal_Int16();
if( aVal >>= nSet )
@@ -341,7 +341,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
}
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("BulletChar")))
+ else if ( rPropName == "BulletChar" )
{
OUString aStr;
if( aVal >>= aStr )
@@ -357,7 +357,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_ADJUST)))
+ else if ( rPropName == UNO_NAME_NRULE_ADJUST )
{
sal_Int16 nAdjust = sal_Int16();
if( aVal >>= nAdjust )
@@ -366,7 +366,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_FONT)))
+ else if ( rPropName == UNO_NAME_NRULE_BULLET_FONT )
{
awt::FontDescriptor aDesc;
if( aVal >>= aDesc )
@@ -377,7 +377,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Graphic")))
+ else if ( rPropName == "Graphic" )
{
Reference< awt::XBitmap > xBmp;
if( aVal >>= xBmp )
@@ -388,7 +388,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("GraphicURL")))
+ else if ( rPropName == "GraphicURL" )
{
OUString aURL;
if( aVal >>= aURL )
@@ -399,7 +399,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("GraphicSize")))
+ else if ( rPropName == "GraphicSize" )
{
awt::Size aUnoSize;
if( aVal >>= aUnoSize )
@@ -408,7 +408,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_START_WITH)))
+ else if ( rPropName == UNO_NAME_NRULE_START_WITH )
{
sal_Int16 nStart = sal_Int16();
if( aVal >>= nStart )
@@ -417,7 +417,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_LEFT_MARGIN)))
+ else if ( rPropName == UNO_NAME_NRULE_LEFT_MARGIN )
{
sal_Int32 nMargin = 0;
if( aVal >>= nMargin )
@@ -426,7 +426,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_FIRST_LINE_OFFSET)))
+ else if ( rPropName == UNO_NAME_NRULE_FIRST_LINE_OFFSET )
{
sal_Int32 nMargin = 0;
if( aVal >>= nMargin )
@@ -435,7 +435,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SymbolTextDistance")))
+ else if ( rPropName == "SymbolTextDistance" )
{
sal_Int32 nTextDistance = 0;
if( aVal >>= nTextDistance )
@@ -444,7 +444,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_COLOR)))
+ else if ( rPropName == UNO_NAME_NRULE_BULLET_COLOR )
{
sal_Int32 nColor = 0;
if( aVal >>= nColor )
@@ -453,7 +453,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_RELSIZE)))
+ else if ( rPropName == UNO_NAME_NRULE_BULLET_RELSIZE )
{
sal_Int16 nSize = sal_Int16();
if( aVal >>= nSize )
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 716655e977ff..4ac6f7f0487c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1689,7 +1689,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
if (pLocale == lLocales.end())
{
#if OSL_DEBUG_LEVEL > 0
- if (sActLocale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("en-US")))
+ if ( sActLocale == "en-US" )
return;
::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString());
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 87702f7df27c..935ada0e0147 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -303,43 +303,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
#define COMP_HACK
#ifdef COMP_HACK
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer")))
+ if ( sDocumentService == "writer" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("web")))
+ if ( sDocumentService == "web" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("global")))
+ if ( sDocumentService == "global" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc")))
+ if ( sDocumentService == "calc" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("draw")))
+ if ( sDocumentService == "draw" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("impress")))
+ if ( sDocumentService == "impress" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("math")))
+ if ( sDocumentService == "math" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" ));
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 397de51020c8..974cdac983e3 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -454,7 +454,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS
{
// We cant check a preselected type for a given stream!
// So we must believe, that it can work ...
- if (aParsedURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("private:stream")))
+ if ( aParsedURL.Complete == "private:stream" )
bBreakDetection = sal_True;
}
@@ -813,9 +813,9 @@ namespace
{
if (rA == rB)
return false;
- if (rA.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
+ if ( rA == "com.sun.star.text.FormatDetector" )
return false;
- if (rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
+ if ( rB == "com.sun.star.text.FormatDetector" )
return true;
return rA < rB;
}
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 64714042f7c9..18451904a632 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -131,9 +131,9 @@ OdfFlatXml::importer(
for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++)
{
paramName = sourceData[paramIdx].Name;
- if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
+ if ( paramName == "InputStream" )
sourceData[paramIdx].Value >>= inputStream;
- else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( paramName == "URL" )
sourceData[paramIdx].Value >>= url;
}
@@ -183,9 +183,9 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData,
for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++)
{
paramName = sourceData[paramIdx].Name;
- if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
+ if ( paramName == "OutputStream" )
sourceData[paramIdx].Value >>= outputStream;
- else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( paramName == "URL" )
sourceData[paramIdx].Value >>= targetURL;
}
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 58b9afa66960..ef8120b0b93b 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -69,7 +69,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
pValue[ i ].Value >>= aFilterData;
else if ( pValue[ i ].Name == "StatusIndicator" )
pValue[ i ].Value >>= xStatusIndicator;
- else if( pValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
+ else if ( pValue[i].Name == "InteractionHandler" )
pValue[i].Value >>= xIH;
}
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index f2e0fc7159a3..c9413a69fdd3 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -471,7 +471,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
if( pOStm )
xOStm = Reference< XOutputStream >( new ::utl::OOutputStreamWrapper ( *pOStm ) );
}
- else if( pValue[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
+ else if ( pValue[ i ].Name == "FilterData" )
{
pValue[ i ].Value >>= maFilterData;
}
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index ec2565379ae2..e2226c099ad0 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -164,7 +164,7 @@ namespace XSLT
void SAL_CALL
OleHandler::insertByName(const OUString& streamName, const OString& content)
{
- if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso")))
+ if ( streamName == "oledata.mso" )
{
initRootStorageFromBase64(content);
}
@@ -178,7 +178,7 @@ namespace XSLT
const OString
SAL_CALL OleHandler::getByName(const OUString& streamName)
{
- if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso")))
+ if ( streamName == "oledata.mso" )
{
//get the length and seek to 0
Reference<XSeekable> xSeek (m_rootStream, UNO_QUERY);
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 687192efa6b7..b42e1f373b0a 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -284,13 +284,13 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
{
aName = aSourceData[i].Name;
Any value = aSourceData[i].Value;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
+ if ( aName == "InputStream" )
value >>= xInputStream;
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")))
+ else if ( aName == "FileName" )
value >>= aFileName;
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( aName == "URL" )
value >>= aURL;
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")))
+ else if ( aName == "InteractionHandler" )
value >>= xInterActionHandler;
}
OSL_ASSERT(xInputStream.is());
@@ -443,15 +443,15 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
for (sal_Int32 i = 0; i < nLength; i++)
{
aName = aSourceData[i].Name;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Indent")))
+ if ( aName == "Indent" )
aSourceData[i].Value >>= bIndent;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_Public")))
+ if ( aName == "DocType_Public" )
aSourceData[i].Value >>= aDoctypePublic;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_System")))
+ if ( aName == "DocType_System" )
aSourceData[i].Value >>= aDoctypeSystem;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
+ if ( aName == "OutputStream" )
aSourceData[i].Value >>= m_rOutputStream;
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( aName == "URL" )
aSourceData[i].Value >>= sURL;
}
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 94a6d31e4062..c3c69bcf0511 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -77,9 +77,9 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen
{
if (! (aSequence[i] >>= aValue))
throw RuntimeException();
- if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+ if ( aValue.Name == "Model" )
aValue.Value >>= m_aModel;
- else if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ContextNode")))
+ else if ( aValue.Name == "ContextNode" )
aValue.Value >>= m_aContextNode;
}
}
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index ca210b89260e..ed3d0ca721fd 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1179,14 +1179,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
{
css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
::rtl::OUString sConfig = xNamed->getName();
- if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")) )
+ if ( sConfig == "Global" )
{
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
css::uno::UNO_QUERY );
XCUBasedAcceleratorConfiguration::reload();
}
- else if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")) )
+ else if ( sConfig == "Modules" )
{
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
@@ -1241,14 +1241,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
- if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+ if ( sGlobalModules == CFG_ENTRY_GLOBAL )
{
::rtl::OUString sModule;
sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
if ( !sKey.isEmpty() && !sPath.isEmpty() )
reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey);
}
- else if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+ else if ( sGlobalModules == CFG_ENTRY_MODULES )
{
::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
@@ -1272,9 +1272,9 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
{
AcceleratorCache aReadCache = AcceleratorCache();
css::uno::Reference< css::container::XNameAccess > xAccess;
- if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")))
+ if ( m_sGlobalOrModules == "Global" )
xCfg->getByName(CFG_ENTRY_GLOBAL) >>= xAccess;
- else if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")))
+ else if ( m_sGlobalOrModules == "Modules" )
{
css::uno::Reference< css::container::XNameAccess > xModules;
xCfg->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1351,13 +1351,13 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
break;
}
- if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
+ if ( sToken[k] == "SHIFT" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
- else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
+ else if ( sToken[k] == "MOD1" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
- else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
+ else if ( sToken[k] == "MOD2" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
- else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
+ else if ( sToken[k] == "MOD3" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
else
{
@@ -1483,9 +1483,9 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
else
m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
- if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+ if ( m_sGlobalOrModules == CFG_ENTRY_GLOBAL )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
- else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+ else if ( m_sGlobalOrModules == CFG_ENTRY_MODULES )
{
css::uno::Reference< css::container::XNameContainer > xModules;
xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1528,9 +1528,9 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
else
m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
- if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+ if ( m_sGlobalOrModules == CFG_ENTRY_GLOBAL )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
- else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+ else if ( m_sGlobalOrModules == CFG_ENTRY_MODULES )
{
css::uno::Reference< css::container::XNameAccess > xModules;
xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1550,7 +1550,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
css::uno::Reference< css::container::XNameContainer > xContainer;
m_xCfg->getByName(sPrimarySecondary) >>= xAccess;
- if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+ if ( sGlobalModules == CFG_ENTRY_GLOBAL )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
else
{
@@ -1576,13 +1576,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
break;
sToken[i] = sKey.getToken(0, '_', nIndex);
- if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
+ if ( sToken[i] == "SHIFT" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
- else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
+ else if ( sToken[i] == "MOD1" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
- else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
+ else if ( sToken[i] == "MOD2" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
- else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
+ else if ( sToken[i] == "MOD3" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
}
@@ -1598,14 +1598,14 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
xCommand->getByName(sLocale) >>= sCommand;
}
- if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_PRIMARY)))
+ if ( sPrimarySecondary == CFG_ENTRY_PRIMARY )
{
if (sCommand.isEmpty())
m_aPrimaryReadCache.removeKey(aKeyEvent);
else
m_aPrimaryReadCache.setKeyCommandPair(aKeyEvent, sCommand);
}
- else if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_SECONDARY)))
+ else if ( sPrimarySecondary == CFG_ENTRY_SECONDARY )
{
if (sCommand.isEmpty())
m_aSecondaryReadCache.removeKey(aKeyEvent);
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index f008fb215cdc..159739a6df26 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -341,17 +341,17 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
beans::NamedValue aValue = rProperties[i];
::rtl::OUString sName = aValue.Name;
- if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
+ if ( sName == "Title" )
aValue.Value >>= sTitle;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ToolTip")) )
+ else if ( sName == "ToolTip" )
aValue.Value >>= sToolTip;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PageURL")) )
+ else if ( sName == "PageURL" )
aValue.Value >>= sPageURL;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EventHdl")) )
+ else if ( sName == "EventHdl" )
aValue.Value >>= xEventHdl;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Image")) )
+ else if ( sName == "Image" )
aValue.Value >>= xImage;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Disabled")) )
+ else if ( sName == "Disabled" )
aValue.Value >>= bDisabled;
}
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 43756fb36b23..cf81fa5d1554 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -193,11 +193,11 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
// If not - we have to break this operation. But an optional listener must be informed.
// BTW: We save the information about the requested operation. Because
// we need it later.
- if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEDOC)))
+ if ( aURL.Complete == URL_CLOSEDOC )
m_eOperation = E_CLOSE_DOC;
- else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEWIN)))
+ else if ( aURL.Complete == URL_CLOSEWIN )
m_eOperation = E_CLOSE_WIN;
- else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEFRAME)))
+ else if ( aURL.Complete == URL_CLOSEFRAME )
m_eOperation = E_CLOSE_FRAME;
else
{
@@ -230,7 +230,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
sal_Bool bIsSynchron = sal_False;
for (sal_Int32 nArgs=0; nArgs<lArguments.getLength(); nArgs++ )
{
- if ( lArguments[nArgs].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SynchronMode")) )
+ if ( lArguments[nArgs].Name == "SynchronMode" )
{
lArguments[nArgs].Value >>= bIsSynchron;
break;
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 562dd744ce47..eead1818dcfd 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -430,7 +430,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
else
xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
}
- else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseFrame")))
+ else if ( aURL.Complete == ".uno:CloseFrame" )
xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
if ( ! xDispatcher.is())
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index bee51f791184..90e0eefcfb8c 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -118,7 +118,7 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
throw(css::uno::RuntimeException)
{
::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW;
- if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_UNO_SHOWSTARTMODULE)))
+ if ( aURL.Complete == CMD_UNO_SHOWSTARTMODULE )
{
nResult = css::frame::DispatchResultState::FAILURE;
if (implts_isBackingModePossible ())
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index e280b304a8b9..d80fcfb88db5 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -138,28 +138,28 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
{
for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
{
- if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( rProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
rProp[i].Value >>= rCommandURL;
rCommandURL = rCommandURL.intern();
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
{
rProp[i].Value >>= rHelpURL;
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
{
rProp[i].Value >>= rSubMenu;
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_LABEL )
{
rProp[i].Value >>= rLabel;
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_TYPE )
{
rProp[i].Value >>= rType;
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_STYLE )
{
rProp[i].Value >>= rStyle;
}
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 6ead1feee3f3..070799e371ff 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -350,7 +350,7 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::bean
Any SAL_CALL ConstItemContainer::getPropertyValue( const ::rtl::OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
- if (PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROPNAME_UINAME)))
+ if ( PropertyName == PROPNAME_UINAME )
return makeAny( m_aUIName );
throw UnknownPropertyException();
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 4c1659ba0976..c14fd5814148 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -207,13 +207,13 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer"));
- else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")) )
+ else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc"));
- else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument")) )
+ else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress"));
- else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocument")) )
+ else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw"));
- else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.formula.FormulaProperties")) )
+ else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math"));
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) ||
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 92b5f7f65859..185008b6bbca 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -161,19 +161,19 @@ throw ( Exception, RuntimeException )
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_CONFIGSOURCE)))
+ if ( aPropValue.Name == UIELEMENT_PROPNAME_CONFIGSOURCE )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGSOURCE, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_FRAME)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_FRAME )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_FRAME, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_PERSISTENT)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_PERSISTENT )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_PERSISTENT, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_RESOURCEURL)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_RESOURCEURL )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_RESOURCEURL, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_TYPE)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_TYPE )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_TYPE, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_CONFIGLISTENER)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_CONFIGLISTENER )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGLISTENER, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_NOCLOSE)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_NOCLOSE )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_NOCLOSE, aPropValue.Value );
}
}
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 3b4774ca2948..7d5e6a580cdc 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -580,22 +580,22 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
if ( aWindowState[n].Value >>= bValue )
rElementData.m_aDockedData.m_bLocked = bValue;
}
- else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXT)))
+ else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_CONTEXT )
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bContextSensitive = bValue;
}
- else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_NOCLOSE)))
+ else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_NOCLOSE )
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bNoClose = bValue;
}
- else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXTACTIVE)))
+ else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_CONTEXTACTIVE )
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bContextActive = bValue;
}
- else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_SOFTCLOSE)))
+ else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_SOFTCLOSE )
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bSoftClose = bValue;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 0c0a241a9fcd..ff6ea0b04513 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1192,9 +1192,9 @@ void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno
::rtl::OUString aTbxTitle;
for ( sal_Int32 j = 0; j < rTbxSeq.getLength(); j++ )
{
- if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")))
+ if ( rTbxSeq[j].Name == "ResourceURL" )
rTbxSeq[j].Value >>= aTbxResName;
- else if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")))
+ else if ( rTbxSeq[j].Name == "UIName" )
rTbxSeq[j].Value >>= aTbxTitle;
}
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
index f31fde0ced83..d96d8fc4879b 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -225,7 +225,7 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
for (int i = 0; i<len; i++)
{
- if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment")))
+ if ( aArguments[i].Name == "Environment" )
{
aArguments[i].Value >>= lEnv;
break;
@@ -235,7 +235,7 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
len = lEnv.getLength ();
for (int i = 0; i<len; i++)
{
- if (lEnv[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+ if ( lEnv[i].Name == "Model" )
{
lEnv[i].Value >>= xModel;
}
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 28d2734a44c8..fecbf6a5202c 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -776,7 +776,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
implts_registerDocument(xDocument);
}
// document modified => set its modify state new (means modified against the original file!)
- else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_MODIFYCHANGED)))
+ else if ( aEvent.EventName == EVENT_ON_MODIFYCHANGED )
{
implts_updateModifiedState(xDocument);
}
@@ -807,7 +807,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
Dont remove temp. files or change the modified state of the document!
It was not realy saved to the original file ...
*/
- else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_SAVETODONE)))
+ else if ( aEvent.EventName == EVENT_ON_SAVETODONE )
{
implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
}
@@ -824,7 +824,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
}
// document closed => remove temp. files and configuration entries
- else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_UNLOAD)))
+ else if ( aEvent.EventName == EVENT_ON_UNLOAD )
{
implts_deregisterDocument(xDocument, sal_True); // sal_True => stop listening for disposing() !
}
@@ -854,7 +854,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
::rtl::OUString sPath;
pChanges[i].Accessor >>= sPath;
- if (sPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_AUTOSAVE_ENABLED)))
+ if ( sPath == CFG_ENTRY_AUTOSAVE_ENABLED )
{
sal_Bool bEnabled = sal_False;
if (pChanges[i].Element >>= bEnabled)
@@ -872,7 +872,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
}
}
else
- if (sPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)))
+ if ( sPath == CFG_ENTRY_AUTOSAVE_TIMEINTERVALL )
pChanges[i].Element >>= m_nAutoSaveTimeIntervall;
}
@@ -2878,27 +2878,27 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ
//-----------------------------------------------
sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
{
- if (aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)))
+ if ( aURL.Protocol == CMD_PROTOCOL )
{
- if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_PREPARE_EMERGENCY_SAVE)))
+ if ( aURL.Path == CMD_DO_PREPARE_EMERGENCY_SAVE )
return AutoRecovery::E_PREPARE_EMERGENCY_SAVE;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_EMERGENCY_SAVE)))
+ else if ( aURL.Path == CMD_DO_EMERGENCY_SAVE )
return AutoRecovery::E_EMERGENCY_SAVE;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_RECOVERY)))
+ else if ( aURL.Path == CMD_DO_RECOVERY )
return AutoRecovery::E_RECOVERY;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_BACKUP)))
+ else if ( aURL.Path == CMD_DO_ENTRY_BACKUP )
return AutoRecovery::E_ENTRY_BACKUP;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_CLEANUP)))
+ else if ( aURL.Path == CMD_DO_ENTRY_CLEANUP )
return AutoRecovery::E_ENTRY_CLEANUP;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_SAVE)))
+ else if ( aURL.Path == CMD_DO_SESSION_SAVE )
return AutoRecovery::E_SESSION_SAVE;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_QUIET_QUIT)))
+ else if ( aURL.Path == CMD_DO_SESSION_QUIET_QUIT )
return AutoRecovery::E_SESSION_QUIET_QUIT;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_RESTORE)))
+ else if ( aURL.Path == CMD_DO_SESSION_RESTORE )
return AutoRecovery::E_SESSION_RESTORE;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_DISABLE_RECOVERY)))
+ else if ( aURL.Path == CMD_DO_DISABLE_RECOVERY )
return AutoRecovery::E_DISABLE_AUTORECOVERY;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SET_AUTOSAVE_STATE)))
+ else if ( aURL.Path == CMD_DO_SET_AUTOSAVE_STATE )
return AutoRecovery::E_SET_AUTOSAVE_STATE;
}
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 92b479d1bcff..55bed9b4b9dc 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -227,11 +227,11 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
{
if (args[i] >>= v)
{
- if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManagerName")))
+ if ( v.Name == "SessionManagerName" )
v.Value >>= aSMgr;
- else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManager")))
+ else if ( v.Name == "SessionManager" )
v.Value >>= m_rSessionManager;
- else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AllowUserInteractionOnQuit")))
+ else if ( v.Name == "AllowUserInteractionOnQuit" )
v.Value >>= m_bAllowUserInteractionOnQuit;
}
}
@@ -250,13 +250,13 @@ void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event)
throw (css::uno::RuntimeException)
{
SAL_INFO("fwk.session", "SessionListener::statusChanged");
- if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")))
+ if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" )
{
if (event.FeatureDescriptor.compareToAscii("update")==0)
m_bRestored = sal_True; // a document was restored
}
- else if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave")))
+ else if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionSave" )
{
if (event.FeatureDescriptor.compareToAscii("stop")==0)
{
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 7426360fa27b..0abb42bb6539 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -770,15 +770,15 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserConfigStorage")) )
+ if ( aPropValue.Name == "UserConfigStorage" )
{
aPropValue.Value >>= m_xUserConfigStorage;
}
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ModuleIdentifier")) )
+ else if ( aPropValue.Name == "ModuleIdentifier" )
{
aPropValue.Value >>= m_aModuleIdentifier;
}
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserRootCommit")) )
+ else if ( aPropValue.Name == "UserRootCommit" )
{
aPropValue.Value >>= m_xUserRootCommit;
}
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 241a3d5874ce..773b1cebfa15 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -215,7 +215,7 @@ throw ( NoSuchElementException, RuntimeException)
xCont->getByName(ModuleIdentifier) >>= lProps;
for (sal_Int32 i=0; i<lProps.getLength(); ++i)
{
- if (lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName")))
+ if ( lProps[i].Name == "ooSetupFactoryShortName" )
{
lProps[i].Value >>= sShort;
break;
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 1f0974282d3f..bc68f637add3 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1396,7 +1396,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
::rtl::OUString aWindowStateFileStr;
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
- if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryWindowStateConfigRef")) )
+ if ( aSeq[y].Name == "ooSetupFactoryWindowStateConfigRef" )
{
aSeq[y].Value >>= aWindowStateFileStr;
break;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0ff34d6d097b..38b14b1d8114 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -883,7 +883,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
// Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
// Only non-popup menu items can have a short-cut
- if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
+ if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
{
KeyCode aKeyCode( KEY_F1 );
pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
@@ -1481,7 +1481,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
// Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
// Only non-popup menu items can have a short-cut
- if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
+ if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
{
KeyCode aKeyCode( KEY_F1 );
pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index a89ca7e8653f..45d5bf849ad6 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -193,7 +193,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MenuOnly")) )
+ if ( aPropValue.Name == "MenuOnly" )
aPropValue.Value >>= bMenuOnly;
}
}
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index d2731962f4c2..d82be5a8629a 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -514,7 +514,7 @@ void NewMenuController::impl_setPopupMenu()
{
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
- if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryEmptyDocumentURL")) )
+ if ( aSeq[y].Name == "ooSetupFactoryEmptyDocumentURL" )
{
aSeq[y].Value >>= m_aEmptyDocURL;
break;
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 3093ec77ad0e..ef15fe75c06d 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -490,27 +490,27 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
- if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aProp[i].Value >>= aCommandURL;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
{
aProp[i].Value >>= aHelpURL;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_STYLE )
{
aProp[i].Value >>= nStyle;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TYPE )
{
aProp[i].Value >>= nType;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_WIDTH )
{
aProp[i].Value >>= nWidth;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_OFFSET)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_OFFSET )
{
aProp[i].Value >>= nOffset;
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 067dbe4eacb1..80adbd735883 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -547,7 +547,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
if ( m_bDisposed )
return;
- if ( Event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ImageOrientation")) )
+ if ( Event.FeatureURL.Complete == ".uno:ImageOrientation" )
{
SfxImageItem aItem( 1, 0 );
aItem.PutValue( Event.State );
@@ -872,7 +872,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
aPropSeq = GetPropsForCommand( aCmdURL );
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) )
+ if ( aPropSeq[i].Name == "Name" )
{
aPropSeq[i].Value >>= aLabel;
break;
@@ -890,7 +890,7 @@ sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString&
aPropSeq = GetPropsForCommand( aCmdURL );
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Properties")) )
+ if ( aPropSeq[i].Name == "Properties" )
{
aPropSeq[i].Value >>= nProperties;
break;
@@ -1282,7 +1282,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
- if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aProp[i].Value >>= aCommandURL;
if ( aCommandURL.compareToAscii(MENUPREFIX, RTL_CONSTASCII_LENGTH(MENUPREFIX) ) == 0 )
@@ -1303,7 +1303,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
xMenuContainer->getByIndex(0) >>= aProps;
for ( sal_Int32 index=0; index<aProps.getLength(); ++index )
{
- if ( aProps[ index ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
+ if ( aProps[ index ].Name == ITEM_DESCRIPTOR_CONTAINER )
{
aProps[ index ].Value >>= aMenuDesc;
@@ -1317,19 +1317,19 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
}
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
aProp[i].Value >>= aHelpURL;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TOOLTIP)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TOOLTIP )
aProp[i].Value >>= aTooltip;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_LABEL )
aProp[i].Value >>= aLabel;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TYPE )
aProp[i].Value >>= nType;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_VISIBLE )
aProp[i].Value >>= bIsVisible;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_WIDTH )
aProp[i].Value >>= nWidth;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_STYLE )
aProp[i].Value >>= nStyle;
}
@@ -2005,11 +2005,11 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
{
for ( sal_Int32 j = 0; j < aProp.getLength(); j++ )
{
- if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( aProp[j].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aProp[j].Value >>= aCommandURL;
}
- else if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
+ else if ( aProp[j].Name == ITEM_DESCRIPTOR_VISIBLE )
{
aProp[j].Value >>= bVisible;
nVisibleIndex = j;
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index 55581665916c..7686b9535089 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -129,13 +129,13 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
{
- if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ConfigurationSource")) )
+ if ( Args[n].Name == "ConfigurationSource" )
Args[n].Value >>= xConfigSource;
- else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")) )
+ else if ( Args[n].Name == "Frame" )
Args[n].Value >>= xFrame;
- else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")) )
+ else if ( Args[n].Name == "ResourceURL" )
Args[n].Value >>= aResourceURL;
- else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Persistent")) )
+ else if ( Args[n].Name == "Persistent" )
Args[n].Value >>= bPersistent;
else if ( _pExtraMode && Args[n].Name.equalsAscii( _pExtraMode ))
Args[n].Value >>= bExtraMode;
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 63b8dd5085b5..c912529e32a7 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -1043,7 +1043,7 @@ Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16
sprintf(aStr, "%d", value); // #100211# - checked
break;
case CalendarDisplayCode::LONG_YEAR:
- if (aCalendar.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gengou")))
+ if ( aCalendar.Name == "gengou" )
sprintf(aStr, "%02d", value); // #100211# - checked
else
sprintf(aStr, "%d", value); // #100211# - checked
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 1c88b9b8997e..b5ce82d80e1f 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -118,9 +118,9 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
if (hModule) {
sal_uInt16 **(*func)(sal_Int16*)=NULL;
const sal_Char *func_name=NULL;
- if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")))
+ if ( rLocale.Language == "zh" )
func_name=(OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0) ? "get_zh_zhuyin" : "get_zh_pinyin";
- else if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ko")))
+ else if ( rLocale.Language == "ko" )
func_name="get_ko_phonetic";
if (func_name)
func=(sal_uInt16 **(*)(sal_Int16*))osl_getFunctionSymbol(hModule, OUString::createFromAscii(func_name).pData);
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 42cf5837fb36..840bf30529ae 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -128,31 +128,31 @@ LocaleNode::~LocaleNode()
LocaleNode* LocaleNode::createNode (const OUString& name, const Reference< XAttributeList > & attr)
{
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_INFO")))
+ if ( name == "LC_INFO" )
return new LCInfoNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_CTYPE")))
+ if ( name == "LC_CTYPE" )
return new LCCTYPENode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_FORMAT")))
+ if ( name == "LC_FORMAT" )
return new LCFormatNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_FORMAT_1")))
+ if ( name == "LC_FORMAT_1" )
return new LCFormatNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_CALENDAR")))
+ if ( name == "LC_CALENDAR" )
return new LCCalendarNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_CURRENCY")))
+ if ( name == "LC_CURRENCY" )
return new LCCurrencyNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_TRANSLITERATION")))
+ if ( name == "LC_TRANSLITERATION" )
return new LCTransliterationNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_COLLATION")))
+ if ( name == "LC_COLLATION" )
return new LCCollationNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_INDEX")))
+ if ( name == "LC_INDEX" )
return new LCIndexNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_SEARCH")))
+ if ( name == "LC_SEARCH" )
return new LCSearchNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_MISC")))
+ if ( name == "LC_MISC" )
return new LCMiscNode (name,attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_NumberingLevel")))
+ if ( name == "LC_NumberingLevel" )
return new LCNumberingLevelNode (name, attr);
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_OutLineNumberingLevel")))
+ if ( name == "LC_OutLineNumberingLevel" )
return new LCOutlineNumberingLevelNode (name, attr);
return new LocaleNode(name,attr);
@@ -447,7 +447,7 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const
incError( "DateSeparator equals TimeSeparator.");
if (aDecSep == aThoSep)
incError( "DecimalSeparator equals ThousandSeparator.");
- if (aThoSep.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( " ")))
+ if ( aThoSep == " " )
incError( "ThousandSeparator is an ' ' ordinary space, this should be a non-breaking space U+00A0 instead.");
if (aListSep == aDecSep)
fprintf( stderr, "Warning: %s\n",
@@ -624,7 +624,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
incErrorStr("replaceTo=\"%s\" needs FFFF to be adapted to the real LangID value.", str);
of.writeParameter("replaceTo", str, mnSection);
// Remember the replaceTo value for "[CURRENCY]" to check format codes.
- if (strFrom.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "[CURRENCY]")))
+ if ( strFrom == "[CURRENCY]" )
sTheCurrencyReplaceTo = str;
// Remember the currency symbol if present.
if (str.indexOfAsciiL( "[$", 2) == 0)
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 3febdd461f6a..de1a36e2795a 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -703,7 +703,7 @@ sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName )
{
MutexGuard aGuard( GetLinguMutex() );
sal_Bool bRes = sal_False;
- if (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY)))
+ if ( rServiceName == SN_CONV_DICTIONARY )
bRes = sal_True;
return bRes;
}
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index d6b2663aec38..b93971f99184 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -529,7 +529,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
const PropertyValue *pVal = rPropVals.getConstArray();
for (sal_Int32 i = 0; i < nLen; ++i)
{
- if (pVal[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UPN_MAX_NUMBER_OF_SUGGESTIONS)))
+ if ( pVal[i].Name == UPN_MAX_NUMBER_OF_SUGGESTIONS )
{
pVal[i].Value >>= nResMaxNumberOfSuggestions;
}
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index dc2bfee0bde3..ff59c792442d 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -114,7 +114,7 @@ sal_Bool LWPFilterReader::filter( const Sequence< PropertyValue >& aDescriptor )
for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
{
//Note we should attempt to use "InputStream" if it exists first!
- if( aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+ if ( aDescriptor[i].Name == "URL" )
aDescriptor[i].Value >>= sURL;
}
@@ -218,11 +218,11 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
sal_Int32 nPropertyCount = aDescriptor.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
- if( aDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
+ if ( aDescriptor[nProperty].Name == "TypeName" )
{
aDescriptor[nProperty].Value >>= aTypeName;
}
- else if( aDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate")) )
+ else if ( aDescriptor[nProperty].Name == "AsTemplate" )
{
bOpenAsTemplate = sal_True;
}
@@ -232,7 +232,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
{
OUString strTemp;
aDescriptor[i].Value >>= strTemp;
- if( aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) )
+ if ( aDescriptor[i].Name == "InputStream" )
{
uno::Reference< XInputStream> rInputStream;
aDescriptor[i].Value >>= rInputStream;
@@ -242,7 +242,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
//
if( IsWordproFile(rInputStream) )
{
- if( aTypeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wordpro_template")) )
+ if ( aTypeName == "wordpro_template" )
{
if(!bOpenAsTemplate)
{
@@ -259,7 +259,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
}
return ret;
}
- else if( aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+ else if ( aDescriptor[i].Name == "URL" )
{
OUString sURL;
OUString sFileName;
@@ -277,7 +277,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
//end with .lwp:
if( IsWordproFile(sURL) )
{
- if( aTypeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wordpro_template")) )
+ if ( aTypeName == "wordpro_template" )
{
if(!bOpenAsTemplate)
{
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index a20c30e0375d..b74e21dc8eee 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -141,11 +141,11 @@ sal_Bool XFlatXml::importer(
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
aName = aSourceData[i].Name;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
+ if ( aName == "InputStream" )
aSourceData[i].Value >>= xInputStream;
- else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")))
+ else if ( aName == "FileName" )
aSourceData[i].Value >>= aFileName;
- else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( aName == "URL" )
aSourceData[i].Value >>= aURL;
}
@@ -203,7 +203,7 @@ sal_Bool XFlatXml::exporter(
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
aName = aSourceData[i].Name;
- if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
+ if ( aName == "OutputStream" )
aSourceData[i].Value >>= rOutputStream;
else if ( aName == "URL" )
aSourceData[i].Value >>= sURL;
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
index b3e6cbaeb9bf..755e69123af0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
@@ -57,7 +57,7 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
const css::beans::NamedValue* p = lArguments.getConstArray();
for (i=0; i<c; ++i)
{
- if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment")))
+ if ( p[i].Name == "Environment" )
{
p[i].Value >>= lEnv;
break;
@@ -70,12 +70,12 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
p = lEnv.getConstArray();
for (i=0; i<c; ++i)
{
- if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+ if ( p[i].Name == "Model" )
{
p[i].Value >>= xModel;
break;
}
- if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")))
+ if ( p[i].Name == "Frame" )
{
css::uno::Reference< css::frame::XController > xController;
css::uno::Reference< css::frame::XFrame > xFrame;
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index fa748a7b6552..219d028dd4a4 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -373,7 +373,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw (RuntimeException)
{
- if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:")) )
+ if ( aURL.Protocol == "vnd.demo.complextoolbarcontrols.demoaddon:" )
{
if ( aURL.Path == "Command1" )
{
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 01ee8191ac41..967f57c661cb 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -394,7 +394,7 @@ Reference< XShape > Shape::createAndInsert(
aTransformation.scale(1/360.0, 1/360.0);
// special for lineshape
- if ( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.LineShape")) )
+ if ( aServiceName == "com.sun.star.drawing.LineShape" )
{
::basegfx::B2DPolygon aPoly;
aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
@@ -415,7 +415,7 @@ Reference< XShape > Shape::createAndInsert(
maShapeProperties[ PROP_PolyPolygon ] <<= aPolyPolySequence;
}
- else if ( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ConnectorShape")) )
+ else if ( aServiceName == "com.sun.star.drawing.ConnectorShape" )
{
::basegfx::B2DPolygon aPoly;
aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index e8c56b3d30f0..4283a48986a8 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -662,24 +662,24 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha
bool bBrokenRangeAvailable = false;
for( sal_Int32 i=0; i<aArgs.getLength(); ++i )
{
- if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+ if ( aArgs[i].Name == "CellRangeRepresentation" )
aArgs[i].Value >>= sCellRange;
- else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("BrokenCellRangeForExport")))
+ else if ( aArgs[i].Name == "BrokenCellRangeForExport" )
{
if( aArgs[i].Value >>= sBrokenRange )
bBrokenRangeAvailable = true;
}
- else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
+ else if ( aArgs[i].Name == "DataRowSource" )
{
::com::sun::star::chart::ChartDataRowSource eRowSource;
aArgs[i].Value >>= eRowSource;
mbRowSourceColumns = ( eRowSource == ::com::sun::star::chart::ChartDataRowSource_COLUMNS );
}
- else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
+ else if ( aArgs[i].Name == "FirstCellAsLabel" )
aArgs[i].Value >>= mbHasSeriesLabels;
- else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SequenceMapping")))
+ else if ( aArgs[i].Name == "SequenceMapping" )
aArgs[i].Value >>= maSequenceMapping;
- else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("TableNumberList")))
+ else if ( aArgs[i].Name == "TableNumberList" )
aArgs[i].Value >>= msTableNumberList;
}
diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx
index b4846ca00373..dc6a070e4be2 100644
--- a/oox/source/ole/axfontdata.cxx
+++ b/oox/source/ole/axfontdata.cxx
@@ -117,7 +117,7 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm )
OUString aGuid = OleHelper::importGuid( rInStrm );
if( aGuid.equalsAscii( AX_GUID_CFONT ) )
return importBinaryModel( rInStrm );
- if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDFONT) ) )
+ if ( aGuid == OLE_GUID_STDFONT )
return importStdFont( rInStrm );
return false;
}
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 91953f35aa4b..191c74b024aa 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -404,7 +404,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
else // hyperlink moniker
{
OUString aGuid = importGuid( rInStrm );
- if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_FILEMONIKER)) )
+ if ( aGuid == OLE_GUID_FILEMONIKER )
{
// file name, maybe relative and with directory up-count
sal_Int16 nUpLevels;
@@ -425,7 +425,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
for( sal_Int16 nLevel = 0; nLevel < nUpLevels; ++nLevel )
orHlinkInfo.maTarget = CREATE_OUSTRING( "../" ) + orHlinkInfo.maTarget;
}
- else if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_URLMONIKER)) )
+ else if ( aGuid == OLE_GUID_URLMONIKER )
{
// URL, maybe relative and with leading '../'
sal_Int32 nBytes = rInStrm.readInt32();
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 1112e68d28d8..486cfef0af8f 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -277,7 +277,7 @@ namespace oox { namespace ppt {
{
nCommand = EffectCommands::STOPAUDIO;
}
- else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("play") ) )
+ else if ( msCommand == "play" )
{
nCommand = EffectCommands::PLAY;
}
@@ -293,11 +293,11 @@ namespace oox { namespace ppt {
}
nCommand = EffectCommands::PLAY;
}
- else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("togglePause") ) )
+ else if ( msCommand == "togglePause" )
{
nCommand = EffectCommands::TOGGLEPAUSE;
}
- else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("stop") ) )
+ else if ( msCommand == "stop" )
{
nCommand = EffectCommands::STOP;
}
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 9258c5a3a7a7..2b61e91aa783 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -585,12 +585,12 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes
aPropSet.setProperty( PROP_GraphicURL, aGraphicUrl );
}
// If the shape has an absolute position, set the properties accordingly.
- if (maTypeModel.maPosition.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("absolute")))
+ if ( maTypeModel.maPosition == "absolute" )
{
aPropSet.setProperty(PROP_HoriOrientPosition, rShapeRect.X);
aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y);
}
- if (maTypeModel.maPositionVerticalRelative.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("page")))
+ if ( maTypeModel.maPositionVerticalRelative == "page" )
{
aPropSet.setProperty(PROP_VertOrientRelation, text::RelOrientation::PAGE_FRAME);
}
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 5fabbab1e973..b8811b5f61cf 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -780,7 +780,7 @@ sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const uno::Sequence< sal_Int8
void SAL_CALL ZipPackageFolder::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, uno::RuntimeException)
{
- if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")))
+ if ( aPropertyName == "MediaType" )
{
// TODO/LATER: activate when zip ucp is ready
// if ( m_nFormat != embed::StorageFormats::PACKAGE )
@@ -788,9 +788,9 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const ::rtl::OUString& aProper
aValue >>= sMediaType;
}
- else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Version")))
+ else if ( aPropertyName == "Version" )
aValue >>= m_sVersion;
- else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Size") ) )
+ else if ( aPropertyName == "Size" )
aValue >>= aEntry.nSize;
else
throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index ff7ebac5d145..3b5ddd9172cb 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -74,7 +74,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
{
::rtl::OUString sMediaType;
xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= sMediaType;
- if ( sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII)) )
+ if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport"));
::comphelper::disposeComponent(xProp);
}
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index f434fc05cc7b..75155732a956 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -158,7 +158,7 @@ void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException,
void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException)
{
bool bExport = true;
- if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) )
+ if ( _sName == "office:chart" )
{
SvXMLAttributeList* pList = new SvXMLAttributeList();
uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList;
@@ -201,12 +201,12 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_xDelegatee->endElement(sTableCalc);
bExport = false;
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) )
+ else if ( _sName == "table:table" )
{
m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),NULL);
lcl_exportPrettyPrinting(m_xDelegatee);
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) )
+ else if ( _sName == "table:table-header-rows" )
{
m_bCountColumnHeader = true;
}
@@ -214,7 +214,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
{
++m_nColumnCount;
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) )
+ else if ( _sName == "table:table-rows" )
{
m_xDelegatee->startElement(_sName,xAttribs);
exportTableRows();
@@ -224,17 +224,17 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
}
else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) )
bExport = false;
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area")))
+ else if ( _sName == "chart:plot-area" )
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")));
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:categories")))
+ else if ( _sName == "chart:categories" )
{
static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS));
lcl_correctCellAddress(s_sCellAddress,xAttribs);
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:series")))
+ else if ( _sName == "chart:series" )
{
static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS));
lcl_correctCellAddress(s_sCellAddress,xAttribs);
@@ -257,21 +257,21 @@ void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName)
{
bool bExport = true;
::rtl::OUString sNewName = _sName;
- if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) )
+ if ( _sName == "office:chart" )
{
sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT);
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) )
+ else if ( _sName == "table:table" )
{
m_xDelegatee->endElement(_sName);
lcl_exportPrettyPrinting(m_xDelegatee);
sNewName = lcl_createAttribute(XML_NP_RPT,XML_DETAIL);
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) )
+ else if ( _sName == "table:table-header-rows" )
{
m_bCountColumnHeader = false;
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) )
+ else if ( _sName == "table:table-rows" )
m_bTableRowsStarted = false;
else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) )
bExport = false;
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 0e87b7a20c39..215d5301338c 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -148,7 +148,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
{
uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList;
bool bExport = true;
- if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) )
+ if ( _sName == "office:report" )
{
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
@@ -196,7 +196,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
bExport = false;
m_bImportedChart = true;
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-field")) )
+ else if ( _sName == "rpt:master-detail-field" )
{
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
@@ -244,7 +244,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
|| _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-component"))
|| _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-element")))
bExport = false;
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area")))
+ else if ( _sName == "chart:plot-area" )
{
sal_Bool bHasCategories = sal_True;
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
@@ -260,7 +260,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
sLocalName = sAttrName;
else
sLocalName = sAttrName.copy( nColonPos + 1L );
- if ( sLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("data-source-has-labels")) )
+ if ( sLocalName == "data-source-has-labels" )
{
const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
bHasCategories = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("both"));
@@ -271,7 +271,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
beans::PropertyValue* pArgEnd = pArgIter + m_aArguments.getLength();
for(;pArgIter != pArgEnd;++pArgIter)
{
- if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")) )
+ if ( pArgIter->Name == "HasCategories" )
{
pArgIter->Value <<= bHasCategories;
break;
@@ -293,11 +293,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName)
{
bool bExport = true;
::rtl::OUString sNewName = _sName;
- if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) )
+ if ( _sName == "office:report" )
{
sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_CHART);
}
- else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-fields")) )
+ else if ( _sName == "rpt:master-detail-fields" )
{
if ( !m_aMasterFields.empty() )
m_xDatabaseDataProvider->setMasterFields(uno::Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index b93f27f564e2..5d77ea8efef1 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -108,11 +108,11 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen
break;
}
}
- if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ZoomSlider")) )
+ if ( m_aCommandURL == ".uno:ZoomSlider" )
{
m_pController = TStatusbarHelper::createFromQuery(new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar));
}
- else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Zoom")) )
+ else if ( m_aCommandURL == ".uno:Zoom" )
{
m_pController = TStatusbarHelper::createFromQuery(new SvxZoomStatusBarControl(m_nSlotId = SID_ATTR_ZOOM,m_nId,*pStatusBar));
}
@@ -135,7 +135,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
if ( m_pController.is() )
{
- if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ZoomSlider")) )
+ if ( m_aCommandURL == ".uno:ZoomSlider" )
{
Sequence< PropertyValue > aSeq;
if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 2 )
@@ -145,7 +145,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
static_cast<SvxZoomSliderControl*>(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider);
}
}
- else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Zoom")) )
+ else if ( m_aCommandURL == ".uno:Zoom" )
{
Sequence< PropertyValue > aSeq;
if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 3 )
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 74e670a19c3a..61219dc0531e 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -158,37 +158,37 @@ void SAL_CALL OToolboxController::initialize( const Sequence< 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_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,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_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,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_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,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_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,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_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,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_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox));
}
- else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CharFontName")) )
+ else if ( m_aCommandURL == ".uno:CharFontName" )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CharFontName")),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox));
diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
index 455e30a23497..6455073224b5 100644
--- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx
+++ b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
@@ -52,7 +52,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
aBootstrap.getFrom(
OUString(RTL_CONSTASCII_USTRINGPARAM("UNO_SERVICES")),
suValue );
- if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("service.rdb")) )
+ if ( suValue == "service.rdb" )
{
return 10;
}
@@ -63,7 +63,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
aBootstrap.getFrom(
OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
suValue );
- if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
+ if ( suValue == "true" )
{
return 20;
}
@@ -74,7 +74,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
aBootstrap.getFrom(
OUString(RTL_CONSTASCII_USTRINGPARAM("QADEV_BOOTSTRAP")),
suValue );
- if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sun&ms")) )
+ if ( suValue == "sun&ms" )
{
return 30;
}
@@ -85,7 +85,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
aBs_custom.getFrom(
OUString(RTL_CONSTASCII_USTRINGPARAM("RTLVALUE")),
suValue );
- if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("qadev17")) )
+ if ( suValue == "qadev17" )
{
return 40;
}
@@ -96,7 +96,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
aBs_custom.getFrom(
OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
suValue );
- if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
+ if ( suValue == "true" )
{
return 50;
}
@@ -107,7 +107,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
aBs_custom.getFrom(
OUString(RTL_CONSTASCII_USTRINGPARAM("ABCDE")),
suValue, suDefault );
- if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("mydefault")) )
+ if ( suValue == "mydefault" )
{
return 60;
}
diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx
index 303bc7ecd8e3..36d2691c8440 100644
--- a/sal/test/unloading/unloadTest.cxx
+++ b/sal/test/unloading/unloadTest.cxx
@@ -559,7 +559,7 @@ sal_Bool test8()
for( sal_Int32 i=0; i<seqTypes.getLength(); i++)
{
OUString name= seqTypes[i].getTypeName();
- if( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XUnloadingPreference")))
+ if ( name == "com.sun.star.uno.XUnloadingPreference" )
b_ifaceSupported= sal_True;
}
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 998f330a3cf1..87fbcedc1d03 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -87,13 +87,13 @@ void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xCh
const beans::PropertyValue& rProp = pPropArray[i];
rtl::OUString aPropName(rProp.Name);
- if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+ if ( aPropName == "CellRangeRepresentation" )
rProp.Value >>= rRanges;
- else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
+ else if ( aPropName == "DataRowSource" )
rDataRowSource = (chart::ChartDataRowSource)ScUnoHelpFunctions::GetEnumFromAny( rProp.Value );
- else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")))
+ else if ( aPropName == "HasCategories" )
rHasCategories = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
- else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
+ else if ( aPropName == "FirstCellAsLabel" )
rFirstCellAsLabel = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
}
}
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index a4ce72468f0f..3b8ebabed36f 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -90,9 +90,9 @@ OUString ScPassHashHelper::getHashURI(ScPasswordHash eHash)
ScPasswordHash ScPassHashHelper::getHashTypeFromURI(const OUString& rURI)
{
- if (rURI.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URI_SHA1)))
+ if ( rURI == URI_SHA1 )
return PASSHASH_SHA1;
- else if (rURI.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URI_XLS_LEGACY)))
+ else if ( rURI == URI_XLS_LEGACY )
return PASSHASH_XL;
return PASSHASH_UNSPECIFIED;
}
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 9b0e48f0f3b4..2d201d1371f4 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -143,7 +143,7 @@ void ScAppOptions::GetDefaultFormulaSeparators(
const Locale& rLocale = *ScGlobal::GetLocale();
const OUString& rLang = rLocale.Language;
- if (rLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ru")))
+ if ( rLang == "ru" )
// Don't do automatic guess for these languages, and fall back to
// the old separator set.
return;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index fb8e42998479..66c19f5e59e6 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2330,11 +2330,11 @@ void ScInterpreter::ScCellExternal()
ScCellKeywordTranslator::transKeyword(aInfoType, ScGlobal::GetLocale(), ocCell);
ScExternalRefManager* pRefMgr = pDok->GetExternalRefManager();
- if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("COL")))
+ if ( aInfoType == "COL" )
PushInt(nCol + 1);
- else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ROW")))
+ else if ( aInfoType == "ROW" )
PushInt(nRow + 1);
- else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHEET")))
+ else if ( aInfoType == "SHEET" )
{
// For SHEET, No idea what number we should set, but let's always set
// 1 if the external sheet exists, no matter what sheet. Excel does
@@ -2344,7 +2344,7 @@ void ScInterpreter::ScCellExternal()
else
SetError(errNoName);
}
- else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ADDRESS")))
+ else if ( aInfoType == "ADDRESS" )
{
// ODF 1.2 says we need to always display address using the ODF A1 grammar.
ScTokenArray aArray;
@@ -2355,7 +2355,7 @@ void ScInterpreter::ScCellExternal()
aComp.CreateStringFromTokenArray(aStr);
PushString(aStr);
}
- else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FILENAME")))
+ else if ( aInfoType == "FILENAME" )
{
// 'file URI'#$SheetName
@@ -2374,7 +2374,7 @@ void ScInterpreter::ScCellExternal()
aBuf.append(aTabName);
PushString(aBuf.makeStringAndClear());
}
- else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CONTENTS")))
+ else if ( aInfoType == "CONTENTS" )
{
switch (pToken->GetType())
{
@@ -2391,7 +2391,7 @@ void ScInterpreter::ScCellExternal()
PushString(ScGlobal::GetEmptyString());
}
}
- else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TYPE")))
+ else if ( aInfoType == "TYPE" )
{
sal_Unicode c = 'v';
switch (pToken->GetType())
@@ -2407,14 +2407,14 @@ void ScInterpreter::ScCellExternal()
}
PushString(rtl::OUString(c));
}
- else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FORMAT")))
+ else if ( aInfoType == "FORMAT" )
{
String aFmtStr;
sal_uLong nFmt = aFmt.mbIsSet ? aFmt.mnIndex : 0;
getFormatString(pFormatter, nFmt, aFmtStr);
PushString(aFmtStr);
}
- else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("COLOR")))
+ else if ( aInfoType == "COLOR" )
{
// 1 = negative values are colored, otherwise 0
int nVal = 0;
@@ -2425,7 +2425,7 @@ void ScInterpreter::ScCellExternal()
}
PushInt(nVal);
}
- else if(aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PARENTHESES")))
+ else if ( aInfoType == "PARENTHESES" )
{
// 1 = format string contains a '(' character, otherwise 0
int nVal = 0;
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 551c035de12f..d8c49798cd73 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -111,7 +111,7 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang
sal_Int32 nLength = aImportProperties.getLength();
sheet::DataImportMode nSourceType = sheet::DataImportMode_NONE;
for (sal_Int32 j = 0; j < nLength; ++j)
- if (aImportProperties[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_SRCTYPE)))
+ if ( aImportProperties[j].Name == SC_UNONAME_SRCTYPE )
aImportProperties[j].Value >>= nSourceType;
if (nSourceType != sheet::DataImportMode_NONE)
{
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 61bd2ce2c567..f82b2a06f5bf 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -189,7 +189,7 @@ void ScFilterOptionsMgr::Init()
rBtnHeader.Check( pDBData->HasHeader() );
theDbName = pDBData->GetName();
- if ( theDbName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)) )
+ if ( theDbName == STR_DB_LOCAL_NONAME )
rBtnHeader.Enable();
else
rBtnHeader.Disable();
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index c315147419da..f935ef977246 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -92,7 +92,7 @@ bool ScDBDocFunc::AddDBRange( const ::rtl::OUString& rName, const ScRange& rRang
bool bOk;
if ( bCompile )
pDoc->CompileDBFormula( sal_True ); // CreateFormulaString
- if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
+ if ( rName == STR_DB_LOCAL_NONAME )
{
pDoc->SetAnonymousDBData(rRange.aStart.Tab() , pNew);
bOk = true;
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 6b52369b748e..941002c42250 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -134,7 +134,7 @@ void ScRangeManagerTable::Init()
{
const ScRangeName* pLocalRangeName = itr->second;
ScRangeNameLine aLine;
- if (itr->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_GLOBAL_RANGE_NAME)))
+ if ( itr->first == STR_GLOBAL_RANGE_NAME )
aLine.aScope = maGlobalString;
else
aLine.aScope = itr->first;
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 913333fc3a00..56b42b05ea80 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -97,7 +97,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB
if ( pUndoData )
{
const ::rtl::OUString& aName = pUndoData->GetName();
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
+ if ( aName == STR_DB_LOCAL_NONAME )
bWasTemp = true;
}
OSL_ENSURE(bWasTemp, "Undo: didn't find database range");
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 5ff808bff4f9..bbfdce78d04a 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1051,7 +1051,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
for(sal_Int32 i = 0; i < aArguments.getLength(); ++i)
{
rtl::OUString sName(aArguments[i].Name);
- if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+ if ( aArguments[i].Name == "CellRangeRepresentation" )
{
aArguments[i].Value >>= aRangeRepresentation;
}
@@ -1460,7 +1460,7 @@ ScChart2DataProvider::createDataSource(
for(sal_Int32 i = 0; i < aArguments.getLength(); ++i)
{
rtl::OUString sName(aArguments[i].Name);
- if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
+ if ( aArguments[i].Name == "DataRowSource" )
{
chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS;
if( ! (aArguments[i].Value >>= eSource))
@@ -1471,19 +1471,19 @@ ScChart2DataProvider::createDataSource(
}
bOrientCol = (eSource == chart::ChartDataRowSource_COLUMNS);
}
- else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
+ else if ( aArguments[i].Name == "FirstCellAsLabel" )
{
bLabel = ::cppu::any2bool(aArguments[i].Value);
}
- else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")))
+ else if ( aArguments[i].Name == "HasCategories" )
{
bCategories = ::cppu::any2bool(aArguments[i].Value);
}
- else if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+ else if ( aArguments[i].Name == "CellRangeRepresentation" )
{
aArguments[i].Value >>= aRangeRepresentation;
}
- else if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SequenceMapping")))
+ else if ( aArguments[i].Name == "SequenceMapping" )
{
aArguments[i].Value >>= aSequenceMapping;
}
@@ -2319,7 +2319,7 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue(
lang::IllegalArgumentException,
lang::WrappedTargetException, uno::RuntimeException)
{
- if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS)))
+ if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
{
if ( !(rValue >>= m_bIncludeHiddenCells))
throw lang::IllegalArgumentException();
@@ -2335,7 +2335,7 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue(
lang::WrappedTargetException, uno::RuntimeException)
{
uno::Any aRet;
- if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS)))
+ if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
aRet <<= m_bIncludeHiddenCells;
else
throw beans::UnknownPropertyException();
@@ -3497,12 +3497,12 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue(
lang::IllegalArgumentException,
lang::WrappedTargetException, uno::RuntimeException)
{
- if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ROLE)))
+ if ( rPropertyName == SC_UNONAME_ROLE )
{
if ( !(rValue >>= m_aRole))
throw lang::IllegalArgumentException();
}
- else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS)))
+ else if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
{
sal_Bool bOldValue = m_bIncludeHiddenCells;
if ( !(rValue >>= m_bIncludeHiddenCells))
@@ -3522,11 +3522,11 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(
lang::WrappedTargetException, uno::RuntimeException)
{
uno::Any aRet;
- if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ROLE)))
+ if ( rPropertyName == SC_UNONAME_ROLE )
aRet <<= m_aRole;
- else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS)))
+ else if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
aRet <<= m_bIncludeHiddenCells;
- else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_HIDDENVALUES)))
+ else if ( rPropertyName == SC_UNONAME_HIDDENVALUES )
{
// This property is read-only thus cannot be set externally via
// setPropertyValue(...).
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 030395c587e4..0d03f9927ee7 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -377,7 +377,7 @@ void ScPrintUIOptions::SetDefaults()
aPropertyValue.Value <<= nContent;
aUIProp[nPropPos].Value <<= aPropertyValue;
}
- else if ( aPropertyValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsIncludeEmptyPages") ) )
+ else if ( aPropertyValue.Name == "IsIncludeEmptyPages" )
{
ScUnoHelpFunctions::SetBoolInAny( aPropertyValue.Value, ! bSuppress );
aUIProp[nPropPos].Value <<= aPropertyValue;
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 9119c1ee1af0..66aa69473cb7 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -693,7 +693,7 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue(
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
- if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST)))
+ if ( rPropertyName == SC_UNO_MODIFY_BROADCAST )
{
aValue >>= mbModifyAndBroadcast;
}
@@ -704,7 +704,7 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyN
uno::RuntimeException)
{
Any aRet;
- if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST)))
+ if ( rPropertyName == SC_UNO_MODIFY_BROADCAST )
{
aRet <<= mbModifyAndBroadcast;
}
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index fdab3736a9ee..6ef14291107c 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -269,7 +269,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
// extract properties
- if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+ if ( lDescriptor[nProperty].Name == "URL" )
{
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
@@ -279,12 +279,12 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
}
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
+ else if ( lDescriptor[nProperty].Name == "TypeName" )
{
lDescriptor[nProperty].Value >>= sTemp;
aTypeName = sTemp;
}
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName")) )
+ else if ( lDescriptor[nProperty].Name == "FilterName" )
{
lDescriptor[nProperty].Value >>= sTemp;
aPreselectedFilterName = sTemp;
@@ -293,22 +293,22 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
// remember index of property to get access to it later
nIndexOfFilterName = nProperty;
}
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) )
+ else if ( lDescriptor[nProperty].Name == "InputStream" )
nIndexOfInputStream = nProperty;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ReadOnly")) )
+ else if ( lDescriptor[nProperty].Name == "ReadOnly" )
nIndexOfReadOnlyFlag = nProperty;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UCBContent")) )
+ else if ( lDescriptor[nProperty].Name == "UCBContent" )
nIndexOfContent = nProperty;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate")) )
+ else if ( lDescriptor[nProperty].Name == "AsTemplate" )
{
lDescriptor[nProperty].Value >>= bOpenAsTemplate;
nIndexOfTemplateFlag = nProperty;
}
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
+ else if ( lDescriptor[nProperty].Name == "InteractionHandler" )
lDescriptor[nProperty].Value >>= xInteraction;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RepairPackage")) )
+ else if ( lDescriptor[nProperty].Name == "RepairPackage" )
lDescriptor[nProperty].Value >>= bRepairPackage;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentTitle")) )
+ else if ( lDescriptor[nProperty].Name == "DocumentTitle" )
nIndexOfDocumentTitle = nProperty;
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 63d8a140fbaa..aa173a701aca 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1040,7 +1040,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr
{
uno::Any aRet;
- if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ) )
+ if ( sPropertyName == "DisplayName" )
{
SolarMutexGuard aGuard;
sal_uInt32 nResId = 0;
@@ -1873,7 +1873,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
if (*pValue >>= nPages)
{
ScPageScaleToItem aItem = ((const ScPageScaleToItem&)rSet.Get(ATTR_PAGE_SCALETO));
- if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SC_UNO_PAGE_SCALETOX)))
+ if ( rPropertyName == SC_UNO_PAGE_SCALETOX )
aItem.SetWidth(static_cast<sal_uInt16>(nPages));
else
aItem.SetHeight(static_cast<sal_uInt16>(nPages));
@@ -2061,7 +2061,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
case ATTR_PAGE_SCALETO:
{
ScPageScaleToItem aItem((const ScPageScaleToItem&)pItemSet->Get(ATTR_PAGE_SCALETO));
- if (aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SC_UNO_PAGE_SCALETOX)))
+ if ( aPropertyName == SC_UNO_PAGE_SCALETOX )
aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetWidth()));
else
aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetHeight()));
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 507915ac0221..2759b9efab0e 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -234,7 +234,7 @@ namespace basprov
for ( sal_Int32 i = 0; i < nProps; ++i )
{
// TODO: according to MBA the property 'Title' may change in future
- if ( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
+ if ( pProps[i].Name == "Title" )
{
pProps[i].Value >>= sDocURL;
break;
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 1c137c0a97ca..420506c61d16 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -379,11 +379,11 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
// TODO: dialogs in packages
Reference< XLibraryContainer > xLibContainer;
- if ( sLocation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) )
+ if ( sLocation == "application" )
{
xLibContainer = Reference< XLibraryContainer >( SFX_APP()->GetDialogContainer(), UNO_QUERY );
}
- else if ( sLocation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document")) )
+ else if ( sLocation == "document" )
{
Reference< XEmbeddedScripts > xDocumentScripts( m_xModel, UNO_QUERY );
if ( xDocumentScripts.is() )
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 6405b0cbf548..a9b623a2bc5e 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -551,7 +551,7 @@ void SdStyleFamily::setPropertyValue( const OUString& , const Any& ) throw (Unk
Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ))
+ if ( PropertyName == "DisplayName" )
{
SolarMutexGuard aGuard;
OUString sDisplayName;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index e5e1f1d57ead..dcdfbd64455b 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -772,12 +772,12 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >&
sal_Int32 nMasterRel = 0;
for( ; nLength--; pValue++ )
{
- if( pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("after-effect") ) )
+ if ( pValue->Name == "after-effect" )
{
pValue->Value >>= bAfterEffect;
nRemoved++;
}
- else if( pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("master-rel") ) )
+ else if ( pValue->Name == "master-rel" )
{
pValue->Value >>= nMasterRel;
nRemoved++;
@@ -2226,7 +2226,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
{
nCommand = EffectCommands::STOPAUDIO;
}
- else if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("play") ) )
+ else if ( aParam == "play" )
{
nCommand = EffectCommands::PLAY;
}
@@ -2242,11 +2242,11 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
}
nCommand = EffectCommands::PLAY;
}
- else if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("togglePause") ) )
+ else if ( aParam == "togglePause" )
{
nCommand = EffectCommands::TOGGLEPAUSE;
}
- else if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("stop") ) )
+ else if ( aParam == "stop" )
{
nCommand = EffectCommands::STOP;
}
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 3bfe71880924..11e4b909816b 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -744,7 +744,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void)
if (xInfo.is())
{
OUString sFirstService = xInfo->getSupportedServiceNames()[0];
- if (sFirstService.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" )
{
sDescription = OUString (RTL_CONSTASCII_USTRINGPARAM("Draw Document"));
}
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index e1c92534044d..9231f420dc87 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -298,7 +298,7 @@ void SAL_CALL
AccessibleDocumentViewBase::propertyChange (rEventObject);
OSL_TRACE ("AccessibleDrawDocumentView::propertyChange");
- if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentPage")))
+ if ( rEventObject.PropertyName == "CurrentPage" )
{
OSL_TRACE (" current page changed");
@@ -333,7 +333,7 @@ void SAL_CALL
else
OSL_TRACE ("View invalid");
}
- else if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VisibleArea")))
+ else if ( rEventObject.PropertyName == "VisibleArea" )
{
OSL_TRACE (" visible area changed");
if (mpChildrenManager != NULL)
@@ -397,7 +397,7 @@ void SAL_CALL
{
uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
OUString sFirstService = aServices[0];
- if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" )
{
if( aServices.getLength() >= 2 &&
aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
@@ -413,13 +413,13 @@ void SAL_CALL
sName = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
}
}
- else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.NotesView")))
+ else if ( sFirstService == "com.sun.star.presentation.NotesView" )
{
SolarMutexGuard aGuard;
sName = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
}
- else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.HandoutView")))
+ else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
{
SolarMutexGuard aGuard;
@@ -454,7 +454,7 @@ void SAL_CALL
{
uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
OUString sFirstService = aServices[0];
- if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" )
{
if( aServices.getLength() >= 2 &&
aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
@@ -470,13 +470,13 @@ void SAL_CALL
sDescription = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
}
}
- else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.NotesView")))
+ else if ( sFirstService == "com.sun.star.presentation.NotesView" )
{
SolarMutexGuard aGuard;
sDescription = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
}
- else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.HandoutView")))
+ else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
{
SolarMutexGuard aGuard;
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 942f0a2cb3fb..d26f1a485ad1 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -225,14 +225,14 @@ void SAL_CALL
AccessibleDocumentViewBase::propertyChange (rEventObject);
OSL_TRACE ("AccessibleOutlineView::propertyChange");
- if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentPage")))
+ if ( rEventObject.PropertyName == "CurrentPage" )
{
OSL_TRACE (" current page changed");
// The current page changed. Update the children accordingly.
UpdateChildren();
}
- else if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VisibleArea")))
+ else if ( rEventObject.PropertyName == "VisibleArea" )
{
OSL_TRACE (" visible area changed");
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 5ce6b395dcdb..56c587b0a6c5 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -590,61 +590,61 @@ void CustomAnimationPane::updateLayout()
static sal_Int32 getPropertyType( const OUString& rProperty )
{
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Direction") ) )
+ if ( rProperty == "Direction" )
return nPropertyTypeDirection;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Spokes") ) )
+ if ( rProperty == "Spokes" )
return nPropertyTypeSpokes;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Zoom") ) )
+ if ( rProperty == "Zoom" )
return nPropertyTypeZoom;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Accelerate") ) )
+ if ( rProperty == "Accelerate" )
return nPropertyTypeAccelerate;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Decelerate") ) )
+ if ( rProperty == "Decelerate" )
return nPropertyTypeDecelerate;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Color1") ) )
+ if ( rProperty == "Color1" )
return nPropertyTypeFirstColor;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Color2") ) )
+ if ( rProperty == "Color2" )
return nPropertyTypeSecondColor;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FillColor") ) )
+ if ( rProperty == "FillColor" )
return nPropertyTypeFillColor;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ColorStyle") ) )
+ if ( rProperty == "ColorStyle" )
return nPropertyTypeColorStyle;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AutoReverse") ) )
+ if ( rProperty == "AutoReverse" )
return nPropertyTypeAutoReverse;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FontStyle") ) )
+ if ( rProperty == "FontStyle" )
return nPropertyTypeFont;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CharColor") ) )
+ if ( rProperty == "CharColor" )
return nPropertyTypeCharColor;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CharHeight") ) )
+ if ( rProperty == "CharHeight" )
return nPropertyTypeCharHeight;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CharDecoration") ) )
+ if ( rProperty == "CharDecoration" )
return nPropertyTypeCharDecoration;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("LineColor") ) )
+ if ( rProperty == "LineColor" )
return nPropertyTypeLineColor;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Rotate") ) )
+ if ( rProperty == "Rotate" )
return nPropertyTypeRotate;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Transparency") ) )
+ if ( rProperty == "Transparency" )
return nPropertyTypeTransparency;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Color") ) )
+ if ( rProperty == "Color" )
return nPropertyTypeColor;
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Scale") ) )
+ if ( rProperty == "Scale" )
return nPropertyTypeScale;
return nPropertyTypeNone;
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 6a31952fd972..814730f56066 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1779,7 +1779,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL
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 >>= sString;
break;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index ed9d76d29369..3e85d2384000 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3506,22 +3506,22 @@ void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArg
void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue ) throw (IllegalArgumentException)
{
- if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("RehearseTimings") ) )
+ if ( rProperty == "RehearseTimings" )
{
if( rValue >>= mbRehearseTimings )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Preview") ) )
+ else if ( rProperty == "Preview" )
{
if( rValue >>= mbPreview )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AnimationNode") ) )
+ else if ( rProperty == "AnimationNode" )
{
if( rValue >>= mxAnimationNode )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ParentWindow") ) )
+ else if ( rProperty == "ParentWindow" )
{
Reference< XWindow > xWindow;
if( rValue >>= xWindow )
@@ -3530,17 +3530,17 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const
return;
}
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AllowAnimations") ) )
+ else if ( rProperty == "AllowAnimations" )
{
if( rValue >>= mbAnimationAllowed )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AllowAnimations") ) )
+ else if ( rProperty == "AllowAnimations" )
{
if( rValue >>= mbAnimationAllowed )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FirstPage") ) )
+ else if ( rProperty == "FirstPage" )
{
OUString aPresPage;
if( rValue >>= aPresPage )
@@ -3556,32 +3556,32 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const
return;
}
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsAlwaysOnTop") ) )
+ else if ( rProperty == "IsAlwaysOnTop" )
{
if( rValue >>= mbAlwaysOnTop )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsAutomatic") ) )
+ else if ( rProperty == "IsAutomatic" )
{
if( rValue >>= mbManual )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsEndless") ) )
+ else if ( rProperty == "IsEndless" )
{
if( rValue >>= mbEndless )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsFullScreen") ) )
+ else if ( rProperty == "IsFullScreen" )
{
if( rValue >>= mbFullScreen )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsMouseVisible") ) )
+ else if ( rProperty == "IsMouseVisible" )
{
if( rValue >>= mbMouseVisible )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Pause") ) )
+ else if ( rProperty == "Pause" )
{
sal_Int32 nPause = -1;
if( (rValue >>= nPause) && (nPause >= 0) )
@@ -3590,12 +3590,12 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const
return;
}
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("StartWithNavigator") ) )
+ else if ( rProperty == "StartWithNavigator" )
{
if( rValue >>= mbStartWithNavigator )
return;
}
- else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UsePen") ) )
+ else if ( rProperty == "UsePen" )
{
if( rValue >>= mbMouseAsPen )
return;
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 2de089665ba5..10e48d9c903d 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -555,11 +555,11 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange (
{
ThrowIfDisposed();
- if (rEvent.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCurrentPagePropertyName)))
+ if ( rEvent.PropertyName == aCurrentPagePropertyName )
{
CallListeners(EventMultiplexerEvent::EID_CURRENT_PAGE);
}
- else if (rEvent.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aEditModePropertyName)))
+ else if ( rEvent.PropertyName == aEditModePropertyName )
{
bool bIsMasterPageMode (false);
rEvent.NewValue >>= bIsMasterPageMode;
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 5dde7a4b4a65..4e8d46861e97 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -125,7 +125,7 @@ SdFilterDetect::~SdFilterDetect()
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
// extract properties
- if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+ if ( lDescriptor[nProperty].Name == "URL" )
{
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
@@ -135,32 +135,32 @@ SdFilterDetect::~SdFilterDetect()
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
}
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
+ else if ( lDescriptor[nProperty].Name == "TypeName" )
{
lDescriptor[nProperty].Value >>= sTemp;
aTypeName = sTemp;
}
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName")) )
+ else if ( lDescriptor[nProperty].Name == "FilterName" )
{
lDescriptor[nProperty].Value >>= sTemp;
aPreselectedFilterName = sTemp;
}
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) )
+ else if ( lDescriptor[nProperty].Name == "InputStream" )
nIndexOfInputStream = nProperty;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ReadOnly")) )
+ else if ( lDescriptor[nProperty].Name == "ReadOnly" )
nIndexOfReadOnlyFlag = nProperty;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UCBContent")) )
+ else if ( lDescriptor[nProperty].Name == "UCBContent" )
nIndexOfContent = nProperty;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate")) )
+ else if ( lDescriptor[nProperty].Name == "AsTemplate" )
{
lDescriptor[nProperty].Value >>= bOpenAsTemplate;
nIndexOfTemplateFlag = nProperty;
}
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
+ else if ( lDescriptor[nProperty].Name == "InteractionHandler" )
lDescriptor[nProperty].Value >>= xInteraction;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RepairPackage")) )
+ else if ( lDescriptor[nProperty].Name == "RepairPackage" )
lDescriptor[nProperty].Value >>= bRepairPackage;
- else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentTitle")) )
+ else if ( lDescriptor[nProperty].Name == "DocumentTitle" )
nIndexOfDocumentTitle = nProperty;
}
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 4940f2cbcffe..986455440e02 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -91,23 +91,23 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet()
String SdLayer::convertToInternalName( const OUString& rName )
{
- if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_background) ) )
+ if ( rName == sUNO_LayerName_background )
{
return String( SdResId( STR_LAYER_BCKGRND ) );
}
- else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_background_objects) ) )
+ else if ( rName == sUNO_LayerName_background_objects )
{
return String( SdResId( STR_LAYER_BCKGRNDOBJ ) );
}
- else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_layout) ) )
+ else if ( rName == sUNO_LayerName_layout )
{
return String( SdResId( STR_LAYER_LAYOUT ) );
}
- else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_controls) ) )
+ else if ( rName == sUNO_LayerName_controls )
{
return String( SdResId( STR_LAYER_CONTROLS ) );
}
- else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_measurelines) ) )
+ else if ( rName == sUNO_LayerName_measurelines )
{
return String( SdResId( STR_LAYER_MEASURELINES ) );
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c1a061d054f1..3bf776a1102f 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -882,17 +882,17 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c
}
- if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_Service_ImageMapRectangleObject) ) )
+ if ( aServiceSpecifier == sUNO_Service_ImageMapRectangleObject )
{
return SvUnoImageMapRectangleObject_createInstance( ImplGetSupportedMacroItems() );
}
- if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_Service_ImageMapCircleObject) ) )
+ if ( aServiceSpecifier == sUNO_Service_ImageMapCircleObject )
{
return SvUnoImageMapCircleObject_createInstance( ImplGetSupportedMacroItems() );
}
- if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_Service_ImageMapPolygonObject) ) )
+ if ( aServiceSpecifier == sUNO_Service_ImageMapPolygonObject )
{
return SvUnoImageMapPolygonObject_createInstance( ImplGetSupportedMacroItems() );
}
@@ -1055,7 +1055,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c
xRet = (uno::XWeak*)pShape;
}
- else if( aServiceSpecifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TableShape") ) )