[Libreoffice-commits] core.git: include/vcl sc/source sd/source sw/source

[Noel Grandin]

 include/vcl/outdev.hxx                       |    8 --------
 include/vcl/window.hxx                       |    7 ++++++-
 sc/source/ui/inc/gridwin.hxx                 |    2 +-
 sd/source/ui/inc/Window.hxx                  |    2 +-
 sw/source/uibase/docvw/SidebarScrollBar.hxx  |    2 +-
 sw/source/uibase/docvw/SidebarTxtControl.hxx |    2 +-
 sw/source/uibase/inc/edtwin.hxx              |    2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 15c9be2bbb9e0ee8853a982f96338960a80d6ee5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Mar 28 10:08:30 2018 +0200

    loplugin:virtualdown in vcl
    
    Change-Id: Iea173295b7bc5e7f8a5e0215dc13ab32190c6f8f
    Reviewed-on: https://gerrit.libreoffice.org/51999
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 4b766ccd797a..649faa6388ef 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1786,14 +1786,6 @@ public:
 
     SAL_DLLPRIVATE DeviceCoordinate LogicWidthToDeviceCoordinate( long nWidth ) const;
 
-protected:
-    /**
-     * Notification about some rectangle of the output device got invalidated.
-     *
-     * @param pRectangle If 0, that means the whole area, otherwise the area in logic coordinates.
-     */
-    virtual void LogicInvalidate(const tools::Rectangle* /*pRectangle*/) {}
-
 private:
 
     /** Convert a logical X coordinate to a device pixel's X coordinate.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index e6a56466d6e6..ddc9ae0408a5 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1074,7 +1074,12 @@ public:
     virtual void                        Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE );
     virtual void                        Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE );
     virtual void                        Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE );
-    virtual void                        LogicInvalidate(const tools::Rectangle* pRectangle) override;
+    /**
+     * Notification about some rectangle of the output device got invalidated.
+     *
+     * @param pRectangle If 0, that means the whole area, otherwise the area in logic coordinates.
+     */
+    virtual void                        LogicInvalidate(const tools::Rectangle* pRectangle);
     void                                Validate();
     bool                                HasPaintEvent() const;
     void                                Update();
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 2788f3574be0..958dc7849691 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -325,7 +325,7 @@ public:
                                int nTilePosX, int nTilePosY,
                                long nTileWidth, long nTileHeight );
 
-    /// @see OutputDevice::LogicInvalidate().
+    /// @see Window::LogicInvalidate().
     void LogicInvalidate(const tools::Rectangle* pRectangle) override;
 
     /// Update the cell selection according to what handles have been dragged.
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index d03890f6f491..806cfa399e09 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -191,7 +191,7 @@ protected:
 
     OUString GetSurroundingText() const override;
     Selection GetSurroundingTextSelection() const override;
-    /// @see OutputDevice::LogicInvalidate().
+    /// @see Window::LogicInvalidate().
     void LogicInvalidate(const ::tools::Rectangle* pRectangle) override;
     /// Same as MouseButtonDown(), but coordinates are in logic unit.
     virtual void LogicMouseButtonDown(const MouseEvent& rMouseEvent) override;
diff --git a/sw/source/uibase/docvw/SidebarScrollBar.hxx b/sw/source/uibase/docvw/SidebarScrollBar.hxx
index 68960d866605..355bd16371eb 100644
--- a/sw/source/uibase/docvw/SidebarScrollBar.hxx
+++ b/sw/source/uibase/docvw/SidebarScrollBar.hxx
@@ -34,7 +34,7 @@ class SidebarScrollBar : public ScrollBar
     SwView& m_rView;
 
 protected:
-    /// @see OutputDevice::LogicInvalidate().
+    /// @see Window::LogicInvalidate().
     void LogicInvalidate(const tools::Rectangle* pRectangle) override;
     void MouseMove(const MouseEvent& rMouseEvent) override;
     void MouseButtonUp(const MouseEvent& rMouseEvent) override;
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index 7c13e62d93ab..6df1feef37d5 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -41,7 +41,7 @@ class SidebarTextControl : public Control
 
     protected:
         virtual void    Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
-        /// @see OutputDevice::LogicInvalidate().
+        /// @see Window::LogicInvalidate().
         void LogicInvalidate(const tools::Rectangle* pRectangle) override;
         virtual void    Command( const CommandEvent& rCEvt ) override;
         virtual void    LoseFocus() override;
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 71e3f9a7b34d..ee00d4e95371 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -281,7 +281,7 @@ public:
 
     virtual void    Command( const CommandEvent& rCEvt ) override;
 
-    /// @see OutputDevice::LogicInvalidate().
+    /// @see Window::LogicInvalidate().
     void LogicInvalidate(const tools::Rectangle* pRectangle) override;
     /// Same as MouseButtonDown(), but coordinates are in logic unit.
     virtual void LogicMouseButtonDown(const MouseEvent& rMouseEvent) override;