[Libreoffice-commits] core.git: 3 commits - basegfx/test basic/source chart2/source connectivity/source cppuhelper/source cpputools/source dbaccess/source desktop/source extensions/source forms/source framework/source i18npool/source i18nutil/source io/test lingucomponent/source linguistic/source linguistic/workben mysqlc/source odk/examples oox/source package/source padmin/source pyuno/source reportdesign/source sal/qa scaddins/source scripting/source sc/source sdext/source sd/source sfx2/source shell/source store/workben svl/source svtools/source svx/source sw/source testtools/source toolkit/source tools/qa ucb/source ucb/workben unotools/source unoxml/source uui/source vcl/generic vcl/unx xmlhelp/source xmloff/source xmlsecurity/source
Noel Grandin
noel at peralex.com
Mon Nov 11 02:59:12 PST 2013
basegfx/test/basegfx2d.cxx | 16 -
basic/source/classes/eventatt.cxx | 2
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 2
connectivity/source/cpool/Zregistration.cxx | 2
connectivity/source/drivers/ado/AConnection.cxx | 8
connectivity/source/drivers/calc/CConnection.cxx | 2
connectivity/source/drivers/evoab2/NConnection.cxx | 2
connectivity/source/drivers/file/FConnection.cxx | 8
connectivity/source/drivers/flat/EConnection.cxx | 12 -
connectivity/source/drivers/hsqldb/HConnection.cxx | 2
connectivity/source/drivers/hsqldb/HTable.cxx | 4
connectivity/source/drivers/mork/MDriver.cxx | 4
connectivity/source/drivers/mork/MResultSet.cxx | 4
connectivity/source/drivers/mozab/MConnection.cxx | 24 +-
connectivity/source/drivers/mozab/MDriver.cxx | 2
connectivity/source/drivers/mozab/MResultSet.cxx | 4
connectivity/source/drivers/odbcbase/OConnection.cxx | 26 +-
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 4
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 12 -
connectivity/source/drivers/postgresql/pq_driver.cxx | 2
connectivity/source/manager/mregistration.cxx | 2
cppuhelper/source/factory.cxx | 4
cppuhelper/source/implementationentry.cxx | 2
cpputools/source/unoexe/unoexe.cxx | 12 -
dbaccess/source/core/dataaccess/ContentHelper.cxx | 6
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 4
dbaccess/source/core/dataaccess/documentcontainer.cxx | 2
dbaccess/source/core/dataaccess/documentdefinition.cxx | 8
dbaccess/source/core/dataaccess/documentevents.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/browser/genericcontroller.cxx | 4
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 4
dbaccess/source/ui/uno/unoDirectSql.cxx | 4
dbaccess/source/ui/uno/unoadmin.cxx | 4
desktop/source/app/appinit.cxx | 2
desktop/source/offacc/acceptor.cxx | 6
extensions/source/bibliography/bibload.cxx | 2
extensions/source/plugin/base/xplugin.cxx | 8
extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 10
forms/source/component/Filter.cxx | 6
forms/source/helper/formnavigation.cxx | 2
forms/source/misc/InterfaceContainer.cxx | 12 -
forms/source/xforms/binding.cxx | 2
framework/source/jobs/joburl.cxx | 12 -
framework/source/services/sessionlistener.cxx | 4
i18npool/source/breakiterator/breakiteratorImpl.cxx | 8
i18npool/source/breakiterator/breakiterator_unicode.cxx | 2
i18npool/source/calendar/calendarImpl.cxx | 2
i18npool/source/calendar/calendar_gregorian.cxx | 2
i18npool/source/characterclassification/cclass_unicode.cxx | 2
i18npool/source/characterclassification/characterclassificationImpl.cxx | 2
i18npool/source/collator/chaptercollator.cxx | 2
i18npool/source/collator/collator_unicode.cxx | 2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 2
i18npool/source/indexentry/indexentrysupplier.cxx | 2
i18npool/source/indexentry/indexentrysupplier_common.cxx | 2
i18npool/source/inputchecker/inputsequencechecker.cxx | 2
i18npool/source/localedata/LocaleNode.cxx | 10
i18npool/source/nativenumber/nativenumbersupplier.cxx | 2
i18npool/source/numberformatcode/numberformatcode.cxx | 2
i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 2
i18npool/source/transliteration/transliterationImpl.cxx | 4
i18nutil/source/utility/paper.cxx | 28 +-
io/test/stm/datatest.cxx | 36 +--
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
linguistic/source/convdiclist.cxx | 2
linguistic/source/dlistimp.cxx | 2
linguistic/source/gciterator.cxx | 2
linguistic/source/lngopt.cxx | 2
linguistic/source/lngsvcmgr.cxx | 34 +-
linguistic/workben/sspellimp.cxx | 2
mysqlc/source/mysqlc_connection.cxx | 12 -
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx | 16 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx | 18 -
oox/source/drawingml/graphicshapecontext.cxx | 2
oox/source/drawingml/table/tableproperties.cxx | 6
oox/source/drawingml/textfield.cxx | 2
oox/source/ppt/animationtypes.cxx | 4
oox/source/ppt/commonbehaviorcontext.cxx | 2
oox/source/ppt/pptfilterhelpers.cxx | 2
oox/source/ppt/timenodelistcontext.cxx | 2
package/source/manifest/UnoRegister.cxx | 8
padmin/source/cmddlg.cxx | 2
padmin/source/desktopcontext.cxx | 2
padmin/source/padialog.cxx | 2
pyuno/source/module/pyuno_adapter.cxx | 6
pyuno/source/module/pyuno_type.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 2
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 4
sc/source/filter/xml/xmldrani.cxx | 2
sc/source/filter/xml/xmlfilti.cxx | 24 +-
sc/source/filter/xml/xmlimprt.cxx | 46 +--
sc/source/filter/xml/xmlsorti.cxx | 2
sc/source/ui/unoobj/confuno.cxx | 120 +++++-----
sc/source/ui/unoobj/defltuno.cxx | 8
sc/source/ui/unoobj/dispuno.cxx | 10
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/eventuno.cxx | 4
sc/source/ui/vba/vbachartobject.cxx | 2
sc/source/ui/view/prevwsh.cxx | 4
sc/source/ui/view/viewdata.cxx | 90 +++----
scaddins/source/analysis/analysis.cxx | 4
scaddins/source/pricing/pricing.cxx | 20 -
scripting/source/dlgprov/dlgevtatt.cxx | 2
sd/source/filter/eppt/pptexanimations.cxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 4
sd/source/ui/dlg/dlgass.cxx | 4
sd/source/ui/framework/factories/FullScreenPane.cxx | 2
sd/source/ui/remotecontrol/ImagePreparer.cxx | 2
sdext/source/minimizer/pppoptimizer.cxx | 8
sdext/source/minimizer/pppoptimizerdialog.cxx | 8
sdext/source/pdfimport/filterdet.cxx | 3
sdext/source/pdfimport/services.cxx | 2
sdext/source/pdfimport/test/tests.cxx | 34 +-
sdext/source/presenter/PresenterPaneFactory.cxx | 2
sfx2/source/appl/helpdispatch.cxx | 4
sfx2/source/control/unoctitm.cxx | 2
sfx2/source/doc/doctemplates.cxx | 6
sfx2/source/doc/printhelper.cxx | 26 +-
shell/source/cmdmail/cmdmailmsg.cxx | 28 +-
store/workben/t_store.cxx | 2
svl/source/fsstor/fsfactory.cxx | 2
svl/source/numbers/numfmuno.cxx | 8
svl/source/passwordcontainer/passwordcontainer.cxx | 4
svl/source/uno/pathservice.cxx | 2
svtools/source/graphic/provider.cxx | 16 -
svtools/source/hatchwindow/hatchwindowfactory.cxx | 4
svtools/source/java/javacontext.cxx | 2
svtools/source/uno/addrtempuno.cxx | 6
svtools/source/uno/miscservices.cxx | 4
svtools/source/uno/unoevent.cxx | 2
svx/source/form/fmscriptingenv.cxx | 4
svx/source/form/fmshimp.cxx | 2
svx/source/form/fmsrccfg.cxx | 9
sw/source/core/crsr/findtxt.cxx | 7
sw/source/core/fields/authfld.cxx | 2
sw/source/core/unocore/unoframe.cxx | 13 -
sw/source/core/unocore/unostyle.cxx | 32 +-
sw/source/filter/html/htmlforw.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/mailmergehelper.cxx | 6
sw/source/ui/envelp/mailmrge.cxx | 4
sw/source/ui/uno/unodispatch.cxx | 24 +-
sw/source/ui/uno/unotxdoc.cxx | 2
sw/source/ui/uno/unotxvw.cxx | 14 -
testtools/source/bridgetest/bridgetest.cxx | 8
testtools/source/performance/ubtest.cxx | 4
toolkit/source/controls/controlmodelcontainerbase.cxx | 58 ++--
tools/qa/cppunit/test_urlobj.cxx | 94 +++----
ucb/source/cacher/cacheserv.cxx | 8
ucb/source/core/ucbcmds.cxx | 4
ucb/source/core/ucbserv.cxx | 10
ucb/source/sorter/sortmain.cxx | 2
ucb/source/sorter/sortresult.cxx | 16 -
ucb/source/ucp/cmis/cmis_provider.cxx | 2
ucb/source/ucp/file/prov.cxx | 16 -
ucb/source/ucp/ftp/ftpcontent.cxx | 36 +--
ucb/source/ucp/ftp/ftpresultsetI.cxx | 16 -
ucb/source/ucp/ftp/ftpservices.cxx | 2
ucb/source/ucp/gio/gio_provider.cxx | 2
ucb/source/ucp/gvfs/gvfs_provider.cxx | 2
ucb/source/ucp/hierarchy/hierarchyservices.cxx | 4
ucb/source/ucp/package/pkgservices.cxx | 2
ucb/source/ucp/tdoc/tdoc_services.cxx | 4
ucb/source/ucp/webdav-neon/DateTimeHelper.cxx | 24 +-
ucb/source/ucp/webdav-neon/webdavservices.cxx | 2
ucb/source/ucp/webdav/DateTimeHelper.cxx | 38 +--
ucb/source/ucp/webdav/webdavservices.cxx | 2
ucb/workben/ucb/ucbdemo.cxx | 2
unotools/source/config/eventcfg.cxx | 2
unotools/source/config/lingucfg.cxx | 4
unotools/source/config/securityoptions.cxx | 22 -
unotools/source/ucbhelper/tempfile.cxx | 2
unotools/source/ucbhelper/xtempfile.cxx | 2
unoxml/source/events/eventdispatcher.cxx | 32 +-
unoxml/source/service/services.cxx | 8
uui/source/iahndl-filter.cxx | 4
uui/source/iahndl.cxx | 2
uui/source/services.cxx | 2
vcl/generic/fontmanager/fontmanager.cxx | 6
vcl/unx/generic/dtrans/X11_selection.cxx | 10
vcl/unx/generic/printer/printerinfomanager.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 20 -
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 2
xmlhelp/source/cxxhelp/provider/services.cxx | 2
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 34 +-
xmlhelp/source/treeview/tvfactory.cxx | 6
xmlhelp/source/treeview/tvread.cxx | 18 -
xmloff/source/chart/SchXMLExport.cxx | 2
xmloff/source/core/DocumentSettingsContext.cxx | 6
xmloff/source/draw/XMLNumberStyles.cxx | 2
xmloff/source/draw/animationexport.cxx | 2
xmloff/source/draw/ximpshap.cxx | 32 +-
xmloff/source/forms/elementimport.cxx | 6
xmloff/source/forms/layerimport.cxx | 6
xmloff/source/forms/propertyexport.cxx | 2
xmloff/source/style/xmlnumfi.cxx | 4
xmloff/source/style/xmlprmap.cxx | 2
xmloff/source/text/XMLTextFrameContext.cxx | 2
xmloff/source/text/XMLTextMarkImportContext.cxx | 16 -
xmloff/source/text/txtflde.cxx | 6
xmlsecurity/source/component/certificatecontainer.cxx | 2
206 files changed, 891 insertions(+), 919 deletions(-)
New commits:
commit fcd1637d5101b9142e6808edfb77b01122857901
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 5 14:39:55 2013 +0200
convert OUString compareToAscii == 0 to equalsAscii
Convert code like
aStr.compareToAscii("XXX") == 0
to
aStr.equalsAscii("XXX")
which is both easier to read and faster.
Change-Id: I448abf58f2fa0e7715dba53f8e8825ca0587c83f
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index e7ab715..7df636f 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -189,7 +189,7 @@ void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeExc
void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet )
{
- if( aScriptEvent.ScriptType.compareToAscii( "StarBasic" ) == 0 )
+ if( aScriptEvent.ScriptType.equalsAscii( "StarBasic" ) )
{
// Full qualified name?
OUString aMacro( aScriptEvent.ScriptCode );
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 6803980..3d3d657 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -38,7 +38,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char*
{
void* pRet = NULL;
- if (OPoolCollection::getImplementationName_Static().compareToAscii(_pImplName) == 0)
+ if (OPoolCollection::getImplementationName_Static().equalsAscii(_pImplName))
{
Reference< XSingleServiceFactory > xFactory(
::cppu::createOneInstanceFactory(
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 6d4577c..40e9a82 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -173,7 +173,7 @@ namespace connectivity { namespace hsqldb
const PropertyValue* pEnd = pIter + aInfo.getLength();
for(;pIter != pEnd;++pIter)
{
- if ( pIter->Name.compareToAscii("readonly") == 0 )
+ if ( pIter->Name.equalsAscii("readonly") )
m_bReadOnly = true;
}
}
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index 1a70ed2..851e18e 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -118,8 +118,8 @@ sal_Bool MorkDriver::acceptsURL(OUString const & url)
aAddrbookScheme = aAddrbookURI.copy(0, nLen);
}
- if ((aAddrbookScheme.compareToAscii( "thunderbird" ) == 0) ||
- (aAddrbookScheme.compareToAscii( "mozilla" ) == 0))
+ if (aAddrbookScheme.equalsAscii( "thunderbird" ) ||
+ aAddrbookScheme.equalsAscii( "mozilla" ) )
{
return true;
}
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 163054e..99f7275 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -875,8 +875,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
matchString = parseTree->getChild(2)->getTokenValue();
}
- if ( columnName.compareToAscii("0") ==0 && op == MQueryOp::Is &&
- matchString.compareToAscii("1") == 0 ) {
+ if ( columnName.equalsAscii("0") && op == MQueryOp::Is &&
+ matchString.equalsAscii("1") ) {
OSL_TRACE("Query always evaluates to FALSE");
m_bIsAlwaysFalseQuery = sal_True;
}
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 766d251..8d78938 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -245,7 +245,7 @@ EDriverType MozabDriver::impl_classifyURL( const OUString& url )
for ( size_t i=0; i < sizeof( aSchemeMap ) / sizeof( aSchemeMap[0] ); ++i )
{
- if ( aAddrbookScheme.compareToAscii( aSchemeMap[i].pScheme ) == 0 )
+ if ( aAddrbookScheme.equalsAscii( aSchemeMap[i].pScheme ) )
return aSchemeMap[i].eType;
}
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 13ce879..d0e449e 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -857,8 +857,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
matchString = parseTree->getChild(2)->getTokenValue();
}
- if ( columnName.compareToAscii("0") ==0 && op == MQueryOp::Is &&
- matchString.compareToAscii("1") == 0 ) {
+ if ( columnName.equalsAscii("0") && op == MQueryOp::Is &&
+ matchString.equalsAscii("1") ) {
OSL_TRACE("Query always evaluates to FALSE");
m_bIsAlwaysFalseQuery = sal_True;
}
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index af01a22..ce712f3 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -38,7 +38,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char* _
{
void* pRet = NULL;
- if (::drivermanager::OSDBCDriverManager::getImplementationName_static().compareToAscii(_pImplName) == 0)
+ if (::drivermanager::OSDBCDriverManager::getImplementationName_static().equalsAscii(_pImplName))
{
Reference< XSingleServiceFactory > xFactory(
::cppu::createOneInstanceFactory(
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index aff6a54..b9e85c1 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -809,9 +809,9 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
if( nPos != -1 )
{
aActivatorName = aLocation.copy( 0, nPos );
- if( aActivatorName.compareToAscii( "java" ) == 0 )
+ if( aActivatorName.equalsAscii( "java" ) )
aActivatorName = "com.sun.star.loader.Java";
- else if( aActivatorName.compareToAscii( "module" ) == 0 )
+ else if( aActivatorName.equalsAscii( "module" ) )
aActivatorName = "com.sun.star.loader.SharedLibrary";
aLocation = aLocation.copy( nPos + 3 );
}
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 971ce34..e02003a 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -200,16 +200,16 @@ static Reference< XInterface > loadComponent(
OUString aExt( rLocation.copy( nDot +1 ) );
- if (aExt.compareToAscii( "dll" ) == 0 ||
- aExt.compareToAscii( "exe" ) == 0 ||
- aExt.compareToAscii( "dylib" ) == 0 ||
- aExt.compareToAscii( "so" ) == 0)
+ if (aExt.equalsAscii( "dll" ) ||
+ aExt.equalsAscii( "exe" ) ||
+ aExt.equalsAscii( "dylib" ) ||
+ aExt.equalsAscii( "so" ) )
{
createInstance(
xLoader, xContext, OUString("com.sun.star.loader.SharedLibrary") );
}
- else if (aExt.compareToAscii( "jar" ) == 0 ||
- aExt.compareToAscii( "class" ) == 0)
+ else if (aExt.equalsAscii( "jar" ) ||
+ aExt.equalsAscii( "class" ) )
{
createInstance(
xLoader, xContext, OUString("com.sun.star.loader.Java") );
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 9f36d7b..da438d7 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -157,7 +157,7 @@ sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier( ) throw (RuntimeExc
Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException)
{
Any aRet;
- if ( aCommand.Name.compareToAscii( "getPropertyValues" ) == 0 )
+ if ( aCommand.Name.equalsAscii( "getPropertyValues" ) )
{
// getPropertyValues
@@ -175,7 +175,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
}
aRet <<= getPropertyValues( Properties);
}
- else if ( aCommand.Name.compareToAscii( "setPropertyValues" ) == 0 )
+ else if ( aCommand.Name.equalsAscii( "setPropertyValues" ) )
{
// setPropertyValues
@@ -206,7 +206,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
aRet <<= setPropertyValues( aProperties, Environment );
}
- else if ( aCommand.Name.compareToAscii( "getPropertySetInfo" ) == 0 )
+ else if ( aCommand.Name.equalsAscii( "getPropertySetInfo" ) )
{
// getPropertySetInfo
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index d3b4e47..7d2bb79 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -763,7 +763,7 @@ sal_Bool ODatabaseDocument::impl_attachResource( const OUString& i_rLogicalDocum
{
if ( ( i_rLogicalDocumentURL == getURL() )
&& ( i_rMediaDescriptor.getLength() == 1 )
- && ( i_rMediaDescriptor[0].Name.compareToAscii( "BreakMacroSignature" ) == 0 )
+ && ( i_rMediaDescriptor[0].Name.equalsAscii( "BreakMacroSignature" ) )
)
{
// this is a BAD hack of the Basic importer code ... there should be a dedicated API for this,
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 155c1bd..bfacec0 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -397,7 +397,7 @@ Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames( ) t
Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException)
{
Any aRet;
- if ( aCommand.Name.compareToAscii( "open" ) == 0 )
+ if ( aCommand.Name.equalsAscii( "open" ) )
{
// open command for a folder content
OpenCommandArgument2 aOpenCommand;
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index d5e6d6b..221d3c8 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1084,14 +1084,14 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
dispose();
}
- else if ( ( aCommand.Name.compareToAscii( "storeOwn" ) == 0 ) // compatibility
- || ( aCommand.Name.compareToAscii( "store" ) == 0 )
+ else if ( aCommand.Name.equalsAscii( "storeOwn" ) // compatibility
+ || aCommand.Name.equalsAscii( "store" )
)
{
impl_store_throw();
}
- else if ( ( aCommand.Name.compareToAscii( "shutdown" ) == 0 ) // compatibility
- || ( aCommand.Name.compareToAscii( "close" ) == 0 )
+ else if ( aCommand.Name.equalsAscii( "shutdown" ) // compatibility
+ || aCommand.Name.equalsAscii( "close" )
)
{
aRet <<= impl_close_throw();
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index d4e9fbe..959d678 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -137,7 +137,7 @@ namespace dbaccess
const DocumentEventData* pEventData = lcl_getDocumentEventData();
while ( pEventData->pAsciiEventName )
{
- if ( _rEventName.compareToAscii( pEventData->pAsciiEventName ) == 0 )
+ if ( _rEventName.equalsAscii( pEventData->pAsciiEventName ) )
return pEventData->bNeedsSyncNotify;
++pEventData;
}
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 249d0d1..dd362aa 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -439,7 +439,7 @@ Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::get
::sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::supportsMode( const OUString& aMode ) throw (RuntimeException)
{
- return aMode.compareToAscii( "DataMode" ) == 0;
+ return aMode.equalsAscii( "DataMode" );
}
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< ::com::sun::star::awt::XTabControllerModel > & /*Model*/) throw( RuntimeException )
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 465b266..065bb3d 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -231,7 +231,7 @@ void Desktop::destroyAcceptor(const OUString& aAcceptString)
{
// special case stop all acceptors
AcceptorMap &rMap = acceptorMap::get();
- if (aAcceptString.compareToAscii("all") == 0) {
+ if (aAcceptString.equalsAscii("all")) {
rMap.clear();
} else {
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 194d32e..5d11e0f 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -230,15 +230,15 @@ Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName )
Reference<XInterface> rInstance;
- if ( aName.compareToAscii( "StarOffice.ServiceManager" ) == 0)
+ if ( aName.equalsAscii( "StarOffice.ServiceManager" ) )
{
rInstance = Reference< XInterface >( m_rContext->getServiceManager() );
}
- else if(aName.compareToAscii( "StarOffice.ComponentContext" ) == 0 )
+ else if(aName.equalsAscii( "StarOffice.ComponentContext" ) )
{
rInstance = m_rContext;
}
- else if ( aName.compareToAscii("StarOffice.NamingService" ) == 0 )
+ else if ( aName.equalsAscii("StarOffice.NamingService" ) )
{
Reference< XNamingService > rNamingService(
m_rContext->getServiceManager()->createInstanceWithContext("com.sun.star.uno.NamingService", m_rContext),
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 18e62a5..3702813 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -898,7 +898,7 @@ PluginDescription XPlugin_Impl::fitDescription( const OUString& rURL )
{
for( int i = 0; i < aDescrs.getLength(); i++ )
{
- if( pDescrs[i].Mimetype.compareToAscii( m_pArgv[nArg] ) == 0 )
+ if( pDescrs[i].Mimetype.equalsAscii( m_pArgv[nArg] ) )
return pDescrs[i];
}
}
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index dea35af..410b76a 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -462,7 +462,7 @@ namespace frm
const FeatureURL* pFeatures = lcl_getFeatureTable();
while ( pFeatures->pAsciiURL )
{
- if ( _rCompleteURL.compareToAscii( pFeatures->pAsciiURL ) == 0 )
+ if ( _rCompleteURL.equalsAscii( pFeatures->pAsciiURL ) )
return pFeatures->nFormFeature;
++pFeatures;
}
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 8e48e7b..71e7f51 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -390,14 +390,14 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL ,
(aURL.isValid() ) &&
(aURL.getEvent(sEvent) ) &&
(!sEvent.isEmpty() ) &&
- (sEvent.compareToAscii(pExpectedEvent)==0)
+ (sEvent.equalsAscii(pExpectedEvent))
);
if (bOK && pExpectedEventArgs!=NULL)
{
bOK = (
(aURL.getEventArgs(sEventArgs) ) &&
- (sEventArgs.compareToAscii(pExpectedEventArgs)==0)
+ (sEventArgs.equalsAscii(pExpectedEventArgs))
);
};
}
@@ -426,14 +426,14 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL ,
(aURL.isValid() ) &&
(aURL.getAlias(sAlias) ) &&
(!sAlias.isEmpty() ) &&
- (sAlias.compareToAscii(pExpectedAlias)==0)
+ (sAlias.equalsAscii(pExpectedAlias))
);
if (bOK && pExpectedAliasArgs!=NULL)
{
bOK = (
(aURL.getAliasArgs(sAliasArgs) ) &&
- (sAliasArgs.compareToAscii(pExpectedAliasArgs)==0)
+ (sAliasArgs.equalsAscii(pExpectedAliasArgs))
);
};
}
@@ -462,14 +462,14 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL ,
(aURL.isValid() ) &&
(aURL.getService(sService) ) &&
(!sService.isEmpty() ) &&
- (sService.compareToAscii(pExpectedService)==0)
+ (sService.equalsAscii(pExpectedService))
);
if (bOK && pExpectedServiceArgs!=NULL)
{
bOK = (
(aURL.getServiceArgs(sServiceArgs) ) &&
- (sServiceArgs.compareToAscii(pExpectedServiceArgs)==0)
+ (sServiceArgs.equalsAscii(pExpectedServiceArgs))
);
};
}
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index bb8be51..cb221ae 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -204,13 +204,13 @@ void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event)
SAL_INFO("fwk.session", "SessionListener::statusChanged");
if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" )
{
- if (event.FeatureDescriptor.compareToAscii("update")==0)
+ if (event.FeatureDescriptor.equalsAscii("update"))
m_bRestored = sal_True; // a document was restored
}
else if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionSave" )
{
- if (event.FeatureDescriptor.compareToAscii("stop")==0)
+ if (event.FeatureDescriptor.equalsAscii("stop"))
{
if (m_rSessionManager.is())
m_rSessionManager->saveDone(this); // done with save
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index b5e4331..0123583 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -587,9 +587,9 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (
// load service with name <base>_<lang>_<country>
createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).append(
rLocale.Country).makeStringAndClear())) ||
- (l > 0 && c > 0 && rLocale.Language.compareToAscii("zh") == 0 &&
- (rLocale.Country.compareToAscii("HK") == 0 ||
- rLocale.Country.compareToAscii("MO") == 0) &&
+ (l > 0 && c > 0 && rLocale.Language.equalsAscii("zh") &&
+ (rLocale.Country.equalsAscii("HK") ||
+ rLocale.Country.equalsAscii("MO") ) &&
// if the country code is HK or MO, one more step to try TW.
createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).appendAscii(
"TW").makeStringAndClear())) ||
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index a4060d4..bd926d1 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -525,7 +525,7 @@ static
int should_ignore( OUString s )
{
// return true if blank or null
- return s.compareToAscii(" ")==0 || (!s.isEmpty() && s[0]==0);
+ return s.equalsAscii(" ") || (!s.isEmpty() && s[0]==0);
}
static
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index 6a4ef3b..4f27493 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.cxx
@@ -184,7 +184,7 @@ IndexEntrySupplier::getImplementationName() throw( RuntimeException )
sal_Bool SAL_CALL
IndexEntrySupplier::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return rServiceName.compareToAscii(implementationName) == 0;
+ return rServiceName.equalsAscii(implementationName);
}
Sequence< OUString > SAL_CALL
diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx
index e4dba38..cdaf612 100644
--- a/i18npool/source/indexentry/indexentrysupplier_common.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx
@@ -126,7 +126,7 @@ IndexEntrySupplier_Common::getImplementationName() throw( RuntimeException )
sal_Bool SAL_CALL
IndexEntrySupplier_Common::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return rServiceName.compareToAscii(implementationName) == 0;
+ return rServiceName.equalsAscii(implementationName);
}
Sequence< OUString > SAL_CALL
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 4669677..ff4ce97 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -1297,7 +1297,7 @@ void LCCollationNode::generateCode (const OFileWriter &of) const
for ( j = 0; j < getNumberOfChildren(); j++ ) {
LocaleNode * currNode = getChildAt (j);
- if( currNode->getName().compareToAscii("Collator") == 0 )
+ if( currNode->getName().equalsAscii("Collator") )
{
OUString str;
str = currNode->getAttr().getValueByName("unoid");
@@ -1310,7 +1310,7 @@ void LCCollationNode::generateCode (const OFileWriter &of) const
nbOfCollations++;
}
- if( currNode->getName().compareToAscii("CollationOptions") == 0 )
+ if( currNode->getName().equalsAscii("CollationOptions") )
{
LocaleNode* pCollationOptions = currNode;
nbOfCollationOptions = sal::static_int_cast<sal_Int16>( pCollationOptions->getNumberOfChildren() );
@@ -1411,7 +1411,7 @@ void LCIndexNode::generateCode (const OFileWriter &of) const
sal_Int16 i;
for (i = 0; i< getNumberOfChildren();i++) {
LocaleNode * currNode = getChildAt (i);
- if( currNode->getName().compareToAscii("IndexKey") == 0 )
+ if( currNode->getName().equalsAscii("IndexKey") )
{
OUString str;
str = currNode->getAttr().getValueByName("unoid");
@@ -1428,13 +1428,13 @@ void LCIndexNode::generateCode (const OFileWriter &of) const
nbOfIndexs++;
}
- if( currNode->getName().compareToAscii("UnicodeScript") == 0 )
+ if( currNode->getName().equalsAscii("UnicodeScript") )
{
of.writeParameter("unicodeScript", currNode->getValue(), nbOfUnicodeScripts );
nbOfUnicodeScripts++;
}
- if( currNode->getName().compareToAscii("FollowPageWord") == 0 )
+ if( currNode->getName().equalsAscii("FollowPageWord") )
{
of.writeParameter("followPageWord", currNode->getValue(), nbOfPageWords);
nbOfPageWords++;
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index bf2ff11..38e7905 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -898,7 +898,7 @@ OUString SAL_CALL NativeNumberSupplier::getImplementationName() throw( RuntimeEx
sal_Bool SAL_CALL
NativeNumberSupplier::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return rServiceName.compareToAscii(implementationName) == 0;
+ return rServiceName.equalsAscii(implementationName);
}
Sequence< OUString > SAL_CALL
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 2af62a7..d700646 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -613,7 +613,7 @@ TransliterationImpl::loadModuleByName( const OUString& implName,
// if the module is ignore case/kana/width, load caseignore for equals/compareString mothed
for (sal_Int16 i = 0; i < 3; i++) {
- if (implName.compareToAscii(TMlist[i].implName) == 0) {
+ if (implName.equalsAscii(TMlist[i].implName)) {
if (i == 0) // current module is caseignore
body->loadModule(TMlist[0].tm, rLocale); // caseingore need to setup module name
if (! caseignore.is()) {
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
index a9d78f9..c9bd218 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
@@ -115,13 +115,13 @@ Reference< XDispatch > SAL_CALL Addon::queryDispatch( const URL& aURL, const ::r
throw( RuntimeException )
{
Reference < XDispatch > xRet;
- if ( aURL.Protocol.compareToAscii("org.openoffice.Office.addon.example:") == 0 )
+ if ( aURL.Protocol.equalsAscii("org.openoffice.Office.addon.example:") )
{
- if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
+ if ( aURL.Path.equalsAscii( "Function1" ) )
xRet = this;
- else if ( aURL.Path.compareToAscii( "Function2" ) == 0 )
+ else if ( aURL.Path.equalsAscii( "Function2" ) )
xRet = this;
- else if ( aURL.Path.compareToAscii( "Help" ) == 0 )
+ else if ( aURL.Path.equalsAscii( "Help" ) )
xRet = this;
}
@@ -134,21 +134,21 @@ Reference< XDispatch > SAL_CALL Addon::queryDispatch( const URL& aURL, const ::r
*/
void SAL_CALL Addon::dispatch( const URL& aURL, const Sequence < PropertyValue >& lArgs ) throw (RuntimeException)
{
- if ( aURL.Protocol.compareToAscii("org.openoffice.Office.addon.example:") == 0 )
+ if ( aURL.Protocol.equalsAscii("org.openoffice.Office.addon.example:") )
{
- if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
+ if ( aURL.Path.equalsAscii( "Function1" ) )
{
ShowMessageBox( mxToolkit, mxFrame,
OUString( "SDK Add-On example" ),
OUString( "Function 1 activated" ) );
}
- else if ( aURL.Path.compareToAscii( "Function2" ) == 0 )
+ else if ( aURL.Path.equalsAscii( "Function2" ) )
{
ShowMessageBox( mxToolkit, mxFrame,
OUString( "SDK Add-On example" ),
OUString( "Function 2 activated" ) );
}
- else if ( aURL.Path.compareToAscii( "Help" ) == 0 )
+ else if ( aURL.Path.equalsAscii( "Help" ) )
{
// Show info box
ShowMessageBox( mxToolkit, mxFrame,
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 73882f8..4cf3366 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -128,7 +128,7 @@ ContextHandlerRef GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
return new DiagramGraphicDataContext( *this, mpShapePtr );
else if ( sUri == "http://schemas.openxmlformats.org/drawingml/2006/chart" )
return new ChartGraphicDataContext( *this, mpShapePtr, mbEmbedShapesInChart );
- else if ( sUri.compareToAscii( "http://schemas.openxmlformats.org/drawingml/2006/table" ) == 0 )
+ else if ( sUri.equalsAscii( "http://schemas.openxmlformats.org/drawingml/2006/table" ) )
return new table::TableContext( *this, mpShapePtr );
else
{
diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx
index bf566ba..76d909b 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -119,7 +119,7 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields,
OSL_TRACE( "Exception %s", OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
}
- else if ( sType.compareToAscii( "slidenum" ) == 0 )
+ else if ( sType.equalsAscii( "slidenum" ) )
{
xIface = xFactory->createInstance( "com.sun.star.text.TextField.PageNumber" );
aFields.push_back( Reference< XTextField > ( xIface, UNO_QUERY ) );
diff --git a/oox/source/ppt/animationtypes.cxx b/oox/source/ppt/animationtypes.cxx
index a6ba788..4992fdd 100644
--- a/oox/source/ppt/animationtypes.cxx
+++ b/oox/source/ppt/animationtypes.cxx
@@ -34,7 +34,7 @@ namespace oox { namespace ppt {
Any GetTime( const OUString & val )
{
Any aDuration;
- if( val.compareToAscii( "indefinite" ) == 0 )
+ if( val.equalsAscii( "indefinite" ) )
{
aDuration <<= Timing_INDEFINITE;
}
@@ -50,7 +50,7 @@ Any GetTime( const OUString & val )
Any GetTimeAnimateValueTime( const OUString & val )
{
Any aPercent;
- if( val.compareToAscii( "indefinite" ) == 0 )
+ if( val.equalsAscii( "indefinite" ) )
{
aPercent <<= Timing_INDEFINITE;
}
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index dd19dee..5cc23c5 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -89,7 +89,7 @@ namespace oox { namespace ppt {
const ImplAttributeNameConversion *attrConv = gImplConversionList;
while( attrConv->mpMSName != NULL )
{
- if(msCurrentAttribute.compareToAscii( attrConv->mpMSName ) == 0 )
+ if(msCurrentAttribute.equalsAscii( attrConv->mpMSName ) )
{
Attribute attr;
attr.name = OUString::intern( attrConv->mpAPIName,
diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx
index 97e3e62..e4f45fb 100644
--- a/oox/source/ppt/pptfilterhelpers.cxx
+++ b/oox/source/ppt/pptfilterhelpers.cxx
@@ -77,7 +77,7 @@ namespace oox { namespace ppt {
while( p->mpName )
{
- if( rName.compareToAscii( p->mpName ) == 0 )
+ if( rName.equalsAscii( p->mpName ) )
return p;
p++;
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 5e7227a..ca7f1cd 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -269,7 +269,7 @@ namespace oox { namespace ppt {
{
nCommand = EffectCommands::PLAY;
}
- else if( msCommand.compareToAscii( "playFrom" ) == 0 )
+ else if( msCommand.equalsAscii( "playFrom" ) )
{
const OUString aMediaTime( msCommand.copy( 9, msCommand.getLength() - 10 ) );
rtl_math_ConversionStatus eStatus;
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index b45cb4b..3d4756f 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -49,13 +49,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL package2_component_getFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< XSingleServiceFactory > xFactory;
- if (ManifestReader::static_getImplementationName().compareToAscii( pImplName ) == 0)
+ if (ManifestReader::static_getImplementationName().equalsAscii( pImplName ) )
xFactory = ManifestReader::createServiceFactory ( xSMgr );
- else if (ManifestWriter::static_getImplementationName().compareToAscii( pImplName ) == 0)
+ else if (ManifestWriter::static_getImplementationName().equalsAscii( pImplName ) )
xFactory = ManifestWriter::createServiceFactory ( xSMgr );
- else if (ZipPackage::static_getImplementationName().compareToAscii( pImplName ) == 0)
+ else if (ZipPackage::static_getImplementationName().equalsAscii( pImplName ) )
xFactory = ZipPackage::createServiceFactory ( xSMgr );
- else if ( OZipFileAccess::impl_staticGetImplementationName().compareToAscii( pImplName ) == 0 )
+ else if ( OZipFileAccess::impl_staticGetImplementationName().equalsAscii( pImplName ) )
xFactory = ::cppu::createSingleFactory( xSMgr,
OZipFileAccess::impl_staticGetImplementationName(),
OZipFileAccess::impl_staticCreateSelfInstance,
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 174e998..6cb37b7 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -695,7 +695,7 @@ void PADialog::UpdateDevice()
OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
if( !aToken.isEmpty() )
{
- if( aToken.compareToAscii( "autoqueue" ) == 0 )
+ if( aToken.equalsAscii( "autoqueue" ) )
bAutoQueue = true;
else if( aToken.startsWith("pdf=") )
bPdf = true;
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
index 2cd663c..c23d1e7 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -185,7 +185,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
int i = 0;
for( i = 0; i < pEnumDesc->nEnumValues ; i ++ )
{
- if( (*((OUString *)&pEnumDesc->ppEnumNames[i])).compareToAscii( stringValue ) == 0 )
+ if( (*((OUString *)&pEnumDesc->ppEnumNames[i])).equalsAscii( stringValue ) )
{
break;
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index c11ee3c..4ed1227 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -4181,7 +4181,7 @@ bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndo
void OReportController::impl_fillCustomShapeState_nothrow(const char* _pCustomShapeType,dbaui::FeatureState& _rState) const
{
_rState.bEnabled = isEditable();
- _rState.bChecked = getDesignView()->GetInsertObj() == OBJ_CUSTOMSHAPE && getDesignView()->GetInsertObjString().compareToAscii(_pCustomShapeType) == 0;
+ _rState.bChecked = getDesignView()->GetInsertObj() == OBJ_CUSTOMSHAPE && getDesignView()->GetInsertObjString().equalsAscii(_pCustomShapeType);
}
// -----------------------------------------------------------------------------
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index c51fe82..5535303 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -207,7 +207,7 @@ namespace rtl_Bootstrap
aBootstrap.getFrom( suValuename, suValue );
sal_Char * pStr = getenv("ENABLE_JAVA");
// printUString( suGetname );
- CPPUNIT_ASSERT_MESSAGE("get the value of environment variable.", suValue.compareToAscii( pStr ) == 0 );
+ CPPUNIT_ASSERT_MESSAGE("get the value of environment variable.", suValue.equalsAscii( pStr ) );
}
/* Notes on Windows:
void getFrom_001_1()
@@ -219,7 +219,7 @@ namespace rtl_Bootstrap
aBootstrap.getFrom( suValuename, suValue );
sal_Char * pStr = getenv("SRC_ROOT");
// printUString( suGetname );
- CPPUNIT_ASSERT_MESSAGE("get the value of environment variable.", suValue.compareToAscii( pStr ) == 0 );
+ CPPUNIT_ASSERT_MESSAGE("get the value of environment variable.", suValue.equalsAscii( pStr ) );
}
The result on Windows:
# # the SRC_ROOT is e:\Qadev\cvs\m19
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 97483e3..9478b0c 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -860,7 +860,7 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport,
if (sValue.getLength() > 8)
{
OUString sTemp = sValue.copy(0, 8);
- if (sTemp.compareToAscii(SC_USERLIST) == 0)
+ if (sTemp.equalsAscii(SC_USERLIST))
{
pDatabaseRangeContext->SetSubTotalsEnabledUserList(true);
sTemp = sValue.copy(8);
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 6e8f88b..34327eb 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -387,9 +387,9 @@ void ScXMLConditionContext::GetOperator(
rParam.bRegExp = true;
rEntry.eOp = SC_NOT_EQUAL;
}
- else if (aOpStr.compareToAscii("=") == 0)
+ else if (aOpStr.equalsAscii("="))
rEntry.eOp = SC_EQUAL;
- else if (aOpStr.compareToAscii("!=") == 0)
+ else if (aOpStr.equalsAscii("!="))
rEntry.eOp = SC_NOT_EQUAL;
else if (IsXMLToken(aOpStr, XML_BOTTOM_PERCENT))
rEntry.eOp = SC_BOTPERC;
@@ -397,13 +397,13 @@ void ScXMLConditionContext::GetOperator(
rEntry.eOp = SC_BOTVAL;
else if (IsXMLToken(aOpStr, XML_EMPTY))
rEntry.SetQueryByEmpty();
- else if (aOpStr.compareToAscii(">") == 0)
+ else if (aOpStr.equalsAscii(">"))
rEntry.eOp = SC_GREATER;
- else if (aOpStr.compareToAscii(">=") == 0)
+ else if (aOpStr.equalsAscii(">="))
rEntry.eOp = SC_GREATER_EQUAL;
- else if (aOpStr.compareToAscii("<") == 0)
+ else if (aOpStr.equalsAscii("<"))
rEntry.eOp = SC_LESS;
- else if (aOpStr.compareToAscii("<=") == 0)
+ else if (aOpStr.equalsAscii("<="))
rEntry.eOp = SC_LESS_EQUAL;
else if (IsXMLToken(aOpStr, XML_NOEMPTY))
rEntry.SetQueryByNonEmpty();
@@ -827,21 +827,21 @@ void ScXMLDPConditionContext::getOperatorXML(
bUseRegularExpressions = true;
aFilterOperator = SC_NOT_EQUAL;
}
- else if (sTempOperator.compareToAscii("=") == 0)
+ else if (sTempOperator.equalsAscii("="))
aFilterOperator = SC_EQUAL;
- else if (sTempOperator.compareToAscii("!=") == 0)
+ else if (sTempOperator.equalsAscii("!="))
aFilterOperator = SC_NOT_EQUAL;
else if (IsXMLToken(sTempOperator, XML_BOTTOM_PERCENT))
aFilterOperator = SC_BOTPERC;
else if (IsXMLToken(sTempOperator, XML_BOTTOM_VALUES))
aFilterOperator = SC_BOTVAL;
- else if (sTempOperator.compareToAscii(">") == 0)
+ else if (sTempOperator.equalsAscii(">"))
aFilterOperator = SC_GREATER;
- else if (sTempOperator.compareToAscii(">=") == 0)
+ else if (sTempOperator.equalsAscii(">="))
aFilterOperator = SC_GREATER_EQUAL;
- else if (sTempOperator.compareToAscii("<") == 0)
+ else if (sTempOperator.equalsAscii("<"))
aFilterOperator = SC_LESS;
- else if (sTempOperator.compareToAscii("<=") == 0)
+ else if (sTempOperator.equalsAscii("<="))
aFilterOperator = SC_LESS_EQUAL;
else if (IsXMLToken(sTempOperator, XML_TOP_PERCENT))
aFilterOperator = SC_TOPPERC;
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 2c0f1b5..0999c04 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2444,20 +2444,20 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
for (sal_Int32 i = 0; i < nCount; ++i)
{
OUString sName(rChangeProps[i].Name);
- if (sName.compareToAscii("ShowChanges") == 0)
+ if (sName.equalsAscii("ShowChanges"))
pViewSettings->SetShowChanges(::cppu::any2bool(rChangeProps[i].Value));
- else if (sName.compareToAscii("ShowAcceptedChanges") == 0)
+ else if (sName.equalsAscii("ShowAcceptedChanges"))
pViewSettings->SetShowAccepted(::cppu::any2bool(rChangeProps[i].Value));
- else if (sName.compareToAscii("ShowRejectedChanges") == 0)
+ else if (sName.equalsAscii("ShowRejectedChanges"))
pViewSettings->SetShowRejected(::cppu::any2bool(rChangeProps[i].Value));
- else if (sName.compareToAscii("ShowChangesByDatetime") == 0)
+ else if (sName.equalsAscii("ShowChangesByDatetime"))
pViewSettings->SetHasDate(::cppu::any2bool(rChangeProps[i].Value));
- else if (sName.compareToAscii("ShowChangesByDatetimeMode") == 0)
+ else if (sName.equalsAscii("ShowChangesByDatetimeMode"))
{
if (rChangeProps[i].Value >>= nTemp16)
pViewSettings->SetTheDateMode(ScChgsDateMode(nTemp16));
}
- else if (sName.compareToAscii("ShowChangesByDatetimeFirstDatetime") == 0)
+ else if (sName.equalsAscii("ShowChangesByDatetimeFirstDatetime"))
{
util::DateTime aDateTime;
if (rChangeProps[i].Value >>= aDateTime)
@@ -2467,7 +2467,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
pViewSettings->SetTheFirstDateTime(aCoreDateTime);
}
}
- else if (sName.compareToAscii("ShowChangesByDatetimeSecondDatetime") == 0)
+ else if (sName.equalsAscii("ShowChangesByDatetimeSecondDatetime"))
{
util::DateTime aDateTime;
if (rChangeProps[i].Value >>= aDateTime)
@@ -2477,9 +2477,9 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
pViewSettings->SetTheLastDateTime(aCoreDateTime);
}
}
- else if (sName.compareToAscii("ShowChangesByAuthor") == 0)
+ else if (sName.equalsAscii("ShowChangesByAuthor"))
pViewSettings->SetHasAuthor(::cppu::any2bool(rChangeProps[i].Value));
- else if (sName.compareToAscii("ShowChangesByAuthorName") == 0)
+ else if (sName.equalsAscii("ShowChangesByAuthorName"))
{
OUString sOUName;
if (rChangeProps[i].Value >>= sOUName)
@@ -2488,9 +2488,9 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
pViewSettings->SetTheAuthorToShow(sAuthorName);
}
}
- else if (sName.compareToAscii("ShowChangesByComment") == 0)
+ else if (sName.equalsAscii("ShowChangesByComment"))
pViewSettings->SetHasComment(::cppu::any2bool(rChangeProps[i].Value));
- else if (sName.compareToAscii("ShowChangesByCommentText") == 0)
+ else if (sName.equalsAscii("ShowChangesByCommentText"))
{
OUString sOUComment;
if (rChangeProps[i].Value >>= sOUComment)
@@ -2499,9 +2499,9 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
pViewSettings->SetTheComment(sComment);
}
}
- else if (sName.compareToAscii("ShowChangesByRanges") == 0)
+ else if (sName.equalsAscii("ShowChangesByRanges"))
pViewSettings->SetHasRange(::cppu::any2bool(rChangeProps[i].Value));
- else if (sName.compareToAscii("ShowChangesByRangesList") == 0)
+ else if (sName.equalsAscii("ShowChangesByRangesList"))
{
OUString sRanges;
if ((rChangeProps[i].Value >>= sRanges) && !sRanges.isEmpty())
@@ -2528,15 +2528,15 @@ void ScXMLImport::SetViewSettings(const uno::Sequence<beans::PropertyValue>& aVi
for (sal_Int32 i = 0; i < nCount; ++i)
{
OUString sName(aViewProps[i].Name);
- if (sName.compareToAscii("VisibleAreaHeight") == 0)
+ if (sName.equalsAscii("VisibleAreaHeight"))
aViewProps[i].Value >>= nHeight;
- else if (sName.compareToAscii("VisibleAreaLeft") == 0)
+ else if (sName.equalsAscii("VisibleAreaLeft"))
aViewProps[i].Value >>= nLeft;
- else if (sName.compareToAscii("VisibleAreaTop") == 0)
+ else if (sName.equalsAscii("VisibleAreaTop"))
aViewProps[i].Value >>= nTop;
- else if (sName.compareToAscii("VisibleAreaWidth") == 0)
+ else if (sName.equalsAscii("VisibleAreaWidth"))
aViewProps[i].Value >>= nWidth;
- else if (sName.compareToAscii("TrackedChangesViewSettings") == 0)
+ else if (sName.equalsAscii("TrackedChangesViewSettings"))
{
uno::Sequence<beans::PropertyValue> aChangeProps;
if(aViewProps[i].Value >>= aChangeProps)
@@ -3025,13 +3025,13 @@ sal_Int32 ScXMLImport::GetRangeType(const OUString sRangeType) const
if ((i == sRangeType.getLength()) || (sRangeType[i] == ' '))
{
OUString sTemp = sBuffer.makeStringAndClear();
- if (sTemp.compareToAscii(SC_REPEAT_COLUMN) == 0)
+ if (sTemp.equalsAscii(SC_REPEAT_COLUMN))
nRangeType |= sheet::NamedRangeFlag::COLUMN_HEADER;
- else if (sTemp.compareToAscii(SC_REPEAT_ROW) == 0)
+ else if (sTemp.equalsAscii(SC_REPEAT_ROW))
nRangeType |= sheet::NamedRangeFlag::ROW_HEADER;
- else if (sTemp.compareToAscii(SC_FILTER) == 0)
+ else if (sTemp.equalsAscii(SC_FILTER))
nRangeType |= sheet::NamedRangeFlag::FILTER_CRITERIA;
- else if (sTemp.compareToAscii(SC_PRINT_RANGE) == 0)
+ else if (sTemp.equalsAscii(SC_PRINT_RANGE))
nRangeType |= sheet::NamedRangeFlag::PRINT_AREA;
}
else if (i < sRangeType.getLength())
@@ -3219,7 +3219,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
for (sal_Int32 i = 0; i < nCount; ++i)
{
OUString sName(aSeq[i].Name);
- if (sName.compareToAscii(SC_ACTIVETABLE) == 0)
+ if (sName.equalsAscii(SC_ACTIVETABLE))
{
OUString sValue;
if(aSeq[i].Value >>= sValue)
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index 175966f..7792ec0 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -179,7 +179,7 @@ void ScXMLSortContext::AddSortField(const OUString& sFieldNumber, const OUString
if (sDataType.getLength() > 8)
{
OUString sTemp = sDataType.copy(0, 8);
- if (sTemp.compareToAscii(SC_USERLIST) == 0)
+ if (sTemp.equalsAscii(SC_USERLIST))
{
bEnabledUserList = true;
sTemp = sDataType.copy(8);
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index ad06a9d..ebb4c0b 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -137,17 +137,17 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
ScViewOptions aViewOpt(pDoc->GetViewOptions());
/*Stampit enable/disable print cancel */
- if ( aPropertyName.compareToAscii( SC_UNO_ALLOWPRINTJOBCANCEL ) == 0 )
+ if ( aPropertyName.equalsAscii( SC_UNO_ALLOWPRINTJOBCANCEL ) )
pDocShell->Stamp_SetPrintCancelState( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
/*Stampit enable/disable print cancel */
- else if ( aPropertyName.compareToAscii( SC_UNO_SHOWZERO ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHOWZERO ) )
aViewOpt.SetOption(VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_SHOWNOTES ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHOWNOTES ) )
aViewOpt.SetOption(VOPT_NOTES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_SHOWGRID ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHOWGRID ) )
aViewOpt.SetOption(VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_GRIDCOLOR ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_GRIDCOLOR ) )
{
sal_Int64 nColor = 0;
if (aValue >>= nColor)
@@ -157,19 +157,19 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
aViewOpt.SetGridColor(aColor, aColorName);
}
}
- else if ( aPropertyName.compareToAscii( SC_UNO_SHOWPAGEBR ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHOWPAGEBR ) )
aViewOpt.SetOption(VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNONAME_LINKUPD ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNONAME_LINKUPD ) )
pDoc->SetLinkMode( static_cast<ScLkUpdMode> ( ScUnoHelpFunctions::GetInt16FromAny( aValue ) ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_COLROWHDR ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_COLROWHDR ) )
aViewOpt.SetOption(VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_SHEETTABS ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHEETTABS ) )
aViewOpt.SetOption(VOPT_TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_OUTLSYMB ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_OUTLSYMB ) )
aViewOpt.SetOption(VOPT_OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_AUTOCALC ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_AUTOCALC ) )
pDoc->SetAutoCalc( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERNAME ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_PRINTERNAME ) )
{
OUString sPrinterName;
if ( aValue >>= sPrinterName )
@@ -196,7 +196,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
else
throw lang::IllegalArgumentException();
}
- else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERSETUP ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_PRINTERSETUP ) )
{
uno::Sequence<sal_Int8> aSequence;
if ( aValue >>= aSequence )
@@ -217,47 +217,47 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
}
}
}
- else if ( aPropertyName.compareToAscii( SC_UNO_APPLYDOCINF ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_APPLYDOCINF ) )
{
sal_Bool bTmp=sal_True;
if ( aValue >>= bTmp )
pDocShell->SetUseUserData( bTmp );
}
- else if ( aPropertyName.compareToAscii( SC_UNO_FORBIDDEN ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_FORBIDDEN ) )
{
// read-only - should not be set
}
- else if ( aPropertyName.compareToAscii( SC_UNO_CHARCOMP ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_CHARCOMP ) )
{
// Int16 contains CharacterCompressionType values
sal_Int16 nUno = ScUnoHelpFunctions::GetInt16FromAny( aValue );
pDoc->SetAsianCompression( (sal_uInt8) nUno );
bUpdateHeights = sal_True;
}
- else if ( aPropertyName.compareToAscii( SC_UNO_ASIANKERN ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_ASIANKERN ) )
{
pDoc->SetAsianKerning( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
bUpdateHeights = sal_True;
}
- else if ( aPropertyName.compareToAscii( SCSAVEVERSION ) == 0)
+ else if ( aPropertyName.equalsAscii( SCSAVEVERSION ) )
{
sal_Bool bTmp=false;
if ( aValue >>= bTmp )
pDocShell->SetSaveVersionOnClose( bTmp );
}
- else if ( aPropertyName.compareToAscii( SC_UNO_UPDTEMPL ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_UPDTEMPL ) )
{
sal_Bool bTmp=sal_True;
if ( aValue >>= bTmp )
pDocShell->SetQueryLoadTemplate( bTmp );
}
- else if ( aPropertyName.compareToAscii( SC_UNO_LOADREADONLY ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_LOADREADONLY ) )
{
sal_Bool bTmp=false;
if ( aValue >>= bTmp )
pDocShell->SetLoadReadonly( bTmp );
}
- else if ( aPropertyName.compareToAscii( SC_UNO_SHAREDOC ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHAREDOC ) )
{
#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
sal_Bool bDocShared = false;
@@ -267,7 +267,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
}
#endif
}
- else if ( aPropertyName.compareToAscii( SC_UNO_MODIFYPASSWORDINFO ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_MODIFYPASSWORDINFO ) )
{
uno::Sequence< beans::PropertyValue > aInfo;
if ( !( aValue >>= aInfo ) )
@@ -281,7 +281,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
OUString( "The hash is not allowed to be changed now!" ),
uno::Reference< uno::XInterface >() );
}
- else if ( aPropertyName.compareToAscii( SC_UNO_EMBED_FONTS ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_EMBED_FONTS ) )
{
sal_Bool bVal = sal_False;
if ( aValue >>=bVal )
@@ -293,19 +293,19 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
else
{
ScGridOptions aGridOpt(aViewOpt.GetGridOptions());
- if ( aPropertyName.compareToAscii( SC_UNO_SNAPTORASTER ) == 0 )
+ if ( aPropertyName.equalsAscii( SC_UNO_SNAPTORASTER ) )
aGridOpt.SetUseGridSnap( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERVIS ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERVIS ) )
aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERRESX ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERRESX ) )
aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERRESY ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERRESY ) )
aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERSUBX ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERSUBX ) )
aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERSUBY ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERSUBY ) )
aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERSYNC ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERSYNC ) )
aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else
throw beans::UnknownPropertyException();
@@ -345,35 +345,35 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
const ScViewOptions& aViewOpt = pDoc->GetViewOptions();
/*Stampit enable/disable print cancel */
- if ( aPropertyName.compareToAscii( SC_UNO_ALLOWPRINTJOBCANCEL ) == 0 )
+ if ( aPropertyName.equalsAscii( SC_UNO_ALLOWPRINTJOBCANCEL ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, pDocShell->Stamp_GetPrintCancelState() );
/*Stampit enable/disable print cancel */
- else if ( aPropertyName.compareToAscii( SC_UNO_SHOWZERO ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHOWZERO ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_NULLVALS ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_SHOWNOTES ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHOWNOTES ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_NOTES ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_SHOWGRID ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHOWGRID ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_GRID ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_GRIDCOLOR ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_GRIDCOLOR ) )
{
OUString aColorName;
Color aColor = aViewOpt.GetGridColor(&aColorName);
aRet <<= static_cast<sal_Int64>(aColor.GetColor());
}
- else if ( aPropertyName.compareToAscii( SC_UNO_SHOWPAGEBR ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHOWPAGEBR ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_PAGEBREAKS ) );
- else if ( aPropertyName.compareToAscii( SC_UNONAME_LINKUPD ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNONAME_LINKUPD ) )
aRet <<= static_cast<sal_Int16> ( pDoc->GetLinkMode() );
- else if ( aPropertyName.compareToAscii( SC_UNO_COLROWHDR ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_COLROWHDR ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_HEADER ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_SHEETTABS ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHEETTABS ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_TABCONTROLS ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_OUTLSYMB ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_OUTLSYMB ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_OUTLINER ) );
- else if ( aPropertyName.compareToAscii( SC_UNO_AUTOCALC ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_AUTOCALC ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, pDoc->GetAutoCalc() );
- else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERNAME ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_PRINTERNAME ) )
{
// #i75610# don't create the printer, return empty string if no printer created yet
// (as in SwXDocumentSettings)
@@ -383,7 +383,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
else
aRet <<= OUString();
}
- else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERSETUP ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_PRINTERSETUP ) )
{
// #i75610# don't create the printer, return empty sequence if no printer created yet
// (as in SwXDocumentSettings)
@@ -402,31 +402,31 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
else
aRet <<= uno::Sequence<sal_Int8>();
}
- else if ( aPropertyName.compareToAscii( SC_UNO_APPLYDOCINF ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_APPLYDOCINF ) )
aRet <<= pDocShell->IsUseUserData();
- else if ( aPropertyName.compareToAscii( SC_UNO_FORBIDDEN ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_FORBIDDEN ) )
{
aRet <<= uno::Reference<i18n::XForbiddenCharacters>(new ScForbiddenCharsObj( pDocShell ));
}
- else if ( aPropertyName.compareToAscii( SC_UNO_CHARCOMP ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_CHARCOMP ) )
aRet <<= static_cast<sal_Int16> ( pDoc->GetAsianCompression() );
- else if ( aPropertyName.compareToAscii( SC_UNO_ASIANKERN ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_ASIANKERN ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, pDoc->GetAsianKerning() );
- else if ( aPropertyName.compareToAscii( SCSAVEVERSION ) == 0)
+ else if ( aPropertyName.equalsAscii( SCSAVEVERSION ) )
aRet <<= pDocShell->IsSaveVersionOnClose();
- else if ( aPropertyName.compareToAscii( SC_UNO_UPDTEMPL ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_UPDTEMPL ) )
aRet <<= pDocShell->IsQueryLoadTemplate();
- else if ( aPropertyName.compareToAscii( SC_UNO_LOADREADONLY ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_LOADREADONLY ) )
aRet <<= pDocShell->IsLoadReadonly();
- else if ( aPropertyName.compareToAscii( SC_UNO_SHAREDOC ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_SHAREDOC ) )
{
#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
ScUnoHelpFunctions::SetBoolInAny( aRet, pDocShell->HasSharedXMLFlagSet() );
#endif
}
- else if ( aPropertyName.compareToAscii( SC_UNO_MODIFYPASSWORDINFO ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_MODIFYPASSWORDINFO ) )
aRet <<= pDocShell->GetModifyPasswordInfo();
- else if ( aPropertyName.compareToAscii( SC_UNO_EMBED_FONTS ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_EMBED_FONTS ) )
{
aRet <<= pDoc->IsUsingEmbededFonts();
}
@@ -434,19 +434,19 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
else
{
const ScGridOptions& aGridOpt = aViewOpt.GetGridOptions();
- if ( aPropertyName.compareToAscii( SC_UNO_SNAPTORASTER ) == 0 )
+ if ( aPropertyName.equalsAscii( SC_UNO_SNAPTORASTER ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetUseGridSnap() );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERVIS ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERVIS ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetGridVisible() );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERRESX ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERRESX ) )
aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERRESY ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERRESY ) )
aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERSUBX ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERSUBX ) )
aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERSUBY ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERSUBY ) )
aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() );
- else if ( aPropertyName.compareToAscii( SC_UNO_RASTERSYNC ) == 0 )
+ else if ( aPropertyName.equalsAscii( SC_UNO_RASTERSYNC ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetSynchronize() );
else
throw beans::UnknownPropertyException();
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index ab2306d..5299528 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -138,7 +138,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue(
throw beans::UnknownPropertyException();
if(!pEntry->nWID)
{
- if(aPropertyName.compareToAscii(SC_UNO_STANDARDDEC) == 0)
+ if(aPropertyName.equalsAscii(SC_UNO_STANDARDDEC) )
{
ScDocument* pDoc = pDocShell->GetDocument();
if (pDoc)
@@ -154,7 +154,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue(
else
throw uno::RuntimeException();
}
- else if (aPropertyName.compareToAscii(SC_UNO_TABSTOPDIS) == 0)
+ else if (aPropertyName.equalsAscii(SC_UNO_TABSTOPDIS) )
{
ScDocument* pDoc = pDocShell->GetDocument();
if (pDoc)
@@ -234,7 +234,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyN
if (!pEntry->nWID)
{
- if(aPropertyName.compareToAscii(SC_UNO_STANDARDDEC) == 0)
+ if(aPropertyName.equalsAscii(SC_UNO_STANDARDDEC) )
{
ScDocument* pDoc = pDocShell->GetDocument();
if (pDoc)
@@ -250,7 +250,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyN
else
throw uno::RuntimeException();
}
- else if (aPropertyName.compareToAscii(SC_UNO_TABSTOPDIS) == 0)
+ else if (aPropertyName.equalsAscii(SC_UNO_TABSTOPDIS) )
{
ScDocument* pDoc = pDocShell->GetDocument();
if (pDoc)
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a373bc2..e55fe21 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2179,7 +2179,7 @@ void ScModelObj::NotifyChanges( const OUString& rOperation, const ScRangeList& r
// handle sheet events
//! separate method with ScMarkData? Then change HasChangesListeners back.
- if ( rOperation.compareToAscii("cell-change") == 0 && pDocShell )
+ if ( rOperation.equalsAscii("cell-change") && pDocShell )
{
ScMarkData aMarkData;
aMarkData.MarkFromRangeList( rRanges, false );
diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
index 5539a3f..5d2b140 100644
--- a/sc/source/ui/unoobj/eventuno.cxx
+++ b/sc/source/ui/unoobj/eventuno.cxx
@@ -94,7 +94,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno:
for (sal_Int32 nPos=0; nPos<nPropCount; ++nPos)
{
const beans::PropertyValue& rProp = aPropSeq[nPos];
- if ( rProp.Name.compareToAscii( SC_UNO_EVENTTYPE ) == 0 )
+ if ( rProp.Name.equalsAscii( SC_UNO_EVENTTYPE ) )
{
OUString aEventType;
if ( rProp.Value >>= aEventType )
@@ -104,7 +104,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno:
throw lang::IllegalArgumentException();
}
}
- else if ( rProp.Name.compareToAscii( SC_UNO_SCRIPT ) == 0 )
+ else if ( rProp.Name.equalsAscii( SC_UNO_SCRIPT ) )
rProp.Value >>= aScript;
}
}
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 1458b0b..e63141f 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -57,7 +57,7 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException )
for (int i = 0; i < nItems; i++)
{
xShape.set( xDrawPage->getByIndex(i), uno::UNO_QUERY_THROW );
- if (xShape->getShapeType().compareToAscii("com.sun.star.drawing.OLE2Shape") == 0 )
+ if (xShape->getShapeType().equalsAscii("com.sun.star.drawing.OLE2Shape") )
{
uno::Reference< beans::XPropertySet > xShapePropertySet(xShape, uno::UNO_QUERY_THROW );
OUString sName;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 77181cb..f2c8fea 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -973,13 +973,13 @@ void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyV
for(sal_Int32 i = 0; i < nCount; i++, pSeq++)
{
OUString sName(pSeq->Name);
- if(sName.compareToAscii(SC_ZOOMVALUE) == 0)
+ if(sName.equalsAscii(SC_ZOOMVALUE))
{
sal_Int32 nTemp = 0;
if (pSeq->Value >>= nTemp)
pPreview->SetZoom(sal_uInt16(nTemp));
}
- else if (sName.compareToAscii("PageNumber") == 0)
+ else if (sName.equalsAscii("PageNumber"))
{
sal_Int32 nTemp = 0;
if (pSeq->Value >>= nTemp)
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 1434cd4..4e3e065 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -171,102 +171,102 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV
for (sal_Int32 i = 0; i < nCount; i++)
{
OUString sName(aSettings[i].Name);
- if (sName.compareToAscii(SC_CURSORPOSITIONX) == 0)
+ if (sName.equalsAscii(SC_CURSORPOSITIONX) )
{
aSettings[i].Value >>= nTemp32;
nCurX = SanitizeCol( static_cast<SCCOL>(nTemp32));
}
- else if (sName.compareToAscii(SC_CURSORPOSITIONY) == 0)
+ else if (sName.equalsAscii(SC_CURSORPOSITIONY) )
{
aSettings[i].Value >>= nTemp32;
nCurY = SanitizeRow( static_cast<SCROW>(nTemp32));
}
- else if (sName.compareToAscii(SC_HORIZONTALSPLITMODE) == 0)
+ else if (sName.equalsAscii(SC_HORIZONTALSPLITMODE) )
{
aSettings[i].Value >>= nTemp16;
eHSplitMode = static_cast<ScSplitMode>(nTemp16);
}
- else if (sName.compareToAscii(SC_VERTICALSPLITMODE) == 0)
+ else if (sName.equalsAscii(SC_VERTICALSPLITMODE) )
{
aSettings[i].Value >>= nTemp16;
eVSplitMode = static_cast<ScSplitMode>(nTemp16);
}
- else if (sName.compareToAscii(SC_HORIZONTALSPLITPOSITION) == 0)
+ else if (sName.equalsAscii(SC_HORIZONTALSPLITPOSITION) )
{
aSettings[i].Value >>= nTempPosH;
bHasHSplitInTwips = false;
}
- else if (sName.compareToAscii(SC_VERTICALSPLITPOSITION) == 0)
+ else if (sName.equalsAscii(SC_VERTICALSPLITPOSITION) )
{
aSettings[i].Value >>= nTempPosV;
bHasVSplitInTwips = false;
}
- else if (sName.compareToAscii(SC_HORIZONTALSPLITPOSITION_TWIPS) == 0)
+ else if (sName.equalsAscii(SC_HORIZONTALSPLITPOSITION_TWIPS) )
{
aSettings[i].Value >>= nTempPosHTw;
bHasHSplitInTwips = true;
}
- else if (sName.compareToAscii(SC_VERTICALSPLITPOSITION_TWIPS) == 0)
+ else if (sName.equalsAscii(SC_VERTICALSPLITPOSITION_TWIPS) )
{
aSettings[i].Value >>= nTempPosVTw;
bHasVSplitInTwips = true;
}
- else if (sName.compareToAscii(SC_ACTIVESPLITRANGE) == 0)
+ else if (sName.equalsAscii(SC_ACTIVESPLITRANGE) )
{
aSettings[i].Value >>= nTemp16;
eWhichActive = static_cast<ScSplitPos>(nTemp16);
}
- else if (sName.compareToAscii(SC_POSITIONLEFT) == 0)
+ else if (sName.equalsAscii(SC_POSITIONLEFT) )
{
aSettings[i].Value >>= nTemp32;
nPosX[SC_SPLIT_LEFT] = SanitizeCol( static_cast<SCCOL>(nTemp32));
}
- else if (sName.compareToAscii(SC_POSITIONRIGHT) == 0)
+ else if (sName.equalsAscii(SC_POSITIONRIGHT) )
{
aSettings[i].Value >>= nTemp32;
nPosX[SC_SPLIT_RIGHT] = SanitizeCol( static_cast<SCCOL>(nTemp32));
}
- else if (sName.compareToAscii(SC_POSITIONTOP) == 0)
+ else if (sName.equalsAscii(SC_POSITIONTOP) )
{
aSettings[i].Value >>= nTemp32;
nPosY[SC_SPLIT_TOP] = SanitizeRow( static_cast<SCROW>(nTemp32));
}
- else if (sName.compareToAscii(SC_POSITIONBOTTOM) == 0)
+ else if (sName.equalsAscii(SC_POSITIONBOTTOM) )
{
aSettings[i].Value >>= nTemp32;
nPosY[SC_SPLIT_BOTTOM] = SanitizeRow( static_cast<SCROW>(nTemp32));
}
- else if (sName.compareToAscii(SC_ZOOMTYPE) == 0)
+ else if (sName.equalsAscii(SC_ZOOMTYPE) )
{
aSettings[i].Value >>= nTemp16;
eZoomType = SvxZoomType(nTemp16);
rHasZoom = true; // set if there is any zoom information
}
- else if (sName.compareToAscii(SC_ZOOMVALUE) == 0)
+ else if (sName.equalsAscii(SC_ZOOMVALUE) )
{
aSettings[i].Value >>= nTemp32;
Fraction aZoom(nTemp32, 100);
aZoomX = aZoomY = aZoom;
rHasZoom = true;
}
- else if (sName.compareToAscii(SC_PAGEVIEWZOOMVALUE) == 0)
+ else if (sName.equalsAscii(SC_PAGEVIEWZOOMVALUE) )
{
aSettings[i].Value >>= nTemp32;
Fraction aZoom(nTemp32, 100);
aPageZoomX = aPageZoomY = aZoom;
rHasZoom = true;
}
- else if (sName.compareToAscii(SC_UNO_SHOWGRID) == 0)
+ else if (sName.equalsAscii(SC_UNO_SHOWGRID) )
{
aSettings[i].Value >>= bShowGrid;
}
- else if (sName.compareToAscii(SC_TABLESELECTED) == 0)
+ else if (sName.equalsAscii(SC_TABLESELECTED) )
{
bool bSelected = false;
aSettings[i].Value >>= bSelected;
rViewData.GetMarkData().SelectTable( nTab, bSelected );
}
- else if (sName.compareToAscii(SC_UNONAME_TABCOLOR) == 0)
+ else if (sName.equalsAscii(SC_UNONAME_TABCOLOR) )
{
// There are documents out there that have their tab color defined as a view setting.
sal_Int32 nColor = COL_AUTO;
@@ -2719,7 +2719,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
{
// SC_VIEWID has to parse and use by mba
OUString sName(rSettings[i].Name);
- if (sName.compareToAscii(SC_TABLES) == 0)
+ if (sName.equalsAscii(SC_TABLES) )
{
uno::Reference<container::XNameContainer> xNameContainer;
if ((rSettings[i].Value >>= xNameContainer) && xNameContainer->hasElements())
@@ -2747,7 +2747,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
}
}
}
- else if (sName.compareToAscii(SC_ACTIVETABLE) == 0)
+ else if (sName.equalsAscii(SC_ACTIVETABLE) )
{
OUString sValue;
if(rSettings[i].Value >>= sValue)
@@ -2758,23 +2758,23 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
nTabNo = nTab;
}
}
- else if (sName.compareToAscii(SC_HORIZONTALSCROLLBARWIDTH) == 0)
+ else if (sName.equalsAscii(SC_HORIZONTALSCROLLBARWIDTH) )
{
if (rSettings[i].Value >>= nTemp32)
pView->SetTabBarWidth(nTemp32);
}
- else if (sName.compareToAscii(SC_RELHORIZONTALTABBARWIDTH) == 0)
+ else if (sName.equalsAscii(SC_RELHORIZONTALTABBARWIDTH) )
{
double fWidth = 0.0;
if (rSettings[i].Value >>= fWidth)
pView->SetPendingRelTabBarWidth( fWidth );
}
- else if (sName.compareToAscii(SC_ZOOMTYPE) == 0)
+ else if (sName.equalsAscii(SC_ZOOMTYPE) )
{
if (rSettings[i].Value >>= nTemp16)
eDefZoomType = SvxZoomType(nTemp16);
}
- else if (sName.compareToAscii(SC_ZOOMVALUE) == 0)
+ else if (sName.equalsAscii(SC_ZOOMVALUE) )
{
if (rSettings[i].Value >>= nTemp32)
{
@@ -2782,7 +2782,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
aDefZoomX = aDefZoomY = aZoom;
}
}
- else if (sName.compareToAscii(SC_PAGEVIEWZOOMVALUE) == 0)
+ else if (sName.equalsAscii(SC_PAGEVIEWZOOMVALUE) )
{
if (rSettings[i].Value >>= nTemp32)
{
@@ -2790,15 +2790,15 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
aDefPageZoomX = aDefPageZoomY = aZoom;
}
}
- else if (sName.compareToAscii(SC_SHOWPAGEBREAKPREVIEW) == 0)
+ else if (sName.equalsAscii(SC_SHOWPAGEBREAKPREVIEW) )
bPageMode = ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value );
- else if ( sName.compareToAscii( SC_UNO_SHOWZERO ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_SHOWZERO ) )
pOptions->SetOption(VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_SHOWNOTES ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_SHOWNOTES ) )
pOptions->SetOption(VOPT_NOTES, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_SHOWGRID ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_SHOWGRID ) )
pOptions->SetOption(VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_GRIDCOLOR ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_GRIDCOLOR ) )
{
sal_Int64 nColor = 0;
if (rSettings[i].Value >>= nColor)
@@ -2811,27 +2811,27 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
pOptions->SetGridColor(aColor, aColorName);
}
}
- else if ( sName.compareToAscii( SC_UNO_SHOWPAGEBR ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_SHOWPAGEBR ) )
pOptions->SetOption(VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_COLROWHDR ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_COLROWHDR ) )
pOptions->SetOption(VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_SHEETTABS ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_SHEETTABS ) )
pOptions->SetOption(VOPT_TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_OUTLSYMB ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_OUTLSYMB ) )
pOptions->SetOption(VOPT_OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_SHOWOBJ ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_SHOWOBJ ) )
{
// #i80528# placeholders not supported anymore
if ( rSettings[i].Value >>= nTemp16 )
pOptions->SetObjMode( VOBJ_TYPE_OLE, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW );
}
- else if ( sName.compareToAscii( SC_UNO_SHOWCHARTS ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_SHOWCHARTS ) )
{
// #i80528# placeholders not supported anymore
if ( rSettings[i].Value >>= nTemp16 )
pOptions->SetObjMode( VOBJ_TYPE_CHART, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW );
}
- else if ( sName.compareToAscii( SC_UNO_SHOWDRAW ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_SHOWDRAW ) )
{
// #i80528# placeholders not supported anymore
if ( rSettings[i].Value >>= nTemp16 )
@@ -2840,19 +2840,19 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
else
{
ScGridOptions aGridOpt(pOptions->GetGridOptions());
- if ( sName.compareToAscii( SC_UNO_SNAPTORASTER ) == 0 )
+ if ( sName.equalsAscii( SC_UNO_SNAPTORASTER ) )
aGridOpt.SetUseGridSnap( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERVIS ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_RASTERVIS ) )
aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERRESX ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_RASTERRESX ) )
aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERRESY ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_RASTERRESY ))
aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERSUBX ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_RASTERSUBX ) )
aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERSUBY ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_RASTERSUBY ) )
aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
- else if ( sName.compareToAscii( SC_UNO_RASTERSYNC ) == 0 )
+ else if ( sName.equalsAscii( SC_UNO_RASTERSYNC ) )
aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
pOptions->SetGridOptions(aGridOpt);
}
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index d282df0..27c0fda 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -283,7 +283,7 @@ OUString SAL_CALL AnalysisAddIn::getImplementationName() throw( uno::RuntimeExce
sal_Bool SAL_CALL AnalysisAddIn::supportsService( const OUString& aName ) throw( uno::RuntimeException )
{
- return aName.compareToAscii( ADDIN_SERVICE ) == 0 || aName.compareToAscii( MY_SERVICE ) == 0;
+ return aName.equalsAscii( ADDIN_SERVICE ) || aName.equalsAscii( MY_SERVICE );
}
@@ -1284,7 +1284,7 @@ OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const uno::An
case uno::TypeClass_STRING:
{
const OUString* pSuff = ( const OUString* ) rSuff.getValue();
- bi = pSuff->compareToAscii( "i" ) == 0 || pSuff->isEmpty();
+ bi = pSuff->equalsAscii( "i" ) || pSuff->isEmpty();
if( !bi && pSuff->compareToAscii( "j" ) != 0 )
throw lang::IllegalArgumentException();
}
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 92048e6..fc0d79a 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -612,24 +612,24 @@ bool getinput_greek(bs::types::Greeks& greek, const uno::Any& anyval) {
return false;
}
- if(str.compareToAscii("value")==0 || str.compareToAscii("price")==0 ||
- str.compareToAscii("v")==0 || str.compareToAscii("p")==0 ) {
+ if(str.equalsAscii("value") || str.equalsAscii("price") ||
+ str.equalsAscii("v") || str.equalsAscii("p") ) {
greek=bs::types::Value;
- } else if(str.compareToAscii("delta")==0||str.compareToAscii("d")==0) {
+ } else if(str.equalsAscii("delta") || str.equalsAscii("d")) {
greek=bs::types::Delta;
- } else if(str.compareToAscii("gamma")==0||str.compareToAscii("g")==0) {
+ } else if(str.equalsAscii("gamma") || str.equalsAscii("g")) {
greek=bs::types::Gamma;
- } else if(str.compareToAscii("theta")==0||str.compareToAscii("t")==0) {
+ } else if(str.equalsAscii("theta") || str.equalsAscii("t")) {
greek=bs::types::Theta;
- } else if(str.compareToAscii("vega")==0||str.compareToAscii("e")==0) {
+ } else if(str.equalsAscii("vega") || str.equalsAscii("e")) {
greek=bs::types::Vega;
- } else if(str.compareToAscii("volga")==0||str.compareToAscii("o")==0) {
+ } else if(str.equalsAscii("volga") || str.equalsAscii("o")) {
greek=bs::types::Volga;
- } else if(str.compareToAscii("vanna")==0||str.compareToAscii("a")==0) {
+ } else if(str.equalsAscii("vanna") || str.equalsAscii("a")) {
greek=bs::types::Vanna;
- } else if(str.compareToAscii("rho")==0||str.compareToAscii("r")==0) {
+ } else if(str.equalsAscii("rho") || str.equalsAscii("r")) {
greek=bs::types::Rho_d;
- } else if(str.compareToAscii("rhof")==0||str.compareToAscii("f")==0) {
+ } else if(str.equalsAscii("rhof") || str.equalsAscii("f")) {
greek=bs::types::Rho_f;
} else {
return false;
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 6dfe69a..9fc11f3 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -527,7 +527,7 @@ namespace dlgprov
OUString sScriptURL;
OUString sScriptCode( aScriptEvent.ScriptCode );
- if ( aScriptEvent.ScriptType.compareToAscii( "StarBasic" ) == 0 )
+ if ( aScriptEvent.ScriptType.equalsAscii( "StarBasic" ) )
{
// StarBasic script: convert ScriptCode to scriptURL
sal_Int32 nIndex = sScriptCode.indexOf( ':' );
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 355877c..6ad06d6 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -98,7 +98,7 @@ void ImplTranslateAttribute( OUString& rString, const TranslateMode eTranslateMo
const ImplAttributeNameConversion* p = gImplConversionList;
while( p->mpAPIName )
{
- if( rString.compareToAscii( p->mpAPIName ) == 0 )
+ if( rString.equalsAscii( p->mpAPIName ) )
break;
p++;
}
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 5bfac6a..3d7daa8 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -91,7 +91,7 @@ const transition* transition::find( const OUString& rName )
while( p->mpName )
{
- if( rName.compareToAscii( p->mpName ) == 0 )
+ if( rName.equalsAscii( p->mpName ) )
return p;
p++;
@@ -698,7 +698,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >&
{
while( p->mpMSName )
{
- if( aAttributeName.compareToAscii( p->mpMSName ) == 0 )
+ if( aAttributeName.equalsAscii( p->mpMSName ) )
break;
p++;
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 76179bd..58e5d25 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -807,9 +807,9 @@ void AssistentDlgImpl::ScanDocmenu (void)
OUString sFactoryName;
for( sal_Int32 i=0; i<nPropCount; ++i )
{
- if( lProps[i].Name.compareToAscii( "DocumentService" ) == 0 &&
+ if( lProps[i].Name.equalsAscii( "DocumentService" ) &&
(lProps[i].Value >>= sFactoryName) &&
- sFactoryName.compareToAscii( "com.sun.star.presentation.PresentationDocument" ) == 0 )
+ sFactoryName.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) )
{
// yes, it's an impress document
INetURLObject aURL;
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index f2804c1..281c465 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -270,7 +270,7 @@ void FullScreenPane::ExtractArguments (
const OUString sKey = aToken.copy(0, nAssign);
const OUString sValue = aToken.copy(nAssign+1);
- if (sKey.compareToAscii("ScreenNumber") == 0)
+ if (sKey.equalsAscii("ScreenNumber"))
{
rnScreenNumberReturnValue = sValue.toInt32();
}
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index f9641b0..7baa1aa 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -305,7 +305,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUr
for ( sal_Int32 nFilterProp = 0; nFilterProp<nFilterProps; nFilterProp++ )
{
const beans::PropertyValue& rFilterProp = aProps[nFilterProp];
- if ( rFilterProp.Name.compareToAscii("FilterService") == 0 )
+ if ( rFilterProp.Name.equalsAscii("FilterService") )
{
rFilterProp.Value >>= aFilterImplName;
break;
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index 3329e48..b6679e8 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -55,9 +55,9 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispat
const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException )
{
Reference < XDispatch > xRet;
- if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) == 0 )
+ if ( aURL.Protocol.equalsAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) )
{
-// if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
+// if ( aURL.Path.equalsAscii( "Function1" ) )
xRet = this;
}
return xRet;
@@ -85,9 +85,9 @@ Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizer:
void SAL_CALL PPPOptimizer::dispatch( const URL& rURL, const Sequence< PropertyValue >& lArguments )
throw( RuntimeException )
{
- if ( mxController.is() && ( rURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) == 0 ) )
+ if ( mxController.is() && rURL.Protocol.equalsAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) )
{
- if ( rURL.Path.compareToAscii( "optimize" ) == 0 )
+ if ( rURL.Path.equalsAscii( "optimize" ) )
{
Reference< XModel > xModel( mxController->getModel() );
if ( xModel.is() )
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 0ff0ed3..1cfc874 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -92,7 +92,7 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizerDialog::query
const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException )
{
Reference < XDispatch > xRet;
- if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PresentationMinimizer:" ) == 0 )
+ if ( aURL.Protocol.equalsAscii( "vnd.com.sun.star.comp.PresentationMinimizer:" ) )
xRet = this;
return xRet;
@@ -122,9 +122,9 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
throw( RuntimeException )
{
- if ( mxController.is() && ( rURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PresentationMinimizer:" ) == 0 ) )
+ if ( mxController.is() && rURL.Protocol.equalsAscii( "vnd.com.sun.star.comp.PresentationMinimizer:" ) )
{
- if ( rURL.Path.compareToAscii( "execute" ) == 0 )
+ if ( rURL.Path.equalsAscii( "execute" ) )
{
try
{
@@ -157,7 +157,7 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
}
}
- else if ( rURL.Path.compareToAscii( "statusupdate" ) == 0 )
+ else if ( rURL.Path.equalsAscii( "statusupdate" ) )
{
if ( mpOptimizerDialog )
mpOptimizerDialog->UpdateStatus( rArguments );
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index d11d8f4..7665be4 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -158,8 +158,7 @@ namespace {
const OUString& MethodName ) throw (lang::WrappedTargetException, uno::RuntimeException)
{
(void)MethodName;
- OSL_ENSURE( MethodName.compareToAscii("SelectionChanged") == 0,
- "Invalid event name" );
+ OSL_ENSURE( MethodName.equalsAscii("SelectionChanged"), "Invalid event name" );
selectionChanged(getSelectedItem());
return sal_True;
}
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 4dc70a0..a1cb317 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -236,7 +236,7 @@ namespace
const char* sExportString = "m53570 7650-35430 24100";
CPPUNIT_ASSERT_MESSAGE( "Stroke is m535.7 518.5-354.3-241",
- basegfx::tools::exportToSvgD( aPath, true, true, false ).compareToAscii(sExportString) == 0 );
+ basegfx::tools::exportToSvgD( aPath, true, true, false ).equalsAscii(sExportString) );
m_bGreenStrokeSeen = true;
}
@@ -259,7 +259,7 @@ namespace
const char* sExportString = "m49890 5670.00000000001-35430 24090";
CPPUNIT_ASSERT_MESSAGE( "Stroke is m49890 5670.00000000001-35430 24090",
- basegfx::tools::exportToSvgD( aPath, true, true, false ).compareToAscii(sExportString) == 0 );
+ basegfx::tools::exportToSvgD( aPath, true, true, false ).equalsAscii(sExportString) );
m_bDashedLineSeen = true;
}
@@ -317,7 +317,7 @@ namespace
const char* sExportString = "m12050 49610c-4310 0-7800-3490-7800-7800 0-4300 "
"3490-7790 7800-7790 4300 0 7790 3490 7790 7790 0 4310-3490 7800-7790 7800z";
CPPUNIT_ASSERT_MESSAGE( "Stroke is a 4-bezier circle",
- basegfx::tools::exportToSvgD( aPath, true, true, false ).compareToAscii(sExportString) == 0 );
+ basegfx::tools::exportToSvgD( aPath, true, true, false ).equalsAscii(sExportString) );
m_bRedCircleSeen = true;
}
@@ -362,9 +362,9 @@ namespace
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMask received two properties",
xBitmap.getLength(), (sal_Int32) 3 );
CPPUNIT_ASSERT_MESSAGE( "drawMask got URL param",
- xBitmap[0].Name.compareToAscii( "URL" ) == 0 );
+ xBitmap[0].Name.equalsAscii( "URL" ) );
CPPUNIT_ASSERT_MESSAGE( "drawMask got InputStream param",
- xBitmap[1].Name.compareToAscii( "InputStream" ) == 0 );
+ xBitmap[1].Name.equalsAscii( "InputStream" ) );
}
virtual void drawImage(const uno::Sequence<beans::PropertyValue>& xBitmap )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list