Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *().

15 files changed, 28 insertions, 28 deletions

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index e36cdaf9a0df..cf8386903173 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -955,8 +955,7 @@ void Edit::ImplInsertText( const XubString& rStr, const Selection* pNewSel, sal_
                         pOldTxt[nChgPos] == pTmpTxt[nChgPos] )
                     ++nChgPos;
 
-                xub_StrLen nChgLen = static_cast< xub_StrLen >( nTmpLen - nChgPos );
-                String aChgText( aTmpText.copy( nChgPos ), nChgLen );
+                String aChgText( aTmpText.copy( nChgPos ) );
 
                 // remove text from first pos to be changed to current pos
                 maText.Erase( static_cast< xub_StrLen >( nChgPos ), static_cast< xub_StrLen >( nTmpPos - nChgPos ) );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index a56ea83d8910..0fd955af9765 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5868,32 +5868,32 @@ bool PDFWriterImpl::emitCatalog()
         if( aInitPageRef.getLength() > 1 )
         {
             aLine.append( "/OpenAction[" );
-            aLine.append( aInitPageRef );
+            aLine.append( aInitPageRef.makeStringAndClear() );
             aLine.append( " /XYZ null null 0]\n" );
         }
         break;
     case PDFWriter::FitInWindow :
         aLine.append( "/OpenAction[" );
-        aLine.append( aInitPageRef );
+        aLine.append( aInitPageRef.makeStringAndClear() );
         aLine.append( " /Fit]\n" ); //Open fit page
         break;
     case PDFWriter::FitWidth :
         aLine.append( "/OpenAction[" );
-        aLine.append( aInitPageRef );
+        aLine.append( aInitPageRef.makeStringAndClear() );
         aLine.append( " /FitH " );
         aLine.append( m_nInheritedPageHeight );//Open fit width
         aLine.append( "]\n" );
         break;
     case PDFWriter::FitVisible :
         aLine.append( "/OpenAction[" );
-        aLine.append( aInitPageRef );
+        aLine.append( aInitPageRef.makeStringAndClear() );
         aLine.append( " /FitBH " );
         aLine.append( m_nInheritedPageHeight );//Open fit visible
         aLine.append( "]\n" );
         break;
     case PDFWriter::ActionZoom :
         aLine.append( "/OpenAction[" );
-        aLine.append( aInitPageRef );
+        aLine.append( aInitPageRef.makeStringAndClear() );
         aLine.append( " /XYZ null null " );
         if( m_aContext.Zoom >= 50 && m_aContext.Zoom <= 1600 )
             aLine.append( (double)m_aContext.Zoom/100.0 );
@@ -6547,7 +6547,7 @@ bool PDFWriterImpl::emitTrailer()
     if( aDocChecksum.getLength() )
     {
         aLine.append( "/DocChecksum /" );
-        aLine.append( aDocChecksum );
+        aLine.append( aDocChecksum.makeStringAndClear() );
         aLine.append( "\n" );
     }
     if( m_aAdditionalStreams.size() > 0 )
@@ -7254,7 +7254,8 @@ void PDFWriterImpl::drawHorizontalGlyphs(
         }
         aKernedLine.append( ">]TJ\n" );
         aUnkernedLine.append( ">Tj\n" );
