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>

12 files changed, 44 insertions, 48 deletions

diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index e9cd489ad041..98651c278374 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -192,7 +192,7 @@ struct SalMouseActivateEvent
 struct SalExtTextInputEvent
 {
     sal_uLong           mnTime;         // Time in ms, when event is created
-    UniString           maText;         // Text
+    OUString            maText;         // Text
     const sal_uInt16*   mpTextAttr;     // Text-Attribute
     sal_uLong           mnCursorPos;    // Cursor-Position
     sal_uLong           mnDeltaStart;   // Start-Position of last change
@@ -228,7 +228,7 @@ struct SalInputContextChangeEvent
 // SURROUNDINGTEXTREQUEST
 struct SalSurroundingTextRequestEvent
 {
-    UniString       maText;         // Text
+    OUString        maText;         // Text
     sal_uLong       mnStart;        // The beginning index of selected range
     sal_uLong       mnEnd;          // The end index of selected range
 };
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index b0b1a2be4e16..4f1facae5395 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -142,7 +142,7 @@ public:
     void                Draw( OutputDevice* pOutDev,
                               const Point& rDestPt,
                               const Size& rDestSize ) const;
-    static void         DrawEx( OutputDevice* pOutDev, const String& rText,
+    static void         DrawEx( OutputDevice* pOutDev, const OUString& rText,
                               Font& rFont, const BitmapEx& rBitmap,
                               const Point& rDestPt, const Size& rDestSize );
 
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index f7a3f0075d16..1fef0cdd8396 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -232,7 +232,7 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont );
 
 // \WIN\SOURCE\APP\SALDATA.CXX
 rtl_TextEncoding ImplSalGetSystemEncoding();
-UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = STRING_LEN );
+OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = STRING_LEN );
 int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
 
 // -----------
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 53c59dcec0fc..e6b669d63b0f 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -116,7 +116,7 @@ long ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, co
 
 struct ImplWinData
 {
-    UniString*          mpExtOldText;
+    OUString*           mpExtOldText;
     sal_uInt16*             mpExtOldAttrAry;
     Rectangle*          mpCursorRect;
     long                mnCursorExtWidth;
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();
 }
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 6343f5b149f8..f8f4906e56bc 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3986,7 +3986,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p
         pThis->m_aInputEvent.mnTime             = 0;
         pThis->m_aInputEvent.mpTextAttr         = 0;
         pThis->m_aInputEvent.maText             = String( pText, RTL_TEXTENCODING_UTF8 );
-        pThis->m_aInputEvent.mnCursorPos        = pThis->m_aInputEvent.maText.Len();
+        pThis->m_aInputEvent.mnCursorPos        = pThis->m_aInputEvent.maText.getLength();
         pThis->m_aInputEvent.mnCursorFlags      = 0;
         pThis->m_aInputEvent.mnDeltaStart       = 0;
         pThis->m_aInputEvent.mbOnlyCursor       = False;
@@ -4007,12 +4007,12 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p
          */
         bool bSingleCommit = false;
         if( ! bWasPreedit
-            && pThis->m_aInputEvent.maText.Len() == 1
+            && pThis->m_aInputEvent.maText.getLength() == 1
             && ! pThis->m_aPrevKeyPresses.empty()
             )
         {
             const PreviousKeyPress& rKP = pThis->m_aPrevKeyPresses.back();
-            sal_Unicode aOrigCode = pThis->m_aInputEvent.maText.GetChar(0);
+            sal_Unicode aOrigCode = pThis->m_aInputEvent.maText[0];
 
             if( checkSingleKeyCommitHack( rKP.keyval, aOrigCode ) )
             {
@@ -4060,7 +4060,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
         // change from nothing to nothing -> do not start preedit
         // e.g. this will activate input into a calc cell without
         // user input
-        if( pThis->m_aInputEvent.maText.Len() == 0 )
+        if( pThis->m_aInputEvent.maText.getLength() == 0 )
         {
             g_free( pText );
             pango_attr_list_unref( pAttrs );
@@ -4078,7 +4078,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
     pThis->m_aInputEvent.mnDeltaStart       = 0;
     pThis->m_aInputEvent.mbOnlyCursor       = False;
 
-    pThis->m_aInputFlags = std::vector<sal_uInt16>( std::max( 1, (int)pThis->m_aInputEvent.maText.Len() ), 0 );
+    pThis->m_aInputFlags = std::vector<sal_uInt16>( std::max( 1, (int)pThis->m_aInputEvent.maText.getLength() ), 0 );
 
     PangoAttrIterator *iter = pango_attr_list_get_iterator(pAttrs);
     do
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 9d1c0fa33465..ff5a10f406d1 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -44,9 +44,9 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
 
 // -----------------------------------------------------------------------
 
-UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen )
+OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen )
 {
-    return UniString( pStr, nLen, ImplSalGetSystemEncoding(),
+    return OUString( pStr, nLen, ImplSalGetSystemEncoding(),
                       RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
                       RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
                       RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index a410028ac3d2..406fa3000d68 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1457,7 +1457,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
                                    LOGFONTW& rLogFont,
                                    bool /*bTestVerticalAvail*/ )
 {
-    UniString   aName;
+    OUString   aName;
     if ( pFont->mpFontData )
         aName = pFont->mpFontData->GetFamilyName();
     else