strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use more OUString::operator== comphelper..cui

Browse source 
Change-Id: Ib5f3037249152be2b66acf347d1a0c236dc7adfa
Reviewed-on: https://gerrit.libreoffice.org/39888
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-07-13 09:55:21 +02:00
parent 8a75aa52ef
commit a394d67f37
31 changed files with 73 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
comphelper/source/container/embeddedobjectcontainer.cxx
View file

@ -669,7 +669,7 @@ bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectContainer
{
bool bResult = false;
if ( ( &rSrc != this || !aOrigName.equals( aTargetName ) ) && !aOrigName.isEmpty() && !aTargetName.isEmpty() )
if ( ( &rSrc != this || aOrigName != aTargetName ) && !aOrigName.isEmpty() && !aTargetName.isEmpty() )
{
OUString aMediaType;
uno::Reference < io::XInputStream > xGrStream = rSrc.GetGraphicStream( aOrigName, &aMediaType );

4
comphelper/source/misc/sequence.cxx
View file

@ -32,7 +32,7 @@ css::uno::Sequence<sal_Int16> findValue(const css::uno::Sequence< OUString >& _r
const OUString* pTArray = _rList.getConstArray();
for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
{
if( pTArray->equals(_rValue) )
if( *pTArray == _rValue )
{
nPos = i;
break;
@ -60,7 +60,7 @@ css::uno::Sequence<sal_Int16> findValue(const css::uno::Sequence< OUString >& _r
const OUString* pTArray = _rList.getConstArray();
for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
{
if( pTArray->equals(_rValue) )
if( *pTArray == _rValue )
{
*pReturn = (sal_Int16)i;
++pReturn;

2
comphelper/source/property/property.cxx
View file

@ -151,7 +151,7 @@ void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName)
if ( pResult != _rProps.end() && pResult->Name == _rPropName )
{
OSL_ENSURE(pResult->Name.equals(_rPropName), "::RemoveProperty Properties not sorted");
OSL_ENSURE(pResult->Name == _rPropName, "::RemoveProperty Properties not sorted");
removeElementAt(_rProps, pResult - pProperties);
}
}

2
comphelper/source/property/propertycontainerhelper.cxx
View file

@ -56,7 +56,7 @@ namespace
bool operator() (const PropertyDescription& x ) const
{
return x.aProperty.Name.equals(m_rCompare);
return x.aProperty.Name == m_rCompare;
}
};
}

2
comphelper/source/property/propertystatecontainer.cxx
View file

@ -119,7 +119,7 @@ namespace comphelper
OSL_ENSURE( pAllProperties->Name.compareTo( (pAllProperties + 1)->Name ) < 0,
"OPropertyStateContainer::getPropertyStates: all-properties not sorted!" );
#endif
if ( pAllProperties->Name.equals( *pLookup ) )
if ( pAllProperties->Name == *pLookup )
{
*pStates++ = getPropertyState( *pLookup );
++pLookup;

2
comphelper/source/property/propstate.cxx
View file

@ -129,7 +129,7 @@ namespace comphelper
for (sal_Int32 i=0, j=0; i<nPropCount && j<nLen; ++i, ++pProps)
{
// get the values only for valid properties
if (pProps->Name.equals(*pNames))
if (pProps->Name == *pNames)
{
*pValues = getPropertyState(*pNames);
++pValues;

2
comphelper/source/xml/ofopxmlhelper.cxx
View file

@ -441,7 +441,7 @@ void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName )
if ( nLength <= 0 )
throw css::xml::sax::SAXException(); // TODO: no other end elements expected!
if ( !m_aElementsSeq[nLength-1].equals( aName ) )
if ( m_aElementsSeq[nLength-1] != aName )
throw css::xml::sax::SAXException(); // TODO: unexpected element ended
m_aElementsSeq.resize( nLength - 1 );

2
connectivity/source/commontools/dbtools.cxx
View file

@ -1737,7 +1737,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
{
OUString sName;
xParamColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
OSL_ENSURE(sName.equals(pFinalValues->Name), "::dbaui::askForParameters: inconsistent parameter names!");
OSL_ENSURE(sName == pFinalValues->Name, "::dbaui::askForParameters: inconsistent parameter names!");
// determine the field type and ...
sal_Int32 nParamType = 0;

2
connectivity/source/drivers/hsqldb/HTable.cxx
View file

@ -194,7 +194,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Refe
// now we should look if the name of the column changed
OUString sNewColumnName;
descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_NAME)) >>= sNewColumnName;
if ( !sNewColumnName.equals(colName) )
if ( sNewColumnName != colName )
{
const OUString sQuote = getMetaData()->getIdentifierQuoteString( );

6
connectivity/source/drivers/postgresql/pq_xtable.cxx
View file

@ -163,7 +163,7 @@ void Table::rename( const OUString& newName )
}
OUString fullNewName = concatQualified( newSchemaName, newTableName );
if( extractStringProperty( this, st.TYPE ).equals( st.VIEW ) && m_pSettings->views.is() )
if( extractStringProperty( this, st.TYPE ) == st.VIEW && m_pSettings->views.is() )
{
// maintain view list (really strange API !)
Any a = m_pSettings->pViewsImpl->getByName( fullOldName );
@ -177,7 +177,7 @@ void Table::rename( const OUString& newName )
}
else
{
if( ! newSchemaName.equals(schema) )
if( newSchemaName != schema )
{
// try new schema name first
try
@ -201,7 +201,7 @@ void Table::rename( const OUString& newName )
}
}
if( ! newTableName.equals( oldName ) ) // might also be just the change of a schema name
if( newTableName != oldName ) // might also be just the change of a schema name
{
OUStringBuffer buf(128);
buf.append( "ALTER TABLE" );

4
connectivity/source/drivers/postgresql/pq_xtables.cxx
View file

@ -326,7 +326,7 @@ void Tables::dropByIndex( sal_Int32 index )
OUString name,schema;
set->getPropertyValue( st.SCHEMA_NAME ) >>= schema;
set->getPropertyValue( st.NAME ) >>= name;
if( extractStringProperty( set, st.TYPE ).equals( st.VIEW ) && m_pSettings->views.is() )
if( extractStringProperty( set, st.TYPE ) == st.VIEW && m_pSettings->views.is() )
{
m_pSettings->pViewsImpl->dropByName( concatQualified( schema, name ) );
}
@ -334,7 +334,7 @@ void Tables::dropByIndex( sal_Int32 index )
{
OUStringBuffer update( 128 );
update.append( "DROP " );
if( extractStringProperty( set, st.TYPE ).equals( st.VIEW ) )
if( extractStringProperty( set, st.TYPE ) == st.VIEW )
update.append( "VIEW " );
else
update.append( "TABLE " );

4
connectivity/source/drivers/postgresql/pq_xview.cxx
View file

@ -112,7 +112,7 @@ void View::rename( const OUString& newName )
}
OUString fullNewName = concatQualified( newSchemaName, newTableName );
if( ! schema.equals( newSchemaName ) )
if( schema != newSchemaName )
{
try
{
@ -135,7 +135,7 @@ void View::rename( const OUString& newName )
}
}
if( ! oldName.equals( newTableName ) )
if( oldName != newTableName )
{
OUStringBuffer buf(128);
buf.append( "ALTER TABLE" );

2
connectivity/source/manager/mdrivermanager.cxx
View file

@ -229,7 +229,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
bool operator()( const DriverAccess& lhs)
{
return lhs.sImplementationName.equals(m_sImplName);
return lhs.sImplementationName == m_sImplName;
}
};

4
cppu/source/uno/EnvStack.cxx
View file

@ -153,10 +153,10 @@ static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const
token1 = str1.getToken(0, ':', nIndex1);
token2 = str2.getToken(0, ':', nIndex2);
if (token1.equals(token2))
if (token1 == token2)
sim += token1.getLength() + 1;
}
while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1.equals(token2));
while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2);
rtl::OUString result;

8
cppu/source/uno/cascade_mapping.cxx
View file

@ -187,10 +187,10 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const &
token1 = str1.getToken(0, ':', nIndex1);
token2 = str2.getToken(0, ':', nIndex2);
if (token1.equals(token2))
if (token1 == token2)
sim += token1.getLength() + 1;
}
while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1.equals(token2));
while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2);
rtl::OUString result;
@ -258,7 +258,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
// direct mapping possible?
// uno:bla-->uno:bla:blubb
if (from_envPurpose.equals(purpose))
if (from_envPurpose == purpose)
{
rtl::OUString rest = to_envPurpose.copy(purpose.getLength());
@ -271,7 +271,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
uno_envDcp += rest.copy(0, index);
}
else if (to_envPurpose.equals(purpose))
else if (to_envPurpose == purpose)
{
rtl::OUString rest = from_envPurpose.copy(purpose.getLength());

6
cppu/source/uno/eq.hxx
View file

@ -166,7 +166,7 @@ inline bool _equalSequence(
{
for ( sal_Int32 nPos = nElements; nPos--; )
{
if (! (static_cast<OUString *>(pDestElements) +nPos)->equals( static_cast<const ::rtl::OUString *>(pSourceElements)[nPos] ))
if ( static_cast<OUString *>(pDestElements)[nPos] != static_cast<const ::rtl::OUString *>(pSourceElements)[nPos] )
return false;
}
return true;
@ -522,8 +522,8 @@ inline bool _equalData(
}
case typelib_TypeClass_STRING:
return eSourceTypeClass == typelib_TypeClass_STRING
&& (static_cast<OUString *>(pDest))->equals(
*static_cast<OUString const *>(pSource) );
&& *static_cast<OUString *>(pDest) ==
*static_cast<OUString const *>(pSource);
case typelib_TypeClass_TYPE:
return eSourceTypeClass == typelib_TypeClass_TYPE
&& _type_equals(

2
cppu/source/uno/lbenv.cxx
View file

@ -992,7 +992,7 @@ inline void EnvironmentsData::getRegisteredEnvironments(
{
uno_Environment * pWeak = iPos->second;
if (rEnvDcp.isEmpty() ||
rEnvDcp.equals( pWeak->pTypeName ))
rEnvDcp == pWeak->pTypeName )
{
aFounds[nSize] = nullptr;
(*pWeak->harden)( &aFounds[nSize], pWeak );

4
cpputools/source/unoexe/unoexe.cxx
View file

@ -103,7 +103,7 @@ static bool readOption( OUString * pValue, const sal_Char * pOpt,
++(*pnIndex);
rtl_getAppCommandArg(*pnIndex, &pValue->pData);
if (*pnIndex >= rtl_getAppCommandArgCount() || pValue->copy(1).equals(dash))
if (*pnIndex >= rtl_getAppCommandArgCount() || pValue->copy(1) == dash)
{
throw RuntimeException( "incomplete option \"-" + aOpt + "\" given!" );
}
@ -130,7 +130,7 @@ static bool readOption( bool * pbOpt, const sal_Char * pOpt,
{
OUString aOpt = OUString::createFromAscii(pOpt);
if(aArg.startsWith("--") && aOpt.equals(aArg.copy(2)))
if(aArg.startsWith("--") && aOpt == aArg.copy(2))
{
++(*pnIndex);
*pbOpt = true;

14
cui/source/customize/cfg.cxx
View file

@ -273,7 +273,7 @@ generateCustomName(
{
SvxConfigEntry* pEntry = *iter;
if ( name.equals( pEntry->GetName() ) )
if ( name == pEntry->GetName() )
{
break;
}
@ -311,7 +311,7 @@ generateCustomURL(
{
SvxConfigEntry* pEntry = *iter;
if ( url.equals( pEntry->GetCommand() ) )
if ( url == pEntry->GetCommand() )
{
break;
}
@ -343,7 +343,7 @@ generateCustomMenuURL(
{
SvxConfigEntry* pEntry = *iter;
if ( url.equals( pEntry->GetCommand() ) )
if ( url == pEntry->GetCommand() )
{
break;
}
@ -1894,7 +1894,7 @@ void SvxConfigPage::Reset( const SfxItemSet* )
} catch(const uno::Exception&)
{ aCheckId.clear(); }
if ( aModuleId.equals( aCheckId ) )
if ( aModuleId == aCheckId )
{
// try to get the document based ui configuration manager
OUString aTitle2;
@ -3355,7 +3355,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void )
OUString aSystemName =
pSaveInData->GetSystemUIName( pEntry->GetCommand() );
if ( !pEntry->GetName().equals( aSystemName ) )
if ( pEntry->GetName() != aSystemName )
{
pEntry->SetName( aSystemName );
m_pContentsListBox->SetEntryText(
@ -3550,7 +3550,7 @@ void SvxToolbarConfigPage::Init()
SvxConfigEntry* pData =
static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( i ));
if ( pData->GetCommand().equals( m_aURLToSelect ) )
if ( pData->GetCommand() == m_aURLToSelect )
{
nPos = i;
break;
@ -3980,7 +3980,7 @@ ToolbarSaveInData::HasURL( const OUString& rURL )
{
SvxConfigEntry* pEntry = *iter;
if ( pEntry->GetCommand().equals( rURL ) )
if ( pEntry->GetCommand() == rURL )
{
return !pEntry->IsParentData();
}

10
cui/source/customize/cfgutil.cxx
View file

@ -576,18 +576,18 @@ void SfxConfigGroupListBox::FillScriptList(const css::uno::Reference< css::scrip
OUString uiName = theChild->getName();
if ( bIsRootNode )
{
if ( ! (theChild->getName().equals( user ) || theChild->getName().equals( share ) ||
theChild->getName().equals( currentDocTitle ) ) )
if ( ! (theChild->getName() == user || theChild->getName() == share ||
theChild->getName() == currentDocTitle ) )
{
bDisplay=false;
}
else
{
if ( uiName.equals( user ) )
if ( uiName == user )
{
uiName = xImp->m_sMyMacros;
}
else if ( uiName.equals( share ) )
else if ( uiName == share )
{
uiName = xImp->m_sProdMacros;
}
@ -816,7 +816,7 @@ SfxConfigGroupListBox::getDocumentModel( Reference< XComponentContext > const &
{
OUString sTdocUrl =
::comphelper::DocumentInfo::getDocumentTitle( model );
if( sTdocUrl.equals( docName ) )
if( sTdocUrl == docName )
{
xModel = model;
break;

14
cui/source/dialogs/SpellAttrib.hxx
View file

@ -75,15 +75,15 @@ struct SpellErrorDescription
bool operator==( const SpellErrorDescription& rDesc ) const
{
return bIsGrammarError == rDesc.bIsGrammarError &&
sErrorText.equals( rDesc.sErrorText ) &&
aLocale.Language.equals( rDesc.aLocale.Language ) &&
aLocale.Country.equals( rDesc.aLocale.Country ) &&
aLocale.Variant.equals( rDesc.aLocale.Variant ) &&
sErrorText == rDesc.sErrorText &&
aLocale.Language == rDesc.aLocale.Language &&
aLocale.Country == rDesc.aLocale.Country &&
aLocale.Variant == rDesc.aLocale.Variant &&
aSuggestions == rDesc.aSuggestions &&
xGrammarChecker == rDesc.xGrammarChecker &&
sDialogTitle.equals( rDesc.sDialogTitle ) &&
sExplanation.equals( rDesc.sExplanation ) &&
sExplanationURL.equals( rDesc.sExplanationURL ) &&
sDialogTitle == rDesc.sDialogTitle &&
sExplanation == rDesc.sExplanation &&
sExplanationURL == rDesc.sExplanationURL &&
sRuleId == rDesc.sRuleId;
}
};

8
cui/source/dialogs/SpellDialog.cxx
View file

@ -467,7 +467,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn, void )
//if it's not the 'no suggestions' entry
if(sWrong == sCurrentErrorText &&
m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount() > 0 &&
!m_sNoSuggestionsST.equals(m_pSuggestionLB->GetSelectEntry()))
m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry())
{
sCurrentErrorText = m_pSuggestionLB->GetSelectEntry();
}
@ -538,7 +538,7 @@ OUString SpellDialog::getReplacementString() const
if(m_pSuggestionLB->IsEnabled() &&
m_pSuggestionLB->GetSelectEntryCount()>0 &&
!m_sNoSuggestionsST.equals(m_pSuggestionLB->GetSelectEntry()))
m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry())
sReplacement = m_pSuggestionLB->GetSelectEntry();
return getDotReplacementString(sOrigString, sReplacement);
@ -711,7 +711,7 @@ void SpellDialog::Impl_Restore(bool bUseSavedSentence)
IMPL_LINK_NOARG(SpellDialog, IgnoreHdl, Button*, void)
{
if (m_sResumeST.equals(m_pIgnorePB->GetText()))
if (m_sResumeST == m_pIgnorePB->GetText())
{
Impl_Restore(false);
}
@ -1727,7 +1727,7 @@ void SentenceEditWindow_Impl::RestoreCurrentError()
if( pAttrib )
{
const SpellErrorDescription& rDesc = pAttrib->GetErrorDescription();
if( !rDesc.sErrorText.equals( GetErrorText() ) )
if( rDesc.sErrorText != GetErrorText() )
ChangeMarkedWord(rDesc.sErrorText, LanguageTag::convertToLanguageType( rDesc.aLocale ));
}
}

4
cui/source/dialogs/colorpicker.cxx
View file

@ -1468,11 +1468,11 @@ void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& a
{
for( sal_Int32 n = 0; n < aProps.getLength(); n++ )
{
if( aProps[n].Name.equals( msColorKey ) )
if( aProps[n].Name == msColorKey )
{
aProps[n].Value >>= mnColor;
}
else if( aProps[n].Name.equals( msModeKey ) )
else if( aProps[n].Name == msModeKey )
{
aProps[n].Value >>= mnMode;
}

2
cui/source/dialogs/cuifmsearch.cxx
View file

@ -262,7 +262,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
// control characters, as can be the case with memo fields), I use
// an empty OUString.
OUString sRealSetText = m_pcmbSearchText->GetText();
if (!sRealSetText.equals(sInitialText))
if (sRealSetText != sInitialText)
m_pcmbSearchText->SetText(OUString());
LINK(this, FmSearchDialog, OnSearchTextModified).Call(*m_pcmbSearchText);

8
cui/source/dialogs/scriptdlg.cxx
View file

@ -192,10 +192,10 @@ void SFTreeListBox::Init( const OUString& language )
bool app = false;
OUString uiName = children[ n ]->getName();
OUString factoryURL;
if ( uiName.equals( userStr ) || uiName.equals( shareStr ) )
if ( uiName == userStr || uiName == shareStr )
{
app = true;
if ( uiName.equals( userStr ) )
if ( uiName == userStr )
{
uiName = m_sMyMacros;
}
@ -261,7 +261,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, OUString&
if ( model.is() )
{
OUString sTdocUrl = ::comphelper::DocumentInfo::getDocumentTitle( model );
if( sTdocUrl.equals( docName ) )
if( sTdocUrl == docName )
{
xModel = model;
break;
@ -281,7 +281,7 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo
Sequence < Reference< browse::XBrowseNode > > children = rootNode->getChildNodes();
for ( sal_Int32 n = 0; n < children.getLength(); n++ )
{
if ( children[ n ]->getName().equals( language ) )
if ( children[ n ]->getName() == language )
{
langNode = children[ n ];
break;

2
cui/source/options/certpath.cxx
View file

@ -194,7 +194,7 @@ void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath
{
OUString* pCertPath = static_cast<OUString*>(pEntry->GetUserData());
//already exists, just select the original one
if (pCertPath->equals(rPath))
if (*pCertPath == rPath)
{
m_pCertPathList->SetCheckButtonState(pEntry, SvButtonState::Checked);
HandleCheckEntry(pEntry);

2
cui/source/options/connpoolconfig.cxx
View file

@ -116,7 +116,7 @@ namespace offapp
aLookup != aSettings.end();
++aLookup
)
if (sThisDriverName.equals(aLookup->sName))
if (sThisDriverName == aLookup->sName)
break;
if (aLookup == aSettings.end())

12
cui/source/options/optaboutconfig.cxx
View file

@ -303,8 +303,8 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
SvTreeListEntries::iterator it = std::find_if(m_modifiedPrefBoxEntries.begin(), m_modifiedPrefBoxEntries.end(),
[&sPath, &sPropertyName](std::unique_ptr<SvTreeListEntry> const& pEntry) -> bool
{
return static_cast<UserData*>(pEntry->GetUserData())->sPropertyPath.equals(sPath)
&& static_cast<SvLBoxString&>(pEntry->GetItem(2)).GetText().equals(sPropertyName);
return static_cast<UserData*>(pEntry->GetUserData())->sPropertyPath == sPath
&& static_cast<SvLBoxString&>(pEntry->GetItem(2)).GetText() == sPropertyName;
}
);
@ -771,8 +771,8 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
SvTreeListEntries::iterator it = std::find_if(m_prefBoxEntries.begin(), m_prefBoxEntries.end(),
[&pUserData, &sPropertyName](std::unique_ptr<SvTreeListEntry> const& rpEntry) -> bool
{
return static_cast<UserData*>(rpEntry->GetUserData())->sPropertyPath.equals(pUserData->sPropertyPath)
&& static_cast<SvLBoxString&>(rpEntry->GetItem(2)).GetText().equals(sPropertyName);
return static_cast<UserData*>(rpEntry->GetUserData())->sPropertyPath == pUserData->sPropertyPath
&& static_cast<SvLBoxString&>(rpEntry->GetItem(2)).GetText() == sPropertyName;
}
);
if (it != m_prefBoxEntries.end())
@ -783,8 +783,8 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
m_modifiedPrefBoxEntries.begin(), m_modifiedPrefBoxEntries.end(),
[&pUserData, &sPropertyName](std::unique_ptr<SvTreeListEntry> const& rpEntry) -> bool
{
return static_cast<UserData*>(rpEntry->GetUserData())->sPropertyPath.equals(pUserData->sPropertyPath)
&& static_cast<SvLBoxString&>(rpEntry->GetItem(2)).GetText().equals(sPropertyName);
return static_cast<UserData*>(rpEntry->GetUserData())->sPropertyPath == pUserData->sPropertyPath
&& static_cast<SvLBoxString&>(rpEntry->GetItem(2)).GetText() == sPropertyName;
}
);

4
cui/source/options/optgdlg.cxx
View file

@ -1198,7 +1198,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
for (sal_Int32 i=0; i < m_pUserInterfaceLB->GetEntryCount(); i++)
{
d = (sal_Int32)reinterpret_cast<sal_IntPtr>(m_pUserInterfaceLB->GetEntryData(i));
if ( d > 0 && seqInstalledLanguages.getLength() > d-1 && seqInstalledLanguages[d-1].equals(m_sUserLocaleValue))
if ( d > 0 && seqInstalledLanguages.getLength() > d-1 && seqInstalledLanguages[d-1] == m_sUserLocaleValue)
m_pUserInterfaceLB->SelectEntryPos(i);
}
}
@ -1370,7 +1370,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
theArgs[0] <<= NamedValue("nodepath", Any(OUString(sUserLocalePath)));
Reference< XPropertySet >xProp(
theConfigProvider->createInstanceWithArguments(sAccessUpdSrvc, theArgs ), UNO_QUERY_THROW );
if ( !m_sUserLocaleValue.equals(aLangString))
if ( m_sUserLocaleValue != aLangString)
{
// OSL_FAIL("UserInterface language was changed, restart.");
// write new value

2
cui/source/options/optupdt.cxx
View file

@ -253,7 +253,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue;
if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) &&
( ! aURL.equals( sValue ) ) )
( aURL != sValue ) )
{
m_xUpdateAccess->replaceByName( "DownloadDestination", uno::Any( aURL ) );
bModified = true;

4
cui/source/tabpages/autocdlg.cxx
View file

@ -1366,7 +1366,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void)
{
for(std::set<OUString>::iterator i = aFormatText.begin(); i != aFormatText.end(); ++i)
{
if((*i).equals(rShortTxt))
if((*i) == rShortTxt)
{
bEnableNew = false;
break;
@ -1380,7 +1380,7 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt
{
for(std::vector<OUString>::iterator i = rStrings.begin(); i != rStrings.end(); ++i)
{
if((*i).equals(rString))
if((*i) == rString)
{
return true;
}