summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basic/source/runtime/methods.cxx2
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx4
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx2
-rw-r--r--editeng/source/items/svxfont.cxx7
-rw-r--r--fpicker/source/office/iodlg.cxx2
-rw-r--r--svl/source/numbers/zforfind.cxx4
-rw-r--r--svl/source/numbers/zformat.cxx5
-rw-r--r--sw/source/core/edit/edtox.cxx5
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx2
-rw-r--r--sw/source/ui/index/cnttab.cxx6
-rw-r--r--xmloff/source/style/xmlnumfe.cxx2
11 files changed, 18 insertions, 23 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 73cd355389f1..f551af16b9ad 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2775,7 +2775,7 @@ OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLData )
// Is there a pure file name left? Otherwise the path is
// invalid anyway because it was not accepted by OSL before
- if (!string::equals(aPureFileName, '*'))
+ if (aPureFileName != "*")
{
pRTLData->pWildCard = new WildCard( aPureFileName );
}
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 290c01629563..4a58d0632c9d 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -228,9 +228,9 @@ OUString OFieldDescControl::BoolStringUI(const OUString& rPersistentString) cons
if (rPersistentString == aYes || rPersistentString == aNo)
return rPersistentString;
- if (comphelper::string::equals(rPersistentString, '0'))
+ if (rPersistentString == "0")
return aNo;
- if (comphelper::string::equals(rPersistentString, '1'))
+ if (rPersistentString == "1")
return aYes;
return ModuleRes(STR_VALUE_NONE).toString();
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 8b43ab4cfe7b..593ad22deb5d 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -413,7 +413,7 @@ namespace dbaui
else
{
sExtension = m_pOwnExtension->GetText();
- if ( comphelper::string::equals(sExtension.getToken(0,'.'), '*') )
+ if ( sExtension.getToken(0,'.') == "*" )
sExtension = sExtension.copy(2);
}
return sExtension;
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 7de20d1eed9d..a2501865bcfa 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -28,9 +28,6 @@
#include <editeng/svxfont.hxx>
#include <editeng/escapementitem.hxx>
-const sal_Unicode CH_BLANK = ' '; // ' ' Space character
-
-
SvxFont::SvxFont()
{
nKern = nEsc = 0;
@@ -262,7 +259,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const
sal_uInt32 nCharacterType = aCharClass.getCharacterType( aCharString, 0 );
if ( ( nCharacterType & ::com::sun::star::i18n::KCharacterType::UPPER ) )
break;
- if ( comphelper::string::equals(aCharString, CH_BLANK) )
+ if ( aCharString == " " )
break;
if( ++nPos < nTxtLen )
aCharString = rTxt.copy( nPos + nIdx, 1 );
@@ -287,7 +284,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const
nOldPos = nPos;
}
// Now the blanks are<processed
- while( nPos < nTxtLen && comphelper::string::equals(aCharString, CH_BLANK) && ++nPos < nTxtLen )
+ while( nPos < nTxtLen && aCharString == " " && ++nPos < nTxtLen )
aCharString = rTxt.copy( nPos + nIdx, 1 );
if( nOldPos != nPos )
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 9f43429424b9..824ef1e6243c 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -997,7 +997,7 @@ IMPL_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
&& _pImp->_pCbAutoExtension // auto extension is enabled in general
&& _pImp->_pCbAutoExtension->IsChecked() // auto extension is really to be used
&& !GetDefaultExt().isEmpty() // there is a default extension
- && !comphelper::string::equals(GetDefaultExt(), '*') // the default extension is not "all"
+ && GetDefaultExt() != "*" // the default extension is not "all"
&& !( FILEDLG_MODE_SAVE == _pImp->_eMode // we're saving a file
&& _pFileView->GetSelectionCount() // there is a selected file in the file view -> it will later on
) // (in SvtFileDialog::GetPathList) be taken as file to save to
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 36dd18e607d7..ac8de66f82c6 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1053,9 +1053,9 @@ bool ImpSvNumberInputScan::MayBeIso8601()
{
sal_Int32 n;
if (nAnzNums >= 3 && nNums[2] < nAnzStrings &&
- comphelper::string::equals(sStrArray[nNums[0]+1], '-') && // separator year-month
+ sStrArray[nNums[0]+1] == "-" && // separator year-month
(n = sStrArray[nNums[1]].toInt32()) >= 1 && n <= 12 && // month
- comphelper::string::equals(sStrArray[nNums[1]+1], '-') && // separator month-day
+ sStrArray[nNums[1]+1] == "-" && // separator month-day
(n = sStrArray[nNums[2]].toInt32()) >= 1 && n <= 31) // day
{
// Year (nNums[0]) value not checked, may be anything, but
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 5a7d557b866e..ec65c7ceee19 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3254,7 +3254,7 @@ bool SvNumberformat::ImpIsIso8601( const ImpSvNumFor& rNumFor )
break;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_DATESEP:
- if (comphelper::string::equals(rNumFor.Info().sStrArray[i], '-'))
+ if (rNumFor.Info().sStrArray[i] == "-")
{
if (eState == eAtYear)
{
@@ -4550,8 +4550,7 @@ bool SvNumberformat::IsNegativeInBracket() const
return false;
}
OUString *tmpStr = NumFor[1].Info().sStrArray;
- using comphelper::string::equals;
- return (equals(tmpStr[0], '(') && equals(tmpStr[nAnz-1], ')'));
+ return tmpStr[0] == "(" && tmpStr[nAnz-1] == ")";
}
bool SvNumberformat::HasPositiveBracketPlaceholder() const
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 7babb2d3a588..578afe1b24c5 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -303,7 +303,6 @@ void SwEditShell::ApplyAutoMark()
//2.
SfxMedium aMedium( sAutoMarkURL, STREAM_STD_READ );
SvStream& rStrm = *aMedium.GetInStream();
- const sal_Unicode cZero('0');
Push();
rtl_TextEncoding eChrSet = ::osl_getThreadTextEncoding();
@@ -347,8 +346,8 @@ void SwEditShell::ApplyAutoMark()
OUString sWordOnly = sLine.getToken(0, ';', nTokenPos);
//3.
- bool bCaseSensitive = !sCase.isEmpty() && !comphelper::string::equals(sCase, cZero);
- bool bWordOnly = !sWordOnly.isEmpty() && !comphelper::string::equals(sWordOnly, cZero);
+ bool bCaseSensitive = !sCase.isEmpty() && sCase != "0";
+ bool bWordOnly = !sWordOnly.isEmpty() && sWordOnly != "0";
if (!bCaseSensitive)
{
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index e5d490e6cf39..3fc30527aa23 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -907,7 +907,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP
if ((eType == MAN_AND) && m_pDrawEditEngine->GetTextLen())
{
ESelection aFirstChar(0, 0, 0, 1);
- if (comphelper::string::equals(m_pDrawEditEngine->GetText( aFirstChar ), 0x5))
+ if (m_pDrawEditEngine->GetText( aFirstChar ) == "\x05")
m_pDrawEditEngine->QuickDelete(aFirstChar);
}
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 7948ccdf6472..d20dffb87154 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1778,7 +1778,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt )
{
sal_uInt16 nLevel = static_cast< sal_uInt16 >(GetModel()->GetAbsPos(pEntry));
OUString sEntry = pParent->GetLevelHelp(++nLevel);
- if (comphelper::string::equals(sEntry, '*'))
+ if (sEntry == "*")
sEntry = GetEntryText(pEntry);
if(!sEntry.isEmpty())
{
@@ -4109,10 +4109,10 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
pToInsert->sSecKey = sLine.getToken(0, ';', nSttPos );
OUString sStr = sLine.getToken(0, ';', nSttPos );
- pToInsert->bCase = !sStr.isEmpty() && !comphelper::string::equals(sStr, '0');
+ pToInsert->bCase = !sStr.isEmpty() && sStr != "0";
sStr = sLine.getToken(0, ';', nSttPos );
- pToInsert->bWord = !sStr.isEmpty() && !comphelper::string::equals(sStr, '0');
+ pToInsert->bWord = !sStr.isEmpty() && sStr != "0";
aEntryArr.push_back( pToInsert );
pToInsert = 0;
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 07cf3131cc69..f580dfaad7e4 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -1476,7 +1476,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
}
break;
case NF_SYMBOLTYPE_DEL:
- if ( pElemStr && comphelper::string::equals(*pElemStr, '@') )
+ if ( pElemStr && *pElemStr == "@" )
{
WriteTextContentElement_Impl();
bAnyContent = true;
generated by cgit (git 2.34.1) at 2024-07-25 00:06:21 +0000