[Libreoffice-commits] core.git: dbaccess/source desktop/source editeng/source embeddedobj/source extensions/source filter/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jul 13 10:06:17 UTC 2017
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 2
dbaccess/source/core/dataaccess/documentcontainer.cxx | 2
dbaccess/source/core/dataaccess/documentdefinition.cxx | 4
dbaccess/source/inc/apitools.hxx | 2
dbaccess/source/shared/registrationhelper.cxx | 4
dbaccess/source/ui/browser/brwctrlr.cxx | 4
dbaccess/source/ui/browser/genericcontroller.cxx | 2
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 2
dbaccess/source/ui/misc/WCopyTable.cxx | 2
dbaccess/source/ui/misc/stringlistitem.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 4
desktop/source/deployment/manager/dp_extensionmanager.cxx | 2
desktop/source/deployment/manager/dp_manager.cxx | 8
desktop/source/deployment/registry/package/dp_package.cxx | 2
desktop/source/lib/init.cxx | 2
desktop/source/migration/migration.cxx | 12 -
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 4
editeng/source/outliner/outliner.cxx | 2
embeddedobj/source/commonembedding/miscobj.cxx | 2
embeddedobj/source/commonembedding/persistence.cxx | 12 -
embeddedobj/source/commonembedding/register.cxx | 6
embeddedobj/source/general/docholder.cxx | 4
embeddedobj/source/general/dummyobject.cxx | 2
embeddedobj/source/msole/olepersist.cxx | 6
embeddedobj/source/msole/oleregister.cxx | 2
extensions/source/bibliography/bibconfig.cxx | 4
extensions/source/dbpilots/commonpagesdbp.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/update/check/updatecheck.cxx | 4
extensions/source/update/check/updatehdl.cxx | 2
filter/source/config/cache/cacheitem.cxx | 12 -
filter/source/config/cache/filtercache.cxx | 8
filter/source/config/cache/filterfactory.cxx | 2
filter/source/config/cache/typedetection.cxx | 2
filter/source/flash/swfuno.cxx | 4
filter/source/msfilter/escherex.cxx | 112 ++++++-------
filter/source/msfilter/msvbahelper.cxx | 6
filter/source/pdf/pdfuno.cxx | 6
filter/source/t602/filterenv.cxx | 4
filter/source/xmlfilteradaptor/genericfilter.cxx | 2
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2
46 files changed, 138 insertions(+), 144 deletions(-)
New commits:
commit dc63cc326ee5757124cef45e470d290e6e32002e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jul 13 09:56:52 2017 +0200
use more OUString::operator== in dbaccess..filter
Change-Id: Ib7b4f2b2403ce766a7db2f6ffc118468e7677776
Reviewed-on: https://gerrit.libreoffice.org/39889
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 58b6bb46640e..47c71bcef2e2 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -586,7 +586,7 @@ void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent
void OContentHelper::impl_rename_throw(const OUString& _sNewName,bool _bNotify )
{
osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex);
- if ( _sNewName.equals( m_pImpl->m_aProps.aTitle ) )
+ if ( _sNewName == m_pImpl->m_aProps.aTitle )
return;
try
{
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index ec1f266dca92..3c3f3089365a 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -497,7 +497,7 @@ namespace
{
OUString sCurrentName;
OSL_VERIFY( xProps->getPropertyValue( PROPERTY_NAME ) >>= sCurrentName );
- if ( sCurrentName.equals( _rName ) )
+ if ( sCurrentName == _rName )
return true;
}
}
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 6e69a851bcc5..b30ee9adef0d 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -730,7 +730,7 @@ void SAL_CALL ODocumentContainer::rename( const OUString& newName )
try
{
osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex);
- if ( newName.equals( m_pImpl->m_aProps.aTitle ) )
+ if ( newName == m_pImpl->m_aProps.aTitle )
return;
sal_Int32 nHandle = PROPERTY_ID_NAME;
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index e16edc795661..d117a3fc0ca6 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -369,7 +369,7 @@ OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _
if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is()
&& ( xObjectProps->getByName("ObjectDocumentServiceName") >>= aEntryDocName )
- && aEntryDocName.equals( sResult ) )
+ && aEntryDocName == sResult )
{
_rClassId = comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation(aClassIDs[nInd]);
break;
@@ -1916,7 +1916,7 @@ void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName )
try
{
::osl::ResettableMutexGuard aGuard(m_aMutex);
- if ( _rNewName.equals( m_pImpl->m_aProps.aTitle ) )
+ if ( _rNewName == m_pImpl->m_aProps.aTitle )
return;
// document definitions are organized in a hierarchical way, so reject names
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index f8ff269f15dd..d03fdb0d453b 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -81,7 +81,7 @@ public:
css::uno::Sequence< OUString > aSupported(getSupportedServiceNames()); \
const OUString* pSupported = aSupported.getConstArray(); \
for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) \
- if (pSupported->equals(_rServiceName)) \
+ if (*pSupported == _rServiceName) \
return true; \
\
return false; \
diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx
index 26e3cc3f16dc..2c9fbc1f1042 100644
--- a/dbaccess/source/shared/registrationhelper.cxx
+++ b/dbaccess/source/shared/registrationhelper.cxx
@@ -85,7 +85,7 @@ void OModuleRegistration::revokeComponent(const OUString& _rImplementationName)
const OUString* pImplNames = s_pImplementationNames->getConstArray();
for (sal_Int32 i=0; i<nLen; ++i, ++pImplNames)
{
- if (pImplNames->equals(_rImplementationName))
+ if (*pImplNames == _rImplementationName)
{
removeElementAt(*s_pImplementationNames, i);
removeElementAt(*s_pSupportedServices, i);
@@ -133,7 +133,7 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory(
for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices, ++pComponentFunction, ++pFactoryFunction)
{
- if (pImplName->equals(_rImplementationName))
+ if (*pImplName == _rImplementationName)
{
const FactoryInstantiation FactoryInstantiationFunction = reinterpret_cast<FactoryInstantiation>(*pFactoryFunction);
const ComponentInstantiation ComponentInstantiationFunction = reinterpret_cast<ComponentInstantiation>(*pComponentFunction);
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index f40850961bef..b159237e3096 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1339,7 +1339,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa
#ifdef DBG_UTIL
OUString sName;
xParam->getPropertyValue(PROPERTY_NAME) >>= sName;
- OSL_ENSURE(sName.equals(pFinalValues->Name), "SbaXDataBrowserController::approveParameter: suspicious value names!");
+ OSL_ENSURE(sName == pFinalValues->Name, "SbaXDataBrowserController::approveParameter: suspicious value names!");
#endif
try { xParam->setPropertyValue(PROPERTY_VALUE, pFinalValues->Value); }
catch(Exception&)
@@ -1781,7 +1781,7 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(bool bFilter)
}
OUString sNewHaving = xParser->getHavingClause();
- if ( sOldVal.equals(sNewVal) && (!bFilter || sOldHaving.equals(sNewHaving)) )
+ if ( sOldVal == sNewVal && (!bFilter || sOldHaving == sNewHaving) )
// nothing to be done
return;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 6c0057e2eea8..d95fd67d0fae 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -730,7 +730,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene
DispatchTarget& rCurrent = *iterSearch;
if ( (rCurrent.xListener == aListener)
&& ( bRemoveForAll
- || (rCurrent.aURL.Complete.equals(_rURL.Complete))
+ || (rCurrent.aURL.Complete == _rURL.Complete)
)
)
{
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index f6fb342290f5..2553ed8c9aed 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -106,7 +106,7 @@ SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const OUString& aName, SvTree
const SvLBoxString* pItem = static_cast<const SvLBoxString*>(
pEntry->GetFirstItem(SvLBoxItemType::String));
- if (pItem && pItem->GetText().equals(aName))
+ if (pItem && pItem->GetText() == aName)
{
if (!_pFilter || _pFilter->includeEntry(pEntry))
// found
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 88a777396536..67a8ce11f480 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -425,7 +425,7 @@ namespace dbaui
OUString sTVal(
static_cast< sal_Unicode >( rList.getToken( (i+1), nTok ).toInt32() ));
- if( sTVal.equals(rVal) )
+ if( sTVal == rVal )
{
rBox.SetText( rList.getToken( i, nTok ) );
break;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d66e4c7bd02c..196da5dfbd3f 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -493,7 +493,7 @@ namespace
{
Reference< XDatabaseMetaData > xMetaLHS( _rxLHS->getMetaData(), UNO_QUERY_THROW );
Reference< XDatabaseMetaData > xMetaRHS( _rxRHS->getMetaData(), UNO_QUERY_THROW );
- return xMetaLHS->getURL().equals( xMetaRHS->getURL() );
+ return xMetaLHS->getURL() == xMetaRHS->getURL();
}
}
diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx
index 5e8ea0a691cb..2c5d23f64188 100644
--- a/dbaccess/source/ui/misc/stringlistitem.cxx
+++ b/dbaccess/source/ui/misc/stringlistitem.cxx
@@ -48,7 +48,7 @@ bool OStringListItem::operator==(const SfxPoolItem& _rItem) const
const OUString* pCompareStrings = pCompare->m_aList.getConstArray();
for (sal_Int32 i=0; i<m_aList.getLength(); ++i, ++pMyStrings, ++pCompareStrings)
- if (!pMyStrings->equals(*pCompareStrings))
+ if (*pMyStrings != *pCompareStrings)
return false;
return true;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index b9dfc239f63e..3d9f49ec3a7c 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1036,7 +1036,7 @@ bool OSelectionBrowseBox::SaveModified()
OUString sFunctionName = m_pFunctionCell->GetEntry(nPos);
OUString sGroupFunctionName = m_aFunctionStrings.getToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1, ';');
bool bGroupBy = false;
- if ( sGroupFunctionName.equals(sFunctionName) ) // check if the function name is GROUP
+ if ( sGroupFunctionName == sFunctionName ) // check if the function name is GROUP
{
bGroupBy = true;
@@ -1428,7 +1428,7 @@ void OSelectionBrowseBox::DeleteFields(const OUString& rAliasName)
for(sal_uInt16 nPos=sal::static_int_cast< sal_uInt16 >(getFields().size());aIter != getFields().rend();++aIter,--nPos)
{
pEntry = *aIter;
- if ( pEntry->GetAlias().equals( rAliasName ) )
+ if ( pEntry->GetAlias() == rAliasName )
{
RemoveField( GetColumnId( nPos ) );
break;
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index d8f4abc5b06e..9ff2e7556788 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -420,8 +420,8 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
break;
}
OSL_ASSERT( verExc.Deployed.is() );
- bool bEqualNames = verExc.NewDisplayName.equals(
- verExc.Deployed->getDisplayName());
+ bool bEqualNames = verExc.NewDisplayName ==
+ verExc.Deployed->getDisplayName();
{
SolarMutexGuard guard;
ScopedVclPtrInstance<MessageDialog> box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr,
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index a53f7e3e5baa..34f862c8f6f6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -244,7 +244,7 @@ void ExtensionManager::addExtensionsToMap(
int index = 0;
for (;citNames != m_repositoryNames.end(); ++citNames, ++index)
{
- if (citNames->equals(repository))
+ if (*citNames == repository)
break;
}
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index a49bff015734..a0eb96fdcc02 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -254,7 +254,7 @@ void PackageManagerImpl::initActivationLayer(
data.size());
OUString sData = OStringToOUString(
osData, RTL_TEXTENCODING_UTF8);
- if (!sData.equals(aUserName))
+ if (sData != aUserName)
continue;
}
}
@@ -1244,8 +1244,8 @@ bool PackageManagerImpl::synchronizeRemovedExtensions(
"must have an identifier and a version");
if (infoset.hasDescription() &&
infoset.getIdentifier() &&
- (! i->first.equals(*(infoset.getIdentifier()))
- || ! i->second.version.equals(infoset.getVersion())))
+ ( i->first != *(infoset.getIdentifier())
+ || i->second.version != infoset.getVersion()))
{
bRemoved = true;
}
@@ -1491,7 +1491,7 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
{
if (!extension.is())
return 0;
- if (!m_context.equals(extension->getRepositoryName()))
+ if (m_context != extension->getRepositoryName())
throw lang::IllegalArgumentException(
"PackageManagerImpl::checkPrerequisites: extension is not from this repository.",
nullptr, 0);
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 5413b9f30ff3..8d051bc2ee45 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -256,7 +256,7 @@ public:
explicit XPackage_eq(const OUString & s) : m_URL(s) {}
bool operator() (const Reference<deployment::XPackage> & p) const
{
- return m_URL.equals(p->getURL());
+ return m_URL == p->getURL();
}
};
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ed8bfa3e3c04..c57c4e4d6760 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2383,7 +2383,7 @@ static char* getFontSubset (const OString& aFontName)
sal_uInt16 nItFont = 0;
for (; nItFont < nFontCount; ++nItFont)
{
- if (aFoundFont.equals(pList->GetFontName(nItFont).GetFamilyName()))
+ if (aFoundFont == pList->GetFontName(nItFont).GetFamilyName())
{
break;
}
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 807e335dc386..0f5b4693a651 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -941,7 +941,7 @@ std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules(
for (sal_Int32 j=0; j<lToolbars.getLength(); ++j) {
OUString sToolbarName = lToolbars[j];
if (sToolbarName.getLength()>=nCustomLen &&
- sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT))
+ sToolbarName.copy(0, nCustomLen) == RESOURCEURL_CUSTOM_ELEMENT)
continue;
aModuleInfo.sModuleShortName = sModuleShortName;
@@ -1106,7 +1106,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
}
}
- if (sCmd.equals(it->m_sPrevSibling))
+ if (sCmd == it->m_sPrevSibling)
break;
}
@@ -1129,7 +1129,7 @@ uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager
uno::Reference< ui::XUIConfigurationManager > xCfgManager;
for ( const css::beans::PropertyValue& rProp : m_lCfgManagerSeq) {
- if (rProp.Name.equals(sModuleShortName)) {
+ if (rProp.Name == sModuleShortName) {
rProp.Value >>= xCfgManager;
break;
}
@@ -1143,7 +1143,7 @@ uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSett
uno::Reference< container::XIndexContainer > xNewMenuSettings;
for (sal_Int32 i=0; i<m_lNewVersionMenubarSettingsSeq.getLength(); ++i) {
- if (m_lNewVersionMenubarSettingsSeq[i].Name.equals(sModuleShortName)) {
+ if (m_lNewVersionMenubarSettingsSeq[i].Name == sModuleShortName) {
m_lNewVersionMenubarSettingsSeq[i].Value >>= xNewMenuSettings;
break;
}
@@ -1157,11 +1157,11 @@ uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSett
uno::Reference< container::XIndexContainer > xNewToolbarSettings;
for (sal_Int32 i=0; i<m_lNewVersionToolbarSettingsSeq.getLength(); ++i) {
- if (m_lNewVersionToolbarSettingsSeq[i].Name.equals(sModuleShortName)) {
+ if (m_lNewVersionToolbarSettingsSeq[i].Name == sModuleShortName) {
uno::Sequence< beans::PropertyValue > lToolbarSettingsSeq;
m_lNewVersionToolbarSettingsSeq[i].Value >>= lToolbarSettingsSeq;
for (sal_Int32 j=0; j<lToolbarSettingsSeq.getLength(); ++j) {
- if (lToolbarSettingsSeq[j].Name.equals(sToolbarName)) {
+ if (lToolbarSettingsSeq[j].Name == sToolbarName) {
lToolbarSettingsSeq[j].Value >>= xNewToolbarSettings;
break;
}
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index b50374694e41..be570542a97c 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -63,8 +63,8 @@ struct ExtensionName
explicit ExtensionName( OUString const & str ) : m_str( str ) {}
bool operator () ( Reference<deployment::XPackage> const & e ) const
{
- return m_str.equals(dp_misc::getIdentifier(e))
- || m_str.equals(e->getName());
+ return m_str == dp_misc::getIdentifier(e)
+ || m_str == e->getName();
}
};
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 51b06af008d0..a1fc3a229b6b 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1875,7 +1875,7 @@ void Outliner::ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRec
aBulletText += pFmt->GetSuffix();
}
- if (!pPara->GetText().equals(aBulletText))
+ if (pPara->GetText() != aBulletText)
pPara->SetText( aBulletText );
pPara->nFlags &= (~ParaFlag::SETBULLETTEXT);
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 9cbf770c11da..f289c5b9b102 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -234,7 +234,7 @@ void OCommonEmbeddedObject::LinkInit_Impl(
{
::comphelper::MimeConfigurationHelper aHelper( m_xContext );
OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName );
- m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) );
+ m_bReadOnly = aExportFilterName != m_aLinkFilterName;
}
m_aDocMediaDescriptor = GetValuableArgs_Impl( aMediaDescr, false );
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 27db3956834b..ba5a3fde2c6e 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -244,7 +244,7 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
const uno::Reference< embed::XStorage >& xNewObjectStorage,
const OUString& aNewName )
{
- if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) )
+ if ( xNewParentStorage == m_xParentStorage && aNewName == m_aEntryName )
{
SAL_WARN_IF( xNewObjectStorage != m_xObjectStorage, "embeddedobj.common", "The storage must be the same!" );
return;
@@ -278,7 +278,7 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage,
const OUString& aNewName )
{
- if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) )
+ if ( xNewParentStorage == m_xParentStorage && aNewName == m_aEntryName )
return;
sal_Int32 nStorageMode = m_bReadOnly ? embed::ElementModes::READ : embed::ElementModes::READWRITE;
@@ -956,7 +956,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
{
// saveCompleted is expected, handle it accordingly
- if ( m_xNewParentStorage == xStorage && m_aNewEntryName.equals( sEntName ) )
+ if ( m_xNewParentStorage == xStorage && m_aNewEntryName == sEntName )
{
saveCompleted( true );
return;
@@ -964,7 +964,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
// if a completely different entry is provided, switch first back to the old persistence in saveCompleted
// and then switch to the target persistence
- bool bSwitchFurther = ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+ bool bSwitchFurther = ( m_xParentStorage != xStorage || m_aEntryName != sEntName );
saveCompleted( false );
if ( !bSwitchFurther )
return;
@@ -1697,7 +1697,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
}
}
- if ( !aOldLinkFilter.equals( m_aLinkFilterName ) )
+ if ( aOldLinkFilter != m_aLinkFilterName )
{
uno::Sequence< beans::NamedValue > aObject = aHelper.GetObjectPropsByFilter( m_aLinkFilterName );
@@ -1806,7 +1806,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
m_bReadOnly = false;
- if ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) )
+ if ( m_xParentStorage != xStorage || m_aEntryName != sEntName )
SwitchOwnPersistence( xStorage, sEntName );
// for linked object it means that it becomes embedded object
diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx
index 7c4ccfad8852..6fadef47f007 100644
--- a/embeddedobj/source/commonembedding/register.cxx
+++ b/embeddedobj/source/commonembedding/register.cxx
@@ -40,21 +40,21 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory(
if ( pServiceManager )
{
- if ( aImplName.equals( OOoEmbeddedObjectFactory::impl_staticGetImplementationName() ) )
+ if ( aImplName == OOoEmbeddedObjectFactory::impl_staticGetImplementationName() )
{
xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
OOoEmbeddedObjectFactory::impl_staticGetImplementationName(),
OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance,
OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
}
- else if ( aImplName.equals( OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() ) )
+ else if ( aImplName == OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() )
{
xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName(),
OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance,
OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
}
- else if ( aImplName.equals( UNOEmbeddedObjectCreator::impl_staticGetImplementationName() ) )
+ else if ( aImplName == UNOEmbeddedObjectCreator::impl_staticGetImplementationName() )
{
xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
UNOEmbeddedObjectCreator::impl_staticGetImplementationName(),
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 1c24905e9dbd..1bef54e7741f 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -114,12 +114,12 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >&
for ( nInd = 0; nInd < aSourceProps.getLength(); nInd++ )
{
aTargetProps[nInd].Name = aSourceProps[nInd].Name;
- if ( !aContModuleName.isEmpty() && aTargetProps[nInd].Name.equals( aModuleIdentPropName ) )
+ if ( !aContModuleName.isEmpty() && aTargetProps[nInd].Name == aModuleIdentPropName )
{
aTargetProps[nInd].Value <<= aContModuleName;
bModuleNameSet = true;
}
- else if ( aTargetProps[nInd].Name.equals( aDispProvPropName ) )
+ else if ( aTargetProps[nInd].Name == aDispProvPropName )
{
aTargetProps[nInd].Value <<= xSourceDisp;
bDispProvSet = true;
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 269599af679d..fa44b4db4286 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -294,7 +294,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
if ( m_bWaitSaveCompleted )
{
if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
- saveCompleted( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+ saveCompleted( m_xParentStorage != xStorage || m_aEntryName != sEntName );
else
throw embed::WrongStateException(
"The object waits for saveCompleted() call!",
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index e039a306f867..3e1f39e7e722 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -744,7 +744,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor
const uno::Reference< io::XStream >& xNewObjectStream,
const OUString& aNewName )
{
- if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) )
+ if ( xNewParentStorage == m_xParentStorage && aNewName == m_aEntryName )
{
SAL_WARN_IF( xNewObjectStream != m_xObjectStream, "embeddedobj.ole", "The streams must be the same!" );
return;
@@ -769,7 +769,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor
void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage,
const OUString& aNewName )
{
- if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) )
+ if ( xNewParentStorage == m_xParentStorage && aNewName == m_aEntryName )
return;
sal_Int32 nStreamMode = m_bReadOnly ? embed::ElementModes::READ : embed::ElementModes::READWRITE;
@@ -1305,7 +1305,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
if ( m_bWaitSaveCompleted )
{
if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
- saveCompleted( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+ saveCompleted( m_xParentStorage != xStorage || m_aEntryName != sEntName );
else
throw embed::WrongStateException(
"The object waits for saveCompleted() call!",
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index 5cb0ae690507..5d01379c7870 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -43,7 +43,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory(
if ( pServiceManager )
{
- if ( aImplName.equals( OleEmbeddedObjectFactory::impl_staticGetImplementationName() ) )
+ if ( aImplName == OleEmbeddedObjectFactory::impl_staticGetImplementationName() )
{
xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
OleEmbeddedObjectFactory::impl_staticGetImplementationName(),
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 7eb7402429ee..ba0f0c0a960a 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -273,7 +273,7 @@ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
for(std::unique_ptr<Mapping> & i : *pMappingsArr)
{
Mapping& rMapping = *i.get();
- bool bURLEqual = rDesc.sDataSource.equals(rMapping.sURL);
+ bool bURLEqual = rDesc.sDataSource == rMapping.sURL;
if(rDesc.sTableOrQuery == rMapping.sTableName && bURLEqual)
return &rMapping;
}
@@ -285,7 +285,7 @@ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapp
for(size_t i = 0; i < pMappingsArr->size(); i++)
{
Mapping& rMapping = *(*pMappingsArr)[i].get();
- bool bURLEqual = rDesc.sDataSource.equals(rMapping.sURL);
+ bool bURLEqual = rDesc.sDataSource == rMapping.sURL;
if(rDesc.sTableOrQuery == rMapping.sTableName && bURLEqual)
{
pMappingsArr->erase(pMappingsArr->begin()+i);
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index ef890085d72b..7813f16b810e 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -148,7 +148,7 @@ namespace dbp
// search the entry of the given type with the given name
for ( sal_Int32 nLookup = 0; nLookup < m_pTable->GetEntryCount(); ++nLookup )
{
- if (sCommand.equals(m_pTable->GetEntry(nLookup)))
+ if (sCommand == m_pTable->GetEntry(nLookup))
{
if ( reinterpret_cast< sal_IntPtr >( m_pTable->GetEntryData( nLookup ) ) == nCommandType )
{
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 192135b23afc..125c96519988 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -550,7 +550,7 @@ namespace pcr
OUString sControlValue;
OSL_VERIFY( _rControlValue >>= sControlValue );
// Don't convert a placeholder
- if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( PcrRes(RID_EMBED_IMAGE_PLACEHOLDER) ) )
+ if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue == PcrRes(RID_EMBED_IMAGE_PLACEHOLDER) )
aPropertyValue <<= sControlValue;
else
{
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index f0d4f40aa32a..f3fa6941ff2e 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1346,7 +1346,7 @@ namespace pcr
// can ignore it
OUString sVal;
_rValue >>= sVal;
- if ( sVal.equals( sPlcHolder ) )
+ if ( sVal == sPlcHolder )
bIsPlaceHolderValue = true;
}
m_sCommittingProperty = rName;
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 242074428e10..dc6e6d492b72 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -720,7 +720,7 @@ namespace pcr
OUString sSelection;
_rValue >>= sSelection;
- if ( !sSelection.equals( getTypedControlWindow()->GetSelectEntry() ) )
+ if ( sSelection != getTypedControlWindow()->GetSelectEntry() )
getTypedControlWindow()->SelectEntry( sSelection );
if ( !getTypedControlWindow()->IsEntrySelected( sSelection ) )
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 7037bf93ea29..c110656e61e0 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -113,7 +113,7 @@ inline OUString getBaseInstallation()
inline bool isObsoleteUpdateInfo(const OUString& rBuildId)
{
- return !rBuildId.equals(getBuildId()) && !rBuildId.isEmpty();
+ return rBuildId != getBuildId() && !rBuildId.isEmpty();
}
@@ -1228,7 +1228,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
{
osl::ClearableMutexGuard aGuard(m_aMutex);
- bool bSuppressBubble = aInfo.BuildId.equals(m_aUpdateInfo.BuildId);
+ bool bSuppressBubble = aInfo.BuildId == m_aUpdateInfo.BuildId;
m_aUpdateInfo = aInfo;
OSL_ASSERT(DISABLED == m_eState || CHECK_SCHEDULED == m_eState);
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 13ba54392c0f..b5dea59112d0 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -311,7 +311,7 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent )
DialogControls eButton = BUTTON_COUNT;
for ( int i = 0; i < BUTTON_COUNT; i++ )
{
- if ( rEvent.ActionCommand.equals( msButtonIDs[i] ) )
+ if ( rEvent.ActionCommand == msButtonIDs[i] )
{
eButton = (DialogControls) i;
break;
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index 8478e1f355ba..21db68c3c382 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -158,7 +158,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
(aSet >>= v2)
)
{
- bool bIs = (v1.equals(v2));
+ bool bIs = v1 == v2;
FILTER_CONFIG_LOG_1_("isSubSet() ... check for string types => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
@@ -176,10 +176,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
(aSet >>= p2)
)
{
- bool bIs = (
- (p1.Name.equals(p2.Name) ) &&
- (isSubSet(p1.Value, p2.Value))
- );
+ bool bIs = (p1.Name == p2.Name) && isSubSet(p1.Value, p2.Value);
FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [PropertyValue] => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
@@ -192,10 +189,7 @@ bool isSubSet(const css::uno::Any& aSubSet,
(aSet >>= n2)
)
{
- bool bIs = (
- (n1.Name.equals(n2.Name) ) &&
- (isSubSet(n1.Value, n2.Value))
- );
+ bool bIs = (n1.Name == n2.Name) && isSubSet(n1.Value, n2.Value);
FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [NamedValue] => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index b9d9bdf395ba..09a136af4120 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -502,7 +502,7 @@ void FilterCache::addStatePropsToItem( EItemType eType,
if (
(aDirectValue >>= sDefaultFrameLoader) &&
(!sDefaultFrameLoader.isEmpty() ) &&
- (sItem.equals(sDefaultFrameLoader) )
+ (sItem == sDefaultFrameLoader )
)
{
rItem[PROPNAME_FINALIZED] <<= true;
@@ -1015,7 +1015,7 @@ void FilterCache::impl_validateAndOptimize()
OUString sInternalTypeNameCheck;
aType[PROPNAME_NAME] >>= sInternalTypeNameCheck;
- if (!sInternalTypeNameCheck.equals(sType))
+ if (sInternalTypeNameCheck != sType)
{
sLog.append("Warning\t:\t" "The type \"" + sType + "\" does support the property \"Name\" correctly.\n");
++nWarnings;
@@ -1147,7 +1147,7 @@ void FilterCache::impl_validateAndOptimize()
OUString sInternalFilterNameCheck;
aPrefFilter[PROPNAME_NAME] >>= sInternalFilterNameCheck;
- if (!sInternalFilterNameCheck.equals(sPrefFilter))
+ if (sInternalFilterNameCheck != sPrefFilter)
{
sLog.append("Warning\t:\t" "The filter \"" + sPrefFilter +
"\" does support the property \"Name\" correctly.\n");
@@ -1186,7 +1186,7 @@ void FilterCache::impl_validateAndOptimize()
// types, which are not referenced by any other loader.
// So we can avoid our code against the complexity of a diff!
OUString sLoader = pIt->first;
- if (sLoader.equals(sDefaultFrameLoader))
+ if (sLoader == sDefaultFrameLoader)
continue;
CacheItem& rLoader = pIt->second;
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index be8750797f94..604118e32d3d 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -312,7 +312,7 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
if (
(!sDocumentService.isEmpty() ) &&
(sDocumentService != QUERY_CONSTVALUE_ALL ) &&
- (!sCheckValue.equals(sDocumentService) )
+ (sCheckValue != sDocumentService )
)
{
continue; // ignore filter -> try next one!
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index d1b9911e7ccb..3469c8e7f105 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -685,7 +685,7 @@ bool TypeDetection::impl_getPreselectionForType(
++pIt )
{
OUString sCheckExtension(pIt->toAsciiLowerCase());
- if (sCheckExtension.equals(sExtension))
+ if (sCheckExtension == sExtension)
{
bBreakDetection = true;
bMatchByExtension = true;
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index eb71a0f1a2d0..eeb122d6004c 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -42,7 +42,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory(
Reference< XSingleServiceFactory > xFactory;
OUString implName = OUString::createFromAscii( pImplName );
- if ( implName.equals(FlashExportFilter_getImplementationName()) )
+ if ( implName == FlashExportFilter_getImplementationName() )
{
xFactory = createSingleFactory(
static_cast< XMultiServiceFactory * >( pServiceManager ),
@@ -50,7 +50,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory(
FlashExportFilter_createInstance, FlashExportFilter_getSupportedServiceNames() );
}
- else if ( implName.equals(SWFDialog_getImplementationName()) )
+ else if ( implName == SWFDialog_getImplementationName() )
{
xFactory = createSingleFactory(
static_cast< XMultiServiceFactory * >( pServiceManager ),
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index a13589eaea44..87dd2b2413b0 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2610,7 +2610,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
for ( i = 0; i < nCount; i++ )
{
const beans::PropertyValue& rProp = aGeoPropSeq[ i ];
- if ( rProp.Name.equals( sViewBox ) )
+ if ( rProp.Name == sViewBox )
{
if ( !bIsDefaultObject )
{
@@ -2624,7 +2624,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
}
}
- else if ( rProp.Name.equals( sTextRotateAngle ) )
+ else if ( rProp.Name == sTextRotateAngle )
{
double f = 0;
if ( rProp.Value >>= f )
@@ -2640,7 +2640,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_cdirFont, mso_cdir270 );
}
}
- else if ( rProp.Name.equals( sExtrusion ) )
+ else if ( rProp.Name == sExtrusion )
{
uno::Sequence< beans::PropertyValue > aExtrusionPropSeq;
if ( rProp.Value >>= aExtrusionPropSeq )
@@ -2681,7 +2681,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
const OUString sExtrusionOrigin ( "Origin" );
const OUString sExtrusionColor ( "Color" );
- if ( rrProp.Name.equals( sExtrusion ) )
+ if ( rrProp.Name == sExtrusion )
{
bool bExtrusionOn;
if ( rrProp.Value >>= bExtrusionOn )
@@ -2693,13 +2693,13 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nLightFaceFlags &=~8;
}
}
- else if ( rrProp.Name.equals( sExtrusionBrightness ) )
+ else if ( rrProp.Name == sExtrusionBrightness )
{
double fExtrusionBrightness = 0;
if ( rrProp.Value >>= fExtrusionBrightness )
AddOpt( DFF_Prop_c3DAmbientIntensity, (sal_Int32)( fExtrusionBrightness * 655.36 ) );
}
- else if ( rrProp.Name.equals( sExtrusionDepth ) )
+ else if ( rrProp.Name == sExtrusionDepth )
{
double fDepth = 0;
double fFraction = 0;
@@ -2719,19 +2719,19 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
}
}
- else if ( rrProp.Name.equals( sExtrusionDiffusion ) )
+ else if ( rrProp.Name == sExtrusionDiffusion )
{
double fExtrusionDiffusion = 0;
if ( rrProp.Value >>= fExtrusionDiffusion )
AddOpt( DFF_Prop_c3DDiffuseAmt, (sal_Int32)( fExtrusionDiffusion * 655.36 ) );
}
- else if ( rrProp.Name.equals( sExtrusionNumberOfLineSegments ) )
+ else if ( rrProp.Name == sExtrusionNumberOfLineSegments )
{
sal_Int32 nExtrusionNumberOfLineSegments = 0;
if ( rrProp.Value >>= nExtrusionNumberOfLineSegments )
AddOpt( DFF_Prop_c3DTolerance, nExtrusionNumberOfLineSegments );
}
- else if ( rrProp.Name.equals( sExtrusionLightFace ) )
+ else if ( rrProp.Name == sExtrusionLightFace )
{
bool bExtrusionLightFace;
if ( rrProp.Value >>= bExtrusionLightFace )
@@ -2743,7 +2743,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nLightFaceFlags &=~1;
}
}
- else if ( rrProp.Name.equals( sExtrusionFirstLightHarsh ) )
+ else if ( rrProp.Name == sExtrusionFirstLightHarsh )
{
bool bExtrusionFirstLightHarsh;
if ( rrProp.Value >>= bExtrusionFirstLightHarsh )
@@ -2755,7 +2755,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFillHarshFlags &=~2;
}
}
- else if ( rrProp.Name.equals( sExtrusionSecondLightHarsh ) )
+ else if ( rrProp.Name == sExtrusionSecondLightHarsh )
{
bool bExtrusionSecondLightHarsh;
if ( rrProp.Value >>= bExtrusionSecondLightHarsh )
@@ -2767,19 +2767,19 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFillHarshFlags &=~1;
}
}
- else if ( rrProp.Name.equals( sExtrusionFirstLightLevel ) )
+ else if ( rrProp.Name == sExtrusionFirstLightLevel )
{
double fExtrusionFirstLightLevel = 0;
if ( rrProp.Value >>= fExtrusionFirstLightLevel )
AddOpt( DFF_Prop_c3DKeyIntensity, (sal_Int32)( fExtrusionFirstLightLevel * 655.36 ) );
}
- else if ( rrProp.Name.equals( sExtrusionSecondLightLevel ) )
+ else if ( rrProp.Name == sExtrusionSecondLightLevel )
{
double fExtrusionSecondLightLevel = 0;
if ( rrProp.Value >>= fExtrusionSecondLightLevel )
AddOpt( DFF_Prop_c3DFillIntensity, (sal_Int32)( fExtrusionSecondLightLevel * 655.36 ) );
}
- else if ( rrProp.Name.equals( sExtrusionFirstLightDirection ) )
+ else if ( rrProp.Name == sExtrusionFirstLightDirection )
{
drawing::Direction3D aExtrusionFirstLightDirection;
if ( rrProp.Value >>= aExtrusionFirstLightDirection )
@@ -2789,7 +2789,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_c3DKeyZ, (sal_Int32)aExtrusionFirstLightDirection.DirectionZ );
}
}
- else if ( rrProp.Name.equals( sExtrusionSecondLightDirection ) )
+ else if ( rrProp.Name == sExtrusionSecondLightDirection )
{
drawing::Direction3D aExtrusionSecondLightPosition;
if ( rrProp.Value >>= aExtrusionSecondLightPosition )
@@ -2799,7 +2799,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_c3DFillZ, (sal_Int32)aExtrusionSecondLightPosition.DirectionZ );
}
}
- else if ( rrProp.Name.equals( sExtrusionMetal ) )
+ else if ( rrProp.Name == sExtrusionMetal )
{
bool bExtrusionMetal;
if ( rrProp.Value >>= bExtrusionMetal )
@@ -2811,7 +2811,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nLightFaceFlags &=~4;
}
}
- else if ( rrProp.Name.equals( sExtrusionShadeMode ) )
+ else if ( rrProp.Name == sExtrusionShadeMode )
{
drawing::ShadeMode eExtrusionShadeMode;
if ( rrProp.Value >>= eExtrusionShadeMode )
@@ -2834,7 +2834,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_c3DRenderMode, nRenderMode );
}
}
- else if ( rrProp.Name.equals( sExtrusionRotateAngle ) )
+ else if ( rrProp.Name == sExtrusionRotateAngle )
{
double fExtrusionAngleX = 0;
double fExtrusionAngleY = 0;
@@ -2847,7 +2847,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_c3DYRotationAngle, (sal_Int32)fExtrusionAngleY );
}
}
- else if ( rrProp.Name.equals( sExtrusionRotationCenter ) )
+ else if ( rrProp.Name == sExtrusionRotationCenter )
{
drawing::Direction3D aExtrusionRotationCenter;
if ( rrProp.Value >>= aExtrusionRotationCenter )
@@ -2858,13 +2858,13 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFillHarshFlags &=~8; // don't use AutoRotationCenter;
}
}
- else if ( rrProp.Name.equals( sExtrusionShininess ) )
+ else if ( rrProp.Name == sExtrusionShininess )
{
double fExtrusionShininess = 0;
if ( rrProp.Value >>= fExtrusionShininess )
AddOpt( DFF_Prop_c3DShininess, (sal_Int32)( fExtrusionShininess * 655.36 ) );
}
- else if ( rrProp.Name.equals( sExtrusionSkew ) )
+ else if ( rrProp.Name == sExtrusionSkew )
{
double fSkewAmount = 0;
double fSkewAngle = 0;
@@ -2875,13 +2875,13 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_c3DSkewAngle, (sal_Int32)( fSkewAngle * 65536 ) );
}
}
- else if ( rrProp.Name.equals( sExtrusionSpecularity ) )
+ else if ( rrProp.Name == sExtrusionSpecularity )
{
double fExtrusionSpecularity = 0;
if ( rrProp.Value >>= fExtrusionSpecularity )
AddOpt( DFF_Prop_c3DSpecularAmt, (sal_Int32)( fExtrusionSpecularity * 1333 ) );
}
- else if ( rrProp.Name.equals( sExtrusionProjectionMode ) )
+ else if ( rrProp.Name == sExtrusionProjectionMode )
{
drawing::ProjectionMode eExtrusionProjectionMode;
if ( rrProp.Value >>= eExtrusionProjectionMode )
@@ -2893,7 +2893,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFillHarshFlags &=~4;
}
}
- else if ( rrProp.Name.equals( sExtrusionViewPoint ) )
+ else if ( rrProp.Name == sExtrusionViewPoint )
{
drawing::Position3D aExtrusionViewPoint;
if ( rrProp.Value >>= aExtrusionViewPoint )
@@ -2906,7 +2906,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_c3DZViewpoint, (sal_Int32)aExtrusionViewPoint.PositionZ );
}
}
- else if ( rrProp.Name.equals( sExtrusionOrigin ) )
+ else if ( rrProp.Name == sExtrusionOrigin )
{
double fExtrusionOriginX = 0;
double fExtrusionOriginY = 0;
@@ -2917,7 +2917,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_c3DOriginY, (sal_Int32)( fExtrusionOriginY * 65536 ) );
}
}
- else if ( rrProp.Name.equals( sExtrusionColor ) )
+ else if ( rrProp.Name == sExtrusionColor )
{
bool bExtrusionColor;
if ( rrProp.Value >>= bExtrusionColor )
@@ -2944,7 +2944,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_fc3DFillHarsh, nFillHarshFlags );
}
}
- else if ( rProp.Name.equals( sEquations ) )
+ else if ( rProp.Name == sEquations )
{
if ( !bIsDefaultObject )
{
@@ -2979,7 +2979,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
}
}
- else if ( rProp.Name.equals( sPath ) )
+ else if ( rProp.Name == sPath )
{
uno::Sequence< beans::PropertyValue > aPathPropSeq;
if ( rProp.Value >>= aPathPropSeq )
@@ -3004,7 +3004,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
const OUString sPathStretchY ( "StretchY" );
const OUString sPathTextFrames ( "TextFrames" );
- if ( rrProp.Name.equals( sPathExtrusionAllowed ) )
+ if ( rrProp.Name == sPathExtrusionAllowed )
{
bool bExtrusionAllowed;
if ( rrProp.Value >>= bExtrusionAllowed )
@@ -3016,7 +3016,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nPathFlags &=~16;
}
}
- else if ( rrProp.Name.equals( sPathConcentricGradientFillAllowed ) )
+ else if ( rrProp.Name == sPathConcentricGradientFillAllowed )
{
bool bConcentricGradientFillAllowed;
if ( rrProp.Value >>= bConcentricGradientFillAllowed )
@@ -3028,7 +3028,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nPathFlags &=~2;
}
}
- else if ( rrProp.Name.equals( sPathTextPathAllowed ) )
+ else if ( rrProp.Name == sPathTextPathAllowed )
{
bool bTextPathAllowed;
if ( rrProp.Value >>= bTextPathAllowed )
@@ -3040,7 +3040,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nPathFlags &=~4;
}
}
- else if ( rrProp.Name.equals( sPathCoordinates ) )
+ else if ( rrProp.Name == sPathCoordinates )
{
if ( !bIsDefaultObject )
{
@@ -3048,7 +3048,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
bPathCoordinatesProp = true;
}
}
- else if ( rrProp.Name.equals( sPathGluePoints ) )
+ else if ( rrProp.Name == sPathGluePoints )
{
if ( !bIsDefaultObject )
{
@@ -3084,13 +3084,13 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
}
}
- else if ( rrProp.Name.equals( sPathGluePointType ) )
+ else if ( rrProp.Name == sPathGluePointType )
{
sal_Int16 nGluePointType = sal_Int16();
if ( rrProp.Value >>= nGluePointType )
AddOpt( DFF_Prop_connectorType, (sal_uInt16)nGluePointType );
}
- else if ( rrProp.Name.equals( sPathSegments ) )
+ else if ( rrProp.Name == sPathSegments )
{
if ( !bIsDefaultObject )
{
@@ -3212,7 +3212,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
}
}
- else if ( rrProp.Name.equals( sPathStretchX ) )
+ else if ( rrProp.Name == sPathStretchX )
{
if ( !bIsDefaultObject )
{
@@ -3221,7 +3221,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_stretchPointX, nStretchX );
}
}
- else if ( rrProp.Name.equals( sPathStretchY ) )
+ else if ( rrProp.Name == sPathStretchY )
{
if ( !bIsDefaultObject )
{
@@ -3230,7 +3230,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_stretchPointY, nStretchY );
}
}
- else if ( rrProp.Name.equals( sPathTextFrames ) )
+ else if ( rrProp.Name == sPathTextFrames )
{
if ( !bIsDefaultObject )
{
@@ -3275,7 +3275,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_fFillOK, nPathFlags );
}
}
- else if ( rProp.Name.equals( sTextPath ) )
+ else if ( rProp.Name == sTextPath )
{
uno::Sequence< beans::PropertyValue > aTextPathPropSeq;
if ( rProp.Value >>= aTextPathPropSeq )
@@ -3293,7 +3293,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
const OUString sTextPathScaleX ( "ScaleX" );
const OUString sSameLetterHeights ( "SameLetterHeights" );
- if ( rrProp.Name.equals( sTextPath ) )
+ if ( rrProp.Name == sTextPath )
{
bool bTextPathOn;
if ( rrProp.Value >>= bTextPathOn )
@@ -3312,7 +3312,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nTextPathFlags &=~0x4000;
}
}
- else if ( rrProp.Name.equals( sTextPathMode ) )
+ else if ( rrProp.Name == sTextPathMode )
{
css::drawing::EnhancedCustomShapeTextPathMode eTextPathMode;
if ( rrProp.Value >>= eTextPathMode )
@@ -3325,7 +3325,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nTextPathFlags |= 0x500;
}
}
- else if ( rrProp.Name.equals( sTextPathScaleX ) )
+ else if ( rrProp.Name == sTextPathScaleX )
{
bool bTextPathScaleX;
if ( rrProp.Value >>= bTextPathScaleX )
@@ -3337,7 +3337,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nTextPathFlags &=~0x40;
}
}
- else if ( rrProp.Name.equals( sSameLetterHeights ) )
+ else if ( rrProp.Name == sSameLetterHeights )
{
bool bSameLetterHeights;
if ( rrProp.Value >>= bSameLetterHeights )
@@ -3477,7 +3477,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt( DFF_Prop_gtextFStrikethrough, nTextPathFlags );
}
}
- else if ( rProp.Name.equals( sHandles ) )
+ else if ( rProp.Name == sHandles )
{
if ( !bIsDefaultObject )
{
@@ -3521,7 +3521,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
const OUString sRangeYMinimum ( "RangeYMinimum" );
const OUString sRangeYMaximum ( "RangeYMaximum" );
- if ( rPropVal.Name.equals( sPosition ) )
+ if ( rPropVal.Name == sPosition )
{
css::drawing::EnhancedCustomShapeParameterPair aPosition;
if ( rPropVal.Value >>= aPosition )
@@ -3530,7 +3530,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
GetValueForEnhancedCustomShapeHandleParameter( nYPosition, aPosition.Second );
}
}
- else if ( rPropVal.Name.equals( sMirroredX ) )
+ else if ( rPropVal.Name == sMirroredX )
{
bool bMirroredX;
if ( rPropVal.Value >>= bMirroredX )
@@ -3539,7 +3539,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 1;
}
}
- else if ( rPropVal.Name.equals( sMirroredY ) )
+ else if ( rPropVal.Name == sMirroredY )
{
bool bMirroredY;
if ( rPropVal.Value >>= bMirroredY )
@@ -3548,7 +3548,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 2;
}
}
- else if ( rPropVal.Name.equals( sSwitched ) )
+ else if ( rPropVal.Name == sSwitched )
{
bool bSwitched;
if ( rPropVal.Value >>= bSwitched )
@@ -3557,7 +3557,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 4;
}
}
- else if ( rPropVal.Name.equals( sPolar ) )
+ else if ( rPropVal.Name == sPolar )
{
css::drawing::EnhancedCustomShapeParameterPair aPolar;
if ( rPropVal.Value >>= aPolar )
@@ -3569,7 +3569,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 8;
}
}
- else if ( rPropVal.Name.equals( sRadiusRangeMinimum ) )
+ else if ( rPropVal.Name == sRadiusRangeMinimum )
{
nYRangeMin = (sal_Int32)0xff4c0000; // the range of angles seems to be a not
nYRangeMax = (sal_Int32)0x00b40000; // used feature, so we are defaulting this
@@ -3582,7 +3582,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 0x2000;
}
}
- else if ( rPropVal.Name.equals( sRadiusRangeMaximum ) )
+ else if ( rPropVal.Name == sRadiusRangeMaximum )
{
nYRangeMin = (sal_Int32)0xff4c0000; // the range of angles seems to be a not
nYRangeMax = (sal_Int32)0x00b40000; // used feature, so we are defaulting this
@@ -3595,7 +3595,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 0x2000;
}
}
- else if ( rPropVal.Name.equals( sRangeXMinimum ) )
+ else if ( rPropVal.Name == sRangeXMinimum )
{
css::drawing::EnhancedCustomShapeParameter aXRangeMinimum;
if ( rPropVal.Value >>= aXRangeMinimum )
@@ -3605,7 +3605,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 0x20;
}
}
- else if ( rPropVal.Name.equals( sRangeXMaximum ) )
+ else if ( rPropVal.Name == sRangeXMaximum )
{
css::drawing::EnhancedCustomShapeParameter aXRangeMaximum;
if ( rPropVal.Value >>= aXRangeMaximum )
@@ -3615,7 +3615,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 0x20;
}
}
- else if ( rPropVal.Name.equals( sRangeYMinimum ) )
+ else if ( rPropVal.Name == sRangeYMinimum )
{
css::drawing::EnhancedCustomShapeParameter aYRangeMinimum;
if ( rPropVal.Value >>= aYRangeMinimum )
@@ -3625,7 +3625,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nFlags |= 0x20;
}
}
- else if ( rPropVal.Name.equals( sRangeYMaximum ) )
+ else if ( rPropVal.Name == sRangeYMaximum )
{
css::drawing::EnhancedCustomShapeParameter aYRangeMaximum;
if ( rPropVal.Value >>= aYRangeMaximum )
@@ -3661,7 +3661,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
}
}
- else if ( rProp.Name.equals( sAdjustmentValues ) )
+ else if ( rProp.Name == sAdjustmentValues )
{
// it is required, that the information which handle is polar has already be read,
// so we are able to change the polar value to a fixed float
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 8f58a82f410d..1e8a6e8ea352 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -148,16 +148,16 @@ SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath )
sal_Int32 lastSlashIndex = xModel->getURL().lastIndexOf( '/' );
if ( lastSlashIndex > -1 )
{
- bDocNameNoPathMatch = xModel->getURL().copy( lastSlashIndex + 1 ).equals( aURL );
+ bDocNameNoPathMatch = xModel->getURL().copy( lastSlashIndex + 1 ) == aURL;
if ( !bDocNameNoPathMatch )
{
OUString aTmpName = "'" + xModel->getURL().copy( lastSlashIndex + 1 ) + "'";
- bDocNameNoPathMatch = aTmpName.equals( aURL );
+ bDocNameNoPathMatch = aTmpName == aURL;
}
}
}
- if ( aURL.equals( xModel->getURL() ) || bDocNameNoPathMatch )
+ if ( aURL == xModel->getURL() || bDocNameNoPathMatch )
{
pFoundShell = pShell;
break;
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index e3ce4a7091cc..7d94f7aff0c3 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -42,21 +42,21 @@ extern "C"
{
Reference< XSingleServiceFactory > xFactory;
- if( aImplName.equals( PDFFilter_getImplementationName() ) )
+ if( aImplName == PDFFilter_getImplementationName() )
{
xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ),
OUString::createFromAscii( pImplName ),
PDFFilter_createInstance, PDFFilter_getSupportedServiceNames() );
}
- else if( aImplName.equals( PDFDialog_getImplementationName() ) )
+ else if( aImplName == PDFDialog_getImplementationName() )
{
xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ),
OUString::createFromAscii( pImplName ),
PDFDialog_createInstance, PDFDialog_getSupportedServiceNames() );
}
- else if( aImplName.equals( PDFInteractionHandler_getImplementationName() ) )
+ else if( aImplName == PDFInteractionHandler_getImplementationName() )
{
xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ),
OUString::createFromAscii( pImplName ),
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index 99491384c1c8..73dda29993d8 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -39,7 +39,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory(
void * pRet = nullptr;
OUString implName = OUString::createFromAscii( pImplName );
- if ( pServiceManager && implName.equals(T602ImportFilter_getImplementationName()) )
+ if ( pServiceManager && implName == T602ImportFilter_getImplementationName() )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
static_cast< XMultiServiceFactory * >( pServiceManager ),
@@ -52,7 +52,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory(
pRet = xFactory.get();
}
}
- else if ( pServiceManager && implName.equals(T602ImportFilterDialog_getImplementationName()) )
+ else if ( pServiceManager && implName == T602ImportFilterDialog_getImplementationName() )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
static_cast< XMultiServiceFactory * >( pServiceManager ),
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index f40ef510ccb2..c2bebaaec1b8 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -34,7 +34,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory(
{
void * pRet = nullptr;
OUString implName = OUString::createFromAscii( pImplName );
- if ( pServiceManager && implName.equals(XmlFilterAdaptor_getImplementationName()) )
+ if ( pServiceManager && implName == XmlFilterAdaptor_getImplementationName() )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
static_cast< XMultiServiceFactory * >( pServiceManager ),
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index ef5cc8a6c819..60b08704e95d 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -334,7 +334,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory(
Reference< XSingleServiceFactory > xFactory;
OUString implName = OUString::createFromAscii( pImplName );
- if ( implName.equals(XMLFilterDialogComponent_getImplementationName()) )
+ if ( implName == XMLFilterDialogComponent_getImplementationName() )
{
xFactory = createOneInstanceFactory(
static_cast< XMultiServiceFactory * >( pServiceManager ),
More information about the Libreoffice-commits
mailing list