[Libreoffice-commits] .: 5 commits - accessibility/source basctl/source basic/source binaryurp/source bridges/source bridges/test canvas/workben chart2/source cli_ure/source codemaker/source configmgr/qa configmgr/source connectivity/source cppuhelper/source cppuhelper/test cppu/qa cppu/source cpputools/source cui/source dbaccess/source desktop/source embeddedobj/source embeddedobj/test embedserv/source extensions/source fileaccess/source filter/source forms/source fpicker/source framework/source hwpfilter/source i18npool/source i18nutil/source io/source l10ntools/source linguistic/source lotuswordpro/source odk/examples oox/source package/source postprocess/prj reportdesign/source sal/cppunittester sal/qa sal/rtl scaddins/source sc/qa scripting/source sc/source sdext/source sd/source sfx2/inc sfx2/source shell/source slideshow/source slideshow/test sot/source stoc/source stoc/test svl/qa svl/source svtools/source svx/source sw/source test/source testtools/source tools/source ucbhelper/so urce ucb/source unotools/source unoxml/source uui/source vbahelper/source vcl/source vcl/unx vcl/workben writerfilter/source writerperfect/source xmlhelp/source xmloff/source xmlscript/source xmlsecurity/source xmlsecurity/tools
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Apr 6 11:02:21 PDT 2012
accessibility/source/extended/textwindowaccessibility.cxx | 6
basctl/source/basicide/baside3.cxx | 3
basctl/source/basicide/bastype2.cxx | 3
basic/source/basmgr/basmgr.cxx | 2
basic/source/uno/namecont.cxx | 4
basic/source/uno/scriptcont.cxx | 12 -
binaryurp/source/bridge.cxx | 3
binaryurp/source/bridgefactory.cxx | 3
binaryurp/source/writer.cxx | 3
bridges/source/jni_uno/jni_bridge.cxx | 10
bridges/source/jni_uno/jni_info.cxx | 3
bridges/source/jni_uno/jni_info.h | 3
bridges/source/jni_uno/jni_java2uno.cxx | 3
bridges/test/java_uno/acquire/testacquire.cxx | 12 -
canvas/workben/canvasdemo.cxx | 5
chart2/source/controller/main/ChartController.cxx | 3
chart2/source/controller/main/ChartDropTargetHelper.cxx | 3
chart2/source/controller/main/CommandDispatchContainer.cxx | 6
chart2/source/controller/main/ControllerCommandDispatch.cxx | 5
chart2/source/controller/main/StatusBarCommandDispatch.cxx | 4
chart2/source/controller/main/UndoCommandDispatch.cxx | 4
chart2/source/model/filter/XMLFilter.cxx | 23 --
chart2/source/model/template/DataInterpreter.cxx | 3
chart2/source/tools/ErrorBar.cxx | 3
chart2/source/tools/RegressionCurveHelper.cxx | 86 ++-----
cli_ure/source/climaker/climaker_emit.cxx | 15 -
cli_ure/source/uno_bridge/cli_bridge.cxx | 6
codemaker/source/cppumaker/cpputype.cxx | 12 -
codemaker/source/javamaker/javatype.cxx | 6
configmgr/qa/unit/test.cxx | 14 -
configmgr/source/components.cxx | 14 -
configmgr/source/configurationprovider.cxx | 8
configmgr/source/data.cxx | 2
configmgr/source/type.cxx | 2
connectivity/source/drivers/evoab2/NDriver.cxx | 2
connectivity/source/drivers/hsqldb/HConnection.cxx | 2
connectivity/source/drivers/mozab/MConnection.cxx | 2
connectivity/source/drivers/mysql/YDriver.cxx | 2
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 4
cppu/qa/test_any.cxx | 85 +------
cppu/source/uno/lbenv.cxx | 3
cppu/source/uno/lbmap.cxx | 2
cppuhelper/source/implbase_ex.cxx | 2
cppuhelper/source/propertysetmixin.cxx | 13 -
cppuhelper/source/servicefactory.cxx | 6
cppuhelper/test/cfg_test.cxx | 10
cppuhelper/test/testimplhelper.cxx | 41 +--
cpputools/source/unoexe/unoexe.cxx | 4
cui/source/customize/cfg.cxx | 4
cui/source/customize/cfgutil.cxx | 4
cui/source/customize/selector.cxx | 8
cui/source/dialogs/about.cxx | 5
cui/source/dialogs/hldocntp.cxx | 8
cui/source/dialogs/scriptdlg.cxx | 4
cui/source/tabpages/macroass.cxx | 2
dbaccess/source/core/api/KeySet.cxx | 2
dbaccess/source/core/dataaccess/connection.cxx | 4
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 4
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 5
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 2
dbaccess/source/core/recovery/dbdocrecovery.cxx | 2
dbaccess/source/core/recovery/settingsimport.cxx | 2
dbaccess/source/ext/macromigration/migrationengine.cxx | 8
dbaccess/source/filter/xml/dbloader2.cxx | 4
dbaccess/source/filter/xml/xmlColumn.cxx | 4
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 2
dbaccess/source/filter/xml/xmlQuery.cxx | 2
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 5
dbaccess/source/filter/xml/xmlTable.cxx | 4
dbaccess/source/ui/misc/WCopyTable.cxx | 2
desktop/source/app/appinit.cxx | 3
desktop/source/app/cmdlineargs.cxx | 16 -
desktop/source/app/langselect.cxx | 2
desktop/source/deployment/manager/dp_manager.cxx | 19 -
desktop/source/deployment/misc/dp_dependencies.cxx | 30 --
desktop/source/deployment/misc/dp_ucb.cxx | 4
desktop/source/deployment/registry/component/dp_component.cxx | 28 --
desktop/source/deployment/registry/dp_registry.cxx | 5
desktop/source/deployment/registry/package/dp_package.cxx | 10
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 13 -
desktop/source/splash/splash.cxx | 4
embeddedobj/source/commonembedding/persistence.cxx | 24 --
embeddedobj/source/msole/olecomponent.cxx | 2
embeddedobj/test/MainThreadExecutor/xexecutor.cxx | 2
embedserv/source/embed/guid.cxx | 2
extensions/source/bibliography/framectr.cxx | 16 -
extensions/source/logging/loggerconfig.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 2
fileaccess/source/FileAccess.cxx | 6
filter/source/config/cache/filtercache.cxx | 2
filter/source/config/cache/lateinitlistener.cxx | 8
filter/source/config/cache/typedetection.cxx | 14 -
filter/source/flash/swfexporter.cxx | 5
filter/source/msfilter/eschesdo.cxx | 2
filter/source/svg/svgexport.cxx | 6
filter/source/svg/svgreader.cxx | 8
filter/source/t602/t602filter.cxx | 18 -
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 3
filter/source/xmlfilterdetect/filterdetect.cxx | 14 -
filter/source/xsltdialog/typedetectionimport.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
forms/source/component/Filter.cxx | 6
forms/source/component/ImageControl.cxx | 2
forms/source/xforms/datatypes.cxx | 6
forms/source/xforms/model_ui.cxx | 2
fpicker/source/office/iodlg.cxx | 3
framework/source/accelerators/keymapping.cxx | 2
framework/source/classes/menumanager.cxx | 21 -
framework/source/dispatch/dispatchprovider.cxx | 7
framework/source/fwe/xml/statusbardocumenthandler.cxx | 20 -
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 4
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 3
framework/source/lomenubar/FrameHelper.cxx | 2
framework/source/uielement/menubarmanager.cxx | 20 -
hwpfilter/source/hwpreader.hxx | 2
i18npool/source/breakiterator/breakiteratorImpl.cxx | 2
i18npool/source/breakiterator/breakiterator_unicode.cxx | 2
i18npool/source/calendar/calendar_gregorian.cxx | 6
i18npool/source/collator/collatorImpl.cxx | 10
i18npool/source/collator/collator_unicode.cxx | 4
i18npool/source/indexentry/indexentrysupplier_asian.cxx | 4
i18npool/source/localedata/LocaleNode.cxx | 28 +-
i18npool/source/localedata/filewriter.cxx | 4
i18npool/source/localedata/localedata.cxx | 9
i18npool/source/nativenumber/nativenumbersupplier.cxx | 6
i18npool/source/textconversion/textconversion_zh.cxx | 8
i18nutil/source/utility/casefolding.cxx | 2
io/source/acceptor/acceptor.cxx | 6
io/source/connector/connector.cxx | 6
l10ntools/source/help/HelpIndexer.cxx | 5
l10ntools/source/localize.cxx | 3
l10ntools/source/tagtest.cxx | 24 +-
l10ntools/source/xmlparse.cxx | 2
linguistic/source/convdiclist.cxx | 2
linguistic/source/convdicxml.cxx | 16 -
linguistic/source/hhconvdic.cxx | 3
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 13 -
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx | 3
odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx | 3
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 14 -
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 3
oox/source/dump/dumperbase.cxx | 2
oox/source/dump/oledumper.cxx | 4
oox/source/export/ColorPropertySet.cxx | 2
oox/source/export/chartexport.cxx | 4
oox/source/export/drawingml.cxx | 8
oox/source/export/shapes.cxx | 2
oox/source/ole/olehelper.cxx | 6
oox/source/ole/vbacontrol.cxx | 6
oox/source/ole/vbaproject.cxx | 2
oox/source/ppt/timenodelistcontext.cxx | 2
package/source/xstor/xstorage.cxx | 11 -
postprocess/prj/build.lst.orig | 12 -
reportdesign/source/core/misc/conditionupdater.cxx | 2
reportdesign/source/core/sdr/formatnormalizer.cxx | 7
reportdesign/source/filter/xml/xmlControlProperty.cxx | 2
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 20 -
sal/cppunittester/cppunittester.cxx | 2
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 26 --
sal/qa/rtl/oustring/rtl_OUString2.cxx | 4
sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx | 6
sal/rtl/source/bootstrap.cxx | 20 -
sc/qa/unit/ucalc.cxx | 30 +-
sc/source/core/data/column3.cxx | 3
sc/source/filter/excel/xehelper.cxx | 6
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/xml/XMLTableShapeResizer.cxx | 2
sc/source/filter/xml/xmlwrap.cxx | 3
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/dbgui/dbnamdlg.cxx | 2
sc/source/ui/docshell/docsh5.cxx | 2
sc/source/ui/unoobj/dapiuno.cxx | 2
sc/source/ui/unoobj/shapeuno.cxx | 2
sc/source/ui/vba/vbaapplication.cxx | 58 ++---
sc/source/ui/vba/vbaworkbook.cxx | 18 -
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/viewfun5.cxx | 2
scaddins/source/datefunc/datefunc.cxx | 3
scripting/source/basprov/basprov.cxx | 2
scripting/source/stringresource/stringresource.cxx | 2
sd/source/core/CustomAnimationEffect.cxx | 7
sd/source/filter/eppt/epptso.cxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 6
sd/source/filter/grf/sdgrffilter.cxx | 4
sd/source/filter/ppt/pptinanimations.cxx | 16 -
sd/source/ui/animations/CustomAnimationPane.cxx | 6
sd/source/ui/annotations/annotationmanager.cxx | 4
sd/source/ui/slideshow/slideshowimpl.cxx | 7
sd/source/ui/table/TableDesignPane.cxx | 4
sd/source/ui/unoidl/unomodel.cxx | 14 -
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 2
sdext/source/pdfimport/tree/style.cxx | 2
sfx2/inc/sfx2/XmlIdRegistry.hxx | 4
sfx2/source/control/unoctitm.cxx | 5
sfx2/source/doc/DocumentMetadataAccess.cxx | 13 -
sfx2/source/doc/Metadatable.cxx | 4
sfx2/source/doc/SfxDocumentMetaData.cxx | 24 +-
sfx2/source/doc/doctemplates.cxx | 8
sfx2/source/doc/objstor.cxx | 11 -
sfx2/source/doc/sfxbasemodel.cxx | 4
sfx2/source/doc/sfxmodelfactory.cxx | 4
sfx2/source/view/ipclient.cxx | 2
sfx2/source/view/viewfrm.cxx | 2
sfx2/source/view/viewfrm2.cxx | 3
shell/source/backends/desktopbe/desktopbackend.cxx | 37 ---
shell/source/backends/gconfbe/gconfaccess.cxx | 4
shell/source/backends/gconfbe/gconfbackend.cxx | 4
shell/source/backends/kde4be/kde4access.cxx | 6
shell/source/backends/kde4be/kde4backend.cxx | 34 ---
shell/source/backends/kdebe/kdeaccess.cxx | 6
shell/source/backends/kdebe/kdebackend.cxx | 34 ---
shell/source/backends/localebe/localebackend.cxx | 2
shell/source/backends/macbe/macbackend.cxx | 27 --
shell/source/backends/wininetbe/wininetbackend.cxx | 24 --
slideshow/source/engine/animationnodes/animationcommandnode.cxx | 4
slideshow/source/engine/shapes/drawshape.cxx | 2
slideshow/source/engine/shapes/shapeimporter.cxx | 34 ---
slideshow/source/engine/slideshowimpl.cxx | 51 +---
slideshow/test/demoshow.cxx | 3
sot/source/sdstor/ucbstorage.cxx | 2
stoc/source/inspect/introspection.cxx | 4
stoc/source/invocation_adapterfactory/iafactory.cxx | 4
stoc/source/javavm/javavm.cxx | 25 --
stoc/source/registry_tdprovider/tdservice.cxx | 3
stoc/source/security/access_controller.cxx | 3
stoc/source/security/file_policy.cxx | 18 -
stoc/source/typeconv/convert.cxx | 6
stoc/source/uriproc/UriReferenceFactory.cxx | 4
stoc/test/testcorefl.cxx | 6
stoc/test/testloader.cxx | 2
stoc/test/testproxyfac.cxx | 3
stoc/test/testregistry.cxx | 7
svl/qa/unit/test_URIHelper.cxx | 3
svl/qa/unit/test_lngmisc.cxx | 14 -
svl/source/fsstor/fsstorage.cxx | 2
svl/source/numbers/zformat.cxx | 5
svtools/source/config/extcolorcfg.cxx | 2
svtools/source/contnr/fileview.cxx | 2
svtools/source/control/inettbc.cxx | 4
svtools/source/filter/filter.cxx | 8
svtools/source/misc/embedhlp.cxx | 2
svx/source/dialog/rubydialog.cxx | 9
svx/source/dialog/srchdlg.cxx | 8
svx/source/form/fmscriptingenv.cxx | 2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 5
svx/source/svdraw/svdoashp.cxx | 2
svx/source/svdraw/svdoole2.cxx | 2
svx/source/table/cell.cxx | 4
svx/source/xml/xmlgrhlp.cxx | 2
sw/source/core/access/accpreview.cxx | 5
sw/source/core/crsr/pam.cxx | 2
sw/source/core/text/portxt.cxx | 8
sw/source/core/unocore/unofield.cxx | 9
sw/source/core/unocore/unoidx.cxx | 51 +---
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/core/unocore/unoparagraph.cxx | 2
sw/source/core/unocore/unosett.cxx | 4
sw/source/core/unocore/unotbl.cxx | 11 -
sw/source/core/unocore/unotext.cxx | 3
sw/source/filter/xml/xmltexti.cxx | 2
sw/source/ui/dbui/dbmgr.cxx | 8
sw/source/ui/docvw/edtwin.cxx | 4
sw/source/ui/uno/unotxdoc.cxx | 15 -
sw/source/ui/uno/unotxvw.cxx | 3
sw/source/ui/vba/vbatablesofcontents.cxx | 2
test/source/sheet/xdatapilotdescriptor.cxx | 2
testtools/source/bridgetest/bridgetest.cxx | 11 -
testtools/source/bridgetest/constructors.cxx | 20 -
testtools/source/bridgetest/currentcontextchecker.cxx | 4
tools/source/rc/resmgr.cxx | 6
ucb/source/core/ucb.cxx | 8
ucb/source/ucp/file/shell.cxx | 4
ucb/source/ucp/ftp/ftpcontent.cxx | 7
ucb/source/ucp/ftp/ftpurl.cxx | 26 --
ucb/source/ucp/ftp/test_ftpurl.cxx | 7
ucb/source/ucp/gvfs/gvfs_content.cxx | 23 +-
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 93 ++------
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 14 -
ucb/source/ucp/hierarchy/hierarchyuri.cxx | 3
ucb/source/ucp/odma/odma_content.cxx | 51 +---
ucb/source/ucp/package/pkgcontent.cxx | 110 +++-------
ucb/source/ucp/package/pkguri.cxx | 8
ucb/source/ucp/tdoc/tdoc_content.cxx | 97 ++------
ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 21 -
ucb/source/ucp/tdoc/tdoc_uri.cxx | 3
ucb/source/ucp/webdav/ContentProperties.cxx | 49 +---
ucb/source/ucp/webdav/NeonSession.cxx | 3
ucb/source/ucp/webdav/NeonUri.cxx | 9
ucb/source/ucp/webdav/webdavcontent.cxx | 96 ++------
ucb/source/ucp/webdav/webdavcontentcaps.cxx | 41 ---
ucb/source/ucp/webdav/webdavprovider.cxx | 23 --
ucbhelper/source/client/proxydecider.cxx | 30 --
unotools/source/config/compatibility.cxx | 4
unotools/source/config/fontcfg.cxx | 2
unotools/source/ucbhelper/ucbhelper.cxx | 4
unoxml/source/dom/document.cxx | 25 --
uui/source/iahndl-ioexceptions.cxx | 11 -
uui/source/iahndl.cxx | 4
vbahelper/source/vbahelper/vbacommandbar.cxx | 4
vbahelper/source/vbahelper/vbacommandbars.cxx | 8
vcl/source/app/svapp.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 4
vcl/source/gdi/pngwrite.cxx | 6
vcl/source/window/printdlg.cxx | 19 -
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 2
vcl/unx/generic/plugadapt/salplug.cxx | 8
vcl/unx/gtk/app/gtkdata.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2
vcl/unx/kde/kdedata.cxx | 2
vcl/unx/kde4/KDEXLib.cxx | 2
vcl/workben/outdevgrind.cxx | 3
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8
writerfilter/source/dmapper/StyleSheetTable.cxx | 4
writerfilter/source/filter/ImportFilter.cxx | 14 -
writerfilter/source/filter/RtfFilter.cxx | 3
writerfilter/source/filter/WriterFilterDetection.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3
writerperfect/source/cdrimp/CDRImportFilter.cxx | 13 -
writerperfect/source/vsdimp/VisioImportFilter.cxx | 13 -
writerperfect/source/wpdimp/WordPerfectImportFilter.cxx | 17 -
writerperfect/source/wpgimp/WPGImportFilter.cxx | 13 -
writerperfect/source/wpsimp/MSWorksImportFilter.cxx | 15 -
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 6
xmloff/source/chart/SchXMLAxisContext.cxx | 5
xmloff/source/chart/SchXMLChartContext.cxx | 12 -
xmloff/source/chart/SchXMLExport.cxx | 8
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 14 -
xmloff/source/chart/SchXMLSeries2Context.cxx | 8
xmloff/source/chart/SchXMLTools.cxx | 6
xmloff/source/core/DocumentSettingsContext.cxx | 8
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/draw/sdxmlimp.cxx | 2
xmloff/source/meta/xmlmetae.cxx | 4
xmloff/source/style/xmlnumfe.cxx | 2
xmloff/source/table/XMLTableExport.cxx | 2
xmloff/source/text/txtparai.cxx | 4
xmloff/source/text/txtvfldi.cxx | 3
xmloff/source/transform/TransformerBase.cxx | 2
xmlscript/source/xmldlg_imexp/imp_share.hxx | 14 -
xmlscript/source/xmllib_imexp/imp_share.hxx | 4
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 4
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 2
xmlsecurity/tools/standalone/csfit/helper.cxx | 2
xmlsecurity/tools/standalone/mscsfit/helper.cxx | 2
347 files changed, 1157 insertions(+), 2091 deletions(-)
New commits:
commit b07288a3f39119834d2bcda741349e4cece5ce37
Author: Szabolcs Dezsi <dezsiszabi at hotmail.com>
Date: Fri Apr 6 19:49:53 2012 +0200
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 39b332c..865a31d 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1248,15 +1248,13 @@ void Document::changeParagraphAttributes(
// they do not replace the old attributes as required by
// XAccessibleEditableText.setAttributes:
for (::sal_Int32 i = 0; i < rAttributeSet.getLength(); ++i)
- if (rAttributeSet[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("CharColor")))
+ if ( rAttributeSet[i].Name == "CharColor" )
m_rEngine.SetAttrib(::TextAttribFontColor(
mapFontColor(rAttributeSet[i].Value)),
nNumber, static_cast< ::sal_uInt16 >(nBegin),
static_cast< ::sal_uInt16 >(nEnd));
// XXX numeric overflow (2x)
- else if (rAttributeSet[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("CharWeight")))
+ else if ( rAttributeSet[i].Name == "CharWeight" )
m_rEngine.SetAttrib(::TextAttribFontWeight(
mapFontWeight(rAttributeSet[i].Value)),
nNumber, static_cast< ::sal_uInt16 >(nBegin),
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index d6ce0de..a7acc1e 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -838,8 +838,7 @@ sal_Bool DialogWindow::SaveDialog()
aExtension = aCompleteName.copy( iDot + 1 );
}
- if( aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "properties" ) ) ||
- aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "default" ) ) )
+ if( aExtension == "properties" || aExtension == "default" )
{
if( aPureName.indexOf( aDialogName_ ) == 0 )
{
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 3703776..986efa3 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -760,8 +760,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
const beans::PropertyValue* pModuleDescr = aModuleDescr.getConstArray();
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- if ( pModuleDescr[ i ].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryEmptyDocumentURL" ) ) )
+ if ( pModuleDescr[ i ].Name == "ooSetupFactoryEmptyDocumentURL" )
{
pModuleDescr[ i ].Value >>= sFactoryURL;
break;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 2395296..81e006b 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -758,7 +758,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
{
Any aLibAny = xScriptCont->getByName( *pScriptLibName );
- if ( pScriptLibName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Standard")) )
+ if ( *pScriptLibName == "Standard" )
xScriptCont->loadLibrary( *pScriptLibName );
BasMgrContainerListenerImpl::insertLibraryImpl
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 9bb8782..18bf973 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1220,7 +1220,7 @@ void SfxLibraryContainer::implScanExtensions( void )
bool bPureDialogLib = false;
while ( !(aLibURL = aScriptIt.nextBasicOrDialogLibrary( bPureDialogLib )).isEmpty())
{
- if( bPureDialogLib && maInfoFileName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "script" ) ) )
+ if( bPureDialogLib && maInfoFileName == "script" )
continue;
// Extract lib name
@@ -1771,7 +1771,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
if ( bStorage )
{
// Don't write if only empty standard lib exists
- if ( ( nNameCount == 1 ) && ( aNames[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) ) )
+ if ( ( nNameCount == 1 ) && ( aNames[0] == "Standard" ) )
{
Any aLibAny = maNameContainer.getByName( aNames[0] );
Reference< XNameAccess > xNameAccess;
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 9dd01a1..fff3a33 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -326,24 +326,20 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
script::ModuleInfo aModInfo;
aModInfo.ModuleType = ModuleType::UNKNOWN;
- if( aMod.aModuleType.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("normal") ))
+ if( aMod.aModuleType == "normal" )
{
aModInfo.ModuleType = ModuleType::NORMAL;
}
- else if( aMod.aModuleType.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("class") ))
+ else if( aMod.aModuleType == "class" )
{
aModInfo.ModuleType = ModuleType::CLASS;
}
- else if( aMod.aModuleType.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("form") ))
+ else if( aMod.aModuleType == "form" )
{
aModInfo.ModuleType = ModuleType::FORM;
aModInfo.ModuleObject = mxOwnerDocument;
}
- else if( aMod.aModuleType.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("document") ))
+ else if( aMod.aModuleType == "document" )
{
aModInfo.ModuleType = ModuleType::DOCUMENT;
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 7718c53..50b873f 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -744,8 +744,7 @@ void Bridge::handleCommitChangeRequest(
assert(ok);
(void) ok; // avoid warnings
for (sal_Int32 i = 0; i != s.getLength(); ++i) {
- if (s[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("CurrentContext")))
+ if ( s[i].Name == "CurrentContext" )
{
ccMode = true;
} else {
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index f3e06ab..de7762f 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -142,8 +142,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
throw css::bridge::BridgeExistsException(
sName, static_cast< cppu::OWeakObject * >(this));
}
- if (!(sProtocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("urp")) &&
- aConnection.is()))
+ if ( sProtocol != "urp" || !aConnection.is() )
{
throw css::lang::IllegalArgumentException(
rtl::OUString(
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index f5ded29..e1b2291 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -169,8 +169,7 @@ void Writer::execute() {
if (item.request) {
sendRequest(
item.tid, item.oid, item.type, item.member, item.arguments,
- (!item.oid.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("UrpProtocolProperties")) &&
+ (item.oid != "UrpProtocolProperties" &&
!item.member.equals(
css::uno::TypeDescription(
rtl::OUString(
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index a4548e1..87d210d 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -512,10 +512,7 @@ void SAL_CALL uno_ext_getMapping(
try
{
- if (from_env_typename.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(UNO_LB_JAVA) ) &&
- to_env_typename.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+ if ( from_env_typename == UNO_LB_JAVA && to_env_typename == UNO_LB_UNO )
{
Bridge * bridge =
new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1
@@ -524,10 +521,7 @@ void SAL_CALL uno_ext_getMapping(
&mapping, Bridge_free,
pFrom, (uno_Environment *)pTo->pExtEnv, 0 );
}
- else if (from_env_typename.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ) &&
- to_env_typename.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(UNO_LB_JAVA) ))
+ else if ( from_env_typename == UNO_LB_UNO && to_env_typename == UNO_LB_JAVA )
{
Bridge * bridge =
new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index c3f34ed..1e0378d 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -461,8 +461,7 @@ JNI_type_info const * JNI_info::get_type_info(
JNI_type_info const * JNI_info::get_type_info(
JNI_context const & jni, OUString const & uno_name ) const
{
- if (uno_name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ))
+ if ( uno_name == "com.sun.star.uno.XInterface" )
{
return m_XInterface_type_info;
}
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index a356be2..f890e49 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -66,8 +66,7 @@ inline bool type_equals(
inline bool is_XInterface( typelib_TypeDescriptionReference * type )
{
return ((typelib_TypeClass_INTERFACE == type->eTypeClass) &&
- ::rtl::OUString::unacquired( &type->pTypeName ).equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ));
+ ::rtl::OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface");
}
//==============================================================================
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 55674b4..26b757f 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -425,8 +425,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
#endif
// special IQueryInterface.queryInterface()
- if (method_name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("queryInterface") ))
+ if ( method_name == "queryInterface" )
{
// oid
JLocalAutoRef jo_oid(
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index ed046fb..fcf7fde 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -119,8 +119,7 @@ private:
css::uno::Any Interface::queryInterface(css::uno::Type const & type)
throw (css::uno::RuntimeException)
{
- return type.getTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.uno.XInterface"))
+ return type.getTypeName() == "com.sun.star.uno.XInterface"
? css::uno::makeAny(css::uno::Reference< css::uno::XInterface >(this))
: css::uno::Any();
}
@@ -153,10 +152,8 @@ protected:
css::uno::Any Base::queryInterface(css::uno::Type const & type)
throw (css::uno::RuntimeException)
{
- return type.getTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(
- "test.javauno.acquire.XBase"))
- ? css::uno::makeAny(
- css::uno::Reference< test::javauno::acquire::XBase >(this))
+ return type.getTypeName() == "test.javauno.acquire.XBase"
+ ? css::uno::makeAny(css::uno::Reference< test::javauno::acquire::XBase >(this))
: Interface::queryInterface(type);
}
@@ -182,8 +179,7 @@ private:
css::uno::Any Derived::queryInterface(css::uno::Type const & type)
throw (css::uno::RuntimeException)
{
- return (type.getTypeName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("test.javauno.acquire.XDerived")))
+ return ( type.getTypeName() == "test.javauno.acquire.XDerived" )
? css::uno::makeAny(
css::uno::Reference< test::javauno::acquire::XDerived >(this))
: Interface::queryInterface(type);
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 963fd77..4a3449c 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -654,9 +654,8 @@ void DemoApp::Main()
{
::rtl::OUString aParam = GetCommandLineParam( i );
- if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) ||
- aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) )
- bHelp = true;
+ if( aParam == "--help" || aParam == "-h" )
+ bHelp = true;
}
if( bHelp )
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 2356669..7c4595d 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1042,8 +1042,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
{
if ( !m_aLifeTimeManager.impl_isDisposed() && getModel().is() )
{
- if( !rTargetFrameName.isEmpty() &&
- rTargetFrameName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_self")))
+ if( !rTargetFrameName.isEmpty() && rTargetFrameName == "_self" )
return m_aDispatchContainer.getDispatchForURL( rURL );
}
return uno::Reference< frame::XDispatch > ();
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 17d413a..892de41 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -118,8 +118,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
if( aDataHelper.GetSequence( SOT_FORMATSTR_ID_LINK, aBytes ))
{
::std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes ));
- if( aStrings.size() >= 3 &&
- aStrings[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "soffice" )))
+ if( aStrings.size() >= 3 && aStrings[0] == "soffice" )
{
OUString aDocName( aStrings[1] );
OUString aRangeString( aStrings[2] );
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 33af33f..a9a2d0c 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -97,8 +97,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL(
{
uno::Reference< frame::XModel > xModel( m_xModel );
- if( xModel.is() && (rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" ))
- || rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Redo" ))) )
+ if( xModel.is() && ( rURL.Path == "Undo" || rURL.Path == "Redo" ) )
{
CommandDispatch * pDispatch = new UndoCommandDispatch( m_xContext, xModel );
xResult.set( pDispatch );
@@ -107,8 +106,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL(
m_aCachedDispatches[ C2U(".uno:Redo") ].set( xResult );
m_aToBeDisposedDispatches.push_back( xResult );
}
- else if( xModel.is() && (rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Context" ))
- || rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ModifiedStatus" ))) )
+ else if( xModel.is() && ( rURL.Path == "Context" || rURL.Path == "ModifiedStatus" ) )
{
Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), uno::UNO_QUERY );
CommandDispatch * pDispatch = new StatusBarCommandDispatch( m_xContext, xModel, xSelSupp );
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index fa85ff3..6ce80c3 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -725,7 +725,7 @@ void ControllerCommandDispatch::fireStatusEvent(
const OUString & rURL,
const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ )
{
- bool bIsChartSelectorURL = rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ChartElementSelector") );
+ bool bIsChartSelectorURL = rURL == ".uno:ChartElementSelector";
if( rURL.isEmpty() || bIsChartSelectorURL )
{
uno::Any aArg;
@@ -742,8 +742,7 @@ void ControllerCommandDispatch::fireStatusEvent(
// statusbar. Should be handled by base implementation
// @todo: remove if Issue 68864 is fixed
- if( rURL.isEmpty() ||
- rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:StatusBarVisible")))
+ if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" )
{
bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xController ));
fireStatusEventForURL( C2U(".uno:StatusBarVisible"), uno::makeAny( bIsStatusBarVisible ), true, xSingleListener );
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index db5a09c..bc3d6df 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -77,8 +77,8 @@ void StatusBarCommandDispatch::fireStatusEvent(
const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ )
{
bool bFireAll( rURL.isEmpty() );
- bool bFireContext( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Context")));
- bool bFireModified( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ModifiedStatus")));
+ bool bFireContext( bFireAll || rURL == ".uno:Context" );
+ bool bFireModified( bFireAll || rURL == ".uno:ModifiedStatus" );
if( bFireContext )
{
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 4c29848..5b9299d 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -92,9 +92,9 @@ void UndoCommandDispatch::fireStatusEvent(
aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoActionTitle());
}
- if( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Undo")))
+ if( bFireAll || rURL == ".uno:Undo" )
fireStatusEventForURL( C2U(".uno:Undo"), aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener );
- if( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Redo")))
+ if( bFireAll || rURL == ".uno:Redo" )
fireStatusEventForURL( C2U(".uno:Redo"), aRedoState, m_xUndoManager->isRedoPossible(), xSingleListener );
}
}
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 57c7975..2a6e35b 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -120,13 +120,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
{
// properties understood by storage factory
// (see package/source/xstor/xfactory.cxx for details)
- if ( rMediaDescriptor[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ))
- || rMediaDescriptor[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "Password" ))
- || rMediaDescriptor[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ))
- )
+ if ( rMediaDescriptor[i].Name == "InteractionHandler" || rMediaDescriptor[i].Name == "Password" || rMediaDescriptor[i].Name == "RepairPackage" )
{
aPropertiesForStorage.push_back( rMediaDescriptor[i] );
}
@@ -187,19 +181,12 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
::std::vector< beans::PropertyValue > aPropertiesForStorage;
for( sal_Int32 i=rMediaDescriptor.getLength(); i--; )
{
- if( rMediaDescriptor[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "InputStream" )))
+ if( rMediaDescriptor[i].Name == "InputStream" )
xStream.set( rMediaDescriptor[i].Value, uno::UNO_QUERY );
// properties understood by storage factory
// (see package/source/xstor/xfactory.cxx for details)
- if ( rMediaDescriptor[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ))
- || rMediaDescriptor[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "Password" ))
- || rMediaDescriptor[i].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ))
- )
+ if ( rMediaDescriptor[i].Name == "InteractionHandler" || rMediaDescriptor[i].Name == "Password" || rMediaDescriptor[i].Name == "RepairPackage" )
{
aPropertiesForStorage.push_back( rMediaDescriptor[i] );
}
@@ -827,7 +814,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes
{
apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor );
if( aMDHelper.ISSET_FilterName )
- rOutOASIS = aMDHelper.FilterName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("chart8"));
+ rOutOASIS = aMDHelper.FilterName == "chart8";
}
// -----------------------------------------------------------------------------
::rtl::OUString XMLFilter::getMediaType(bool _bOasis)
@@ -843,7 +830,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >
{
apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor );
if( aMDHelper.ISSET_FilterName )
- rOutOASIS = aMDHelper.FilterName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("StarOffice XML (Base) Report Chart"));
+ rOutOASIS = aMDHelper.FilterName == "StarOffice XML (Base) Report Chart";
}
// -----------------------------------------------------------------------------
::rtl::OUString XMLReportFilterHelper::getMediaType(bool )
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index f4354c1..3ce9acd 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -383,8 +383,7 @@ bool DataInterpreter::HasCategories(
GetProperty( rArguments, C2U(("HasCategories"))) >>= bHasCategories;
for( sal_Int32 nLSeqIdx=0; ! bHasCategories && nLSeqIdx<rData.getLength(); ++nLSeqIdx )
- bHasCategories = ( rData[nLSeqIdx].is() &&
- GetRole( rData[nLSeqIdx]->getValues()).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")));
+ bHasCategories = ( rData[nLSeqIdx].is() && GetRole( rData[nLSeqIdx]->getValues() ) == "categories");
return bHasCategories;
}
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 4166b73..4c0b1ae 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -176,8 +176,7 @@ struct StaticErrorBarInfo : public rtl::StaticAggregate< uno::Reference< beans::
bool lcl_isInternalData( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{
uno::Reference< lang::XServiceInfo > xServiceInfo( xLSeq, uno::UNO_QUERY );
- return ( xServiceInfo.is() && xServiceInfo->getImplementationName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.chart2.LabeledDataSequence")));
+ return ( xServiceInfo.is() && xServiceInfo->getImplementationName() == "com.sun.star.comp.chart2.LabeledDataSequence" );
}
} // anonymous namespace
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 4566238..3988da4 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -101,29 +101,21 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
Reference< XRegressionCurve > xResult;
// todo: use factory methods with service name
- if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.LinearRegressionCurve" )))
+ if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
{
- xResult.set(
- new LinearRegressionCurve( xContext ));
+ xResult.set( new LinearRegressionCurve( xContext ) );
}
- else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.LogarithmicRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
{
- xResult.set(
- new LogarithmicRegressionCurve( xContext ));
+ xResult.set( new LogarithmicRegressionCurve( xContext ) );
}
- else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.ExponentialRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
{
- xResult.set(
- new ExponentialRegressionCurve( xContext ));
+ xResult.set( new ExponentialRegressionCurve( xContext ) );
}
- else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.PotentialRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
{
- xResult.set(
- new PotentialRegressionCurve( xContext ));
+ xResult.set( new PotentialRegressionCurve( xContext ) );
}
return xResult;
@@ -137,30 +129,25 @@ Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionC
Reference< XRegressionCurveCalculator > xResult;
// todo: use factory methods with service name
- if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.MeanValueRegressionCurve" )))
+ if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" )
{
- xResult.set( new MeanValueRegressionCurveCalculator());
+ xResult.set( new MeanValueRegressionCurveCalculator() );
}
- if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.LinearRegressionCurve" )))
+ if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
{
- xResult.set( new LinearRegressionCurveCalculator());
+ xResult.set( new LinearRegressionCurveCalculator() );
}
- else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.LogarithmicRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
{
- xResult.set( new LogarithmicRegressionCurveCalculator());
+ xResult.set( new LogarithmicRegressionCurveCalculator() );
}
- else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.ExponentialRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
{
- xResult.set( new ExponentialRegressionCurveCalculator());
+ xResult.set( new ExponentialRegressionCurveCalculator() );
}
- else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.chart2.PotentialRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
{
- xResult.set( new PotentialRegressionCurveCalculator());
+ xResult.set( new PotentialRegressionCurveCalculator() );
}
return xResult;
@@ -192,15 +179,12 @@ void RegressionCurveHelper::initializeCurveCalculator(
if( xProp->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole )
{
- if( bUseXValuesIfAvailable &&
- ! bXValuesFound &&
- aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values-x" )))
+ if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" )
{
aXValues = DataSequenceToDoubleSequence( xSeq );
bXValuesFound = true;
}
- else if( ! bYValuesFound &&
- aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values-y" )))
+ else if( !bYValuesFound && aRole == "values-y" )
{
aYValues = DataSequenceToDoubleSequence( xSeq );
bYValuesFound = true;
@@ -537,28 +521,23 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType(
{
::rtl::OUString aServiceName( xServName->getServiceName() );
- if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LinearRegressionCurve" )))
+ if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
{
eResult = REGRESSION_TYPE_LINEAR;
}
- else if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LogarithmicRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
{
eResult = REGRESSION_TYPE_LOG;
}
- else if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ExponentialRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
{
eResult = REGRESSION_TYPE_EXP;
}
- else if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.PotentialRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
{
eResult = REGRESSION_TYPE_POWER;
}
- else if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" )
{
eResult = REGRESSION_TYPE_MEAN_VALUE;
}
@@ -604,28 +583,23 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
return aResult;
OUString aServiceName( xServiceName->getServiceName());
- if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" )))
+ if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" )
{
aResult = ::chart::SchResId::getResString( STR_REGRESSION_MEAN );
}
- else if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LinearRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
{
aResult = ::chart::SchResId::getResString( STR_REGRESSION_LINEAR );
}
- else if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LogarithmicRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
{
aResult = ::chart::SchResId::getResString( STR_REGRESSION_LOG );
}
- else if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ExponentialRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
{
aResult = ::chart::SchResId::getResString( STR_REGRESSION_EXP );
}
- else if( aServiceName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.PotentialRegressionCurve" )))
+ else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
{
aResult = ::chart::SchResId::getResString( STR_REGRESSION_POWER );
}
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index d7d20e4..7dace0b 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -648,13 +648,11 @@ Assembly * TypeEmitter::type_resolve(
OUString uno_name( xType->getName() );
if (TypeClass_EXCEPTION == xType->getTypeClass())
{
- if (uno_name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.uno.Exception") ))
+ if ( uno_name == "com.sun.star.uno.Exception" )
{
return get_type_Exception();
}
- if (uno_name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.uno.RuntimeException") ))
+ if ( uno_name == "com.sun.star.uno.RuntimeException" )
{
return get_type_RuntimeException();
}
@@ -723,8 +721,7 @@ Assembly * TypeEmitter::type_resolve(
Reference< reflection::XInterfaceTypeDescription2 > const & xType )
{
OUString uno_name( xType->getName() );
- if (uno_name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ))
+ if ( uno_name == "com.sun.star.uno.XInterface" )
{
return __typeof (::System::Object);
}
@@ -750,8 +747,7 @@ Assembly * TypeEmitter::type_resolve(
Reference<reflection::XInterfaceTypeDescription2> xIfaceTd =
resolveInterfaceTypedef(seqBaseTypes[i]);
- if (xIfaceTd->getName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) == sal_False)
+ if ( xIfaceTd->getName() != "com.sun.star.uno.XInterface" )
{
vecBaseTypes.push_back(xIfaceTd);
}
@@ -867,8 +863,7 @@ Assembly * TypeEmitter::type_resolve(
Reference<reflection::XInterfaceTypeDescription2> aBaseType =
resolveInterfaceTypedef( seqBaseTypes[i]);
- if (aBaseType->getName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) == sal_False)
+ if ( aBaseType->getName() != "com.sun.star.uno.XInterface" )
{
::System::String * basetype_name = to_cts_name( aBaseType->getName() );
iface_entry * base_entry = dynamic_cast< iface_entry * >(
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index c910d8e..3fb843b 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -326,16 +326,14 @@ void SAL_CALL uno_ext_getMapping(
try
{
- if (from_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_CLI) ) &&
- to_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+ if ( from_env_typename == UNO_LB_CLI && to_env_typename == UNO_LB_UNO )
{
Bridge * bridge = new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1
mapping = &bridge->m_cli2uno;
uno_registerMapping(
&mapping, Bridge_free, pFrom, (uno_Environment *)pTo->pExtEnv, 0 );
}
- else if (from_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ) &&
- to_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_CLI) ))
+ else if ( from_env_typename == UNO_LB_UNO && to_env_typename == UNO_LB_CLI )
{
Bridge * bridge = new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1
mapping = &bridge->m_uno2cli;
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 64dad4d..b4eac78 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1587,9 +1587,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o)
inc();
sal_Int16 nBases = m_reader.getSuperTypeCount();
OSL_ASSERT(nBases > 0);
- if (nBases == 1
- && m_reader.getSuperTypeName(0).equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XInterface")))
+ if (nBases == 1 && m_reader.getSuperTypeName(0) == "com/sun/star/uno/XInterface" )
{
nBases = 0;
}
@@ -2215,9 +2213,7 @@ void InterfaceType::dumpExceptionSpecification(
rtl::OUString name(
m_reader.getMethodExceptionTypeName(
static_cast< sal_uInt16 >(methodIndex), i));
- if (!name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
- "com/sun/star/uno/RuntimeException")))
+ if ( name != "com/sun/star/uno/RuntimeException" )
{
if (!first) {
out << ", ";
@@ -2269,9 +2265,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames(
sal_uInt16 n = m_reader.getMethodExceptionCount(methodIndex);
for (sal_uInt16 i = 0; i < n; ++i) {
rtl::OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i));
- if (!name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
- "com/sun/star/uno/RuntimeException")))
+ if ( name != "com/sun/star/uno/RuntimeException" )
{
dumpExceptionTypeName(out, prefix, count++, name);
}
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 1453122..ddbb20c 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -2198,8 +2198,7 @@ void handleInterfaceType(
|| mflags == RT_MODE_ATTRIBUTE_SET)
&& reader.getMethodName(j) == attrNameUtf16)
{
- if (!reader.getMethodReturnTypeName(j).equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("void"))
+ if (reader.getMethodReturnTypeName(j) != "void"
|| reader.getMethodParameterCount(j) != 0
|| (mflags == RT_MODE_ATTRIBUTE_GET
? getter != SAL_MAX_UINT16
@@ -2895,8 +2894,7 @@ void handleService(
reader.getMethodName(i)));
bool defaultCtor = name.getLength() == 0;
if (reader.getMethodFlags(i) != RT_MODE_TWOWAY
- || (!reader.getMethodReturnTypeName(i).equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("void")))
+ || (reader.getMethodReturnTypeName(i) != "void")
|| (defaultCtor
&& (methods != 1 || reader.getMethodParameterCount(i) != 0
|| reader.getMethodExceptionCount(i) != 0)))
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 11786fa..2dc8a9b 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -291,9 +291,7 @@ void RecursiveTest::disposing(css::lang::EventObject const & Source)
void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt)
throw (css::uno::RuntimeException)
{
- CPPUNIT_ASSERT(
- evt.Source == properties_ &&
- evt.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label")));
+ CPPUNIT_ASSERT( evt.Source == properties_ && evt.PropertyName == "Label" );
if (count_ > 0) {
--count_;
step();
@@ -406,7 +404,7 @@ void Test::testKeySet() {
RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>=
s);
- CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("baa")));
+ CPPUNIT_ASSERT( s == "baa" );
}
void Test::testKeyReset() {
@@ -422,7 +420,7 @@ void Test::testKeyReset() {
RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>=
s);
- CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Foo")));
+ CPPUNIT_ASSERT( s == "Foo" );
}
}
@@ -436,8 +434,7 @@ void Test::testSetSetMemberName() {
".uno:FontworkShapeType")),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>=
s);
- CPPUNIT_ASSERT(
- s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Shape")));
+ CPPUNIT_ASSERT( s == "Fontwork Shape" );
css::uno::Reference< css::container::XNameAccess > access(
createUpdateAccess(
@@ -468,8 +465,7 @@ void Test::testSetSetMemberName() {
".uno:FontworkShapeType")),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>=
s);
- CPPUNIT_ASSERT(
- s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Gallery")));
+ CPPUNIT_ASSERT( s == "Fontwork Gallery" );
}
void Test::testReadCommands() {
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 54e20e4..5b40d30 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -221,7 +221,7 @@ Components & Components::getSingleton(
}
bool Components::allLocales(rtl::OUString const & locale) {
- return locale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"));
+ return locale == "*";
}
rtl::Reference< Node > Components::resolvePathRepresentation(
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 3f41805..940da36 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -259,12 +259,10 @@ Service::createInstanceWithArguments(
}
}
bool update;
- if (ServiceSpecifier.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(accessServiceName)))
+ if ( ServiceSpecifier == accessServiceName )
{
update = false;
- } else if (ServiceSpecifier.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(updateAccessServiceName)))
+ } else if ( ServiceSpecifier == updateAccessServiceName )
{
update = true;
} else {
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 04ec1b1..70c39f8 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -181,7 +181,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException)
// --------------------------------------------------------------------------------
sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url )
{
- return (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:local")) || url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise"))||url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))&& EApiInit();
+ return ( url == "sdbc:address:evolution:local" || url == "sdbc:address:evolution:groupwise" || url == "sdbc:address:evolution:ldap" ) && EApiInit();
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 2021e79..cb8a749 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -333,7 +333,7 @@ namespace connectivity { namespace hsqldb
{
Reference< XRow > xValueAccess( xTableHsqlType, UNO_QUERY_THROW );
::rtl::OUString sTableType = xValueAccess->getString( 1 );
- bIsTextTable = sTableType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TEXT" ) );
+ bIsTextTable = sTableType == "TEXT";
}
}
catch( const Exception& )
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 29e1a9e..89f5bb9 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -157,7 +157,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
//
sal_Int32 nLen = url.indexOf(':');
nLen = url.indexOf(':',nLen+1);
- OSL_ENSURE( url.copy( 0, nLen ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:address" ) ), "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" );
+ OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" );
::rtl::OUString aAddrbookURI(url.copy(nLen+1));
// Get Scheme
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index af3eb9e..32ae159 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -106,7 +106,7 @@ namespace connectivity
{
sal_Bool isOdbcUrl(const ::rtl::OUString& _sUrl)
{
- return _sUrl.copy(0,16).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:mysql:odbc:"));
+ return _sUrl.copy(0,16) == "sdbc:mysql:odbc:";
}
//--------------------------------------------------------------------
sal_Bool isNativeUrl(const ::rtl::OUString& _sUrl)
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index b0b5d1a..4cc9b15 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1475,7 +1475,7 @@ static void columnMetaData2DatabaseTypeDescription(
queryBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT oid,typtype,typname FROM pg_TYPE WHERE " ) );
while( rs->next() )
{
- if( row->getString( 9 ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("d")) && oidMap.find( row->getInt( 12 ) ) == oidMap.end() )
+ if( row->getString( 9 ) == "d" && oidMap.find( row->getInt( 12 ) ) == oidMap.end() )
{
oidMap[row->getInt(12)] = DatabaseTypeDescription();
if( domains )
@@ -1646,7 +1646,7 @@ static void columnMetaData2DatabaseTypeDescription(
row[1] <<= sNewSchema;
row[2] <<= sNewTable;
row[3] <<= xRow->getString(3);
- if( xRow->getString(8).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("d")) )
+ if( xRow->getString(8) == "d" )
{
DatabaseTypeDescription desc( domainMap[xRow->getInt(11)] );
type = typeNameToDataType( desc.typeName, desc.typeType );
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 415f2a4..404f1b8 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -308,9 +308,7 @@ void Test::testVoid() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -408,9 +406,7 @@ void Test::testBoolean() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -509,9 +505,7 @@ void Test::testByte() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -610,9 +604,7 @@ void Test::testShort() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -713,9 +705,7 @@ void Test::testUnsignedShort() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -810,9 +800,7 @@ void Test::testLong() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -907,9 +895,7 @@ void Test::testUnsignedLong() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1004,9 +990,7 @@ void Test::testHyper() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1101,9 +1085,7 @@ void Test::testUnsignedHyper() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1198,9 +1180,7 @@ void Test::testFloat() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1295,9 +1275,7 @@ void Test::testDouble() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1397,9 +1375,7 @@ void Test::testChar() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1494,9 +1470,7 @@ void Test::testString() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- (a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", (a >>= b) && b == "1" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1591,9 +1565,7 @@ void Test::testType() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1689,9 +1661,7 @@ void Test::testSequence() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1792,9 +1762,7 @@ void Test::testEnum() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1893,9 +1861,7 @@ void Test::testStruct() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -1949,10 +1915,7 @@ void Test::testStruct() {
void Test::testPoly() {
css::uno::Any a;
a <<= Poly< css::uno::Sequence< ::sal_Unicode > >();
- CPPUNIT_ASSERT_MESSAGE(
- "type name",
- a.getValueType().getTypeName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("Poly<[]char>")));
+ CPPUNIT_ASSERT_MESSAGE( "type name", a.getValueType().getTypeName() == "Poly<[]char>" );
CPPUNIT_ASSERT_MESSAGE(
"constructor",
a == css::uno::Any(Poly< css::uno::Sequence< ::sal_Unicode > >()));
@@ -2018,9 +1981,7 @@ void Test::testException() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -2136,9 +2097,7 @@ void Test::testInterface() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
@@ -2252,9 +2211,7 @@ void Test::testNull() {
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
- CPPUNIT_ASSERT_MESSAGE(
- "rtl::OUString",
- !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")));
+ CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(getCppuType< rtl::OUString >());
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 7a4d493..47ca98f 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -217,8 +217,7 @@ inline InterfaceEntry * ObjectEntry::find(
OUString const & type_name =
OUString::unacquired(
&((typelib_TypeDescription *) pTypeDescr_)->pTypeName );
- if (type_name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ))
+ if ( type_name == "com.sun.star.uno.XInterface" )
{
return &aInterfaces[ 0 ];
}
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 0dab901..f7aad32 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -427,7 +427,7 @@ static Mapping loadExternalMapping(
oslModule hModule = 0;
OUString aName;
- if (EnvDcp::getTypeName(rFrom.getTypeName()).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+ if ( EnvDcp::getTypeName(rFrom.getTypeName()) == UNO_LB_UNO )
hModule = loadModule( aName = getBridgeName( rTo, rFrom, rAddPurpose ) );
if (! hModule)
hModule = loadModule( aName = getBridgeName( rFrom, rTo, rAddPurpose ) );
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index 2e5e952..1759c4a 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -72,7 +72,7 @@ static inline void checkInterface( Type const & rType )
//--------------------------------------------------------------------------------------------------
static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW(())
{
- return (((OUString const *)&pStr)->equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) != sal_False);
+ return (*((OUString const *)&pStr) == "com.sun.star.uno.XInterface");
}
//--------------------------------------------------------------------------------------------------
static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(())
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index e4cddeb..85a4d80 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -219,9 +219,7 @@ void Data::initProperties(
// works if the specified exceptions are of the exact type, not
// of a supertype:
for (sal_Int32 j = 0; j < excs.getLength(); ++j) {
- if (excs[j]->getName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.beans.UnknownPropertyException")))
+ if ( excs[j]->getName() == "com.sun.star.beans.UnknownPropertyException" )
{
getUnknown = true;
break;
@@ -229,15 +227,10 @@ void Data::initProperties(
}
excs = attr->getSetExceptions();
for (sal_Int32 j = 0; j < excs.getLength(); ++j) {
- if (excs[j]->getName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.beans.UnknownPropertyException")))
+ if ( excs[j]->getName() == "com.sun.star.beans.UnknownPropertyException" )
{
setUnknown = true;
- } else if (excs[j]->getName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.beans."
- "PropertyVetoException")))
+ } else if ( excs[j]->getName() == "com.sun.star.beans.PropertyVetoException" )
{
attrAttribs
|= css::beans::PropertyAttribute::CONSTRAINED;
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index ff4f417..db8835f 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -256,8 +256,7 @@ static void add_access_control_entries(
"single-user-id");
entry.value <<= ac_user;
context_values.push_back( entry );
- if (! ac_mode.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("single-user") ))
+ if ( ac_mode != "single-user" )
{
throw SecurityException(
OUSTR("set UNO_AC=single-user "
@@ -267,8 +266,7 @@ static void add_access_control_entries(
}
else
{
- if (! ac_mode.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("single-default-user") ))
+ if ( ac_mode != "single-default-user" )
{
throw SecurityException(
OUSTR("set UNO_AC=single-default-user "
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 2dd1d57..ac976be 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -113,14 +113,14 @@ ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SA
OSL_VERIFY( n == 13 );
OSL_VERIFY( m_xContext->getValueByName(
OUSTR("/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop1") ) >>= val );
- OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("value of serviceprop1") ) );
+ OSL_VERIFY( val == "value of serviceprop1" );
// impl properties
OSL_VERIFY( m_xContext->getValueByName(
OUSTR("/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop0") ) >>= n );
OSL_VERIFY( n == 15 );
OSL_VERIFY( m_xContext->getValueByName(
OUSTR("/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop1") ) >>= val );
- OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("value of implprop1") ) );
+ OSL_VERIFY( val == "value of implprop1" );
}
// XInitialization
//__________________________________________________________________________________________________
@@ -131,11 +131,11 @@ void ServiceImpl0::initialize( const Sequence< Any >& rArgs )
OUString val;
OSL_VERIFY( rArgs.getLength() == 3 );
OSL_VERIFY( rArgs[ 0 ] >>= val );
- OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("first argument") ) );
+ OSL_VERIFY( val == "first argument" );
OSL_VERIFY( rArgs[ 1 ] >>= val );
- OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("second argument") ) );
+ OSL_VERIFY( val == "second argument" );
OSL_VERIFY( rArgs[ 2 ] >>= val );
- OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("third argument") ) );
+ OSL_VERIFY( val == "third argument" );
}
// XServiceInfo
//__________________________________________________________________________________________________
diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx
index cfeeb51..f38f261 100644
--- a/cppuhelper/test/testimplhelper.cxx
+++ b/cppuhelper/test/testimplhelper.cxx
@@ -349,24 +349,24 @@ static void dotest( const Reference< XInterface > & xOriginal )
}
Reference< A > xa( xOriginal, UNO_QUERY );
- OSL_ENSURE( xa->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### A failed!" );
+ OSL_ENSURE( xa->a() == "a", "### A failed!" );
Reference< BA > xba( xa, UNO_QUERY );
- OSL_ENSURE( xba->ba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ba") ), "### BA failed!" );
- OSL_ENSURE( xba->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### BA failed!" );
+ OSL_ENSURE( xba->ba() == "ba", "### BA failed!" );
+ OSL_ENSURE( xba->a() == "a" ), "### BA failed!" );
Reference< CA > xca( xba, UNO_QUERY );
- OSL_ENSURE( xca->ca().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ca") ), "### CA failed!" );
- OSL_ENSURE( xca->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### CA failed!" );
+ OSL_ENSURE( xca->ca() == "ca", "### CA failed!" );
+ OSL_ENSURE( xca->a() == "a", "### CA failed!" );
Reference< DBA > xdba( xca, UNO_QUERY );
- OSL_ENSURE( xdba->dba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dba") ), "### DBA failed!" );
- OSL_ENSURE( xdba->ba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ba") ), "### DBA failed!" );
- OSL_ENSURE( xdba->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### DBA failed!" );
+ OSL_ENSURE( xdba->dba() == "dba", "### DBA failed!" );
+ OSL_ENSURE( xdba->ba() == "ba", "### DBA failed!" );
+ OSL_ENSURE( xdba->a() == "a", "### DBA failed!" );
Reference< E > xe( xdba, UNO_QUERY );
- OSL_ENSURE( xe->e().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("e") ), "### E failed!" );
+ OSL_ENSURE( xe->e() == "e", "### E failed!" );
Reference< FE > xfe( xe, UNO_QUERY );
- OSL_ENSURE( xfe->fe().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("fe") ), "### FE failed!" );
+ OSL_ENSURE( xfe->fe() == "fe", "### FE failed!" );
Reference< G > xg( xfe, UNO_QUERY );
- OSL_ENSURE( xg->g().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("g") ), "### G failed!" );
- OSL_ENSURE( xg->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### G failed!" );
+ OSL_ENSURE( xg->g() == "g", "### G failed!" );
+ OSL_ENSURE( xg->a() == "a", "### G failed!" );
// type provider
Reference< lang::XTypeProvider > xProv( xg, UNO_QUERY );
@@ -466,16 +466,16 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
dotest( xWeakImpl );
Reference< H > xH( xWeakImpl, UNO_QUERY );
Reference< I > xI( xH, UNO_QUERY );
- OSL_ASSERT( xH->h().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("h") ) );
- OSL_ASSERT( xI->i().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("i") ) );
+ OSL_ASSERT( xH->h() == "h" );
+ OSL_ASSERT( xI->i() == "i" );
xWeakAggImpl = (OWeakObject *)new TestAggImplInh();
Reference< lang::XTypeProvider > xTP7( xWeakAggImpl, UNO_QUERY );
dotest( xWeakAggImpl );
xH.set( xWeakAggImpl, UNO_QUERY );
xI.set( xH, UNO_QUERY );
- OSL_ASSERT( xH->h().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("h2") ) );
- OSL_ASSERT( xI->i().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("i2") ) );
+ OSL_ASSERT( xH->h() == "h2" );
+ OSL_ASSERT( xI->i() == "i2" );
//
OSL_ASSERT(
@@ -545,8 +545,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
}
catch (RuntimeException & rExc)
{
- OSL_ENSURE( rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("runtime exc") ) && rExc.Context == xImpl,
- "### unexpected exception content!" );
+ OSL_ENSURE( rExc.Message == "runtime exc" && rExc.Context == xImpl, "### unexpected exception content!" );
try
{
throwException( makeAny( Exception(
@@ -558,8 +557,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
}
catch (Exception & rExc2)
{
- OSL_ENSURE( rExc2.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("exc") ) && rExc2.Context == xImpl,
- "### unexpected exception content!" );
+ OSL_ENSURE( rExc2.Message == "exc" && rExc2.Context == xImpl, "### unexpected exception content!" );
try
{
throwException( makeAny( lang::IllegalAccessException(
@@ -567,8 +565,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
}
catch (lang::IllegalAccessException & rExc3)
{
- OSL_ENSURE( rExc3.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("axxess exc") ) && rExc3.Context == xImpl,
- "### unexpected exception content!" );
+ OSL_ENSURE( rExc3.Message == "axxess exc" && rExc3.Context == xImpl, "### unexpected exception content!" );
return;
}
}
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index a3ea100..a522f2d 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -534,9 +534,7 @@ Reference< XInterface > OInstanceProvider::getInstance( const OUString & rName )
if (_aImplName.isEmpty() && _aServiceName.isEmpty())
{
- OSL_ASSERT(
- rName.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("uno.ComponentContext") ) );
+ OSL_ASSERT( rName == "uno.ComponentContext" );
xRet = _xContext;
}
else if (_bSingleInstance)
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index cf27750..5624c73 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -404,9 +404,7 @@ SvxConfigPage::CanConfig( const OUString& aModuleId )
{
OSL_TRACE("SupportsDocumentConfig: %s", PRTSTR(aModuleId));
- if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.script.BasicIDE" ) )
- || aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.frame.Bibliography" ) )
- )
+ if ( aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography" )
{
return sal_False;
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 02055ae..f626d9e 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -801,9 +801,7 @@ Image SfxConfigGroupListBox_Impl::GetImage(
moduleDescr.getConstArray();
for ( sal_Int32 pos = moduleDescr.getLength(); pos--; )
{
- if (pmoduleDescr[ pos ].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
- "ooSetupFactoryEmptyDocumentURL") ))
+ if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" )
{
pmoduleDescr[ pos ].Value >>= factoryURL;
OSL_TRACE("factory url for doc images is %s",
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index de928dd..6343692 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -315,7 +315,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
Sequence< Reference< browse::XBrowseNode > > children =
_rxRootNode->getChildNodes();
- sal_Bool bIsRootNode = _rxRootNode->getName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Root"));
+ sal_Bool bIsRootNode = _rxRootNode->getName() == "Root";
/* To mimic current starbasic behaviour we
need to make sure that only the current document
@@ -586,7 +586,7 @@ Image SvxConfigGroupListBox_Impl::GetImage(
Image aImage;
if ( bIsRootNode )
{
- if ( node->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) || node->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "share" ) ) )
+ if ( node->getName() == "user" || node->getName() == "share" )
{
aImage = m_hdImage;
}
@@ -619,9 +619,7 @@ Image SvxConfigGroupListBox_Impl::GetImage(
moduleDescr.getConstArray();
for ( sal_Int32 pos = moduleDescr.getLength(); pos--; )
{
- if (pmoduleDescr[ pos ].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
- "ooSetupFactoryEmptyDocumentURL") ))
+ if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" )
{
pmoduleDescr[ pos ].Value >>= factoryURL;
break;
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index f0bfdef..3ee3e8f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -169,10 +169,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
rtl::OUStringBuffer sText(m_aVendorTextStr);
sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
- sal_uInt32 nCopyrightId =
- utl::ConfigManager::getProductName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("LibreOffice"))
- ? ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED;
+ sal_uInt32 nCopyrightId = utl::ConfigManager::getProductName() == "LibreOffice" ? ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED;
String aProductCopyrightTextStr(ResId(nCopyrightId, *rId.GetResMgr()));
sText.append(aProductCopyrightTextStr);
sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 3531a20..0e3af31 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -197,15 +197,15 @@ void SvxHyperlinkNewDocTp::FillDocumentList ()
rDynamicMenuEntry[e].Value >>= aTargetName;
}
//#i96822# business cards, labels and database should not be inserted here
- if( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/swriter?slot=21051" ) ) ||
- aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/swriter?slot=21052" )) ||
- aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/sdatabase?Interactive" )))
+ if( aDocumentUrl == "private:factory/swriter?slot=21051" ||
+ aDocumentUrl == "private:factory/swriter?slot=21052" ||
+ aDocumentUrl == "private:factory/sdatabase?Interactive" )
continue;
// Insert into listbox
if ( !aDocumentUrl.isEmpty() )
{
- if ( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/simpress?slot=6686" ) ) ) // SJ: #106216# do not start
+ if ( aDocumentUrl == "private:factory/simpress?slot=6686" ) // SJ: #106216# do not start
aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress
// insert private-url and default-extension as user-data
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 0970951..30be39a 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -243,9 +243,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
moduleDescr.getConstArray();
for ( sal_Int32 pos = moduleDescr.getLength(); pos--; )
{
- if (pmoduleDescr[ pos ].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(
- "ooSetupFactoryEmptyDocumentURL") ))
+ if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" )
{
pmoduleDescr[ pos ].Value >>= factoryURL;
break;
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 62f38c2..ef34486 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -131,7 +131,7 @@ String ConvertToUIName_Impl( SvxMacro *pMacro )
{
String aName( pMacro->GetMacName() );
String aEntry;
- if ( ! pMacro->GetLanguage().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("JavaScript")) )
+ if ( pMacro->GetLanguage() != "JavaScript" )
{
sal_uInt16 nCount = comphelper::string::getTokenCount(aName, '.');
aEntry = aName.GetToken( nCount-1, '.' );
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 8fb0d6a..fe3a2b1 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -360,7 +360,7 @@ void OKeySet::executeStatement(::rtl::OUStringBuffer& io_aFilter,const ::rtl::OU
for(;pAnd != pAndEnd;++pAnd)
{
::rtl::OUString sValue;
- if ( !(pAnd->Value >>= sValue) || !(sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("?")) || sValue.matchAsciiL(":",1,0)) )
+ if ( !(pAnd->Value >>= sValue) || !( sValue == "?" || sValue.matchAsciiL( ":",1,0 ) ) )
{ // we have a criteria which has to be taken into account for updates
m_aFilterColumns.push_back(pAnd->Name);
}
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index e80093e..2e69373 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -681,9 +681,7 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUStr
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::createInstance" );
Reference< XServiceInfo > xRet;
- if ( ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier )
- || ( _sServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) ) )
- )
+ if ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier || _sServiceSpecifier == "com.sun.star.sdb.SingleSelectQueryAnalyzer" )
{
xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext );
m_aComposers.push_back(WeakReferenceHelper(xRet));
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 27dbacc..f533642 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2046,7 +2046,7 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewControlle
Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const ::rtl::OUString& _ViewName, const Sequence< PropertyValue >& _Arguments, const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException)
{
- if ( !_ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Default" ) ) && !_ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) ) )
+ if ( _ViewName != "Default" && _ViewName != "Preview" )
throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
if ( !_Frame.is() )
throw IllegalArgumentException( ::rtl::OUString(), *this, 3 );
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index bf95e7c..fa81893 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -614,7 +614,7 @@ void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const
void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException)
{
ClearableMutexGuard aGuard(m_aMutex);
- if(evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ))
+ if( evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName == "Title" )
{
m_bInPropertyChange = sal_True;
try
@@ -641,7 +641,7 @@ void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& a
{
MutexGuard aGuard(m_aMutex);
- if(aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+ if( aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" )
{
::rtl::OUString sNewName;
aEvent.NewValue >>= sNewName;
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index 9d5420f..df1a60f 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -190,10 +190,7 @@ namespace dbaccess
// no script is assigned to this event
return;
- bool bDispatchScriptURL =
- ( sEventType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) )
- || sEventType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Service" ) )
- );
+ bool bDispatchScriptURL = ( sEventType == "Script" || sEventType == "Service" );
bool bNonEmptyScript = !sScript.isEmpty();
OSL_ENSURE( bDispatchScriptURL && bNonEmptyScript,
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 255fd93..541c921 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -278,7 +278,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum
::rtl::OUString aRole;
if ( xSeqProp.is()
&& ( xSeqProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" ) ) ) >>= aRole )
- && aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "categories" ) )
+ && aRole == "categories"
)
{
bHasCategories = sal_True;
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 965c2f8..1490f2a 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -231,7 +231,7 @@ namespace dbaccess
continue;
// the only section we support so far is "storages"
- if ( !sCurrentSection.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "storages" ) ) )
+ if ( sCurrentSection != "storages" )
{
bCurrentSectionIsKnownToBeUnsupported = true;
continue;
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index 3b22a20..dab6036 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -117,7 +117,7 @@ namespace dbaccess
o_rLocalName = i_rElementName.copy( nSeparatorPos + 1 );
}
- OSL_ENSURE( o_rNamespace.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config" ) ), "SettingsImport::split: unexpected namespace!" );
+ OSL_ENSURE( o_rNamespace == "config", "SettingsImport::split: unexpected namespace!" );
// our recovery file is kind of hand-made, so there shouldn't be anything else than "config".
// If there is, then just ignore it ...
}
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 5da4555..1013551 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -332,7 +332,7 @@ namespace dbmm
bool bCausedByNewStyleReport =
( _rDocument.eType == eReport )
&& ( aError.isExtractableTo( ::cppu::UnoType< WrongFormatException >::get() ) )
- && ( lcl_getMimeType_nothrow( _rDocument.xCommandProcessor ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.sun.xml.report" ) ) );
+ && ( lcl_getMimeType_nothrow( _rDocument.xCommandProcessor ) == "application/vnd.sun.xml.report" );
if ( bCausedByNewStyleReport )
{
@@ -1636,9 +1636,7 @@ namespace dbmm
Any aException;
try
{
- if ( !_rScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) )
- || _rScriptType.isEmpty()
- )
+ if ( _rScriptType != "Script" || _rScriptType.isEmpty() )
{
OSL_FAIL(
"MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: no or unknown script type!" );
@@ -1669,7 +1667,7 @@ namespace dbmm
::rtl::OUString sLocation = xUri->getParameter(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "location" ) ) );
- if ( !sLocation.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "document" ) ) )
+ if ( sLocation != "document" )
{
// only document libraries must be migrated, of course
return false;
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 1e5aa44..df140ed 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -165,7 +165,7 @@ DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFac
{
::rtl::OUString sMediaType;
xStorageProperties->getPropertyValue( INFO_MEDIATYPE ) >>= sMediaType;
- if ( sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII)) || sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_VND_SUN_XML_BASE_ASCII)) )
+ if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII || sMediaType == MIMETYPE_VND_SUN_XML_BASE_ASCII )
{
if ( bStreamFromDescr && sURL.compareTo( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) ), 14 ) != COMPARE_EQUAL )
{
@@ -346,7 +346,7 @@ namespace
URL aURL;
aURL.Complete = _rURL;
xTransformer->parseStrict( aURL );
- bDoesAllow = aURL.Arguments.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Interactive" ) );
+ bDoesAllow = aURL.Arguments == "Interactive";
}
}
catch( const Exception& )
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index 8916e2f..5cbaaf6 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -90,7 +90,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
m_sHelpMessage = sValue;
break;
case XML_TOK_COLUMN_VISIBILITY:
- m_bHidden = !sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("visible"));
+ m_bHidden = sValue != "visible";
break;
case XML_TOK_COLUMN_TYPE_NAME:
sType = sValue;
@@ -101,7 +101,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
m_aDefaultValue <<= sValue;
break;
case XML_TOK_COLUMN_VISIBLE:
- m_bHidden = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("false"));
+ m_bHidden = sValue == "false";
break;
case XML_TOK_DEFAULT_CELL_STYLE_NAME:
m_sCellStyleName = sValue;
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index bbe086f..5147b34 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -72,7 +72,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
case XML_TOK_DATA_SOURCE_SETTING_IS_LIST:
- m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
+ m_bIsList = sValue == "true";
break;
case XML_TOK_DATA_SOURCE_SETTING_TYPE:
{
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index 1b93b9f..3b011eb 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -76,7 +76,7 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport
m_sCommand = sValue;
break;
case XML_TOK_ESCAPE_PROCESSING:
- m_bEscapeProcessing = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
+ m_bEscapeProcessing = sValue == "true";
break;
}
}
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index b2dfb33..d3460f5 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -90,10 +90,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
if ( !sType.isEmpty() )
{
::rtl::OUStringBuffer sURL;
- if ( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysql:jdbc" ) )
- || sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysqlc" ) )
- || sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysql:mysqlc" ) )
- )
+ if ( sType == "sdbc:mysql:jdbc" || sType == "sdbc:mysqlc" || sType == "sdbc:mysql:mysqlc" )
{
sURL.append( sType );
sURL.append( sal_Unicode( ':' ) );
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 8f5ae40..47d0b23 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -91,10 +91,10 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
m_sStyleName = sValue;
break;
case XML_TOK_APPLY_FILTER:
- m_bApplyFilter = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
+ m_bApplyFilter = sValue == "true";
break;
case XML_TOK_APPLY_ORDER:
- m_bApplyOrder = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
+ m_bApplyOrder = sValue == "true";
break;
}
}
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 30cbad8..36dacbc 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -151,7 +151,7 @@ bool ObjectCopySource::isView() const
{
::rtl::OUString sObjectType;
OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_TYPE ) >>= sObjectType );
- bIsView = sObjectType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VIEW" ) );
+ bIsView = sObjectType == "VIEW";
}
}
catch( const Exception& )
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 92da668..4c27e53 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -136,8 +136,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
"system.desktop-environment" ) )
);
rtl::OUString aDesktopEnvironment;
- if ((aValue >>= aDesktopEnvironment)
- && aDesktopEnvironment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")))
+ if ( (aValue >>= aDesktopEnvironment) && aDesktopEnvironment == "GNOME" )
{
Reference<XContentProviderManager> xCPM =
cb->getContentProviderManagerInterface();
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index e62315b..60d40af 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -596,56 +596,56 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
{
AddStringListParam_Impl( CMD_STRINGPARAM_LANGUAGE, oArg.copy(RTL_CONSTASCII_LENGTH("language=")) );
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "writer" )) == sal_True )
+ else if ( oArg == "writer" )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WRITER );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_WRITER, sal_True );
m_bDocumentArgs = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "calc" )) == sal_True )
+ else if ( oArg == "calc" )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_CALC );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_CALC, sal_True );
m_bDocumentArgs = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "draw" )) == sal_True )
+ else if ( oArg == "draw" )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_DRAW );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_DRAW, sal_True );
m_bDocumentArgs = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "impress" )) == sal_True )
+ else if ( oArg == "impress" )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_IMPRESS );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_IMPRESS, sal_True );
m_bDocumentArgs = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "base" )) == sal_True )
+ else if ( oArg == "base" )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_BASE );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_BASE, sal_True );
m_bDocumentArgs = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "global" )) == sal_True )
+ else if ( oArg == "global" )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_GLOBAL );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_GLOBAL, sal_True );
m_bDocumentArgs = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "math" )) == sal_True )
+ else if ( oArg == "math" )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_MATH );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_MATH, sal_True );
m_bDocumentArgs = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "web" )) == sal_True )
+ else if ( oArg == "web" )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WEB );
if ( !bAlreadySet )
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 572b91e..ec2c40a 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -139,14 +139,9 @@ void PackageManagerImpl::initActivationLayer(
Reference<sdbc::XRow> xRow( xResultSet, UNO_QUERY_THROW );
OUString title( xRow->getString( 1 /* Title */ ) );
// xxx todo: remove workaround for tdoc
- if (title.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "this_is_a_dummy_stream_just_there_"
- "as_a_workaround_for_a_"
- "temporary_limitation_of_the_"
- "storage_api_implementation") ))
+ if ( title == "this_is_a_dummy_stream_just_there_as_a_workaround_for_a_temporary_limitation_of_the_storage_api_implementation" )
continue;
- if (title.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "META-INF") ) )
+ if ( title == "META-INF" )
continue;
::ucbhelper::Content sourceContent(
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 710eea8..e7de531 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -118,28 +118,19 @@ check(dp_misc::DescriptionInfoset const & infoset) {
css::uno::Reference< css::xml::dom::XElement > e(
deps->item(i), css::uno::UNO_QUERY_THROW);
bool sat = false;
- if (e->getNamespaceURI().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg))
- && e->getTagName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(minimalVersionOpenOfficeOrg)))
+ if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName() == minimalVersionOpenOfficeOrg )
{
sat = satisfiesMinimalVersion(
getReferenceOpenOfficeOrgMajorMinor(),
e->getAttribute(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
- } else if (e->getNamespaceURI().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg))
- && e->getTagName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(maximalVersionOpenOfficeOrg)))
+ } else if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName() == maximalVersionOpenOfficeOrg )
{
sat = satisfiesMaximalVersion(
getReferenceOpenOfficeOrgMajorMinor(),
e->getAttribute(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
- } else if (e->getNamespaceURI().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(namespaceLibreOffice))
- && e->getTagName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(minimalVersionLibreOffice)))
+ } else if (e->getNamespaceURI() == namespaceLibreOffice && e->getTagName() == minimalVersionLibreOffice )
{
sat = satisfiesMinimalVersion(
getLibreOfficeMajorMinorMicro(),
@@ -173,30 +164,21 @@ rtl::OUString getErrorText(
css::uno::Reference< css::xml::dom::XElement > const & dependency)
{
OSL_ASSERT(dependency.is());
- if (dependency->getNamespaceURI().equalsAsciiL(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list