summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/docfld.cxx2
-rw-r--r--sw/source/core/doc/doctxm.cxx2
-rw-r--r--sw/source/core/text/xmldump.cxx2
-rw-r--r--sw/source/core/tox/tox.cxx2
-rw-r--r--sw/source/core/tox/txmsrt.cxx4
-rw-r--r--sw/source/core/undo/undel.cxx2
-rw-r--r--sw/source/core/undo/undobj.cxx4
-rw-r--r--sw/source/core/unocore/unofield.cxx2
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx4
-rw-r--r--sw/source/filter/html/htmlsect.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx4
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx2
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx2
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationWin2.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx2
-rw-r--r--sw/source/uibase/misc/glosdoc.cxx2
20 files changed, 25 insertions, 25 deletions
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index aae20e0da9c4..6646c903d6e6 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -524,7 +524,7 @@ std::vector<OUString>& SwDoc::FindUsedDBs( const std::vector<OUString>& rAllDBNa
const sal_Int32 nEndPos = sFormula.indexOf('.', nPos);
if( nEndPos>=0 )
{
- rUsedDBNames.emplace_back(sItem + OUStringChar(DB_DELIM) + sFormula.copy( nPos, nEndPos - nPos ));
+ rUsedDBNames.emplace_back(sItem + OUStringChar(DB_DELIM) + sFormula.subView( nPos, nEndPos - nPos ));
}
}
}
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 5642224b083f..8485a422b409 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1965,7 +1965,7 @@ Range SwTOXBaseSection::GetKeyRange(const OUString& rStr, const OUString& rStrRe
if( SwTOIOptions::InitialCaps & GetOptions() )
{
aToCompare.sText = rIntl.ToUpper( aToCompare.sText, 0 )
- + aToCompare.sText.copy(1);
+ + aToCompare.sText.subView(1);
}
OSL_ENSURE(rRange.Min() >= 0 && rRange.Max() >= 0, "Min Max < 0");
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 6a982af47944..47d3e6536ab7 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -143,7 +143,7 @@ class XmlPortionDumper:public SwPortionHandler
BAD_CAST(m_rText.copy(sal_Int32(ofs), sal_Int32(nLength)).toUtf8().getStr()));
xmlTextWriterEndElement( writer );
- m_aLine += m_rText.copy(sal_Int32(ofs), sal_Int32(nLength));
+ m_aLine += m_rText.subView(sal_Int32(ofs), sal_Int32(nLength));
ofs += nLength;
}
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 703cec868733..caf5e3732b3f 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -742,7 +742,7 @@ OUString SwFormToken::GetString() const
break;
}
- return sToken.copy(0, sToken.getLength()-1) + sData + sToken.copy(sToken.getLength()-1);
+ return sToken.subView(0, sToken.getLength()-1) + sData + sToken.subView(sToken.getLength()-1);
}
// -> #i21237#
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 7afb7fcd08c9..f76dafd6a2a9 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -359,7 +359,7 @@ TextAndReading SwTOXIndex::GetText_Impl(SwRootFrame const*const pLayout) const
// if SwTOIOptions::InitialCaps is set, first character is to be capitalized
if( SwTOIOptions::InitialCaps & nOpt && pTOXIntl && !aRet.sText.isEmpty())
{
- aRet.sText = pTOXIntl->ToUpper( aRet.sText, 0 ) + aRet.sText.copy(1);
+ aRet.sText = pTOXIntl->ToUpper( aRet.sText, 0 ) + aRet.sText.subView(1);
}
return aRet;
@@ -386,7 +386,7 @@ void SwTOXIndex::FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16,
: ExpandMode(0)));
if(SwTOIOptions::InitialCaps & nOpt && pTOXIntl && !aRet.sText.isEmpty())
{
- aRet.sText = pTOXIntl->ToUpper( aRet.sText, 0 ) + aRet.sText.copy(1);
+ aRet.sText = pTOXIntl->ToUpper( aRet.sText, 0 ) + aRet.sText.subView(1);
}
}
else
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 245dfd3d3921..351883c2a557 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -704,7 +704,7 @@ static OUString lcl_DenotedPortion(const OUString& rStr, sal_Int32 nStart, sal_I
else if (bQuoted)
{
aResult = SwResId(STR_START_QUOTE) +
- rStr.copy(nStart, nCount) +
+ rStr.subView(nStart, nCount) +
SwResId(STR_END_QUOTE);
}
else
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index dcc49e905bf9..cc1f806f1696 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1539,9 +1539,9 @@ OUString ShortenString(const OUString & rStr, sal_Int32 nLength, const OUString
const sal_Int32 nFrontLen = nLength - nLength / 2;
const sal_Int32 nBackLen = nLength - nFrontLen;
- return rStr.copy(0, nFrontLen)
+ return rStr.subView(0, nFrontLen)
+ rFillStr
- + rStr.copy(rStr.getLength() - nBackLen);
+ + rStr.subView(rStr.getLength() - nBackLen);
}
static bool IsAtEndOfSection(SwPosition const& rAnchorPos)
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 5ac8da9bd311..fa423875dbb2 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1034,7 +1034,7 @@ OUString SwXFieldMaster::LocalizeFormula(
const OUString sDest = bQuery ? sProgName : sTypeName;
if(rFormula.startsWith(sSource))
{
- return sDest + rFormula.copy(sSource.getLength());
+ return sDest + rFormula.subView(sSource.getLength());
}
}
return rFormula;
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index d9933628a773..5ea4560e9907 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -72,7 +72,7 @@ SwASCWriter::SwASCWriter( const OUString& rFltNm )
break;
default:
- if( rFltNm.getLength() >= 4 && rFltNm.copy( 4 )=="_DLG" )
+ if( rFltNm.getLength() >= 4 && rFltNm.subView( 4 )==u"_DLG" )
{
// use the options
aNewOpts = GetAsciiOptions();
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 46b29ebf2e51..18c5def4ccf6 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -824,13 +824,13 @@ static void lcl_html_getEvents( const OUString& rOption, const OUString& rValue,
{
if( rOption.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_sdevent ) )
{
- OUString aEvent = rOption.copy( strlen( OOO_STRING_SVTOOLS_HTML_O_sdevent ) ) +
+ OUString aEvent = OUString::Concat(rOption.subView( strlen( OOO_STRING_SVTOOLS_HTML_O_sdevent ) )) +
"-" + rValue;
rUnoMacroTable.push_back(aEvent);
}
else if( rOption.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) )
{
- OUString aParam = rOption.copy( strlen( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) ) +
+ OUString aParam = OUString::Concat(rOption.subView( strlen( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) )) +
"-" + rValue;
rUnoMacroParamTable.push_back(aParam);
}
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index c9208357ceee..d68a22e2e389 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -302,11 +302,11 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
+ OUStringChar(sfx2::cTokenSeparator);
if( nPos2 == -1 )
{
- aURL += aHRef.copy( nPos+1 );
+ aURL += aHRef.subView( nPos+1 );
}
else
{
- aURL += aHRef.copy( nPos+1, nPos2 - (nPos+1) )
+ aURL += aHRef.subView( nPos+1, nPos2 - (nPos+1) )
+ OUStringChar(sfx2::cTokenSeparator)
+ rtl::Uri::decode( aHRef.copy( nPos2+1 ),
rtl_UriDecodeWithCharset,
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 0171c28b27d6..407c5182e997 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1755,7 +1755,7 @@ OUString SwWW8AttrIter::GetSnippet(const OUString &rStr, sal_Int32 nCurrentPos,
rStr, nCurrentPos, g_pBreakIt->GetLocale(nLanguage),
i18n::WordType::ANYWORD_IGNOREWHITESPACES ) )
{
- aSnippet = OUStringChar(rStr[nCurrentPos]) + aSnippet.copy(1);
+ aSnippet = OUStringChar(rStr[nCurrentPos]) + aSnippet.subView(1);
}
}
m_rExport.m_aCurrentCharPropStarts.pop();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index cc66c44952c0..fb26419025e0 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3179,11 +3179,11 @@ void AttributeOutputBase::TextField( const SwFormatField& rField )
+ "\\o (\\s\\up "
+ OUString::number(nHeight/2)
+ "("
- + pField->GetPar1().copy(0, nAbove)
+ + pField->GetPar1().subView(0, nAbove)
+ "), \\s\\do "
+ OUString::number(nHeight/5)
+ "("
- + pField->GetPar1().copy(nAbove)
+ + pField->GetPar1().subView(nAbove)
+ "))";
GetExport().OutputField(pField, ww::eEQ, sStr);
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index a2b9289349b3..4a21a87b9a5c 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4497,7 +4497,7 @@ OUString WW8PLCFx_Book::GetUniqueBookmarkName(const OUString &rSuggestedName)
sal_Int32 p = len - 1;
while (p > 0 && aRet[p] >= '0' && aRet[p] <= '9')
--p;
- aRet = aRet.copy(0, p+1) + OUString::number(nBookmarkId++);
+ aRet = aRet.subView(0, p+1) + OUString::number(nBookmarkId++);
i = 0; // start search from beginning
}
else
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index bff5619a4270..876f5e5bf27d 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -609,7 +609,7 @@ sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl() const
for (int i = 0, nEntryCount = m_xAddressElementsLB->n_children(); i < nEntryCount; ++i)
{
const OUString sEntry = m_xAddressElementsLB->get_text(i);
- if( sEntry == sSelected.copy( 1, sSelected.getLength() - 2 ) )
+ if( sEntry == sSelected.subView( 1, sSelected.getLength() - 2 ) )
{
nRet = m_xAddressElementsLB->get_id(i).toInt32();
break;
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index dd3cb2227435..72fd56cdc7c2 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -103,7 +103,7 @@ void SwVbaOptions::setValueEvent( const uno::Any& value )
sal_Int32 nIndex = sOldPathUrl.lastIndexOf( ';' );
if( nIndex != -1 )
{
- sNewPathUrl = sOldPathUrl.copy( 0, nIndex + 1 ) + sNewPathUrl;
+ sNewPathUrl = sOldPathUrl.subView( 0, nIndex + 1 ) + sNewPathUrl;
}
xPathSettings->setPropertyValue( msDefaultFilePath, uno::makeAny( sNewPathUrl ) );
}
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 860a926a5076..3e96b2c9e807 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -436,7 +436,7 @@ bool SwGlossaryHdl::Expand(weld::Window* pParent, const OUString& rShortName,
const sal_Int32 nMaxLen = 50;
if(pWrtShell->IsSelection() && aShortName.getLength() > nMaxLen)
{
- aShortName = aShortName.copy(0, nMaxLen) + " ...";
+ aShortName = OUString::Concat(aShortName.subView(0, nMaxLen)) + " ...";
}
OUString aTmp( SwResId(STR_NOGLOS));
aTmp = aTmp.replaceFirst("%1", aShortName);
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index bec2b148a58c..4b1e7c70836c 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -589,7 +589,7 @@ void SwAnnotationWin::CheckMetaText()
}
else if (sMeta.getLength() > 23)
{
- sMeta = sMeta.copy(0, 20) + "...";
+ sMeta = OUString::Concat(sMeta.subView(0, 20)) + "...";
}
if ( mpMetadataAuthor->GetText() != sMeta )
{
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 5ee7e763fcb9..0ffe30e41044 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -327,7 +327,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
sText = pRefField->GetExpandedTextOfReferencedTextNode(*rSh.GetLayout());
if ( sText.getLength() > 80 )
{
- sText = sText.copy(0, 80) + "...";
+ sText = OUString::Concat(sText.subView(0, 80)) + "...";
}
}
else
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx
index 6c047877cded..f4e58d08ffcd 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -310,7 +310,7 @@ std::vector<OUString> & SwGlossaries::GetNameList()
SWUnoHelper::UCB_GetFileListOfFolder(m_PathArr[i], aFiles, &sExt);
for (const OUString& aTitle : aFiles)
{
- const OUString sName( aTitle.copy( 0, aTitle.getLength() - sExt.getLength() )
+ const OUString sName( aTitle.subView( 0, aTitle.getLength() - sExt.getLength() )
+ OUStringChar(GLOS_DELIM) + OUString::number( static_cast<sal_Int16>(i) ));
m_GlosArr.push_back(sName);
}
generated by cgit (git 2.34.1) at 2024-08-10 23:52:52 +0000