[Libreoffice-commits] core.git: include/svx svx/source

[Mike Kaganski (via logerrit)]

 include/svx/sdrpaintwindow.hxx       |    1 -
 svx/source/svdraw/sdrpaintwindow.cxx |   15 +++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

New commits:
commit 085c179b9e146ef27d98aed72d5b681c585cabfc
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Nov 18 15:31:56 2022 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Nov 18 15:22:29 2022 +0100

    Simplify a bit
    
    Change-Id: Ie2cdb0a361376b488d9829c892c9f4c6e9711503
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142941
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index d6dee79a9389..109851aacd80 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -123,7 +123,6 @@ public:
 
     // prepare PreRendering (evtl.)
     void PreparePreRenderDevice();
-    void DestroyPreRenderDevice();
     void OutputPreRenderDevice(const vcl::Region& rExpandedRegion);
     SdrPreRenderDevice* GetPreRenderDevice() const { return 
mpPreRenderDevice.get(); }
 
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx 
b/svx/source/svdraw/sdrpaintwindow.cxx
index 6c3b328ba5ea..ebed55326a57 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -252,7 +252,7 @@ SdrPaintWindow::~SdrPaintWindow()
 {
     mxOverlayManager.clear();
 
-    DestroyPreRenderDevice();
+    mpPreRenderDevice.reset();
 }
 
 rtl::Reference< sdr::overlay::OverlayManager > const & 
SdrPaintWindow::GetOverlayManager() const
@@ -292,21 +292,12 @@ void SdrPaintWindow::PreparePreRenderDevice()
         {
             mpPreRenderDevice.reset(new SdrPreRenderDevice(*mpOutputDevice));
         }
+        mpPreRenderDevice->PreparePreRenderDevice();
     }
     else
     {
-        DestroyPreRenderDevice();
+        mpPreRenderDevice.reset();
     }
-
-    if(mpPreRenderDevice)
-    {
-        mpPreRenderDevice->PreparePreRenderDevice();
-    }
-}
-
-void SdrPaintWindow::DestroyPreRenderDevice()
-{
-    mpPreRenderDevice.reset();
 }
 
 void SdrPaintWindow::OutputPreRenderDevice(const vcl::Region& rExpandedRegion)