death to some UniStrings

Change-Id: I0fa0c60e12c418d25f8bd96cc04c6abd74b1a608

4 files changed, 9 insertions, 12 deletions

diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 497bd20cdb79..ad14ca314194 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -91,8 +91,7 @@ void SvTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr,
     for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ )
     {
         if( pCurToken && nCurTokenLen )
-            // aToken.Assign( pCurToken, nCurTokenLen );
-            aToken = XubString( pCurToken, nCurTokenLen );
+            aToken = rtl::OUString(pCurToken, nCurTokenLen);
         else
             aToken.Erase();
         SvLBoxString* pStr = new SvLBoxString( pEntry, 0, aToken );
@@ -339,7 +338,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal
             if( nCol == 0xffff )
             {
                 if( pCurToken )
-                    aTemp = XubString( pCurToken, nCurTokenLen );
+                    aTemp = rtl::OUString(pCurToken, nCurTokenLen);
                 else
                     aTemp.Erase(); // delete all columns without a token
                 ((SvLBoxString*)pStr)->SetText( pEntry, aTemp );
@@ -350,7 +349,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal
             {
                 if( !nCol )
                 {
-                    aTemp = XubString( pCurToken, nCurTokenLen );
+                    aTemp = rtl::OUString(pCurToken, nCurTokenLen);
                     ((SvLBoxString*)pStr)->SetText( pEntry, aTemp );
                     if( !pNextToken )
                         break;
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index 2bf3d0204a7e..a366c03dc6f4 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -423,7 +423,7 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
 
             if( bCanBeKeyword )
             {
-                String aKWString(rpStartPos, sal::static_int_cast< xub_StrLen >(nCount) );
+                rtl::OUString aKWString(rpStartPos, nCount);
                 rtl::OString aByteStr = rtl::OUStringToOString(aKWString,
                     RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase();
                 if ( bsearch( aByteStr.getStr(), ppListKeyWords, nKeyWordCount, sizeof( char* ),
diff --git a/svtools/source/filter/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx
index cadb5e2cea98..f19c8f19a2a8 100644
--- a/svtools/source/filter/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -1180,7 +1180,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
                                 *pTmp = nTmp;
                             }
 #endif
-                            aText = String( pBuf, (xub_StrLen)nLen );
+                            aText = rtl::OUString(pBuf, nLen);
                             delete[] pBuf;
                         }
                     }
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 5427d86e521d..5d94f12a4040 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -519,7 +519,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
 
                     if( IsParserWorking() && !rInput.IsEof() )
                     {
-                        String sEntity( sEntityBuffer.getStr(), nPos );
+                        rtl::OUString sEntity(sEntityBuffer.getStr(), nPos);
                         cChar = GetHTMLCharName( sEntity );
 
                         // not found ( == 0 ): plain text
@@ -533,8 +533,8 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
                             {
                                 nNextCh = sEntityBuffer[i];
                                 sEntityBuffer.setLength( i );
-                                sEntity.Assign( sEntityBuffer.getStr(), i );
-                                 cChar = GetHTMLCharName( sEntity );
+                                sEntity = rtl::OUString(sEntityBuffer.getStr(), i);
+                                cChar = GetHTMLCharName( sEntity );
                                 if( cChar )
                                 {
                                     rInput.SeekRel( -(long)
@@ -896,9 +896,7 @@ int HTMLParser::_GetNextRawToken()
                     nNextCh = GetNextChar();
                 }
 
-                String aTok( sTmpBuffer.getStr(),
-                             sal::static_int_cast< xub_StrLen >(
-                                 sTmpBuffer.getLength()) );
+                String aTok( sTmpBuffer.toString() );
                 aTok.ToUpperAscii();
                 bool bDone = false;
                 if( bReadScript || aEndToken.Len() )