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

Stephan Bergmann sbergman at redhat.com
Wed May 13 00:33:47 PDT 2015


 include/svx/swframeexample.hxx       |    1 -
 svx/source/dialog/swframeexample.cxx |   22 ++++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit b7b0035c5f1267da8c178ebc9a48415cbb3feb0c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 13 09:32:50 2015 +0200

    loplugin:staticmethods
    
    Change-Id: Ia16605c8227573948e2ac750414e9dff3efc2f81

diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index 5a813c7..13c40fe 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -66,7 +66,6 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
     void CalcBoundRect_Impl(Rectangle &rRect);
     Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, const Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor);
 
-    void DrawRect_Impl(vcl::RenderContext& rRenderContext, const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor);
     virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
 protected:
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 2ed2c18..e316381 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -35,6 +35,18 @@ using namespace ::com::sun::star::text;
 #define FLYINFLY_BORDER 3
 #define DEMOTEXT        "Ij"
 
+namespace {
+
+void DrawRect_Impl(vcl::RenderContext& rRenderContext, const Rectangle &rRect,
+                   const Color &rFillColor, const Color &rLineColor)
+{
+    rRenderContext.SetFillColor(rFillColor);
+    rRenderContext.SetLineColor(rLineColor);
+    rRenderContext.DrawRect(rRect);
+}
+
+}
+
 SvxSwFrameExample::SvxSwFrameExample( vcl::Window *pParent, WinBits nStyle ) :
 
     Window(pParent, nStyle),
@@ -705,14 +717,4 @@ void SvxSwFrameExample::SetRelPos(const Point& rP)
         aRelPos.Y() = -5;
 }
 
-void SvxSwFrameExample::DrawRect_Impl(vcl::RenderContext& rRenderContext, const Rectangle &rRect,
-                                      const Color &rFillColor, const Color &rLineColor)
-{
-    rRenderContext.SetFillColor(rFillColor);
-    rRenderContext.SetLineColor(rLineColor);
-    rRenderContext.DrawRect(rRect);
-}
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list