convert CPPCANVAS module from String to OUString

Change-Id: I12a219a50cc3a9b07c9852cc0d417f71797b9e15

5 files changed, 13 insertions, 14 deletions

diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 79a2967f88d6..c70bf548dbd5 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -263,7 +263,7 @@ static float GetSwapFloat( SvStream& rSt )
                                        bool                           bSubsettableActions );
 
             void createTextAction( const ::Point&                 rStartPoint,
-                                   const String                   rString,
+                                   const OUString                 rString,
                                    int                            nIndex,
                                    int                            nLength,
                                    const sal_Int32*               pCharWidths,
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index a88ae1277da2..3bee95ff8b14 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -750,7 +750,7 @@ namespace cppcanvas
                     if (width == 0) { // non native formats
                         GraphicFilter filter;
 
-                        filter.ImportGraphic (graphic, String (), s);
+                        filter.ImportGraphic (graphic, OUString(), s);
                         SAL_INFO("cppcanvas.emf", "EMF+\tbitmap width: "  << graphic.GetBitmap().GetSizePixel().Width() << " height: " << graphic.GetBitmap().GetSizePixel().Height());
                     }
 
@@ -764,7 +764,7 @@ namespace cppcanvas
                     // workaround buggy metafiles, which have wrong mfSize set (n#705956 for example)
                     SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), bUseWholeStream ? s.remainingSize() : dataSize - 16, STREAM_READ);
 
-                    filter.ImportGraphic (graphic, String (), mfStream);
+                    filter.ImportGraphic (graphic, OUString(), mfStream);
 
                     // debug code - write the stream to debug file /tmp/emf-stream.emf
 #if OSL_DEBUG_LEVEL > 1
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index c9489afd244c..a8145bb9d2f6 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -849,14 +849,14 @@ namespace cppcanvas
 
         // create text effects such as shadow/relief/embossed
         void ImplRenderer::createTextAction( const ::Point&                 rStartPoint,
-                                             const String                   rString,
+                                             const OUString                 rString,
                                              int                            nIndex,
                                              int                            nLength,
                                              const sal_Int32*               pCharWidths,
                                              const ActionFactoryParameters& rParms,
                                              bool                           bSubsettableActions )
         {
-            ENSURE_OR_THROW( nIndex >= 0 && nLength <= rString.Len() + nIndex,
+            ENSURE_OR_THROW( nIndex >= 0 && nLength <= rString.getLength() + nIndex,
                               "ImplRenderer::createTextWithEffectsAction(): Invalid text index" );
 
             if( !nLength )
@@ -975,11 +975,11 @@ namespace cppcanvas
                 nMaxWidth += nWidth + 1;
 
                 long nFullStrikeoutWidth = 0;
-                String aStrikeoutText;
+                OUString aStrikeoutText;
                 while( (nFullStrikeoutWidth+=nStrikeoutWidth ) < nMaxWidth+1 )
-                    aStrikeoutText += pChars[0];
+                    aStrikeoutText += OUString(pChars[0]);
 
-                xub_StrLen nLen = aStrikeoutText.Len();
+                sal_Int32 nLen = aStrikeoutText.getLength();
 
                 if( nLen )
                 {
@@ -1008,7 +1008,7 @@ namespace cppcanvas
                             aShadowColor,
                             aStrikeoutText,
                             nStartPos,
-                            aStrikeoutText.Len(),
+                            aStrikeoutText.getLength(),
                             pStrikeoutCharWidths,
                             rParms.mrVDev,
                             rParms.mrCanvas,
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 61b9182e9124..927d34424cb1 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -189,7 +189,7 @@ namespace cppcanvas
                 return aCharWidthSeq;
             }
 
-            uno::Sequence< double > setupDXArray( const ::String&    rText,
+            uno::Sequence< double > setupDXArray( const OUString&    rText,
                                                   sal_Int32          nStartPos,
                                                   sal_Int32          nLen,
                                                   VirtualDevice&     rVDev,
@@ -1935,7 +1935,7 @@ namespace cppcanvas
                                            const ::Color&                   rReliefColor,
                                            const ::basegfx::B2DSize&        rShadowOffset,
                                            const ::Color&                   rShadowColor,
-                                           const String&                    rText,
+                                           const OUString&                  rText,
                                            sal_Int32                        nStartPos,
                                            sal_Int32                        nLen,
                                            const sal_Int32*                 pDXArray,
@@ -2085,7 +2085,7 @@ namespace cppcanvas
                                                              const ::Color&                 rReliefColor,
                                                              const ::Size&                  rShadowOffset,
                                                              const ::Color&                 rShadowColor,
-                                                             const String&                  rText,
+                                                             const OUString&                rText,
                                                              sal_Int32                      nStartPos,
                                                              sal_Int32                      nLen,
                                                              const sal_Int32*               pDXArray,
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index b3218b0a2a1a..f40f03ee6787 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -31,7 +31,6 @@ class VirtualDevice;
 class Point;
 class Size;
 class Color;
-class String;
 
 
 /* Definition of internal::TextActionFactory class */
@@ -71,7 +70,7 @@ namespace cppcanvas
                                                      const ::Color&                 rReliefColor,
                                                      const ::Size&                  rShadowOffset,
                                                      const ::Color&                 rShadowColor,
-                                                     const ::String&                rText,
+                                                     const OUString&                rText,
                                                      sal_Int32                      nStartPos,
                                                      sal_Int32                      nLen,
                                                      const sal_Int32*               pDXArray,