-        rLine.append( bNeedKern ? aKernedLine : aUnkernedLine );
+        rLine.append(
+            (bNeedKern ? aKernedLine : aUnkernedLine).makeStringAndClear() );
 
         // set beginning of next run
         nBeginRun = aRunEnds[nRun];
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 22f109905b13..2de2993905f1 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -753,7 +753,7 @@ Atom SelectionManager::getAtom( const OUString& rString )
     if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() )
     {
         static Atom nNoDisplayAtoms = 1;
-        Atom aAtom = m_pDisplay ? XInternAtom( m_pDisplay, OUStringToOString( rString, RTL_TEXTENCODING_ISO_8859_1 ), False ) : nNoDisplayAtoms++;
+        Atom aAtom = m_pDisplay ? XInternAtom( m_pDisplay, OUStringToOString( rString, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), False ) : nNoDisplayAtoms++;
         m_aStringToAtom[ rString ] = aAtom;
         m_aAtomToString[ aAtom ] = rString;
     }
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 62d6288c518f..f196cf9a2ce7 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -281,7 +281,7 @@ struct GetPPDAttribs
     {
         // This CUPS method is not at all thread-safe we need
         // to dup the pointer to a static buffer it returns ASAP
-        OString aResult = m_pFunction( m_aParameter );
+        OString aResult = m_pFunction( m_aParameter.getStr() );
         MutexGuard aGuard( *m_pSyncMutex );
         m_aResult = aResult;
         m_aCondition.set();
diff --git a/vcl/unx/generic/printergfx/glyphset.cxx b/vcl/unx/generic/printergfx/glyphset.cxx
index 967c9f2a175f..a49e5a0e21a7 100644
--- a/vcl/unx/generic/printergfx/glyphset.cxx
+++ b/vcl/unx/generic/printergfx/glyphset.cxx
@@ -458,13 +458,13 @@ GlyphSet::PSDefineReencodedFont (osl::File* pOutFile, sal_Int32 nGlyphSetID)
     sal_Int32 nSize = 0;
 
     nSize += psp::appendStr ("(", pEncodingVector + nSize);
-    nSize += psp::appendStr (GetReencodedFontName(nGlyphSetID),
+    nSize += psp::appendStr (GetReencodedFontName(nGlyphSetID).getStr(),
                                   pEncodingVector + nSize);
     nSize += psp::appendStr (") cvn (", pEncodingVector + nSize);
     nSize += psp::appendStr (maBaseName.getStr(),
                                   pEncodingVector + nSize);
     nSize += psp::appendStr (") cvn ", pEncodingVector + nSize);
-    nSize += psp::appendStr (GetGlyphSetEncodingName(nGlyphSetID),
+    nSize += psp::appendStr (GetGlyphSetEncodingName(nGlyphSetID).getStr(),
                                   pEncodingVector + nSize);
     nSize += psp::appendStr (" psp_definefont\n",
                                   pEncodingVector + nSize);
@@ -738,7 +738,7 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
 
         nSize += psp::appendStr ("/",
                                  pEncodingVector + nSize);
-        nSize += psp::appendStr (GetGlyphSetEncodingName(nGlyphSetID),
+        nSize += psp::appendStr (GetGlyphSetEncodingName(nGlyphSetID).getStr(),
                                  pEncodingVector + nSize);
         nSize += psp::appendStr (" [ ",
                                  pEncodingVector + nSize);
@@ -769,7 +769,7 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
             std::list< OString > aName( rMgr.getAdobeNameFromUnicode((*aSortedGlyph).second) );
 
             if( aName.begin() != aName.end() )
-                nSize += psp::appendStr ( aName.front(), pEncodingVector + nSize);
+                nSize += psp::appendStr ( aName.front().getStr(), pEncodingVector + nSize);
             else
                 nSize += psp::appendStr (".notdef", pEncodingVector + nSize );
             nSize += psp::appendStr (" ",  pEncodingVector + nSize);
diff --git a/vcl/unx/generic/printergfx/printerjob.cxx b/vcl/unx/generic/printergfx/printerjob.cxx
index 7ae6a28372f6..c6fa885acc4c 100644
--- a/vcl/unx/generic/printergfx/printerjob.cxx
+++ b/vcl/unx/generic/printergfx/printerjob.cxx
@@ -355,10 +355,9 @@ getLocalTime(sal_Char* pBuffer)
 
 static bool isAscii( const rtl::OUString& rStr )
 {
-    const sal_Unicode* pStr = rStr;
     sal_Int32 nLen = rStr.getLength();
     for( sal_Int32 i = 0; i < nLen; i++ )
-        if( pStr[i] > 127 )
+        if( rStr[i] > 127 )
             return false;
     return true;
 }
diff --git a/vcl/unx/generic/printergfx/psputil.cxx b/vcl/unx/generic/printergfx/psputil.cxx
index e0f82d3fff6a..2664bac8d022 100644
--- a/vcl/unx/generic/printergfx/psputil.cxx
+++ b/vcl/unx/generic/printergfx/psputil.cxx
@@ -184,7 +184,7 @@ WritePS (osl::File* pFile, const rtl::OString &rString)
     sal_uInt64 nOutLength = 0;
 
     if (nInLength > 0 && pFile)
-        pFile->write (rString, nInLength, nOutLength);
+        pFile->write (rString.getStr(), nInLength, nOutLength);
 
     return nInLength == nOutLength;
 }
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 39c51cb3b274..873a491ac148 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -54,7 +54,7 @@ getAsConst( const rtl::OString& rString )
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
     aUgly[nIdx] = rString;
-    return aUgly[ nIdx ];
+    return aUgly[ nIdx ].getStr();
 }
 
 static accessibility::XAccessibleAction*
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index 04263fd72906..3e7ef0f20991 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.cxx
@@ -46,7 +46,7 @@ getAsConst( rtl::OUString rString )
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
     aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
-    return aUgly[ nIdx ];
+    return aUgly[ nIdx ].getStr();
 }
 
 static accessibility::XAccessibleImage*
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index dec06cd7005b..013ca3ada614 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -63,7 +63,7 @@ getAsConst( rtl::OUString rString )
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
     aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
-    return aUgly[ nIdx ];
+    return aUgly[ nIdx ].getStr();
 }
 
 /*****************************************************************************/
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 7ccf07b57488..46e4f03aead0 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -726,7 +726,7 @@ ensureTypeFor( uno::XInterface *pAccessible )
         }
     }
 
