weld SwFramePage

Change-Id: I12f868611860867df26bd29474aa19189c2b9a96
Reviewed-on: https://gerrit.libreoffice.org/63818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 4 insertions, 60 deletions

diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index ddcc5961b95a..814f0d84aa22 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -27,7 +27,7 @@
 #include <vcl/window.hxx>
 #include <com/sun/star/text/WrapTextMode.hpp>
 
-class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
+class SVX_DLLPUBLIC SwFrameExample : public weld::CustomWidgetController
 {
     Color       m_aTransColor;      ///< transparency
     Color       m_aBgCol;           ///< background
@@ -63,65 +63,6 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
 
     void InitColors_Impl();
     void InitAllRects_Impl(vcl::RenderContext& rRenderContext);
-    void CalcBoundRect_Impl(tools::Rectangle &rRect);
-    tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor);
-
-    virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
-    virtual Size GetOptimalSize() const override;
-protected:
-    virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
-public:
-
-    SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle);
-
-    void SetWrap(css::text::WrapTextMode nW) { nWrap     = nW; }
-
-    void SetHAlign(short nH)          { nHAlign   = nH; }
-    void SetHoriRel(short nR)         { nHRel     = nR; }
-
-    void SetVAlign(short nV)          { nVAlign   = nV; }
-    void SetVertRel(short nR)         { nVRel     = nR; }
-
-    void SetTransparent(bool bT)      { bTrans    = bT; }
-    void SetAnchor(RndStdIds nA) { nAnchor   = nA; }
-
-    void SetRelPos(const Point& rP);
-};
-
-class SVX_DLLPUBLIC SwFrameExample : public weld::CustomWidgetController
-{
-    Color       m_aTransColor;      ///< transparency
-    Color       m_aBgCol;           ///< background
-    Color       m_aFrameColor;      ///< graphic frame
-    Color       m_aAlignColor;      ///< align anchor
-    Color       m_aBorderCol;       ///< frame of doc
-    Color       m_aPrintAreaCol;    ///< frame of printable area of doc
-    Color       m_aTxtCol;          ///< symbolised text
-    Color       m_aBlankCol;        ///< area of symbol for blank
-    Color       m_aBlankFrameCol;   ///< frame of symbol for blank
-
-    tools::Rectangle   aPage;
-    tools::Rectangle   aPagePrtArea;
-    tools::Rectangle   aTextLine;
-    tools::Rectangle   aPara;
-    tools::Rectangle   aParaPrtArea;
-    tools::Rectangle   aFrameAtFrame;
-    tools::Rectangle   aDrawObj;
-    tools::Rectangle   aAutoCharFrame;
-    Size        aFrmSize;
-
-    short       nHAlign;
-    short       nHRel;
-
-    short       nVAlign;
-    short       nVRel;
-
-    RndStdIds   nAnchor;
-
-    Point       aRelPos;
-
-    void InitColors_Impl();
-    void InitAllRects_Impl(vcl::RenderContext& rRenderContext);
     void CalcBoundRect_Impl(vcl::RenderContext& rRenderContext, tools::Rectangle &rRect);
     tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor);
 
@@ -133,12 +74,15 @@ public:
 
     virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
 
+    void SetWrap(css::text::WrapTextMode nW) { nWrap     = nW; }
+
     void SetHAlign(short nH)          { nHAlign   = nH; }
     void SetHoriRel(short nR)         { nHRel     = nR; }
 
     void SetVAlign(short nV)          { nVAlign   = nV; }
     void SetVertRel(short nR)         { nVRel     = nR; }
 
+    void SetTransparent(bool bT)      { bTrans    = bT; }
     void SetAnchor(RndStdIds nA) { nAnchor   = nA; }
 
     void SetRelPos(const Point& rP);