summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/crsr/crstrvl.cxx2
-rw-r--r--sw/source/core/doc/acmplwrd.cxx5
-rw-r--r--sw/source/core/doc/doc.cxx2
-rw-r--r--sw/source/core/edit/editsh.cxx2
-rw-r--r--sw/source/core/edit/edlingu.cxx5
-rw-r--r--sw/source/core/fields/ddetbl.cxx2
-rw-r--r--sw/source/core/fields/reffld.cxx2
-rw-r--r--sw/source/filter/ascii/ascatr.cxx2
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx3
-rw-r--r--sw/source/filter/html/htmlform.cxx3
-rw-r--r--sw/source/filter/html/htmlgrin.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx6
-rw-r--r--sw/source/filter/html/wrthtml.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx4
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx2
-rw-r--r--sw/source/ui/misc/bookmark.cxx2
-rw-r--r--sw/source/ui/vba/vbafield.cxx2
-rw-r--r--sw/source/uibase/app/appenv.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx2
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
22 files changed, 26 insertions, 32 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index bebb41ba67b1..5ade3ec3cf5d 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -2222,7 +2222,7 @@ bool SwCursorShell::SelectNxtPrvHyperlink( bool bNext )
OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
*rAttr.GetEnd() - rAttr.GetStart() ) );
- sText = comphelper::string::remove(sText, 0x0a);
+ sText = sText.replaceAll(OUStringLiteral1<0x0a>(), "");
sText = comphelper::string::strip(sText, ' ');
if( !sText.isEmpty() )
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 634d587b3574..c07b8b0417a8 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -244,9 +244,8 @@ bool SwAutoCompleteWord::InsertWord( const OUString& rWord, SwDoc& rDoc )
return false;
}
- OUString aNewWord(rWord);
- aNewWord = comphelper::string::remove(aNewWord, CH_TXTATR_INWORD);
- aNewWord = comphelper::string::remove(aNewWord, CH_TXTATR_BREAKWORD);
+ OUString aNewWord = rWord.replaceAll(OUString(CH_TXTATR_INWORD), "")
+ .replaceAll(OUStringLiteral1<CH_TXTATR_BREAKWORD>(), "");
pImpl->AddDocument(rDoc);
bool bRet = false;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index ea8089295b9b..d4b951adc1a8 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -627,7 +627,7 @@ static void lcl_FormatPostIt(
aStr = pField->GetPar2();
#if defined(_WIN32)
// Throw out all CR in Windows
- aStr = comphelper::string::remove(aStr, '\r');
+ aStr = aStr.replaceAll("\r", "");
#endif
pIDCO->InsertString( aPam, aStr );
}
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 43aa82fab6e2..83cc9dfd9793 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -673,7 +673,7 @@ void SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
*rAttr.GetEnd() - rAttr.GetStart() ) );
- sText = comphelper::string::remove(sText, 0x0a);
+ sText = sText.replaceAll(OUStringLiteral1<0x0a>(), "");
sText = comphelper::string::strip(sText, ' ');
if( !sText.isEmpty() )
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index b517487a6c51..17a2b29b4b40 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -861,9 +861,8 @@ uno::Reference< XSpellAlternatives >
if( pWrong->InWrongWord(nBegin,nLen) && !pNode->IsSymbol(nBegin) )
{
const OUString aText(pNode->GetText().copy(nBegin, nLen));
- OUString aWord( aText );
- aWord = comphelper::string::remove(aWord, CH_TXTATR_BREAKWORD);
- aWord = comphelper::string::remove(aWord, CH_TXTATR_INWORD);
+ OUString aWord = aText.replaceAll(OUStringLiteral1<CH_TXTATR_BREAKWORD>(), "")
+ .replaceAll(OUString(CH_TXTATR_INWORD), "");
uno::Reference< XSpellChecker1 > xSpell( ::GetSpellChecker() );
if( xSpell.is() )
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 6c356ae47be7..5543f05ceac9 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -108,7 +108,7 @@ void SwDDETable::ChangeContent()
// access to DDEFieldType
SwDDEFieldType* pDDEType = static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
- OUString aExpand = comphelper::string::remove(pDDEType->GetExpansion(), '\r');
+ OUString aExpand = pDDEType->GetExpansion().replaceAll("\r", "");
sal_Int32 nExpandTokenPos = 0;
for( size_t n = 0; n < m_aLines.size(); ++n )
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index a993a073642c..118d7c17bd1e 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -398,7 +398,7 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
// remove all special characters (replace them with blanks)
if( !sText.isEmpty() )
{
- sText = comphelper::string::remove(sText, 0xad);
+ sText = sText.replaceAll(OUString(sal_Unicode(0xad)), "");
OUStringBuffer aBuf(sText);
const sal_Int32 l = aBuf.getLength();
for (sal_Int32 i=0; i<l; ++i)
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 8fa82a85d96f..7afdedad12f3 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -204,7 +204,7 @@ static Writer& OutASC_SwTextNode( Writer& rWrt, SwContentNode& rNode )
{
OUString aOutStr( aStr.copy( nStrPos, nNextAttr - nStrPos ) );
if ( !bExportSoftHyphens )
- aOutStr = comphelper::string::remove(aOutStr, CHAR_SOFTHYPHEN);
+ aOutStr = aOutStr.replaceAll(OUString(CHAR_SOFTHYPHEN), "");
rWrt.Strm().WriteUnicodeOrByteText( aOutStr );
}
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index b2e95fa773b9..642816a16d2c 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1969,8 +1969,7 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
OUString aURL( rURL.copy( 1 ) );
// nPos-1+1/3 (-1 wg. Erase)
- OUString sCmp(comphelper::string::remove(aURL.copy(bEncoded ? nPos+2 : nPos),
- ' '));
+ OUString sCmp = aURL.copy(bEncoded ? nPos+2 : nPos).replaceAll(" ","");
if( sCmp.isEmpty() )
return;
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index aeb520d418f6..894cfdf718ea 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1607,8 +1607,7 @@ void SwHTMLParser::InsertInput()
// geloescht werden.
if( !bKeepCRLFInValue )
{
- sText = comphelper::string::remove(sText, '\r');
- sText = comphelper::string::remove(sText, '\n');
+ sText = sText.replaceAll("\r", "").replaceAll("\n", "");
}
const uno::Reference< XMultiServiceFactory > & rServiceFactory =
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index c83eafe5d36c..2d6d590508dc 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1162,7 +1162,7 @@ ANCHOR_SETEVENT:
sal_Int32 nPos = sDecoded.lastIndexOf( cMarkSeparator );
if( nPos != -1 )
{
- OUString sCmp(comphelper::string::remove(sDecoded.copy(nPos+1), ' '));
+ OUString sCmp= sDecoded.copy(nPos+1).replaceAll(" ","");
if( !sCmp.isEmpty() )
{
sCmp = sCmp.toAsciiLowerCase();
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0f8c49a312a3..fe2fd8be6361 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -377,8 +377,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
OUString sCmp;
if (nPos)
{
- sCmp = comphelper::string::remove(
- m_sJmpMark.copy(nPos + 1), ' ');
+ sCmp = m_sJmpMark.copy(nPos + 1).replaceAll(" ", "");
}
if( !sCmp.isEmpty() )
@@ -5386,8 +5385,7 @@ void SwHTMLParser::ParseMoreMetaOptions()
aName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_content_script_type ) )
return;
- aContent = comphelper::string::remove(aContent, '\r');
- aContent = comphelper::string::remove(aContent, '\n');
+ aContent = aContent.replaceAll("\r", "").replaceAll("\n", "");
if( aName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_sdendnote ) )
{
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index abc371493dad..b85cb22125dd 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1191,7 +1191,7 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const OUString& rURL)
sal_Int32 nPos = sURL.lastIndexOf(cMarkSeparator);
if (nPos != -1)
{
- OUString sCompare(comphelper::string::remove(sURL.copy(nPos + 1), ' '));
+ OUString sCompare = sURL.copy(nPos + 1).replaceAll(" ", "");
if (!sCompare.isEmpty())
{
sCompare = sCompare.toAsciiLowerCase();
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index a5b2c16d4616..c726accae3c9 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2975,7 +2975,7 @@ void MSWordExportBase::AddLinkTarget(const OUString& rURL)
if( nPos < 2 )
return;
- OUString sCmp(comphelper::string::remove(aURL.copy(nPos+1), ' '));
+ OUString sCmp = aURL.copy(nPos+1).replaceAll(" ", "");
if( sCmp.isEmpty() )
return;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 306403b63fa8..aa7cac7f479c 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1501,7 +1501,7 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
}
}
- aDocProperty = comphelper::string::remove(aDocProperty, '"');
+ aDocProperty = aDocProperty.replaceAll("\"", "");
/*
There are up to 26 fields that may be meant by 'DocumentProperty'.
@@ -1691,7 +1691,7 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
}
}
- aData = comphelper::string::remove(aData, '"');
+ aData = aData.replaceAll("\"", "");
}
SwDocInfoField aField( static_cast<SwDocInfoFieldType*>(
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 5052e3d0303b..8cc3cba5b31d 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -130,7 +130,7 @@ void SwFieldInputDlg::StateChanged( StateChangedType nType )
// Close
void SwFieldInputDlg::Apply()
{
- OUString aTmp(comphelper::string::remove(m_pEditED->GetText(), '\r'));
+ OUString aTmp = m_pEditED->GetText().replaceAll("\r", "");
rSh.StartAllAction();
bool bModified = false;
if(pInpField)
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index a50e74fc415a..1dd1666465f4 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -56,7 +56,7 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, ModifyHdl, Edit&, void)
for (sal_Int32 i = 0; i < BookmarkTable::aForbiddenChars.getLength(); i++)
{
const sal_Int32 nTmpLen = sTmp.getLength();
- sTmp = comphelper::string::remove(sTmp, BookmarkTable::aForbiddenChars[i]);
+ sTmp = sTmp.replaceAll(OUString(BookmarkTable::aForbiddenChars[i]), "");
if (sTmp.getLength() != nTmpLen)
sMsg += OUString(BookmarkTable::aForbiddenChars[i]);
}
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 2859c6882321..1779f09f46c3 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -435,7 +435,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
break;
}
}
- aDocProperty = comphelper::string::remove(aDocProperty, '"');
+ aDocProperty = aDocProperty.replaceAll("\"", "");
OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() );
if( aDocProperty.isEmpty() )
{
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 63cfd8458b7b..e26316305c34 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -78,7 +78,7 @@
OUString InsertLabEnvText( SwWrtShell& rSh, SwFieldMgr& rFieldMgr, const OUString& rText )
{
OUString sRet;
- OUString aText(comphelper::string::remove(rText, '\r'));
+ OUString aText = rText.replaceAll("\r", "");
sal_Int32 nTokenPos = 0;
while( -1 != nTokenPos )
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index a480b73d47d9..0d2517129de4 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -202,7 +202,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
if( !sText.isEmpty() )
{
- OUStringBuffer sTmp(comphelper::string::remove(sText, 0xad));
+ OUStringBuffer sTmp(sText.replaceAll(OUString(sal_Unicode(0xad)), ""));
for (sal_Int32 i = 0; i < sTmp.getLength(); ++i)
{
if (sTmp[i] < 0x20)
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index ad207523df3d..5ff38fdd9273 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -416,7 +416,7 @@ void SwZoomBox_Impl::Select()
{
if ( !IsTravelSelect() )
{
- OUString sEntry(comphelper::string::remove(GetText(), '%'));
+ OUString sEntry = GetText().replaceAll("%", "");
SvxZoomItem aZoom(SvxZoomType::PERCENT,100);
if(sEntry == SVX_RESSTR( RID_SVXSTR_ZOOM_PAGE_WIDTH ) )
aZoom.SetType(SvxZoomType::PAGEWIDTH);
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 121a77a554bb..67911a5ee199 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1931,7 +1931,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
IDocumentMarkAccess::const_iterator_t ppMark;
IDocumentMarkAccess* const pMarkAccess = m_pWrtShell->getIDocumentMarkAccess();
if( -1 != nPos )
- sCmp = comphelper::string::remove(sMark.copy(nPos + 1), ' ');
+ sCmp = sMark.copy(nPos + 1).replaceAll(" ", "");
if( !sCmp.isEmpty() )
{
generated by cgit (git 2.34.1) at 2024-08-04 17:45:10 +0000