[Libreoffice-commits] .: basic/source canvas/source chart2/source configmgr/source connectivity/source cppuhelper/source cppu/source cui/source dbaccess/source desktop/source editeng/source filter/source forms/source framework/source i18npool/source linguistic/source lotuswordpro/source odk/examples oox/source package/source reportdesign/source sal/qa sal/test scripting/source sc/source sdext/source sd/source sfx2/source slideshow/source sot/source stoc/source stoc/test svl/source svtools/source svx/source svx/workben sw/qa sw/source tools/source ucb/source unotools/source unoxml/source vbahelper/source vcl/generic vcl/source vcl/unx writerfilter/source xmlhelp/source xmloff/source xmlscript/source xmlsecurity/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Apr 6 06:07:51 PDT 2012
basic/source/uno/namecont.cxx | 4
canvas/source/tools/parametricpolypolygon.cxx | 20
chart2/source/controller/main/ChartDropTargetHelper.cxx | 2
chart2/source/controller/main/CommandDispatchContainer.cxx | 2
chart2/source/model/main/ChartModel_Persistence.cxx | 2
configmgr/source/components.cxx | 2
configmgr/source/type.cxx | 6
connectivity/source/commontools/dbtools2.cxx | 2
connectivity/source/drivers/evoab2/NConnection.cxx | 4
connectivity/source/drivers/hsqldb/HDriver.cxx | 4
connectivity/source/drivers/postgresql/pq_connection.cxx | 8
connectivity/source/drivers/postgresql/pq_xkeys.cxx | 4
cppu/source/uno/lbenv.cxx | 4
cppuhelper/source/component_context.cxx | 12
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/factory/dlgfact.cxx | 8
cui/source/tabpages/numpages.cxx | 12
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 6
dbaccess/source/filter/xml/xmlDataSource.cxx | 8
dbaccess/source/filter/xml/xmlExport.cxx | 10
dbaccess/source/ui/app/AppController.cxx | 6
dbaccess/source/ui/control/toolboxcontroller.cxx | 2
dbaccess/source/ui/misc/dsmeta.cxx | 4
desktop/source/app/configinit.cxx | 2
desktop/source/app/desktopcontext.cxx | 2
desktop/source/deployment/manager/dp_managerfac.cxx | 6
desktop/source/deployment/registry/dp_backend.cxx | 10
desktop/source/migration/migration.cxx | 16
desktop/source/migration/services/jvmfwk.cxx | 10
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 8
editeng/source/uno/unofield.cxx | 16
editeng/source/uno/unonrule.cxx | 32 -
filter/source/config/cache/filtercache.cxx | 2
filter/source/config/cache/filterfactory.cxx | 14
filter/source/config/cache/typedetection.cxx | 6
filter/source/odfflatxml/OdfFlatXml.cxx | 8
filter/source/pdf/pdffilter.cxx | 2
filter/source/svg/svgexport.cxx | 2
filter/source/xsltfilter/OleHandler.cxx | 4
filter/source/xsltfilter/XSLTFilter.cxx | 18
forms/source/xforms/xpathlib/extension.cxx | 4
framework/source/accelerators/acceleratorconfiguration.cxx | 42 -
framework/source/classes/fwktabwindow.cxx | 12
framework/source/dispatch/closedispatcher.cxx | 8
framework/source/dispatch/dispatchprovider.cxx | 2
framework/source/dispatch/startmoduledispatcher.cxx | 2
framework/source/fwe/xml/menudocumenthandler.cxx | 12
framework/source/fwi/uielement/constitemcontainer.cxx | 2
framework/source/helper/titlebarupdate.cxx | 8
framework/source/helper/uiconfigelementwrapperbase.cxx | 14
framework/source/layoutmanager/layoutmanager.cxx | 8
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 4
framework/source/lomenubar/FrameJob.cxx | 4
framework/source/services/autorecovery.cxx | 32 -
framework/source/services/sessionlistener.cxx | 10
framework/source/uiconfiguration/imagemanagerimpl.cxx | 6
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2
framework/source/uiconfiguration/windowstateconfiguration.cxx | 2
framework/source/uielement/menubarmanager.cxx | 4
framework/source/uielement/menubarwrapper.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 2
framework/source/uielement/statusbarmanager.cxx | 12
framework/source/uielement/toolbarmanager.cxx | 28 -
framework/source/uifactory/menubarfactory.cxx | 8
i18npool/source/calendar/calendar_gregorian.cxx | 2
i18npool/source/indexentry/indexentrysupplier_asian.cxx | 4
i18npool/source/localedata/LocaleNode.cxx | 30 -
linguistic/source/convdic.cxx | 2
linguistic/source/lngprophelp.cxx | 2
lotuswordpro/source/filter/lwpfilter.cxx | 14
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx | 8
odk/examples/cpp/complextoolbarcontrols/MyListener.cxx | 6
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 2
oox/source/drawingml/shape.cxx | 4
oox/source/export/chartexport.cxx | 12
oox/source/ole/axfontdata.cxx | 2
oox/source/ole/olehelper.cxx | 4
oox/source/ppt/timenodelistcontext.cxx | 6
oox/source/vml/vmlshape.cxx | 4
package/source/zippackage/ZipPackageFolder.cxx | 6
reportdesign/source/filter/xml/dbloader2.cxx | 2
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 22
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 14
reportdesign/source/ui/misc/statusbarcontroller.cxx | 8
reportdesign/source/ui/misc/toolboxcontroller.cxx | 14
sal/qa/rtl/bootstrap/bootstrap_process.cxx | 12
sal/test/unloading/unloadTest.cxx | 2
sc/source/core/data/documen5.cxx | 8
sc/source/core/data/tabprotection.cxx | 4
sc/source/core/tool/appoptio.cxx | 2
sc/source/core/tool/interpr1.cxx | 20
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2
sc/source/ui/dbgui/foptmgr.cxx | 2
sc/source/ui/docshell/dbdocfun.cxx | 2
sc/source/ui/namedlg/namemgrtable.cxx | 2
sc/source/ui/undo/undoutil.cxx | 2
sc/source/ui/unoobj/chart2uno.cxx | 26 -
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/nameuno.cxx | 4
sc/source/ui/unoobj/scdetect.cxx | 20
sc/source/ui/unoobj/styleuno.cxx | 6
scripting/source/basprov/basmethnode.cxx | 2
scripting/source/dlgprov/dlgprov.cxx | 4
sd/source/core/stlfamily.cxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 10
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 16
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 4
sd/source/ui/animations/CustomAnimationPane.cxx | 38 -
sd/source/ui/dlg/dlgass.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 30 -
sd/source/ui/tools/EventMultiplexer.cxx | 4
sd/source/ui/unoidl/sddetect.cxx | 20
sd/source/ui/unoidl/unolayer.cxx | 10
sd/source/ui/unoidl/unomodel.cxx | 12
sdext/source/minimizer/fileopendialog.cxx | 2
sdext/source/minimizer/informationdialog.cxx | 2
sdext/source/pdfimport/test/tests.cxx | 2
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 4
sdext/source/presenter/PresenterScreen.cxx | 4
sdext/source/presenter/PresenterToolBar.cxx | 14
sfx2/source/appl/appuno.cxx | 108 ++--
sfx2/source/appl/sfxhelp.cxx | 6
sfx2/source/appl/shutdowniconunx.cxx | 4
sfx2/source/bastyp/fltfnc.cxx | 24 -
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/doc/plugin.cxx | 12
sfx2/source/doc/sfxbasemodel.cxx | 32 -
sfx2/source/notify/eventsupplier.cxx | 26 -
sfx2/source/view/sfxbasecontroller.cxx | 6
sfx2/source/view/viewprn.cxx | 10
slideshow/source/engine/slideshowimpl.cxx | 2
sot/source/sdstor/ucbstorage.cxx | 6
stoc/source/inspect/introspection.cxx | 8
stoc/source/javavm/javavm.cxx | 8
stoc/source/security/access_controller.cxx | 10
stoc/source/security/permissions.cxx | 4
stoc/source/servicemanager/servicemanager.cxx | 10
stoc/source/tdmanager/tdmgr.cxx | 30 -
stoc/test/security/test_security.cxx | 2
stoc/test/testiadapter.cxx | 80 +--
svl/source/fsstor/fsstorage.cxx | 4
svl/source/items/macitem.cxx | 4
svtools/source/filter/SvFilterOptionsDialog.cxx | 6
svtools/source/filter/exportdialog.cxx | 34 -
svtools/source/graphic/provider.cxx | 8
svtools/source/uno/contextmenuhelper.cxx | 2
svtools/source/uno/popupmenucontrollerbase.cxx | 4
svtools/source/uno/statusbarcontroller.cxx | 10
svtools/source/uno/toolboxcontroller.cxx | 8
svtools/source/uno/unogridcolumnfacade.cxx | 4
svx/source/dialog/rubydialog.cxx | 14
svx/source/dialog/svxbmpnumvalueset.cxx | 12
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/form/fmdmod.cxx | 2
svx/source/table/tabledesign.cxx | 2
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 14
svx/source/unodraw/UnoNameItemTable.cxx | 2
svx/source/unodraw/unomod.cxx | 6
svx/source/unodraw/unomtabl.cxx | 2
svx/workben/msview/xmlconfig.cxx | 10
sw/qa/extras/rtftok/rtftok.cxx | 8
sw/source/core/edit/edlingu.cxx | 2
sw/source/core/unocore/unochart.cxx | 10
sw/source/core/unocore/unoobj.cxx | 14
sw/source/core/unocore/unorefmk.cxx | 8
sw/source/core/unocore/unostyle.cxx | 2
sw/source/core/unocore/unotext.cxx | 2
sw/source/filter/xml/xmlimp.cxx | 40 -
sw/source/ui/app/docsh2.cxx | 4
sw/source/ui/dbui/dbmgr.cxx | 12
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 2
sw/source/ui/dbui/mailmergehelper.cxx | 2
sw/source/ui/lingu/olmenu.cxx | 2
sw/source/ui/uno/swdetect.cxx | 20
sw/source/ui/vba/vbaheaderfooterhelper.cxx | 2
sw/source/ui/vba/vbapagesetup.cxx | 4
sw/source/ui/vba/vbatables.cxx | 2
sw/source/ui/vba/vbaview.cxx | 8
tools/source/fsys/urlobj.cxx | 4
ucb/source/core/provprox.cxx | 2
ucb/source/ucp/file/bc.cxx | 24 -
ucb/source/ucp/file/filglob.cxx | 2
ucb/source/ucp/ftp/ftpurl.cxx | 2
ucb/source/ucp/odma/odma_content.cxx | 6
unotools/source/config/moduleoptions.cxx | 16
unoxml/source/dom/saxbuilder.cxx | 2
vbahelper/source/vbahelper/vbadialogbase.cxx | 2
vbahelper/source/vbahelper/vbaglobalbase.cxx | 4
vcl/generic/fontmanager/fontmanager.cxx | 2
vcl/source/app/svmain.cxx | 2
vcl/source/control/edit.cxx | 2
vcl/source/gdi/print3.cxx | 2
vcl/source/window/arrange.cxx | 6
vcl/source/window/window4.cxx | 6
vcl/unx/generic/app/saldata.cxx | 2
vcl/unx/gtk/gdi/salprn-gtk.cxx | 36 -
writerfilter/source/dmapper/ModelEventListener.cxx | 2
writerfilter/source/dmapper/PropertyMapHelper.cxx | 2
writerfilter/source/filter/WriterFilterDetection.cxx | 2
writerfilter/source/rtftok/rtfsdrimport.cxx | 24 -
xmlhelp/source/cxxhelp/provider/content.cxx | 36 -
xmloff/source/chart/SchXMLExport.cxx | 14
xmloff/source/chart/SchXMLSeries2Context.cxx | 4
xmloff/source/chart/SchXMLTools.cxx | 14
xmloff/source/core/DocumentSettingsContext.cxx | 2
xmloff/source/core/RDFaImportHelper.cxx | 2
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/core/xmlimp.cxx | 2
xmloff/source/draw/sdxmlimp.cxx | 8
xmloff/source/style/xmlstyle.cxx | 8
xmloff/source/text/txtfldi.cxx | 8
xmloff/source/xforms/xformsexport.cxx | 6
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 78 +--
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 240 +++++-----
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 4
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 2
219 files changed, 1130 insertions(+), 1130 deletions(-)
New commits:
commit 743f22045c4ec08c46c259fc0ba240194a391457
Author: Szabolcs Dezsi <dezsiszabi at hotmail.com>
Date: Fri Apr 6 15:05:52 2012 +0200
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:
find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\)) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 7dc3102..9bb8782 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -3344,11 +3344,11 @@ Reference< deployment::XPackage > ScriptSubPackageIterator::implDetectScriptPack
{
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType();
rtl::OUString aMediaType = xPackageTypeInfo->getMediaType();
- if( aMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sBasicLibMediaType)) )
+ if ( aMediaType == sBasicLibMediaType )
{
xScriptPackage = xPackage;
}
- else if( aMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sDialogLibMediaType)) )
+ else if ( aMediaType == sDialogLibMediaType )
{
rbPureDialogLib = true;
xScriptPackage = xPackage;
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index b395b20..45e9c0d 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -83,46 +83,46 @@ namespace canvas
beans::PropertyValue aProp;
if( (rArgs[i] >>= aProp) )
{
- if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Colors")) )
+ if ( aProp.Name == "Colors" )
{
aProp.Value >>= colorSequence;
}
- else if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Stops")) )
+ else if ( aProp.Name == "Stops" )
{
aProp.Value >>= colorStops;
}
- else if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AspectRatio")) )
+ else if ( aProp.Name == "AspectRatio" )
{
aProp.Value >>= fAspectRatio;
}
}
}
- if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LinearGradient")) )
+ if ( rServiceName == "LinearGradient" )
{
return createLinearHorizontalGradient(rDevice, colorSequence, colorStops);
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EllipticalGradient")) )
+ else if ( rServiceName == "EllipticalGradient" )
{
return createEllipticalGradient(rDevice, colorSequence, colorStops, fAspectRatio);
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RectangularGradient")) )
+ else if ( rServiceName == "RectangularGradient" )
{
return createRectangularGradient(rDevice, colorSequence, colorStops, fAspectRatio);
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VerticalLineHatch")) )
+ else if ( rServiceName == "VerticalLineHatch" )
{
// TODO: NYI
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OrthogonalLinesHatch")) )
+ else if ( rServiceName == "OrthogonalLinesHatch" )
{
// TODO: NYI
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ThreeCrossingLinesHatch")) )
+ else if ( rServiceName == "ThreeCrossingLinesHatch" )
{
// TODO: NYI
}
- else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FourCrossingLinesHatch")) )
+ else if ( rServiceName == "FourCrossingLinesHatch" )
{
// TODO: NYI
}
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 007bbf1..17d413a 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -150,7 +150,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
beans::PropertyValue * pCellRange = 0;
for( sal_Int32 i=0; i<aArguments.getLength(); ++i )
{
- if( aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+ if ( aArguments[i].Name == "CellRangeRepresentation" )
{
pCellRange = (aArguments.getArray() + i);
aArguments[i].Value >>= aOldRange;
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 3e1b1d0..33af33f 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -158,7 +158,7 @@ Sequence< Reference< frame::XDispatch > > CommandDispatchContainer::getDispatche
for( sal_Int32 nPos = 0; nPos < nCount; ++nPos )
{
- if( aDescriptors[ nPos ].FrameName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_self")))
+ if ( aDescriptors[ nPos ].FrameName == "_self" )
aRet[ nPos ] = getDispatchForURL( aDescriptors[ nPos ].FeatureURL );
}
return aRet;
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index e97e82d..8bcdb3c 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -312,7 +312,7 @@ void SAL_CALL ChartModel::storeToURL(
uno::Sequence< beans::PropertyValue > aReducedMediaDescriptor(
aMediaDescriptorHelper.getReducedForModel() );
- if( rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("private:stream")))
+ if ( rURL == "private:stream" )
{
try
{
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 6f18508..b3767ee 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -543,7 +543,7 @@ Components::Components(
if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xcsxcu"))) {
parseXcsXcuLayer(layer, url);
layer += 2; //TODO: overflow
- } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("bundledext")))
+ } else if ( type == "bundledext" )
{
parseXcsXcuIniLayer(layer, url, false);
layer += 2; //TODO: overflow
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index 86a2e6d..0fae6ab 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -156,13 +156,13 @@ Type getDynamicType(css::uno::Any const & value) {
RTL_CONSTASCII_STRINGPARAM("[]boolean")))
{
return TYPE_BOOLEAN_LIST;
- } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]short")))
+ } else if ( name == "[]short" )
{
return TYPE_SHORT_LIST;
- } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]long")))
+ } else if ( name == "[]long" )
{
return TYPE_INT_LIST;
- } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]hyper")))
+ } else if ( name == "[]hyper" )
{
return TYPE_LONG_LIST;
} else if (name.equalsAsciiL(
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 1ad8985..db7ce81 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -868,7 +868,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc
const PropertyValue* pEnd = pIter + aArgs.getLength();
for(;pIter != pEnd;++pIter)
{
- if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ComponentData")) )
+ if ( pIter->Name == "ComponentData" )
{
Sequence<PropertyValue> aDocumentContext;
pIter->Value >>= aDocumentContext;
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 896d34f..815e752 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -121,9 +121,9 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro
}
}
- if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise")))
+ if ( url == "sdbc:address:evolution:groupwise" )
setSDBCAddressType(SDBCAddress::EVO_GWISE);
- else if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))
+ else if ( url == "sdbc:address:evolution:ldap" )
setSDBCAddressType(SDBCAddress::EVO_LDAP);
else
setSDBCAddressType(SDBCAddress::EVO_LOCAL);
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index b1b5784..8aebe8e 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -195,11 +195,11 @@ namespace connectivity
for (;pIter != pEnd; ++pIter)
{
- if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Storage")) )
+ if ( pIter->Name == "Storage" )
{
xStorage.set(pIter->Value,UNO_QUERY);
}
- else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+ else if ( pIter->Name == "URL" )
{
pIter->Value >>= sURL;
}
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 8fb6382..c148646 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -181,13 +181,13 @@ static sal_Int32 readLogLevelFromConfiguration()
OUString str;
if( bootstrapHandle.getFrom( ASCII_STR( "PQ_LOGLEVEL" ), str ) )
{
- if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NONE")) )
+ if ( str == "NONE" )
loglevel = LogLevel::NONE;
- else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ERROR")) )
+ else if ( str == "ERROR" )
loglevel = LogLevel::ERROR;
- else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SQL")) )
+ else if ( str == "SQL" )
loglevel = LogLevel::SQL;
- else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("INFO")) )
+ else if ( str == "INFO" )
loglevel = LogLevel::INFO;
else
{
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 9ad71b1..314924d 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -117,9 +117,9 @@ Keys::~Keys()
static sal_Int32 string2keytype( const rtl::OUString &type )
{
sal_Int32 ret = com::sun::star::sdbcx::KeyType::UNIQUE;
- if( type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("p")) )
+ if ( type == "p" )
ret = com::sun::star::sdbcx::KeyType::PRIMARY;
- else if( type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("f")) )
+ else if ( type == "f" )
ret = com::sun::star::sdbcx::KeyType::FOREIGN;
return ret;
}
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 0fc5239..7a4d493 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1065,7 +1065,7 @@ static bool loadEnv(OUString const & cLibStem,
oslModule hMod;
uno_initEnvironmentFunc fpInit = NULL;
- if (cLibStem.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno")) )
+ if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" )
fpInit = CPPU_ENV_uno_initEnvironment;
else
{
@@ -1116,7 +1116,7 @@ static uno_Environment * initDefaultEnvironment(
OUString envTypeName = cppu::EnvDcp::getTypeName(rEnvDcp);
// create default environment
- if (envTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+ if ( envTypeName == UNO_LB_UNO )
{
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
that->computeObjectIdentifier = unoenv_computeObjectIdentifier;
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 6c795de..6ca08be 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -524,7 +524,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
SAL_THROW( (RuntimeException) )
{
#ifdef CONTEXT_DIAG
- if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dump_maps") ))
+ if ( rName == "dump_maps" )
{
::fprintf( stderr, ">>> dumping out ComponentContext %p m_map:\n", this );
typedef ::std::map< OUString, ContextEntry * > t_sorted; // sorted map
@@ -653,7 +653,7 @@ Any ComponentContext::getValueByName( OUString const & rName )
throw (RuntimeException)
{
// to determine the root context:
- if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_root") ))
+ if ( rName == "_root" )
{
if (m_xDelegate.is())
return m_xDelegate->getValueByName( rName );
@@ -723,15 +723,15 @@ void ComponentContext::disposing()
pEntry->value >>= xComp;
if (xComp.is())
{
- if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(TDMGR_SINGLETON) ))
+ if ( iPos->first == TDMGR_SINGLETON )
{
xTDMgr = xComp;
}
- else if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(AC_SINGLETON) ))
+ else if ( iPos->first == AC_SINGLETON )
{
xAC = xComp;
}
- else if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(AC_POLICY) ))
+ else if ( iPos->first == AC_POLICY )
{
xPolicy = xComp;
}
@@ -770,7 +770,7 @@ ComponentContext::ComponentContext(
{
ContextEntry_Init const & rEntry = pEntries[ nPos ];
- if (rEntry.name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SMGR_SINGLETON) ))
+ if ( rEntry.name == SMGR_SINGLETON )
{
rEntry.value >>= m_xSMgr;
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 570e7eb..23b3aa4 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1231,7 +1231,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
sal_Int32 i = 0;
while ( sFullCommentURL.isEmpty() && i < aProperties.getLength() )
{
- if ( aProperties[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FullCommentURL")) )
+ if ( aProperties[i].Name == "FullCommentURL" )
{
uno::Any aValue = aProperties[i].Value;
aValue >>= sFullCommentURL;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index f4c570b..bcb26fd 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1881,11 +1881,11 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia
const SvObjectServerList* pList )
{
InsertObjectDialog_Impl* pDlg=0;
- if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObject")) )
+ if ( rCommand == ".uno:InsertObject" )
pDlg = new SvInsertOleDlg( pParent, xStor, pList );
- else if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertPlugin")) )
+ else if ( rCommand == ".uno:InsertPlugin" )
pDlg = new SvInsertPlugInDialog( pParent, xStor );
- else if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObjectFloatingFrame")) )
+ else if ( rCommand == ".uno:InsertObjectFloatingFrame" )
pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor );
if ( pDlg )
@@ -1900,7 +1900,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p
const Reference < com::sun::star::embed::XEmbeddedObject >& xObj )
{
InsertObjectDialog_Impl* pDlg=0;
- if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObjectFloatingFrame")) )
+ if ( rCommand == ".uno:InsertObjectFloatingFrame" )
{
pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e5b8a6c..e85b5fd 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -128,17 +128,17 @@ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& r
SvxNumSettings_ImplPtr pNew = new SvxNumSettings_Impl;
for(sal_Int32 j = 0; j < rLevelProps.getLength(); j++)
{
- if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cNumberingType)))
+ if ( pValues[j].Name == cNumberingType )
pValues[j].Value >>= pNew->nNumberType;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cPrefix)))
+ else if ( pValues[j].Name == cPrefix )
pValues[j].Value >>= pNew->sPrefix;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cSuffix)))
+ else if ( pValues[j].Name == cSuffix )
pValues[j].Value >>= pNew->sSuffix;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cParentNumbering)))
+ else if ( pValues[j].Name == cParentNumbering )
pValues[j].Value >>= pNew->nParentNumbering;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletChar)))
+ else if ( pValues[j].Name == cBulletChar )
pValues[j].Value >>= pNew->sBulletChar;
- else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletFontName)))
+ else if ( pValues[j].Name == cBulletFontName )
pValues[j].Value >>= pNew->sBulletFont;
}
return pNew;
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 6083340..8e959d9 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -322,7 +322,7 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) t
for(;pBegin != pEnd;++pBegin)
{
*pBegin >>= aValue;
- if ( aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Parent")) )
+ if ( aValue.Name == "Parent" )
{
m_xParentContainer.set(aValue.Value,UNO_QUERY);
}
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 36fa236..255fd93 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -177,21 +177,21 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
const beans::PropertyValue* pArgEnd = pArgIter + _aArguments.getLength();
for(;pArgIter != pArgEnd;++pArgIter)
{
- if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")) )
+ if ( pArgIter->Name == "DataRowSource" )
{
::com::sun::star::chart::ChartDataRowSource eRowSource = ::com::sun::star::chart::ChartDataRowSource_COLUMNS;
pArgIter->Value >>= eRowSource;
if ( eRowSource != ::com::sun::star::chart::ChartDataRowSource_COLUMNS )
return sal_False;
}
- else if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")) )
+ else if ( pArgIter->Name == "CellRangeRepresentation" )
{
::rtl::OUString sRange;
pArgIter->Value >>= sRange;
if ( !sRange.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("all")) )
return sal_False;
}
- else if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")) )
+ else if ( pArgIter->Name == "FirstCellAsLabel" )
{
sal_Bool bFirstCellAsLabel = sal_True;
pArgIter->Value >>= bFirstCellAsLabel;
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index c2130d1..1ae1ad3 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -144,13 +144,13 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
break;
case XML_TOK_BOOLEAN_COMPARISON_MODE:
aProperty.Name = PROPERTY_BOOLEANCOMPARISONMODE;
- if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) )
+ if ( sValue == "equal-integer" )
aProperty.Value <<= sal_Int32(0);
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("is-boolean")) )
+ else if ( sValue == "is-boolean" )
aProperty.Value <<= sal_Int32(1);
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-boolean")) )
+ else if ( sValue == "equal-boolean" )
aProperty.Value <<= sal_Int32(2);
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-use-only-zero")) )
+ else if ( sValue == "equal-use-only-zero" )
aProperty.Value <<= sal_Int32(3);
break;
case XML_TOK_USE_CATALOG:
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 06ad477..ca93c90 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -402,15 +402,15 @@ void ODBExport::exportDataSource()
{
sal_Int32 nValue = 0;
aValue >>= nValue;
- if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")) )
+ if ( sValue == "0" )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-integer"));
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1")) )
+ else if ( sValue == "1" )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("is-boolean"));
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")) )
+ else if ( sValue == "2" )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-boolean"));
- else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("3")) )
+ else if ( sValue == "3" )
sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-use-only-zero"));
- if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) )
+ if ( sValue == "equal-integer" )
continue;
eToken = XML_BOOLEAN_COMPARISON_MODE;
}
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index bc059d3..d2c7266 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1114,7 +1114,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
const PropertyValue* pEnd = pIter + aArgs.getLength();
for( ; pIter != pEnd ; ++pIter)
{
- if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FormatStringId")) )
+ if ( pIter->Name == "FormatStringId" )
{
SotFormatStringId nFormatId = 0;
if ( pIter->Value >>= nFormatId )
@@ -2886,7 +2886,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
const NamedValue* pEnd = pIter + aCurrentSelection.getLength();
for(;pIter != pEnd;++pIter)
{
- if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Type")) )
+ if ( pIter->Name == "Type" )
{
sal_Int32 nType = 0;
pIter->Value >>= nType;
@@ -2894,7 +2894,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
throw IllegalArgumentException();
eType = static_cast< ElementType >( nType );
}
- else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Selection")) )
+ else if ( pIter->Name == "Selection" )
pIter->Value >>= aSelection;
}
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 3ecb7d9..cd01aa1 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -112,7 +112,7 @@ namespace dbaui
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
- if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:DBNewForm")) )
+ if ( m_aCommandURL == ".uno:DBNewForm" )
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewForm")) ,sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewView")) ,sal_True));
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index afc4f10..0d7828f 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -153,9 +153,9 @@ namespace dbaui
{
::rtl::OUString sAuth;
aMetaData.get("Authentication") >>= sAuth;
- if ( sAuth.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserPassword")) )
+ if ( sAuth == "UserPassword" )
aInit = AuthUserPwd;
- else if ( sAuth.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Password")) )
+ else if ( sAuth == "Password" )
aInit = AuthPwd;
}
s_aSupport.insert(Supported::value_type(*pIter,aInit));
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index f4e1044..a51dd36 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -124,7 +124,7 @@ private:
uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName)
throw (uno::RuntimeException)
{
- if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CONFIG_ERROR_HANDLER)) )
+ if ( aName == CONFIG_ERROR_HANDLER )
{
if ( !m_xHandler.is() )
m_xHandler = ConfigurationErrorHandler::getDefaultInteractionHandler();
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 82338f3..0627da3 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -48,7 +48,7 @@ Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) throw (Runtim
{
Any retVal;
- if (Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(JAVA_INTERACTION_HANDLER_NAME)))
+ if ( Name == JAVA_INTERACTION_HANDLER_NAME )
{
retVal = makeAny( Reference< XInteractionHandler >( new svt::JavaInteractionHandler()) );
}
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 9061f04..5312923 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -148,11 +148,11 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context )
{
OSL_ASSERT( insertion.first->second.get() == xRet );
// hold user, shared mgrs for whole process: live deployment
- if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") ))
+ if ( context == "user" )
m_xUserMgr = xRet;
- else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") ))
+ else if ( context == "shared" )
m_xSharedMgr = xRet;
- else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled") ))
+ else if ( context == "bundled" )
m_xBundledMgr = xRet;
}
else
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 8b84ec5..fef95a8 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -94,15 +94,15 @@ PackageRegistryBackend::PackageRegistryBackend(
if (readOnly)
m_readOnly = *readOnly;
- if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") ))
+ if ( m_context == "user" )
m_eContext = CONTEXT_USER;
- else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") ))
+ else if ( m_context == "shared" )
m_eContext = CONTEXT_SHARED;
- else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled") ))
+ else if ( m_context == "bundled" )
m_eContext = CONTEXT_BUNDLED;
- else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") ))
+ else if ( m_context == "tmp" )
m_eContext = CONTEXT_TMP;
- else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") ))
+ else if ( m_context == "bundled_prereg" )
m_eContext = CONTEXT_BUNDLED_PREREG;
else if (m_context.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.tdoc:/") ))
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index d0efd58..eca7509 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -1080,9 +1080,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
{
for(int i=0; i<aProp.getLength(); ++i)
{
- if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
aProp[i].Value >>= aMigrationItem.m_sCommandURL;
- else if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
}
@@ -1098,9 +1098,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
{
for(int i=0; i<aProp.getLength(); ++i)
{
- if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
aProp[i].Value >>= aMigrationItem.m_sCommandURL;
- else if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
}
@@ -1209,11 +1209,11 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j)
{
::rtl::OUString sPropName = aPropSeq[j].Name;
- if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+ if ( sPropName == ITEM_DESCRIPTOR_COMMANDURL )
aPropSeq[j].Value >>= sCommandURL;
- else if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)))
+ else if ( sPropName == ITEM_DESCRIPTOR_LABEL )
aPropSeq[j].Value >>= sLabel;
- else if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+ else if ( sPropName == ITEM_DESCRIPTOR_CONTAINER )
aPropSeq[j].Value >>= xChild;
}
@@ -1250,7 +1250,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
xTemp->getByIndex(i) >>= aTempPropSeq;
for (sal_Int32 j=0; j<aTempPropSeq.getLength(); ++j)
{
- if (aTempPropSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+ if ( aTempPropSeq[j].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aTempPropSeq[j].Value >>= sCmd;
break;
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index b2946af..e997736 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -276,7 +276,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
for(;pIter != pEnd;++pIter)
{
*pIter >>= aValue;
- if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OldConfiguration")))
+ if ( aValue.Name == "OldConfiguration" )
{
sal_Bool bSuccess = aValue.Value >>= aOldConfigValues;
OSL_ENSURE(bSuccess == sal_True, "[Service implementation " IMPL_NAME
@@ -287,7 +287,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
const css::beans::NamedValue* pEnd2 = pIter2 + aOldConfigValues.getLength();
for(;pIter2 != pEnd2;++pIter2)
{
- if ( pIter2->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("org.openoffice.Office.Java")) )
+ if ( pIter2->Name == "org.openoffice.Office.Java" )
{
pIter2->Value >>= m_xLayer;
break;
@@ -295,7 +295,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
}
}
}
- else if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserData")))
+ else if ( aValue.Name == "UserData" )
{
if ( !(aValue.Value >>= m_sUserDir) )
{
@@ -418,9 +418,9 @@ void SAL_CALL JavaMigration::overrideProperty(
MalformedDataException,
WrappedTargetException )
{
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enable")))
+ if ( aName == "Enable" )
m_aStack.push(TElementStack::value_type(aName,ENABLE_JAVA));
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserClassPath")))
+ else if ( aName == "UserClassPath" )
m_aStack.push(TElementStack::value_type(aName, USER_CLASS_PATH));
}
// -----------------------------------------------------------------------------
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 7b48403..bc2fda6 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -483,7 +483,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
xExtensionManager->reinstallDeployedExtensions(
repository, Reference<task::XAbortChannel>(), xCmdEnv);
}
- else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("list") ))
+ else if ( subCommand == "list" )
{
::std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
::comphelper::sequenceToContainer(vecExtUnaccepted,
@@ -572,7 +572,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
printf_packages(allExtensions, vecUnaccepted, xCmdEnv );
}
- else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("validate") ))
+ else if ( subCommand == "validate" )
{
::std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
::comphelper::sequenceToContainer(
@@ -610,7 +610,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
extension, Reference<task::XAbortChannel>(), xCmdEnv);
}
}
- else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("gui") ))
+ else if ( subCommand == "gui" )
{
Reference<ui::dialogs::XAsynchronousExecutableDialog> xDialog(
deployment::ui::PackageManagerDialog::createAndInstall(
@@ -626,7 +626,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
xDialog->startExecuteModal(xListener);
dialogEnded.wait();
}
- else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("sync")))
+ else if ( subCommand == "sync" )
{
if (! dp_misc::office_is_running())
{
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 8621dc1..1038066 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -1127,27 +1127,27 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
sal_Int32 nId = ID_UNKNOWN;
- if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DateTime") ) )
+ if ( aFieldType == "DateTime" )
{
nId = ID_DATEFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL") ) )
+ else if ( aFieldType == "URL" )
{
nId = ID_URLFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageNumber") ) )
+ else if ( aFieldType == "PageNumber" )
{
nId = ID_PAGEFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageCount") ) )
+ else if ( aFieldType == "PageCount" )
{
nId = ID_PAGESFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SheetName") ) )
+ else if ( aFieldType == "SheetName" )
{
nId = ID_TABLEFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FileName") ) )
+ else if ( aFieldType == "FileName" )
{
nId = ID_EXT_FILEFIELD;
}
@@ -1158,11 +1158,11 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
{
nId = ID_FILEFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Author") ) )
+ else if ( aFieldType == "Author" )
{
nId = ID_AUTHORFIELD;
}
- else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Measure") ) )
+ else if ( aFieldType == "Measure" )
{
nId = ID_MEASUREFIELD;
}
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 16f8c6a..bd171da 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -290,7 +290,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
const OUString& rPropName = rProp.Name;
const Any& aVal = rProp.Value;
- if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_NUMBERINGTYPE)))
+ if ( rPropName == UNO_NAME_NRULE_NUMBERINGTYPE )
{
sal_Int16 nSet = sal_Int16();
aVal >>= nSet;
@@ -311,7 +311,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_PREFIX)))
+ else if ( rPropName == UNO_NAME_NRULE_PREFIX )
{
OUString aPrefix;
if( aVal >>= aPrefix )
@@ -320,7 +320,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_SUFFIX)))
+ else if ( rPropName == UNO_NAME_NRULE_SUFFIX )
{
OUString aSuffix;
if( aVal >>= aSuffix )
@@ -329,7 +329,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLETID)))
+ else if ( rPropName == UNO_NAME_NRULE_BULLETID )
{
sal_Int16 nSet = sal_Int16();
if( aVal >>= nSet )
@@ -341,7 +341,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
}
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("BulletChar")))
+ else if ( rPropName == "BulletChar" )
{
OUString aStr;
if( aVal >>= aStr )
@@ -357,7 +357,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_ADJUST)))
+ else if ( rPropName == UNO_NAME_NRULE_ADJUST )
{
sal_Int16 nAdjust = sal_Int16();
if( aVal >>= nAdjust )
@@ -366,7 +366,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_FONT)))
+ else if ( rPropName == UNO_NAME_NRULE_BULLET_FONT )
{
awt::FontDescriptor aDesc;
if( aVal >>= aDesc )
@@ -377,7 +377,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Graphic")))
+ else if ( rPropName == "Graphic" )
{
Reference< awt::XBitmap > xBmp;
if( aVal >>= xBmp )
@@ -388,7 +388,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("GraphicURL")))
+ else if ( rPropName == "GraphicURL" )
{
OUString aURL;
if( aVal >>= aURL )
@@ -399,7 +399,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("GraphicSize")))
+ else if ( rPropName == "GraphicSize" )
{
awt::Size aUnoSize;
if( aVal >>= aUnoSize )
@@ -408,7 +408,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_START_WITH)))
+ else if ( rPropName == UNO_NAME_NRULE_START_WITH )
{
sal_Int16 nStart = sal_Int16();
if( aVal >>= nStart )
@@ -417,7 +417,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_LEFT_MARGIN)))
+ else if ( rPropName == UNO_NAME_NRULE_LEFT_MARGIN )
{
sal_Int32 nMargin = 0;
if( aVal >>= nMargin )
@@ -426,7 +426,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_FIRST_LINE_OFFSET)))
+ else if ( rPropName == UNO_NAME_NRULE_FIRST_LINE_OFFSET )
{
sal_Int32 nMargin = 0;
if( aVal >>= nMargin )
@@ -435,7 +435,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SymbolTextDistance")))
+ else if ( rPropName == "SymbolTextDistance" )
{
sal_Int32 nTextDistance = 0;
if( aVal >>= nTextDistance )
@@ -444,7 +444,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_COLOR)))
+ else if ( rPropName == UNO_NAME_NRULE_BULLET_COLOR )
{
sal_Int32 nColor = 0;
if( aVal >>= nColor )
@@ -453,7 +453,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
continue;
}
}
- else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_RELSIZE)))
+ else if ( rPropName == UNO_NAME_NRULE_BULLET_RELSIZE )
{
sal_Int16 nSize = sal_Int16();
if( aVal >>= nSize )
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 716655e..4ac6f7f 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1689,7 +1689,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
if (pLocale == lLocales.end())
{
#if OSL_DEBUG_LEVEL > 0
- if (sActLocale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("en-US")))
+ if ( sActLocale == "en-US" )
return;
::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString());
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 87702f7..935ada0 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -303,43 +303,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
#define COMP_HACK
#ifdef COMP_HACK
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer")))
+ if ( sDocumentService == "writer" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("web")))
+ if ( sDocumentService == "web" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("global")))
+ if ( sDocumentService == "global" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc")))
+ if ( sDocumentService == "calc" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("draw")))
+ if ( sDocumentService == "draw" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("impress")))
+ if ( sDocumentService == "impress" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
}
else
- if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("math")))
+ if ( sDocumentService == "math" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" ));
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 397de51..974cdac 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -454,7 +454,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS
{
// We cant check a preselected type for a given stream!
// So we must believe, that it can work ...
- if (aParsedURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("private:stream")))
+ if ( aParsedURL.Complete == "private:stream" )
bBreakDetection = sal_True;
}
@@ -813,9 +813,9 @@ namespace
{
if (rA == rB)
return false;
- if (rA.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
+ if ( rA == "com.sun.star.text.FormatDetector" )
return false;
- if (rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
+ if ( rB == "com.sun.star.text.FormatDetector" )
return true;
return rA < rB;
}
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 6471404..1845190 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -131,9 +131,9 @@ OdfFlatXml::importer(
for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++)
{
paramName = sourceData[paramIdx].Name;
- if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
+ if ( paramName == "InputStream" )
sourceData[paramIdx].Value >>= inputStream;
- else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( paramName == "URL" )
sourceData[paramIdx].Value >>= url;
}
@@ -183,9 +183,9 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData,
for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++)
{
paramName = sourceData[paramIdx].Name;
- if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
+ if ( paramName == "OutputStream" )
sourceData[paramIdx].Value >>= outputStream;
- else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( paramName == "URL" )
sourceData[paramIdx].Value >>= targetURL;
}
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 58b9afa..ef8120b 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -69,7 +69,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
pValue[ i ].Value >>= aFilterData;
else if ( pValue[ i ].Name == "StatusIndicator" )
pValue[ i ].Value >>= xStatusIndicator;
- else if( pValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
+ else if ( pValue[i].Name == "InteractionHandler" )
pValue[i].Value >>= xIH;
}
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index f2e0fc7..c9413a6 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -471,7 +471,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
if( pOStm )
xOStm = Reference< XOutputStream >( new ::utl::OOutputStreamWrapper ( *pOStm ) );
}
- else if( pValue[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
+ else if ( pValue[ i ].Name == "FilterData" )
{
pValue[ i ].Value >>= maFilterData;
}
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index ec25653..e2226c0 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -164,7 +164,7 @@ namespace XSLT
void SAL_CALL
OleHandler::insertByName(const OUString& streamName, const OString& content)
{
- if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso")))
+ if ( streamName == "oledata.mso" )
{
initRootStorageFromBase64(content);
}
@@ -178,7 +178,7 @@ namespace XSLT
const OString
SAL_CALL OleHandler::getByName(const OUString& streamName)
{
- if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso")))
+ if ( streamName == "oledata.mso" )
{
//get the length and seek to 0
Reference<XSeekable> xSeek (m_rootStream, UNO_QUERY);
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 687192e..b42e1f3 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -284,13 +284,13 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
{
aName = aSourceData[i].Name;
Any value = aSourceData[i].Value;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
+ if ( aName == "InputStream" )
value >>= xInputStream;
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")))
+ else if ( aName == "FileName" )
value >>= aFileName;
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( aName == "URL" )
value >>= aURL;
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")))
+ else if ( aName == "InteractionHandler" )
value >>= xInterActionHandler;
}
OSL_ASSERT(xInputStream.is());
@@ -443,15 +443,15 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
for (sal_Int32 i = 0; i < nLength; i++)
{
aName = aSourceData[i].Name;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Indent")))
+ if ( aName == "Indent" )
aSourceData[i].Value >>= bIndent;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_Public")))
+ if ( aName == "DocType_Public" )
aSourceData[i].Value >>= aDoctypePublic;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_System")))
+ if ( aName == "DocType_System" )
aSourceData[i].Value >>= aDoctypeSystem;
- if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
+ if ( aName == "OutputStream" )
aSourceData[i].Value >>= m_rOutputStream;
- else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+ else if ( aName == "URL" )
aSourceData[i].Value >>= sURL;
}
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 94a6d31..c3c69bc 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -77,9 +77,9 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen
{
if (! (aSequence[i] >>= aValue))
throw RuntimeException();
- if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+ if ( aValue.Name == "Model" )
aValue.Value >>= m_aModel;
- else if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ContextNode")))
+ else if ( aValue.Name == "ContextNode" )
aValue.Value >>= m_aContextNode;
}
}
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index ca210b8..ed3d0ca 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1179,14 +1179,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
{
css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
::rtl::OUString sConfig = xNamed->getName();
- if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")) )
+ if ( sConfig == "Global" )
{
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
css::uno::UNO_QUERY );
XCUBasedAcceleratorConfiguration::reload();
}
- else if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")) )
+ else if ( sConfig == "Modules" )
{
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
@@ -1241,14 +1241,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
- if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+ if ( sGlobalModules == CFG_ENTRY_GLOBAL )
{
::rtl::OUString sModule;
sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
if ( !sKey.isEmpty() && !sPath.isEmpty() )
reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey);
}
- else if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+ else if ( sGlobalModules == CFG_ENTRY_MODULES )
{
::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
@@ -1272,9 +1272,9 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
{
AcceleratorCache aReadCache = AcceleratorCache();
css::uno::Reference< css::container::XNameAccess > xAccess;
- if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")))
+ if ( m_sGlobalOrModules == "Global" )
xCfg->getByName(CFG_ENTRY_GLOBAL) >>= xAccess;
- else if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")))
+ else if ( m_sGlobalOrModules == "Modules" )
{
css::uno::Reference< css::container::XNameAccess > xModules;
xCfg->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1351,13 +1351,13 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
break;
}
- if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
+ if ( sToken[k] == "SHIFT" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
- else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
+ else if ( sToken[k] == "MOD1" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
- else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
+ else if ( sToken[k] == "MOD2" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
- else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
+ else if ( sToken[k] == "MOD3" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
else
{
@@ -1483,9 +1483,9 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
else
m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
- if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+ if ( m_sGlobalOrModules == CFG_ENTRY_GLOBAL )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
- else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+ else if ( m_sGlobalOrModules == CFG_ENTRY_MODULES )
{
css::uno::Reference< css::container::XNameContainer > xModules;
xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1528,9 +1528,9 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
else
m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
- if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+ if ( m_sGlobalOrModules == CFG_ENTRY_GLOBAL )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
- else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+ else if ( m_sGlobalOrModules == CFG_ENTRY_MODULES )
{
css::uno::Reference< css::container::XNameAccess > xModules;
xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1550,7 +1550,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
css::uno::Reference< css::container::XNameContainer > xContainer;
m_xCfg->getByName(sPrimarySecondary) >>= xAccess;
- if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+ if ( sGlobalModules == CFG_ENTRY_GLOBAL )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
else
{
@@ -1576,13 +1576,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
break;
sToken[i] = sKey.getToken(0, '_', nIndex);
- if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
+ if ( sToken[i] == "SHIFT" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
- else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
+ else if ( sToken[i] == "MOD1" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
- else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
+ else if ( sToken[i] == "MOD2" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
- else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
+ else if ( sToken[i] == "MOD3" )
aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
}
@@ -1598,14 +1598,14 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
xCommand->getByName(sLocale) >>= sCommand;
}
- if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_PRIMARY)))
+ if ( sPrimarySecondary == CFG_ENTRY_PRIMARY )
{
if (sCommand.isEmpty())
m_aPrimaryReadCache.removeKey(aKeyEvent);
else
m_aPrimaryReadCache.setKeyCommandPair(aKeyEvent, sCommand);
}
- else if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_SECONDARY)))
+ else if ( sPrimarySecondary == CFG_ENTRY_SECONDARY )
{
if (sCommand.isEmpty())
m_aSecondaryReadCache.removeKey(aKeyEvent);
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index f008fb2..159739a 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -341,17 +341,17 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
beans::NamedValue aValue = rProperties[i];
::rtl::OUString sName = aValue.Name;
- if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
+ if ( sName == "Title" )
aValue.Value >>= sTitle;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ToolTip")) )
+ else if ( sName == "ToolTip" )
aValue.Value >>= sToolTip;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PageURL")) )
+ else if ( sName == "PageURL" )
aValue.Value >>= sPageURL;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EventHdl")) )
+ else if ( sName == "EventHdl" )
aValue.Value >>= xEventHdl;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Image")) )
+ else if ( sName == "Image" )
aValue.Value >>= xImage;
- else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Disabled")) )
+ else if ( sName == "Disabled" )
aValue.Value >>= bDisabled;
}
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 43756fb..cf81fa5 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -193,11 +193,11 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
// If not - we have to break this operation. But an optional listener must be informed.
// BTW: We save the information about the requested operation. Because
// we need it later.
- if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEDOC)))
+ if ( aURL.Complete == URL_CLOSEDOC )
m_eOperation = E_CLOSE_DOC;
- else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEWIN)))
+ else if ( aURL.Complete == URL_CLOSEWIN )
m_eOperation = E_CLOSE_WIN;
- else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEFRAME)))
+ else if ( aURL.Complete == URL_CLOSEFRAME )
m_eOperation = E_CLOSE_FRAME;
else
{
@@ -230,7 +230,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
sal_Bool bIsSynchron = sal_False;
for (sal_Int32 nArgs=0; nArgs<lArguments.getLength(); nArgs++ )
{
- if ( lArguments[nArgs].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SynchronMode")) )
+ if ( lArguments[nArgs].Name == "SynchronMode" )
{
lArguments[nArgs].Value >>= bIsSynchron;
break;
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 562dd74..eead181 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -430,7 +430,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
else
xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
}
- else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseFrame")))
+ else if ( aURL.Complete == ".uno:CloseFrame" )
xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
if ( ! xDispatcher.is())
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index bee51f7..90e0eef 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -118,7 +118,7 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
throw(css::uno::RuntimeException)
{
::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW;
- if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_UNO_SHOWSTARTMODULE)))
+ if ( aURL.Complete == CMD_UNO_SHOWSTARTMODULE )
{
nResult = css::frame::DispatchResultState::FAILURE;
if (implts_isBackingModePossible ())
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index e280b30..d80fcfb 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -138,28 +138,28 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
{
for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
{
- if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( rProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
rProp[i].Value >>= rCommandURL;
rCommandURL = rCommandURL.intern();
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
{
rProp[i].Value >>= rHelpURL;
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
{
rProp[i].Value >>= rSubMenu;
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_LABEL )
{
rProp[i].Value >>= rLabel;
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_TYPE )
{
rProp[i].Value >>= rType;
}
- else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+ else if ( rProp[i].Name == ITEM_DESCRIPTOR_STYLE )
{
rProp[i].Value >>= rStyle;
}
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 6ead1fe..070799e 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -350,7 +350,7 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::bean
Any SAL_CALL ConstItemContainer::getPropertyValue( const ::rtl::OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
- if (PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROPNAME_UINAME)))
+ if ( PropertyName == PROPNAME_UINAME )
return makeAny( m_aUIName );
throw UnknownPropertyException();
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 4c1659b..c14fd58 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -207,13 +207,13 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer"));
- else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")) )
+ else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc"));
- else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument")) )
+ else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress"));
- else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocument")) )
+ else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw"));
- else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.formula.FormulaProperties")) )
+ else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math"));
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) ||
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 92b5f7f..185008b 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -161,19 +161,19 @@ throw ( Exception, RuntimeException )
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_CONFIGSOURCE)))
+ if ( aPropValue.Name == UIELEMENT_PROPNAME_CONFIGSOURCE )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGSOURCE, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_FRAME)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_FRAME )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_FRAME, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_PERSISTENT)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_PERSISTENT )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_PERSISTENT, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_RESOURCEURL)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_RESOURCEURL )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_RESOURCEURL, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_TYPE)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_TYPE )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_TYPE, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_CONFIGLISTENER)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_CONFIGLISTENER )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGLISTENER, aPropValue.Value );
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_NOCLOSE)))
+ else if ( aPropValue.Name == UIELEMENT_PROPNAME_NOCLOSE )
setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_NOCLOSE, aPropValue.Value );
}
}
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 3b4774c..7d5e6a5 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -580,22 +580,22 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
if ( aWindowState[n].Value >>= bValue )
rElementData.m_aDockedData.m_bLocked = bValue;
}
- else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXT)))
+ else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_CONTEXT )
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bContextSensitive = bValue;
}
- else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_NOCLOSE)))
+ else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_NOCLOSE )
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bNoClose = bValue;
}
- else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXTACTIVE)))
+ else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_CONTEXTACTIVE )
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bContextActive = bValue;
}
- else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_SOFTCLOSE)))
+ else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_SOFTCLOSE )
{
if ( aWindowState[n].Value >>= bValue )
rElementData.m_bSoftClose = bValue;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 0c0a241..ff6ea0b 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1192,9 +1192,9 @@ void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno
::rtl::OUString aTbxTitle;
for ( sal_Int32 j = 0; j < rTbxSeq.getLength(); j++ )
{
- if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")))
+ if ( rTbxSeq[j].Name == "ResourceURL" )
rTbxSeq[j].Value >>= aTbxResName;
- else if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")))
+ else if ( rTbxSeq[j].Name == "UIName" )
rTbxSeq[j].Value >>= aTbxTitle;
}
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
index f31fde0..d96d8fc 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -225,7 +225,7 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
for (int i = 0; i<len; i++)
{
- if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment")))
+ if ( aArguments[i].Name == "Environment" )
{
aArguments[i].Value >>= lEnv;
break;
@@ -235,7 +235,7 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
len = lEnv.getLength ();
for (int i = 0; i<len; i++)
{
- if (lEnv[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+ if ( lEnv[i].Name == "Model" )
{
lEnv[i].Value >>= xModel;
}
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 28d2734..fecbf6a 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -776,7 +776,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
implts_registerDocument(xDocument);
}
// document modified => set its modify state new (means modified against the original file!)
- else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_MODIFYCHANGED)))
+ else if ( aEvent.EventName == EVENT_ON_MODIFYCHANGED )
{
implts_updateModifiedState(xDocument);
}
@@ -807,7 +807,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
Dont remove temp. files or change the modified state of the document!
It was not realy saved to the original file ...
*/
- else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_SAVETODONE)))
+ else if ( aEvent.EventName == EVENT_ON_SAVETODONE )
{
implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
}
@@ -824,7 +824,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
}
// document closed => remove temp. files and configuration entries
- else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_UNLOAD)))
+ else if ( aEvent.EventName == EVENT_ON_UNLOAD )
{
implts_deregisterDocument(xDocument, sal_True); // sal_True => stop listening for disposing() !
}
@@ -854,7 +854,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
::rtl::OUString sPath;
pChanges[i].Accessor >>= sPath;
- if (sPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_AUTOSAVE_ENABLED)))
+ if ( sPath == CFG_ENTRY_AUTOSAVE_ENABLED )
{
sal_Bool bEnabled = sal_False;
if (pChanges[i].Element >>= bEnabled)
@@ -872,7 +872,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
}
}
else
- if (sPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)))
+ if ( sPath == CFG_ENTRY_AUTOSAVE_TIMEINTERVALL )
pChanges[i].Element >>= m_nAutoSaveTimeIntervall;
}
@@ -2878,27 +2878,27 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ
//-----------------------------------------------
sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
{
- if (aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)))
+ if ( aURL.Protocol == CMD_PROTOCOL )
{
- if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_PREPARE_EMERGENCY_SAVE)))
+ if ( aURL.Path == CMD_DO_PREPARE_EMERGENCY_SAVE )
return AutoRecovery::E_PREPARE_EMERGENCY_SAVE;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_EMERGENCY_SAVE)))
+ else if ( aURL.Path == CMD_DO_EMERGENCY_SAVE )
return AutoRecovery::E_EMERGENCY_SAVE;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_RECOVERY)))
+ else if ( aURL.Path == CMD_DO_RECOVERY )
return AutoRecovery::E_RECOVERY;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_BACKUP)))
+ else if ( aURL.Path == CMD_DO_ENTRY_BACKUP )
return AutoRecovery::E_ENTRY_BACKUP;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_CLEANUP)))
+ else if ( aURL.Path == CMD_DO_ENTRY_CLEANUP )
return AutoRecovery::E_ENTRY_CLEANUP;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_SAVE)))
+ else if ( aURL.Path == CMD_DO_SESSION_SAVE )
return AutoRecovery::E_SESSION_SAVE;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_QUIET_QUIT)))
+ else if ( aURL.Path == CMD_DO_SESSION_QUIET_QUIT )
return AutoRecovery::E_SESSION_QUIET_QUIT;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_RESTORE)))
+ else if ( aURL.Path == CMD_DO_SESSION_RESTORE )
return AutoRecovery::E_SESSION_RESTORE;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_DISABLE_RECOVERY)))
+ else if ( aURL.Path == CMD_DO_DISABLE_RECOVERY )
return AutoRecovery::E_DISABLE_AUTORECOVERY;
- else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SET_AUTOSAVE_STATE)))
+ else if ( aURL.Path == CMD_DO_SET_AUTOSAVE_STATE )
return AutoRecovery::E_SET_AUTOSAVE_STATE;
}
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 92b479d..55bed9b 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -227,11 +227,11 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
{
if (args[i] >>= v)
{
- if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManagerName")))
+ if ( v.Name == "SessionManagerName" )
v.Value >>= aSMgr;
- else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManager")))
+ else if ( v.Name == "SessionManager" )
v.Value >>= m_rSessionManager;
- else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AllowUserInteractionOnQuit")))
+ else if ( v.Name == "AllowUserInteractionOnQuit" )
v.Value >>= m_bAllowUserInteractionOnQuit;
}
}
@@ -250,13 +250,13 @@ void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event)
throw (css::uno::RuntimeException)
{
SAL_INFO("fwk.session", "SessionListener::statusChanged");
- if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")))
+ if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" )
{
if (event.FeatureDescriptor.compareToAscii("update")==0)
m_bRestored = sal_True; // a document was restored
}
- else if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave")))
+ else if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionSave" )
{
if (event.FeatureDescriptor.compareToAscii("stop")==0)
{
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 7426360..0abb42b 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -770,15 +770,15 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserConfigStorage")) )
+ if ( aPropValue.Name == "UserConfigStorage" )
{
aPropValue.Value >>= m_xUserConfigStorage;
}
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ModuleIdentifier")) )
+ else if ( aPropValue.Name == "ModuleIdentifier" )
{
aPropValue.Value >>= m_aModuleIdentifier;
}
- else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserRootCommit")) )
+ else if ( aPropValue.Name == "UserRootCommit" )
{
aPropValue.Value >>= m_xUserRootCommit;
}
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 241a3d5..773b1ce 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -215,7 +215,7 @@ throw ( NoSuchElementException, RuntimeException)
xCont->getByName(ModuleIdentifier) >>= lProps;
for (sal_Int32 i=0; i<lProps.getLength(); ++i)
{
- if (lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName")))
+ if ( lProps[i].Name == "ooSetupFactoryShortName" )
{
lProps[i].Value >>= sShort;
break;
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 1f09742..bc68f63 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1396,7 +1396,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
::rtl::OUString aWindowStateFileStr;
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
- if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryWindowStateConfigRef")) )
+ if ( aSeq[y].Name == "ooSetupFactoryWindowStateConfigRef" )
{
aSeq[y].Value >>= aWindowStateFileStr;
break;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0ff34d6..38b14b1 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -883,7 +883,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
// Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
// Only non-popup menu items can have a short-cut
- if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
+ if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
{
KeyCode aKeyCode( KEY_F1 );
pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
@@ -1481,7 +1481,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
// Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
// Only non-popup menu items can have a short-cut
- if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
+ if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
{
KeyCode aKeyCode( KEY_F1 );
pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index a89ca7e..45d5bf8 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -193,7 +193,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MenuOnly")) )
+ if ( aPropValue.Name == "MenuOnly" )
aPropValue.Value >>= bMenuOnly;
}
}
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index d273196..d82be5a 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -514,7 +514,7 @@ void NewMenuController::impl_setPopupMenu()
{
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
- if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryEmptyDocumentURL")) )
+ if ( aSeq[y].Name == "ooSetupFactoryEmptyDocumentURL" )
{
aSeq[y].Value >>= m_aEmptyDocURL;
break;
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 3093ec7..ef15fe7 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -490,27 +490,27 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
- if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aProp[i].Value >>= aCommandURL;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
{
aProp[i].Value >>= aHelpURL;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_STYLE )
{
aProp[i].Value >>= nStyle;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TYPE )
{
aProp[i].Value >>= nType;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_WIDTH )
{
aProp[i].Value >>= nWidth;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_OFFSET)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_OFFSET )
{
aProp[i].Value >>= nOffset;
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 067dbe4..80adbd7 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -547,7 +547,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
if ( m_bDisposed )
return;
- if ( Event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ImageOrientation")) )
+ if ( Event.FeatureURL.Complete == ".uno:ImageOrientation" )
{
SfxImageItem aItem( 1, 0 );
aItem.PutValue( Event.State );
@@ -872,7 +872,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
aPropSeq = GetPropsForCommand( aCmdURL );
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) )
+ if ( aPropSeq[i].Name == "Name" )
{
aPropSeq[i].Value >>= aLabel;
break;
@@ -890,7 +890,7 @@ sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString&
aPropSeq = GetPropsForCommand( aCmdURL );
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Properties")) )
+ if ( aPropSeq[i].Name == "Properties" )
{
aPropSeq[i].Value >>= nProperties;
break;
@@ -1282,7 +1282,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
- if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aProp[i].Value >>= aCommandURL;
if ( aCommandURL.compareToAscii(MENUPREFIX, RTL_CONSTASCII_LENGTH(MENUPREFIX) ) == 0 )
@@ -1303,7 +1303,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
xMenuContainer->getByIndex(0) >>= aProps;
for ( sal_Int32 index=0; index<aProps.getLength(); ++index )
{
- if ( aProps[ index ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
+ if ( aProps[ index ].Name == ITEM_DESCRIPTOR_CONTAINER )
{
aProps[ index ].Value >>= aMenuDesc;
@@ -1317,19 +1317,19 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
}
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
aProp[i].Value >>= aHelpURL;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TOOLTIP)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TOOLTIP )
aProp[i].Value >>= aTooltip;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_LABEL )
aProp[i].Value >>= aLabel;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TYPE )
aProp[i].Value >>= nType;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_VISIBLE )
aProp[i].Value >>= bIsVisible;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_WIDTH )
aProp[i].Value >>= nWidth;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list