[Libreoffice-commits] core.git: sd/source

Stephan Bergmann sbergman at redhat.com
Fri Dec 5 09:36:06 PST 2014


 sd/source/ui/inc/slideshow.hxx       |    3 ++-
 sd/source/ui/slideshow/slideshow.cxx |    2 +-
 sd/source/ui/view/drawview.cxx       |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b42c5a7809b8ca9eaef757897215b3225bce8056
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 5 18:35:34 2014 +0100

    loplugin:cstylecast, involving pointer to incomplete type
    
    Change-Id: I4b892790a16892396252467b3f3c31240b2f64e8

diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index fda3d8a..2a35f13 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -46,6 +46,7 @@ namespace com { namespace sun { namespace star {
 
 class SdDrawDocument;
 class KeyEvent;
+class OutputDevice;
 class Size;
 class Rectangle;
 namespace vcl { class Window; }
@@ -158,7 +159,7 @@ public:
     // settings
     bool isFullScreen();                                // a.k.a. FuSlideShow::IsFullScreen()
     bool isAlwaysOnTop();                               // a.k.a. FuSlideShow::IsAlwaysOnTop();
-    ShowWindow* getShowWindow();                        // a.k.a. FuSlideShow::GetShowWindow()
+    OutputDevice* getShowWindow();                      // a.k.a. FuSlideShow::GetShowWindow()
     int getAnimationMode();                             // a.k.a. FuSlideShow::GetAnimationMode()
     sal_Int32 getCurrentPageNumber();                   // a.k.a. FuSlideShow::GetCurrentPage()
     sal_Int32 getFirstPageNumber();
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 85ac816..dcb5dbc 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -925,7 +925,7 @@ bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Ref
     return true;
 }
 
-ShowWindow* SlideShow::getShowWindow()
+OutputDevice* SlideShow::getShowWindow()
 {
     return mxController.is() ? mxController->mpShowWindow : 0;
 }
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 131db8b..b2b2d782 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -471,7 +471,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sd
         rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( pDoc ) );
         if(xSlideshow.is() && xSlideshow->isRunning())
         {
-            OutputDevice* pShowWindow = ( OutputDevice* )xSlideshow->getShowWindow();
+            OutputDevice* pShowWindow = xSlideshow->getShowWindow();
             if( (pShowWindow == pOutDev) || (xSlideshow->getAnimationMode() == ANIMATIONMODE_PREVIEW) )
             {
                 if( pShowWindow == pOutDev )


More information about the Libreoffice-commits mailing list