String->OUString

Change-Id: I0557dcc191aab97adb6aa68ebee1970a11600f4f

sd/source/ui/inc/PreviewRenderer.hxx

@@ -79,7 +79,7 @@ public:
     Image RenderPage (
         const SdPage* pPage,
         const sal_Int32 nWidth,
-        const String& sSubstitutionText,
+        const OUString& sSubstitutionText,
         const bool bObeyHighContrastMode = true,
         const bool bDisplayPresentationObjects = true);
 
@@ -104,7 +104,7 @@ public:
     Image RenderPage (
         const SdPage* pPage,
         const Size aPreviewPixelSize,
-        const String& sSubstitutionText,
+        const OUString& sSubstitutionText,
         const bool bObeyHighContrastMode = true,
         const bool bDisplayPresentationObjects = true);
 
@@ -115,7 +115,7 @@ public:
     */
     Image RenderSubstitution (
         const Size& rPreviewPixelSize,
-        const String& sSubstitutionText);
+        const OUString& sSubstitutionText);
 
     /** Scale the given bitmap by keeping its aspect ratio to the desired
         width.  Add a frame to it afterwards.
@@ -145,7 +145,7 @@ private:
     void PaintPage (
         const SdPage* pPage,
         const bool bDisplayPresentationObjects);
-    void PaintSubstitutionText (const String& rSubstitutionText);
+    void PaintSubstitutionText (const OUString& rSubstitutionText);
     void PaintFrame (void);
 
     /** Set up the map mode so that the given page is renderer into a bitmap

sd/source/ui/presenter/PresenterTextView.cxx

@@ -116,7 +116,7 @@ private:
     Size maSize;
     Color maBackgroundColor;
     Color maTextColor;
-    String msText;
+    OUString msText;
     sal_Int32 mnTop;
     sal_Int32 mnTotalHeight;
 

sd/source/ui/tools/PreviewRenderer.cxx

@@ -100,7 +100,7 @@ PreviewRenderer::~PreviewRenderer (void)
 Image PreviewRenderer::RenderPage (
     const SdPage* pPage,
     const sal_Int32 nWidth,
-    const String& rSubstitutionText,
+    const OUString& rSubstitutionText,
     const bool bObeyHighContrastMode,
     const bool bDisplayPresentationObjects)
 {
@@ -129,7 +129,7 @@ Image PreviewRenderer::RenderPage (
 Image PreviewRenderer::RenderPage (
     const SdPage* pPage,
     Size aPixelSize,
-    const String& rSubstitutionText,
+    const OUString& rSubstitutionText,
     const bool bObeyHighContrastMode,
     const bool bDisplayPresentationObjects)
 {
@@ -167,7 +167,7 @@ Image PreviewRenderer::RenderPage (
 
 Image PreviewRenderer::RenderSubstitution (
     const Size& rPreviewPixelSize,
-    const String& rSubstitutionText)
+    const OUString& rSubstitutionText)
 {
     Image aPreview;
 
@@ -352,9 +352,9 @@ void PreviewRenderer::PaintPage (
 
 
 
-void PreviewRenderer::PaintSubstitutionText (const String& rSubstitutionText)
+void PreviewRenderer::PaintSubstitutionText (const OUString& rSubstitutionText)
 {
-    if (rSubstitutionText.Len() > 0)
+    if (!rSubstitutionText.isEmpty())
     {
         // Set the font size.
         const Font& rOriginalFont (mpPreviewDevice->GetFont());