-    GType nType = g_type_from_name( aTypeName );
+    GType nType = g_type_from_name( aTypeName.getStr() );
     if( nType == G_TYPE_INVALID )
     {
         GTypeInfo aTypeInfo = {
@@ -736,7 +736,8 @@ ensureTypeFor( uno::XInterface *pAccessible )
             0, NULL, NULL
         } ;
         nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER,
-                                        aTypeName, &aTypeInfo, (GTypeFlags)0 ) ;
+                                        aTypeName.getStr(), &aTypeInfo,
+                                        (GTypeFlags)0 ) ;
 
         for( int j = 0; j < aTypeTableSize; j++ )
             if( bTypes[j] )
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index 94a8b1981688..42928ece2aa2 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -118,7 +118,7 @@ static inline gchar *
 OUStringToGChar(const rtl::OUString& rString )
 {
     rtl::OString aUtf8 = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
-    return g_strdup( aUtf8 );
+    return g_strdup( aUtf8.getStr() );
 }
 
 #define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr()
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index c5d12c80fb63..4cb161a303ce 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -708,7 +708,7 @@ void GtkXLib::Init()
     if( aAppName.getLength() > 0 )
     {
         rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc);
-        g_set_prgname(aPrgName);
+        g_set_prgname(aPrgName.getStr());
     }
 
     // init gtk/gdk
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 289ebc50a462..f0cf177a383a 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -249,7 +249,7 @@ void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r
     }
 #if GTK_CHECK_VERSION(2,10,0)
     GtkRecentManager *manager = gtk_recent_manager_get_default ();
-    gtk_recent_manager_add_item (manager, sGtkURL);
+    gtk_recent_manager_add_item (manager, sGtkURL.getStr());
     (void)rMimeType;
 #else
     static getDefaultFnc sym_gtk_recent_manager_get_default =
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index faa8a719b331..e5f84ae28781 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1814,7 +1814,7 @@ void GtkSalFrame::updateWMClass()
     }
     else
         gtk_window_set_wmclass( GTK_WINDOW(m_pWindow),
-                                X11SalData::getFrameResName( m_nExtStyle ),
+                                X11SalData::getFrameResName( m_nExtStyle ).getStr(),
                                 pResClass );
 }
 
@@ -3846,7 +3846,7 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
         if (!sAllText.getLength())
             return sal_False;
     rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
-    rtl::OUString sCursorText(sAllText, nPosition);
+    rtl::OUString sCursorText(sAllText.copy(0, nPosition));
     gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(),
         rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
     return sal_True;