summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorJean-Noël Rouvignac <jn.rouvignac@gmail.com>2013-02-08 09:06:10 +0100
committerTor Lillqvist <tml@iki.fi>2013-02-08 14:57:16 +0000
commit9e310cc32923ceb4b18d97ce68d54a339b935f01 (patch)
treed79b44b80c15f6bdb3116db4c9b6955a9e6cb4c9 /vcl/source
parent9c427991d9658a870ee0eb1bdc4cd3b393c93fd5 (diff)
fdo#38838 Some removal/replacement of the String/UniString with OUString
Change-Id: I6daea312198fae3a9717bd8d4fea6371aa4cd275 Reviewed-on: https://gerrit.libreoffice.org/1962 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/filter/wmf/winwmf.cxx2
-rw-r--r--vcl/source/gdi/cvtsvm.cxx14
-rw-r--r--vcl/source/gdi/graph.cxx20
-rw-r--r--vcl/source/gdi/jobset.cxx4
-rw-r--r--vcl/source/window/winproc.cxx26
5 files changed, 31 insertions, 35 deletions
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 0d6276a8f3df..317140c1fa55 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -805,7 +805,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
eCharSet = osl_getThreadTextEncoding();
if ( eCharSet == RTL_TEXTENCODING_SYMBOL )
eCharSet = RTL_TEXTENCODING_MS_1252;
- aLogFont.alfFaceName = UniString( lfFaceName, eCharSet );
+ aLogFont.alfFaceName = String( lfFaceName, eCharSet );
pOut->CreateObject( GDI_FONT, new WinMtfFontStyle( aLogFont ) );
}
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index ff812a079218..2427d9928e95 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -306,7 +306,7 @@ sal_Bool ImplWriteUnicodeComment( SvStream& rOStm, const String& rString )
// ------------------------------------------------------------------------
-void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm, String& rString )
+void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm, OUString& rString )
{
sal_uInt32 nOld = rIStm.Tell();
if ( nStrmPos )
@@ -829,7 +829,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
ImplReadColor( rIStm, aActionColor ); aFont.SetColor( aActionColor );
ImplReadColor( rIStm, aActionColor ); aFont.SetFillColor( aActionColor );
rIStm.Read( aName, 32 );
- aFont.SetName( UniString( aName, rIStm.GetStreamCharSet() ) );
+ aFont.SetName( String( aName, rIStm.GetStreamCharSet() ) );
rIStm >> nWidth >> nHeight;
rIStm >> nCharOrient >> nLineOrient;
rIStm >> nCharSet >> nFamily >> nPitch >> nAlign >> nWeight >> nUnderline >> nStrikeout;
@@ -871,12 +871,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
rIStm >> aPt >> nIndex >> nLen >> nTmp;
if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) )
{
- rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
+ OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
sal_uInt8 nTerminator = 0;
rIStm >> nTerminator;
DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" );
- UniString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet));
+ OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
if ( nUnicodeCommentActionNumber == i )
ImplReadUnicodeComment( nUnicodeCommentStreamPos, rIStm, aStr );
rMtf.AddAction( new MetaTextAction( aPt, aStr, (sal_uInt16) nIndex, (sal_uInt16) nLen ) );
@@ -898,11 +898,11 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
rIStm >> nTerminator;
DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" );
- UniString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet));
+ OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet));
if( nAryLen > 0L )
{
- sal_Int32 nStrLen( aStr.Len() );
+ sal_Int32 nStrLen( aStr.getLength() );
pDXAry = new sal_Int32[ Max( nAryLen, nStrLen ) ];
@@ -961,7 +961,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
rIStm >> nTerminator;
DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" );
- UniString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet));
+ OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet));
if ( nUnicodeCommentActionNumber == i )
ImplReadUnicodeComment( nUnicodeCommentStreamPos, rIStm, aStr );
rMtf.AddAction( new MetaStretchTextAction( aPt, nWidth, aStr, (sal_uInt16) nIndex, (sal_uInt16) nLen ) );
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index b622c22e6619..fcfaf6183aa6 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star;
// - Default-Drawmethode -
// -----------------------
-static void ImplDrawDefault( OutputDevice* pOutDev, const UniString* pText,
+static void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText,
Font* pFont, const Bitmap* pBitmap, const BitmapEx* pBitmapEx,
const Point& rDestPt, const Size& rDestSize )
{
@@ -92,7 +92,7 @@ static void ImplDrawDefault( OutputDevice* pOutDev, const UniString* pText,
}
}
- if ( aSize.Width() > 0 && aSize.Height() > 0 && pFont && pText && pText->Len()
+ if ( aSize.Width() > 0 && aSize.Height() > 0 && pFont && pText && pText->getLength()
&& !(!pOutDev->IsOutputEnabled() /*&& pOutDev->GetConnectMetaFile() */) )
{
MapMode aMapMode( MAP_POINT );
@@ -122,25 +122,25 @@ static void ImplDrawDefault( OutputDevice* pOutDev, const UniString* pText,
sal_uInt16 nStart = 0;
sal_uInt16 nLen = 0;
- while( nStart < pText->Len() && pText->GetChar( nStart ) == ' ' )
+ while( nStart < pText->getLength() && (*pText)[nStart] == ' ' )
nStart++;
- while( nStart+nLen < pText->Len() && pText->GetChar( nStart+nLen ) != ' ' )
+ while( nStart+nLen < pText->getLength() && (*pText)[nStart+nLen] != ' ' )
nLen++;
- while( nStart < pText->Len() && nLines-- )
+ while( nStart < pText->getLength() && nLines-- )
{
sal_uInt16 nNext = nLen;
do
{
- while ( nStart+nNext < pText->Len() && pText->GetChar( nStart+nNext ) == ' ' )
+ while ( nStart+nNext < pText->getLength() && (*pText)[nStart+nNext] == ' ' )
nNext++;
- while ( nStart+nNext < pText->Len() && pText->GetChar( nStart+nNext ) != ' ' )
+ while ( nStart+nNext < pText->getLength() && (*pText)[nStart+nNext] != ' ' )
nNext++;
nTextWidth = pOutDev->GetTextWidth( *pText, nStart, nNext );
if ( nTextWidth > aSize.Width() )
break;
nLen = nNext;
}
- while ( nStart+nNext < pText->Len() );
+ while ( nStart+nNext < pText->getLength() );
sal_uInt16 n = nLen;
nTextWidth = pOutDev->GetTextWidth( *pText, nStart, n );
@@ -151,7 +151,7 @@ static void ImplDrawDefault( OutputDevice* pOutDev, const UniString* pText,
aPoint.Y() += nTextHeight;
nStart = sal::static_int_cast<sal_uInt16>(nStart + nLen);
nLen = nNext-nLen;
- while( nStart < pText->Len() && pText->GetChar( nStart ) == ' ' )
+ while( nStart < pText->getLength() && (*pText)[nStart] == ' ' )
{
nStart++;
nLen--;
@@ -542,7 +542,7 @@ void Graphic::Draw( OutputDevice* pOutDev,
// ------------------------------------------------------------------------
-void Graphic::DrawEx( OutputDevice* pOutDev, const String& rText,
+void Graphic::DrawEx( OutputDevice* pOutDev, const OUString& rText,
Font& rFont, const BitmapEx& rBitmap,
const Point& rDestPt, const Size& rDestSz )
{
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index fc1df45eed1b..fdd4f5a571b1 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -297,8 +297,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
rJobSetup.mpData = new ImplJobSetup;
ImplJobSetup* pJobData = rJobSetup.mpData;
- pJobData->maPrinterName = UniString(pData->cPrinterName, aStreamEncoding);
- pJobData->maDriver = UniString(pData->cDriverName, aStreamEncoding);
+ pJobData->maPrinterName = OStringToOUString(pData->cPrinterName, aStreamEncoding);
+ pJobData->maDriver = OStringToOUString(pData->cDriverName, aStreamEncoding);
// Sind es unsere neuen JobSetup-Daten?
if ( nSystem == JOBSET_FILE364_SYSTEM ||
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 56fc9b15fdfd..d6d2e1c0eefd 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1262,10 +1262,7 @@ static long ImplHandleExtTextInput( Window* pWindow,
if ( !pChild->ImplGetWindowImpl()->mbExtTextInput )
{
pChild->ImplGetWindowImpl()->mbExtTextInput = sal_True;
- if ( !pWinData->mpExtOldText )
- pWinData->mpExtOldText = new UniString;
- else
- pWinData->mpExtOldText->Erase();
+ pWinData->mpExtOldText = new OUString;
if ( pWinData->mpExtOldAttrAry )
{
delete [] pWinData->mpExtOldAttrAry;
@@ -1281,11 +1278,11 @@ static long ImplHandleExtTextInput( Window* pWindow,
// Test for changes
sal_Bool bOnlyCursor = sal_False;
- xub_StrLen nMinLen = Min( pWinData->mpExtOldText->Len(), rText.Len() );
+ xub_StrLen nMinLen = Min( pWinData->mpExtOldText->getLength(), sal_Int32(rText.Len()) );
xub_StrLen nDeltaStart = 0;
while ( nDeltaStart < nMinLen )
{
- if ( pWinData->mpExtOldText->GetChar( nDeltaStart ) != rText.GetChar( nDeltaStart ) )
+ if ( (*pWinData->mpExtOldText)[nDeltaStart] != rText.GetChar( nDeltaStart ) )
break;
nDeltaStart++;
}
@@ -1308,13 +1305,13 @@ static long ImplHandleExtTextInput( Window* pWindow,
}
}
if ( (nDeltaStart >= nMinLen) &&
- (pWinData->mpExtOldText->Len() == rText.Len()) )
+ (pWinData->mpExtOldText->getLength() == rText.Len()) )
bOnlyCursor = sal_True;
// Call Event and store the information
CommandExtTextInputData aData( rText, pTextAttr,
(xub_StrLen)nCursorPos, nCursorFlags,
- nDeltaStart, pWinData->mpExtOldText->Len(),
+ nDeltaStart, pWinData->mpExtOldText->getLength(),
bOnlyCursor );
*pWinData->mpExtOldText = rText;
if ( pWinData->mpExtOldAttrAry )
@@ -2279,20 +2276,19 @@ static long ImplHandleShowDialog( Window* pWindow, int nDialogId )
// -----------------------------------------------------------------------
static void ImplHandleSurroundingTextRequest( Window *pWindow,
- XubString& rText,
+ OUString& rText,
Selection &rSelRange )
{
Window* pChild = ImplGetKeyInputWindow( pWindow );
if ( !pChild )
{
- rText = XubString::EmptyString();
+ rText = OUString();
rSelRange.setMin( 0 );
rSelRange.setMax( 0 );
}
else
{
-
rText = pChild->GetSurroundingText();
Selection aSel = pChild->GetSurroundingTextSelection();
rSelRange.setMin( aSel.Min() );
@@ -2312,15 +2308,15 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow,
if( aSelRange.Min() < 0 )
pEvt->mnStart = 0;
- else if( aSelRange.Min() > pEvt->maText.Len() )
- pEvt->mnStart = pEvt->maText.Len();
+ else if( aSelRange.Min() > pEvt->maText.getLength() )
+ pEvt->mnStart = pEvt->maText.getLength();
else
pEvt->mnStart = aSelRange.Min();
if( aSelRange.Max() < 0 )
pEvt->mnStart = 0;
- else if( aSelRange.Max() > pEvt->maText.Len() )
- pEvt->mnEnd = pEvt->maText.Len();
+ else if( aSelRange.Max() > pEvt->maText.getLength() )
+ pEvt->mnEnd = pEvt->maText.getLength();
else
pEvt->mnEnd = aSelRange.Max();
}