diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/app/IconThemeInfo.cxx | 2 | ||||
-rw-r--r-- | vcl/source/edit/textundo.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/textlayout.cxx | 2 | ||||
-rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/text.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/geninst.cxx | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx index aa7a5cf7c1bd..877b7d570b0a 100644 --- a/vcl/source/app/IconThemeInfo.cxx +++ b/vcl/source/app/IconThemeInfo.cxx @@ -134,7 +134,7 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString& themeId) sal_Unicode firstLetter = aDisplayName[0]; if (rtl::isAsciiLowerCase(firstLetter)) { - aDisplayName = OUStringChar(sal_Unicode(rtl::toAsciiUpperCase(firstLetter))) + aDisplayName.copy(1); + aDisplayName = OUStringChar(sal_Unicode(rtl::toAsciiUpperCase(firstLetter))) + aDisplayName.subView(1); } } diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx index 2e57d0be2a37..284300e9ec10 100644 --- a/vcl/source/edit/textundo.cxx +++ b/vcl/source/edit/textundo.cxx @@ -50,9 +50,9 @@ void Shorten (OUString& rString) iLast = nLen - 8; // not possible // finally: rString = - rString.copy(0, iFirst + 1) + + OUString::Concat(rString.subView(0, iFirst + 1)) + "..." + - rString.copy(iLast); + rString.subView(iLast); } } // namespace diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index ea86aa47b049..0c8953e92f8d 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -203,7 +203,7 @@ namespace vcl MetricVector aGlyphBounds; m_rReferenceDevice.GetGlyphBoundRects( _rStartPoint, _rText, _nStartIndex, _nLength, aGlyphBounds ); _pVector->insert( _pVector->end(), aGlyphBounds.begin(), aGlyphBounds.end() ); - *_pDisplayText += _rText.copy( _nStartIndex, _nLength ); + *_pDisplayText += _rText.subView( _nStartIndex, _nLength ); return; } diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index f08f1973c785..4d2906d9b779 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -92,7 +92,7 @@ OUString convertLcTo32Path(OUString const & rPath) OUString sDir = rPath.copy(0, rPath.lastIndexOf('/')); if (!sFile.isEmpty() && sFile.startsWith("lc_")) { - aResult = sDir + "/32/" + sFile.copy(3); + aResult = sDir + "/32/" + sFile.subView(3); } } return aResult; @@ -100,7 +100,7 @@ OUString convertLcTo32Path(OUString const & rPath) OUString createPath(OUString const & name, sal_Int32 pos, OUString const & locale) { - return name.copy(0, pos + 1) + locale + name.copy(pos); + return name.subView(0, pos + 1) + locale + name.subView(pos); } OUString getIconCacheUrl(OUString const & sVariant, ImageRequestParameters const & rParameters) diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 0057fb4a2a14..adfcefbcd316 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -859,7 +859,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, { GetGlyphBoundRects( rStartPt, rStr, nIndex, nLen, *pVector ); if( pDisplayText ) - *pDisplayText += rStr.copy( nIndex, nLen ); + *pDisplayText += rStr.subView( nIndex, nLen ); } } @@ -2025,7 +2025,7 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, { if ( nFirstContent > 4 ) nFirstContent = 4; - OUString aFirstStr = aStr.copy( 0, nFirstContent ) + "..."; + OUString aFirstStr = OUString::Concat(aStr.subView( 0, nFirstContent )) + "..."; OUString aTempStr = aFirstStr + aLastStr; if ( _rLayout.GetTextWidth( aTempStr, 0, aTempStr.getLength() ) > nMaxWidth ) aStr = OutputDevice::ImplGetEllipsisString( rTargetDevice, aStr, nMaxWidth, nStyle | DrawTextFlags::EndEllipsis, _rLayout ); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index d50444f1f3f4..3e9200df6d2e 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1623,7 +1623,7 @@ VclBuilder::customMakeWidget GetCustomMakeWidget(const OString& rName) VclBuilder::customMakeWidget pFunction = nullptr; if (sal_Int32 nDelim = name.indexOf('-'); nDelim != -1) { - const OString aFunction("make" + name.copy(nDelim + 1)); + const OString aFunction(OString::Concat("make") + name.subView(nDelim + 1)); const OUString sFunction(OStringToOUString(aFunction, RTL_TEXTENCODING_UTF8)); #ifndef DISABLE_DYNLOADING diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx index c385ab57d587..0093f64376c6 100644 --- a/vcl/unx/generic/app/geninst.cxx +++ b/vcl/unx/generic/app/geninst.cxx @@ -68,7 +68,7 @@ OUString SalGenericInstance::getOSVersion() if (nTooDetailed < 1 || nTooDetailed > 8) aKernelVer = "Linux (misparsed version)"; else // "3.16.7-29-desktop ..." - aKernelVer = "Linux " + aVers.copy(0, nTooDetailed); + aKernelVer = OUString::Concat("Linux ") + aVers.subView(0, nTooDetailed); } fclose( pVersion ); } |