refactor optload / optpage to use RenderContext

Change-Id: I6b4897230963ecde335c5a04b1e34c8ca02d654c

sw/source/ui/config/optload.cxx

@@ -63,8 +63,7 @@ using namespace ::com::sun::star;
 #include <svl/eitem.hxx>
 
 SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "OptGeneralPage",
-        "modules/swriter/ui/optgeneralpage.ui", &rSet)
+    : SfxTabPage(pParent, "OptGeneralPage", "modules/swriter/ui/optgeneralpage.ui", &rSet)
     , m_pWrtShell(NULL)
     , m_nLastTab(0)
     , m_nOldLinkMode(MANUAL)
@@ -107,7 +106,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_pMetricLB->SetSelectHdl(LINK(this, SwLoadOptPage, MetricHdl));
 
     const SfxPoolItem* pItem;
-    if(SfxItemState::SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem )
+    if (SfxItemState::SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem)
         && static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON)
     {
         m_pTabFT->Hide();
@@ -382,8 +381,9 @@ SwCaptionOptDlg::SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet)
     SetTabPage(SwCaptionOptPage::Create(get_content_area(), &rSet));
 }
 
-SwCaptionPreview::SwCaptionPreview( vcl::Window* pParent, WinBits nStyle )
-    : Window( pParent, nStyle )
+SwCaptionPreview::SwCaptionPreview(vcl::Window* pParent, WinBits nStyle)
+    : Window(pParent, nStyle)
+    , mbFontInitialized(false)
 {
     Init();
 }
@@ -399,21 +399,30 @@ VCL_BUILDER_DECL_FACTORY(SwCaptionPreview)
 
 void SwCaptionPreview::Init()
 {
-    maDrawPos = Point( 4, 6 );
+    maDrawPos = Point(4, 6);
+}
+
+void SwCaptionPreview::ApplySettings(vcl::RenderContext& rRenderContext)
+{
+    Wallpaper aBack(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
+    rRenderContext.SetBackground(aBack);
+    rRenderContext.SetFillColor(aBack.GetColor());
+    rRenderContext.SetLineColor(aBack.GetColor());
 
-    Wallpaper   aBack( GetSettings().GetStyleSettings().GetWindowColor() );
-    SetBackground( aBack );
-    SetFillColor( aBack.GetColor() );
-    SetLineColor( aBack.GetColor() );
-    SetBorderStyle( WindowBorderStyle::MONO );
-    vcl::Font aFont(GetFont());
-    aFont.SetHeight(aFont.GetHeight() * 120 / 100 );
-    SetFont(aFont);
+    if (!mbFontInitialized)
+    {
+        maFont = vcl::Font(rRenderContext.GetFont());
+        maFont.SetHeight(maFont.GetHeight() * 120 / 100);
+        mbFontInitialized = true;
+    }
+    rRenderContext.SetFont(maFont);
+
+    SetBorderStyle(WindowBorderStyle::MONO);
 }
 
-void SwCaptionPreview::SetPreviewText( const OUString& rText )
+void SwCaptionPreview::SetPreviewText(const OUString& rText)
 {
-    if( rText != maText )
+    if (rText != maText)
     {
         maText = rText;
         Invalidate();
@@ -429,11 +438,11 @@ void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle
 {
     Window::Paint(rRenderContext, rRect);
 
-    DrawRect( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
-    DrawText( Point( 4, 6 ), maText );
+    rRenderContext.DrawRect(Rectangle(Point(0, 0), GetSizePixel()));
+    rRenderContext.DrawText(Point(4, 6), maText);
 }
 
-SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet )
+SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", &rSet)
     , m_sSWTable(SW_RESSTR(STR_CAPTION_TABLE))
     , m_sSWFrame(SW_RESSTR(STR_CAPTION_FRAME))
@@ -466,15 +475,12 @@ SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet
     get(m_pCharStyleLB, "charstyle");
     get(m_pApplyBorderCB, "applyborder");
 
-    Wallpaper   aBack( GetSettings().GetStyleSettings().GetWindowColor() );
-    m_pPreview->SetBackground( aBack );
-
     SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_ABB, m_sIllustration);
     SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_TABLE, m_sTable);
     SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FRAME, m_sText);
     SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_DRAWING, m_sDrawing);
 
