From 12191a4f30078bb81c39a74a994ba7b2b410adaf Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 9 May 2017 12:14:32 +0200
Subject: make loplugin constantparam smarter about string params

Change-Id: Id3df69b38fd35f46735246a6d307a89aa10d4294
Reviewed-on: https://gerrit.libreoffice.org/37426
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sd/source/ui/inc/PreviewRenderer.hxx                | 5 -----
 sd/source/ui/presenter/SlideRenderer.cxx            | 2 +-
 sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx | 1 -
 sd/source/ui/tools/PreviewRenderer.cxx              | 4 +---
 4 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'sd/source')

diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index 3c0e97254b0e..e8d815d59bcc 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -69,10 +69,6 @@ public:
             The page to render.
         @param aPreviewPixelSize
             The size in device coordinates of the preview.
-        @param sSubstitutionText
-            When the actual preview can not be created for some reason, then
-            this text is painted in an empty rectangle of the requested size
-            instead.
         @param bObeyHighContrastMode
             When <FALSE/> then the high contrast mode of the application is
             ignored and the preview is rendered in normal mode.  When
@@ -85,7 +81,6 @@ public:
     Image RenderPage (
         const SdPage* pPage,
         const Size aPreviewPixelSize,
-        const OUString& sSubstitutionText,
         const bool bObeyHighContrastMode,
         const bool bDisplayPresentationObjects = true);
 
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index f00cff827f4b..a5ca061a4a1d 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -175,7 +175,7 @@ BitmapEx SlideRenderer::CreatePreview (
     const Image aPreview = maPreviewRenderer.RenderPage (
         pPage,
         Size(aPreviewSize.Width*nFactor, aPreviewSize.Height*nFactor),
-        OUString(), true);
+        true);
     if (nFactor == 1)
         return aPreview.GetBitmapEx();
     else
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
index 782e55ae3dfc..cb18c6efad25 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
@@ -64,7 +64,6 @@ Bitmap BitmapFactory::CreateBitmap (
     Bitmap aPreview (maRenderer.RenderPage (
         &rPage,
         aSize,
-        OUString(),
         true,
         false).GetBitmapEx().GetBitmap());
     if (bDoSuperSampling)
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index c41822289095..384b53dbbf0d 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -95,7 +95,6 @@ Image PreviewRenderer::RenderPage (
         return RenderPage (
             pPage,
             Size(nWidth,nHeight),
-            OUString(),
             false/*bObeyHighContrastMode*/);
     }
     else
@@ -105,7 +104,6 @@ Image PreviewRenderer::RenderPage (
 Image PreviewRenderer::RenderPage (
     const SdPage* pPage,
     Size aPixelSize,
-    const OUString& rSubstitutionText,
     const bool bObeyHighContrastMode,
     const bool bDisplayPresentationObjects)
 {
@@ -118,7 +116,7 @@ Image PreviewRenderer::RenderPage (
             if (Initialize(pPage, aPixelSize, bObeyHighContrastMode))
             {
                 PaintPage(pPage, bDisplayPresentationObjects);
-                PaintSubstitutionText(rSubstitutionText);
+                PaintSubstitutionText("");
                 PaintFrame();
 
                 Size aSize (mpPreviewDevice->GetOutputSizePixel());
-- 
cgit