summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basic/source/classes/sbunoobj.cxx4
-rw-r--r--basic/source/comp/dim.cxx8
-rw-r--r--basic/source/runtime/stdobj.cxx4
-rw-r--r--editeng/inc/editeng/outliner.hxx10
-rw-r--r--editeng/source/outliner/outliner.cxx6
-rw-r--r--fpicker/test/svdem.cxx2
-rw-r--r--svtools/source/control/calendar.cxx4
-rw-r--r--svtools/source/control/ctrlbox.cxx6
-rw-r--r--svtools/source/control/filectrl.cxx2
-rw-r--r--svtools/source/control/fmtfield.cxx2
-rw-r--r--svtools/source/edit/svmedit.cxx2
-rw-r--r--sw/source/core/layout/dbg_lay.cxx6
-rw-r--r--sw/source/core/layout/newfrm.cxx2
-rw-r--r--sw/source/core/text/txtftn.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx11
-rw-r--r--vcl/source/window/msgbox.cxx2
-rw-r--r--vcl/source/window/window.cxx2
-rw-r--r--vcl/test/canvasbitmaptest.cxx2
-rw-r--r--vcl/test/dndtest.cxx2
-rw-r--r--vcl/workben/svdem.cxx2
-rw-r--r--vcl/workben/svpclient.cxx2
-rw-r--r--vcl/workben/svptest.cxx2
-rw-r--r--vcl/workben/vcldemo.cxx2
23 files changed, 41 insertions, 46 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 1a38e04ea103..084a657af70f 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2349,8 +2349,8 @@ SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ )
static Reference< XIntrospection > xIntrospection;
// beat out again the default properties of Sbx
- Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Name")), SbxCLASS_DONTCARE );
- Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Parent")), SbxCLASS_DONTCARE );
+ Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE );
+ Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE );
// check the type of the ojekts
TypeClass eType = aUnoObj_.getValueType().getTypeClass();
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 5263d42ff7fc..1acc7c98b3ea 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -669,8 +669,8 @@ void SbiParser::DefType( sal_Bool bPrivate )
}
}
- pType->Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Name") ), SbxCLASS_DONTCARE );
- pType->Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Parent") ), SbxCLASS_DONTCARE );
+ pType->Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE );
+ pType->Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE );
rTypeArray->Insert (pType,rTypeArray->Count());
}
@@ -805,8 +805,8 @@ void SbiParser::DefEnum( sal_Bool bPrivate )
}
}
- pEnum->Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Name") ), SbxCLASS_DONTCARE );
- pEnum->Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Parent") ), SbxCLASS_DONTCARE );
+ pEnum->Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE );
+ pEnum->Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE );
rEnumArray->Insert( pEnum, rEnumArray->Count() );
}
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index f782a3940abd..89a244f56beb 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -737,8 +737,8 @@ SbiStdObject::SbiStdObject( const String& r, StarBASIC* pb ) : SbxObject( r )
}
// #i92642: Remove default properties
- Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Name") ), SbxCLASS_DONTCARE );
- Remove( XubString( RTL_CONSTASCII_USTRINGPARAM("Parent") ), SbxCLASS_DONTCARE );
+ Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE );
+ Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE );
SetParent( pb );
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index da3b9c28d94a..800794536337 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -136,16 +136,16 @@ private:
Paragraph& operator=(const Paragraph& rPara );
- sal_uInt16 nFlags;
- XubString aBulText;
+ sal_uInt16 nFlags;
+ rtl::OUString aBulText;
Size aBulSize;
- sal_Bool bVisible;
+ sal_Bool bVisible;
sal_Bool IsVisible() const { return bVisible; }
- void SetText( const XubString& rText ) { aBulText = rText; aBulSize.Width() = -1; }
+ void SetText( const rtl::OUString& rText ) { aBulText = rText; aBulSize.Width() = -1; }
void Invalidate() { aBulSize.Width() = -1; }
void SetDepth( sal_Int16 nNewDepth ) { nDepth = nNewDepth; aBulSize.Width() = -1; }
- const XubString& GetText() const { return aBulText; }
+ const rtl::OUString& GetText() const { return aBulText; }
Paragraph( sal_Int16 nDepth );
Paragraph( const Paragraph& );
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index cb2393f6b4ae..d124a4a489e6 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1001,7 +1001,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
if(bStrippingPortions)
{
const Font aSvxFont(pOutDev->GetFont());
- sal_Int32* pBuf = new sal_Int32[ pPara->GetText().Len() ];
+ sal_Int32* pBuf = new sal_Int32[ pPara->GetText().getLength() ];
pOutDev->GetTextArray( pPara->GetText(), pBuf );
if(bSymbol)
@@ -1011,7 +1011,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
aTextPos.Y() -= aMetric.GetDescent();
}
- DrawingText(aTextPos, pPara->GetText(), 0, pPara->GetText().Len(), pBuf,
+ DrawingText(aTextPos, pPara->GetText(), 0, pPara->GetText().getLength(), pBuf,
aSvxFont, nPara, 0xFFFF, 0xFF, 0, 0, false, false, true, 0, Color(), Color());
delete[] pBuf;
@@ -1952,7 +1952,7 @@ void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_
aBulletText += pFmt->GetSuffix();
}
- if( aBulletText != pPara->GetText() )
+ if (!pPara->GetText().equals(aBulletText))
pPara->SetText( aBulletText );
pPara->nFlags &= (~PARAFLAG_SETBULLETTEXT);
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 55235249176f..04a0a53cf135 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -123,7 +123,7 @@ private:
void Main()
{
MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
- aMainWin.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "VCL - Workbench" ) ) );
+ aMainWin.SetText(rtl::OUString("VCL - Workbench"));
aMainWin.Show();
Application::Execute();
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 6da63862e6b4..9c41a8b486af 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -351,7 +351,7 @@ void Calendar::ImplFormat()
if ( (aOutSize.Width() <= 1) || (aOutSize.Height() <= 1) )
return;
- XubString a99Text( XubString( RTL_CONSTASCII_USTRINGPARAM( "99" ) ) );
+ rtl::OUString a99Text("99");
Font aOldFont = GetFont();
@@ -2168,7 +2168,7 @@ void Calendar::EndSelection()
Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine,
long nCalcLines ) const
{
- XubString a99Text( XubString( RTL_CONSTASCII_USTRINGPARAM( "99" ) ) );
+ rtl::OUString a99Text("99");
Font aOldFont = GetFont();
// Wochenanzeige beruecksichtigen
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index c2e26b900493..be53f12867c4 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -91,7 +91,7 @@ public:
void ColorListBox::ImplInit()
{
pColorList = new ImpColorList();
- aImageSize.Width() = GetTextWidth( XubString( RTL_CONSTASCII_USTRINGPARAM( "xxx" ) ) );
+ aImageSize.Width() = GetTextWidth( rtl::OUString("xxx") );
aImageSize.Height() = GetTextHeight();
aImageSize.Height() -= 2;
@@ -688,7 +688,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
void LineListBox::ImplInit()
{
- aTxtSize.Width() = GetTextWidth( XubString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
+ aTxtSize.Width() = GetTextWidth( rtl::OUString( " " ) );
aTxtSize.Height() = GetTextHeight();
pLineList = new ImpLineList();
eUnit = FUNIT_POINT;
@@ -904,7 +904,7 @@ void LineListBox::UpdateEntries( long nOldWidth )
GetColorLine2( GetEntryCount( ) ),
GetColorDist( GetEntryCount( ) ),
pData->GetStyle(), aBmp );
- ListBox::InsertEntry( XubString( RTL_CONSTASCII_USTRINGPARAM( " " ) ), aBmp, LISTBOX_APPEND );
+ ListBox::InsertEntry( rtl::OUString( " " ), aBmp, LISTBOX_APPEND );
if ( n == nTypePos )
SelectEntryPos( GetEntryCount() - 1 );
}
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index ddf8fdd54d7d..7f702b5b4f01 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -168,7 +168,7 @@ void FileControl::Resize()
}
else
{
- XubString aSmallText( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+ rtl::OUString aSmallText( "..." );
maButton.SetText( aSmallText );
nButtonTextWidth = maButton.GetTextWidth( aSmallText );
}
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 98545612b09b..8dcffcea938b 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -1266,7 +1266,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat()
sSymbol = comphelper::string::stripStart(sSymbol, ' ');
sSymbol = comphelper::string::stripEnd(sSymbol, ' ');
- XubString sTemp = String::CreateFromAscii("[$");
+ XubString sTemp = rtl::OUString("[$");
sTemp += sSymbol;
sTemp.AppendAscii("] ");
sTemp += sNewFormat;
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index beb2153e4ffc..4fff9e02d1e4 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1409,7 +1409,7 @@ void MultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSi
}
}
- XubString aText = GetText();
+ rtl::OUString aText = GetText();
Size aTextSz( pDev->GetTextWidth( aText ), pDev->GetTextHeight() );
sal_uLong nLines = (sal_uLong) (aSize.Height() / aTextSz.Height());
if ( !nLines )
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 660133328e65..fb9f94c77d23 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -301,7 +301,7 @@ void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct,
void SwProtocol::Init()
{
nRecord = 0;
- XubString aName( "dbg_lay.go", RTL_TEXTENCODING_MS_1252 );
+ rtl::OUString aName("dbg_lay.go");
SvFileStream aStream( aName, STREAM_READ );
if( aStream.IsOpen() )
{
@@ -334,7 +334,7 @@ SwImplProtocol::SwImplProtocol()
sal_Bool SwImplProtocol::NewStream()
{
- XubString aName( "dbg_lay.out", RTL_TEXTENCODING_MS_1252 );
+ rtl::OUString aName("dbg_lay.out");
nLineCount = 0;
pStream = new SvFileStream( aName, STREAM_WRITE | STREAM_TRUNC );
if( pStream->GetError() )
@@ -466,7 +466,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine )
* --------------------------------------------------*/
void SwImplProtocol::FileInit()
{
- XubString aName( "dbg_lay.ini", RTL_TEXTENCODING_MS_1252 );
+ rtl::OUString aName("dbg_lay.ini");
SvFileStream aStream( aName, STREAM_READ );
if( aStream.IsOpen() )
{
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index dd6091b0cf1d..64755d591a04 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -475,7 +475,7 @@ void InitCurrShells( SwRootFrm *pRoot )
SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) :
SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt(
- XubString( "Root", RTL_TEXTENCODING_MS_1252 ), pFmt ), 0 ),
+ rtl::OUString("Root"), pFmt ), 0 ),
// --> PAGES01
maPagesArea(),
mnViewWidth( -1 ),
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 1cb527dd09a4..eb2c365854f0 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1517,7 +1517,7 @@ sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
if( bFull )
{
// zweiter Versuch, wir kuerzen den String:
- aExpand = XubString( "...", RTL_TEXTENCODING_MS_1252 );
+ aExpand = rtl::OUString("...");
bFull = SwFldPortion::Format( rInf );
SetLen( 0 );
if( bFull )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 07af72728f1d..6d73e91356b2 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7796,7 +7796,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const String& rOrigStr, sa
// multiline text
if ( nStyle & TEXT_DRAW_MULTILINE )
{
- XubString aLastLine;
+ rtl::OUString aLastLine;
ImplMultiTextLineInfo aMultiLineInfo;
ImplTextLineInfo* pLineInfo;
xub_StrLen i;
@@ -7821,12 +7821,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const String& rOrigStr, sa
pLineInfo = aMultiLineInfo.GetLine( nFormatLines );
aLastLine = convertLineEnd(aStr.Copy(pLineInfo->GetIndex()), LINEEND_LF);
// replace line feed by space
- xub_StrLen nLastLineLen = aLastLine.Len();
- for ( i = 0; i < nLastLineLen; i++ )
- {
- if ( aLastLine.GetChar( i ) == _LF )
- aLastLine.SetChar( i, ' ' );
- }
+ aLastLine = aLastLine.replace(_LF, ' ');
aLastLine = m_pReferenceDevice->GetEllipsisString( aLastLine, nWidth, nStyle );
nStyle &= ~(TEXT_DRAW_VCENTER | TEXT_DRAW_BOTTOM);
nStyle |= TEXT_DRAW_TOP;
@@ -7858,7 +7853,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const String& rOrigStr, sa
// output last line left adjusted since it was shortened
- if ( aLastLine.Len() )
+ if (!aLastLine.isEmpty())
drawText( aPos, aLastLine, 0, STRING_LEN, bTextLines );
}
}
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 6863d2e81507..8f3e296fa567 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -262,7 +262,7 @@ void MessBox::ImplPosControls()
// Message-Text um Tabs bereinigen
- XubString aTabStr( RTL_CONSTASCII_USTRINGPARAM( " " ) );
+ rtl::OUString aTabStr(" ");
sal_uInt16 nIndex = 0;
while ( nIndex != STRING_NOTFOUND )
nIndex = aMessText.SearchAndReplace( '\t', aTabStr, nIndex );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8cb1a5213e12..9c45e8bf814c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -217,7 +217,7 @@ void Window::ImplInitAppFontData( Window* pWindow )
{
ImplSVData* pSVData = ImplGetSVData();
long nTextHeight = pWindow->GetTextHeight();
- long nTextWidth = pWindow->GetTextWidth( XubString( "aemnnxEM" ) );
+ long nTextWidth = pWindow->GetTextWidth(rtl::OUString("aemnnxEM"));
long nSymHeight = nTextHeight*4;
// Make the basis wider if the font is too narrow
// such that the dialog looks symmetrical and does not become too narrow.
diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx
index d65ddeb10f21..576810afc96e 100644
--- a/vcl/test/canvasbitmaptest.cxx
+++ b/vcl/test/canvasbitmaptest.cxx
@@ -1033,7 +1033,7 @@ void Main()
{
TestWindow aWindow;
aWindow.Execute();
- aWindow.SetText( XubString( "VCL - canvasbitmaptest" ) );
+ aWindow.SetText( rtl::OUString( "VCL - canvasbitmaptest" ) );
Application::Execute();
}
diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx
index d35e673fdc6e..28f2518cb15c 100644
--- a/vcl/test/dndtest.cxx
+++ b/vcl/test/dndtest.cxx
@@ -190,7 +190,7 @@ void MyApp::Main()
MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
- aMainWin.SetText( XubString( "Drag And Drop - Workbench" ) );
+ aMainWin.SetText( rtl::OUString( "Drag And Drop - Workbench" ) );
aMainWin.Show();
// test the clipboard code
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 0bbb30978eb5..cbdea98c5f98 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -75,7 +75,7 @@ public:
void Main()
{
MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
- aMainWin.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "VCL - Workbench" ) ) );
+ aMainWin.SetText(rtl::OUString("VCL - Workbench"));
aMainWin.Show();
Application::Execute();
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index a059735ae8cb..4b07940eccf4 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -162,7 +162,7 @@ public:
void Main()
{
MyWin aMainWin( NULL, WB_STDWORK );
- aMainWin.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "SvpClient" ) ) );
+ aMainWin.SetText( rtl::OUString( "SvpClient" ) );
aMainWin.Show();
Application::Execute();
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 2c1dd59a8174..6e08dc1e2831 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -95,7 +95,7 @@ public:
void Main()
{
MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
- aMainWin.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "VCL - Workbench" ) ) );
+ aMainWin.SetText( rtl::OUString( "VCL - Workbench" ) );
aMainWin.Show();
Application::Execute();
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 7df524a81599..b5fbb89089b0 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -87,7 +87,7 @@ public:
void Main()
{
MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
- aMainWin.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "VCLDemo - VCL Workbench" ) ) );
+ aMainWin.SetText( rtl::OUString( "VCLDemo - VCL Workbench" ) );
aMainWin.Show();
/*
generated by cgit (git 2.34.1) at 2024-07-15 10:40:12 +0000