-    SwWrtShell *pSh = ::GetActiveWrtShell();
+    SwWrtShell* pSh = ::GetActiveWrtShell();
 
     // m_pFormatBox
     sal_uInt16 nSelFmt = SVX_NUM_ARABIC;
@@ -839,19 +845,19 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl)
     m_pTextText->Enable(bEnable);
     m_pTextEdit->Enable(bEnable);
 
-    DrawSample();
+    InvalidatePreview();
     return 0;
 }
 
 IMPL_LINK_NOARG(SwCaptionOptPage, SelectHdl)
 {
-    DrawSample();
+    InvalidatePreview();
     return 0;
 }
 
 IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
 {
-    DrawSample();
+    InvalidatePreview();
 
     SvTreeListEntry* pSelEntry = m_pCheckLB->FirstSelected();
     bool bChecked = false;
@@ -866,7 +872,7 @@ IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
     return 0;
 }
 
-void SwCaptionOptPage::DrawSample()
+void SwCaptionOptPage::InvalidatePreview()
 {
     OUString aStr;
 
@@ -924,13 +930,13 @@ void SwCaptionOptPage::DrawSample()
         }
         aStr += m_pTextEdit->GetText();
     }
-    m_pPreview->SetPreviewText( aStr );
+    m_pPreview->SetPreviewText(aStr);
 }
 
 // Description: ComboBox without Spaces
 void CaptionComboBox::KeyInput(const KeyEvent& rEvt)
 {
-    if( rEvt.GetKeyCode().GetCode() != KEY_SPACE )
+    if (rEvt.GetKeyCode().GetCode() != KEY_SPACE)
         SwComboBox::KeyInput(rEvt);
 }
 

sw/source/ui/config/optpage.cxx

@@ -1643,9 +1643,9 @@ void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt )
         InitColors();
 }
 
-void SwMarkPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*rRect*/)
+void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &/*rRect*/)
 {
-    const Size aSz(GetOutputSizePixel());
+    const Size aSz(rRenderContext.GetOutputSizePixel());
 
     // Page
     aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3));
@@ -1670,19 +1670,19 @@ void SwMarkPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangl
     // draw shadow
     Rectangle aShadow(aPage);
     aShadow += Point(3, 3);
-    DrawRect( aShadow, m_aShadowCol, m_aTransCol );
+    DrawRect(rRenderContext, aShadow, m_aShadowCol, m_aTransCol);
 
     // draw page
-    DrawRect( aPage, m_aBgCol, m_aLineCol );
+    DrawRect(rRenderContext, aPage, m_aBgCol, m_aLineCol);
 
     // draw separator
     Rectangle aPageSeparator(aPage);
     aPageSeparator.SetSize(Size(2, aPageSeparator.GetHeight()));
     aPageSeparator.Move(aPage.GetWidth() / 2 - 1, 0);
-    DrawRect( aPageSeparator, m_aLineCol, m_aTransCol );
+    DrawRect(rRenderContext, aPageSeparator, m_aLineCol, m_aTransCol);
 
-    PaintPage(aLeftPagePrtArea);
-    PaintPage(aRightPagePrtArea);
+    PaintPage(rRenderContext, aLeftPagePrtArea);
+    PaintPage(rRenderContext, aRightPagePrtArea);
 
     Rectangle aLeftMark(Point(aPage.Left() + 2, aLeftPagePrtArea.Top() + 4), Size(aLeftPagePrtArea.Left() - 4, 2));
     Rectangle aRightMark(Point(aRightPagePrtArea.Right() + 2, aRightPagePrtArea.Bottom() - 6), Size(aLeftPagePrtArea.Left() - 4, 2));
@@ -1709,14 +1709,14 @@ void SwMarkPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangl
         default:
             return;
     }
-    DrawRect( aLeftMark, m_aMarkCol, m_aTransCol );
-    DrawRect( aRightMark, m_aMarkCol, m_aTransCol );
+    DrawRect(rRenderContext, aLeftMark, m_aMarkCol, m_aTransCol);
+    DrawRect(rRenderContext, aRightMark, m_aMarkCol, m_aTransCol);
 }
 
