convert drawinglayer module from String to OUString

Change-Id: I115dfd5ca7d343b220b2a3e8aa0565f9e4689042

4 files changed, 20 insertions, 16 deletions

diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx
index b49ab83b300e..dda163f61519 100644
--- a/include/drawinglayer/attribute/fontattribute.hxx
+++ b/include/drawinglayer/attribute/fontattribute.hxx
@@ -26,7 +26,9 @@
 //////////////////////////////////////////////////////////////////////////////
 // predefines
 
-class String;
+namespace rtl {
+   class OUString;
+}
 
 namespace drawinglayer { namespace attribute {
     class ImpFontAttribute;
@@ -55,8 +57,8 @@ namespace drawinglayer
             /// constructors/assignmentoperator/destructor
             /// TODO: pair kerning and CJK kerning
             FontAttribute(
-                const String& rFamilyName,
-                const String& rStyleName,
+                const rtl::OUString& rFamilyName,
+                const rtl::OUString& rStyleName,
                 sal_uInt16 nWeight,
                 bool bSymbol = false,
                 bool bVertical = false,
@@ -77,8 +79,8 @@ namespace drawinglayer
             bool operator==(const FontAttribute& rCandidate) const;
 
             /// data read access
-            const String& getFamilyName() const;
-            const String& getStyleName() const;
+            const rtl::OUString& getFamilyName() const;
+            const rtl::OUString& getStyleName() const;
             sal_uInt16 getWeight() const;
             bool getSymbol() const;
             bool getVertical() const;
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index a469f8042c61..575678422360 100644
--- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -72,7 +72,7 @@ namespace drawinglayer
             void impCreateGeometryContent(
                 std::vector< Primitive2DReference >& rTarget,
                 basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose& rDecTrans,
-                const String& rText,
+                const OUString& rText,
                 xub_StrLen aTextPosition,
                 xub_StrLen aTextLength,
                 const ::std::vector< double >& rDXArray,
@@ -88,7 +88,7 @@ namespace drawinglayer
 
                 /// TextSimplePortionPrimitive2D parameters
                 const basegfx::B2DHomMatrix& rNewTransform,
-                const String& rText,
+                const OUString& rText,
                 xub_StrLen aTextPosition,
                 xub_StrLen aTextLength,
                 const ::std::vector< double >& rDXArray,
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index a0338a371aad..90ffb17a70f6 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -33,7 +33,9 @@
 // predefines
 class VirtualDevice;
 class Font;
-class String;
+namespace rtl {
+   class OUString;
+};
 class OutputDevice;
 class GDIMetaFile;
 
@@ -81,19 +83,19 @@ namespace drawinglayer
             double getStrikeoutOffset() const;
 
             double getTextWidth(
-                const String& rText,
+                const rtl::OUString& rText,
                 sal_uInt32 nIndex,
                 sal_uInt32 nLength) const;
 
             bool getTextOutlines(
                 basegfx::B2DPolyPolygonVector&,
-                const String& rText,
+                const rtl::OUString& rText,
                 sal_uInt32 nIndex,
                 sal_uInt32 nLength,
                 const ::std::vector< double >& rDXArray) const;
 
             basegfx::B2DRange getTextBoundRect(
-                const String& rText,
+                const rtl::OUString& rText,
                 sal_uInt32 nIndex,
                 sal_uInt32 nLength) const;
 
@@ -102,12 +104,12 @@ namespace drawinglayer
 
             void addTextRectActions(
                 const Rectangle& rRectangle,
-                const String& rText,
+                const rtl::OUString& rText,
                 sal_uInt16 nStyle,
                 GDIMetaFile& rGDIMetaFile) const;
 
             ::std::vector< double > getTextArray(
-                const String& rText,
+                const rtl::OUString& rText,
                 sal_uInt32 nIndex,
                 sal_uInt32 nLength) const;
         };
diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index b0c28c84ac41..e38086fc8d28 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -97,7 +97,7 @@ namespace drawinglayer
             basegfx::B2DHomMatrix                   maTextTransform;
 
             /// The text, used from maTextPosition up to maTextPosition + maTextLength
-            String                                  maText;
+            OUString                                maText;
 
             /// The index from where on maText is used
             xub_StrLen                              maTextPosition;
@@ -130,7 +130,7 @@ namespace drawinglayer
             /// constructor
             TextSimplePortionPrimitive2D(
                 const basegfx::B2DHomMatrix& rNewTransform,
-                const String& rText,
+                const OUString& rText,
                 xub_StrLen aTextPosition,
                 xub_StrLen aTextLength,
                 const ::std::vector< double >& rDXArray,
@@ -148,7 +148,7 @@ namespace drawinglayer
 
             /// data read access
             const basegfx::B2DHomMatrix& getTextTransform() const { return maTextTransform; }
-            const String& getText() const { return maText; }
+            const OUString& getText() const { return maText; }
             xub_StrLen getTextPosition() const { return maTextPosition; }
             xub_StrLen getTextLength() const { return maTextLength; }
             const ::std::vector< double >& getDXArray() const { return maDXArray; }