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

Miklos Vajna vmiklos at collabora.co.uk
Wed Mar 16 08:43:20 UTC 2016


 sw/source/core/inc/frame.hxx       |    3 +--
 sw/source/core/layout/paintfrm.cxx |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f87317c3264b6aecfb6b7dcf99fa1783d79d9605
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Mar 16 09:09:25 2016 +0100

    SwFrame::Retouche() -> Retouch() rename
    
    Change-Id: I2a93358c64f831a3dd014942c900b7ae46a3836f
    Reviewed-on: https://gerrit.libreoffice.org/23290
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 81faabb..f9c0e43 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -392,9 +392,8 @@ public:
     drawinglayer::processor2d::BaseProcessor2D * CreateProcessor2D( ) const;
     void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DContainer& rSequence ) const;
 
-    // FIXME: EasyHack (refactoring): rename method name in all files
     // retouch, not in the area of the given Rect!
-    void Retouche( const SwPageFrame *pPage, const SwRect &rRect ) const;
+    void Retouch( const SwPageFrame *pPage, const SwRect &rRect ) const;
 
     bool GetBackgroundBrush(
         drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes,
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index b03146e..5c3b1fd 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3635,7 +3635,7 @@ void SwLayoutFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec
             if ( pFrame->IsRetoucheFrame() && bWin && !pFrame->GetNext() )
             {   if ( !pPage )
                     pPage = FindPageFrame();
-               pFrame->Retouche( pPage, rRect );
+               pFrame->Retouch( pPage, rRect );
             }
             pFrame->ResetRetouche();
         }
@@ -7386,7 +7386,7 @@ const vcl::Font& SwPageFrame::GetEmptyPageFont()
  * The whole area of the upper which is located below the Frame will be
  * cleared using PaintBackground.
  */
-void SwFrame::Retouche( const SwPageFrame * pPage, const SwRect &rRect ) const
+void SwFrame::Retouch( const SwPageFrame * pPage, const SwRect &rRect ) const
 {
     if ( gProp.bSFlyMetafile )
         return;


More information about the Libreoffice-commits mailing list