-void SwMarkPreview::PaintPage(const Rectangle &rRect)
+void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const Rectangle &rRect)
 {
     // draw PrintArea
-    DrawRect(rRect, m_aTransCol, m_aPrintAreaCol );
+    DrawRect(rRenderContext, rRect, m_aTransCol, m_aPrintAreaCol);
 
     // draw Testparagraph
     sal_uLong nLTxtBorder = 4;
@@ -1739,18 +1739,18 @@ void SwMarkPreview::PaintPage(const Rectangle &rRect)
             aTextLine.SetSize(Size(aTextLine.GetWidth() / 2, aTextLine.GetHeight()));
 
         if (aPage.IsInside(aTextLine))
-            DrawRect(aTextLine, m_aTxtCol, m_aTransCol );
+            DrawRect(rRenderContext, aTextLine, m_aTxtCol, m_aTransCol);
 
         aTextLine.Move(0, nStep);
     }
     aTextLine.Move(0, -nStep);
 }
 
-void SwMarkPreview::DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor)
+void SwMarkPreview::DrawRect(vcl::RenderContext& rRenderContext, const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor)
 {
-    SetFillColor(rFillColor);
-    SetLineColor(rLineColor);
-    Window::DrawRect(rRect);
+    rRenderContext.SetFillColor(rFillColor);
+    rRenderContext.SetLineColor(rLineColor);
+    rRenderContext.DrawRect(rRect);
 }
 
 Size SwMarkPreview::GetOptimalSize() const

sw/source/uibase/inc/optload.hxx

@@ -95,10 +95,13 @@ class SwCaptionPreview : public vcl::Window
 {
 private:
     OUString maText;
-    Point    maDrawPos;
+    bool mbFontInitialized;
+    vcl::Font maFont;
+    Point maDrawPos;
 public:
-    SwCaptionPreview( vcl::Window* pParent, WinBits nStyle );
+    SwCaptionPreview(vcl::Window* pParent, WinBits nStyle);
     void Init();
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext);
     void SetPreviewText( const OUString& rText );
     virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
@@ -130,25 +133,25 @@ private:
     VclPtr<ListBox>          m_pCharStyleLB;
     VclPtr<CheckBox>         m_pApplyBorderCB;
 
-    OUString        m_sSWTable;
-    OUString        m_sSWFrame;
-    OUString        m_sSWGraphic;
-    OUString        m_sOLE;
+    OUString m_sSWTable;
+    OUString m_sSWFrame;
+    OUString m_sSWGraphic;
+    OUString m_sOLE;
 
-    OUString        m_sIllustration;
-    OUString        m_sTable;
-    OUString        m_sText;
-    OUString        m_sDrawing;
+    OUString m_sIllustration;
+    OUString m_sTable;
+    OUString m_sText;
+    OUString m_sDrawing;
 
-    OUString        m_sBegin;
-    OUString        m_sEnd;
-    OUString        m_sAbove;
-    OUString        m_sBelow;
+    OUString m_sBegin;
+    OUString m_sEnd;
+    OUString m_sAbove;
+    OUString m_sBelow;
 
-    OUString        m_sNone;
+    OUString m_sNone;
 
-    SwFldMgr        *pMgr;
-    bool            bHTMLMode;
+    SwFldMgr* pMgr;
+    bool bHTMLMode;
 
     DECL_LINK(SelectHdl, void *);
     DECL_LINK(ModifyHdl, void * = 0);
@@ -156,12 +159,10 @@ private:
     DECL_LINK(ShowEntryHdl, void *);
     DECL_LINK(SaveEntryHdl, void *);
 
-    void                DelUserData();
-    void                SetOptions( const sal_uLong nPos,
-                                    const SwCapObjType eType,
-                                    const SvGlobalName *pOleId = 0);
-    void                SaveEntry( SvTreeListEntry* pEntry );
-    void                DrawSample();
+    void DelUserData();
+    void SetOptions(const sal_uLong nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0);
+    void SaveEntry(SvTreeListEntry* pEntry);
+    void InvalidatePreview();
 
 public:
                         SwCaptionOptPage( vcl::Window* pParent,