summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-04-28 11:00:54 +0900
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-04-29 09:19:47 +0900
commitf50fd9692ed7b9632c0f8dad9508f5a207679be4 (patch)
tree50c9598cb186708215899b45c43623447b7b60ff /sw
parentd36da8c19378f4772c896ca4df94117077e823d6 (diff)
mass rewrite Paint(Rect&) to Paint(RenderContext&, Rect&)
Change-Id: Ia1667246064d11827dbd149def15e5bf08b119b8
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/SidebarWin.hxx2
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx4
-rw-r--r--sw/source/ui/config/optload.cxx2
-rw-r--r--sw/source/ui/config/optpage.cxx2
-rw-r--r--sw/source/ui/envelp/envlop1.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.hxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx2
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/table/tautofmt.cxx4
-rw-r--r--sw/source/uibase/dbui/mailmergehelper.cxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.cxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.hxx2
-rw-r--r--sw/source/uibase/docvw/DashedLine.cxx2
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx2
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx2
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx2
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.hxx2
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx2
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx2
-rw-r--r--sw/source/uibase/frmdlg/colex.cxx2
-rw-r--r--sw/source/uibase/inc/DashedLine.hxx2
-rw-r--r--sw/source/uibase/inc/HeaderFooterWin.hxx2
-rw-r--r--sw/source/uibase/inc/PageBreakWin.hxx2
-rw-r--r--sw/source/uibase/inc/bmpwin.hxx2
-rw-r--r--sw/source/uibase/inc/colex.hxx2
-rw-r--r--sw/source/uibase/inc/edtwin.hxx2
-rw-r--r--sw/source/uibase/inc/envlop.hxx2
-rw-r--r--sw/source/uibase/inc/mailmergehelper.hxx2
-rw-r--r--sw/source/uibase/inc/numprevw.hxx2
-rw-r--r--sw/source/uibase/inc/optload.hxx2
-rw-r--r--sw/source/uibase/inc/optpage.hxx2
-rw-r--r--sw/source/uibase/inc/pview.hxx2
-rw-r--r--sw/source/uibase/inc/srcedtw.hxx2
-rw-r--r--sw/source/uibase/inc/swruler.hxx2
-rw-r--r--sw/source/uibase/misc/swruler.cxx2
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
38 files changed, 40 insertions, 40 deletions
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index e660b9bcc7c4..8790c623ac50 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -182,7 +182,7 @@ class SwSidebarWin : public vcl::Window
protected:
virtual void DataChanged( const DataChangedEvent& aEvent) SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
- virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
virtual VclPtr<MenuButton> CreateMenuButton() = 0;
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index cd402d033ad0..0e024ab3cac6 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -91,7 +91,7 @@ class SwDropCapsPict : public Control
Size maTextSize;
Reference< css::i18n::XBreakIterator > xBreak;
- virtual void Paint(const Rectangle &rRect) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) SAL_OVERRIDE;
void CheckScript();
Size CalcTextSize();
inline void InitPrinter();
@@ -345,7 +345,7 @@ void SwDropCapsPict::UpdatePaintSettings()
Invalidate();
}
-void SwDropCapsPict::Paint(const Rectangle &/*rRect*/)
+void SwDropCapsPict::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*rRect*/)
{
if (!IsVisible())
return;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 0ce66ad8b874..87ba77f90ebb 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -425,7 +425,7 @@ Size SwCaptionPreview::GetOptimalSize() const
return LogicToPixel(Size(106 , 20), MapMode(MAP_APPFONT));
}
-void SwCaptionPreview::Paint( const Rectangle& rRect )
+void SwCaptionPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
Window::Paint( rRect );
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 8a595b87285f..287429ba43e6 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1647,7 +1647,7 @@ void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt )
InitColors();
}
-void SwMarkPreview::Paint(const Rectangle &/*rRect*/)
+void SwMarkPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*rRect*/)
{
const Size aSz(GetOutputSizePixel());
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index d0fcedae9073..e6072f718899 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -69,7 +69,7 @@ void SwEnvPreview::DataChanged( const DataChangedEvent& rDCEvt )
SetBackground( GetSettings().GetStyleSettings().GetDialogColor() );
}
-void SwEnvPreview::Paint(const Rectangle &)
+void SwEnvPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &)
{
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 646da3d044b4..92e77b99effd 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -89,7 +89,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwLabPreview(vcl::Wind
return new SwLabPreview(pParent);
}
-void SwLabPreview::Paint(const Rectangle &)
+void SwLabPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &)
{
const Size aSz(GetOutputSizePixel());
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index d35833a7122b..c81acc1b2180 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -54,7 +54,7 @@ class SwLabPreview : public vcl::Window
SwLabItem aItem;
- virtual void Paint(const Rectangle&) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index aa7f9d67f1b7..1f357799563a 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2666,7 +2666,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBmpWindow(vcl::Window
return new BmpWindow(pParent, 0);
}
-void BmpWindow::Paint( const Rectangle& )
+void BmpWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
Point aPntPos;
Size aPntSz( GetSizePixel() );
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index c66b86947e80..f2a15a30cad9 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -927,7 +927,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumberingPreview(vcl::
}
// paint numbering's preview
-void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
+void NumberingPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
{
const Size aSize(PixelToLogic(GetOutputSizePixel()));
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 36a0cccf0061..a60439cd3ec0 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -57,7 +57,7 @@ public:
virtual void Resize() SAL_OVERRIDE;
protected:
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
private:
SwTableAutoFmt aCurData;
@@ -924,7 +924,7 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ )
aVD->SetDrawMode( nOldDrawMode );
}
-void AutoFmtPreview::Paint( const Rectangle& rRect )
+void AutoFmtPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
DoPaint( rRect );
}
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 8f7baa658f91..e3cbddea71e0 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -315,7 +315,7 @@ void SwAddressPreview::UpdateScrollBar()
}
}
-void SwAddressPreview::Paint(const Rectangle&)
+void SwAddressPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&)
{
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
SetFillColor(rSettings.GetWindowColor());
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 14c486369ca8..cfa3dc38b1ab 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -120,7 +120,7 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt )
MenuButton::MouseButtonDown( rMEvt );
}
-void AnnotationMenuButton::Paint( const Rectangle& /*rRect*/ )
+void AnnotationMenuButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
{
if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
SetFillColor(COL_BLACK);
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
index 9682bcf491fe..a7c1df80a11f 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
@@ -40,7 +40,7 @@ class AnnotationMenuButton : public MenuButton
// override vcl::Window methods
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
private:
diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx
index f7104cbccb46..8dc146cc88ae 100644
--- a/sw/source/uibase/docvw/DashedLine.cxx
+++ b/sw/source/uibase/docvw/DashedLine.cxx
@@ -29,7 +29,7 @@ SwDashedLine::~SwDashedLine( )
{
}
-void SwDashedLine::Paint( const Rectangle& )
+void SwDashedLine::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 61dcbd21964e..78d24ba09cb7 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -262,7 +262,7 @@ bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const
return false;
}
-void SwHeaderFooterWin::Paint( const Rectangle& )
+void SwHeaderFooterWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
const Rectangle aRect( Rectangle( Point( 0, 0 ), PixelToLogic( GetSizePixel() ) ) );
drawinglayer::primitive2d::Primitive2DSequence aSeq( 3 );
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index d806eb332395..23b5902bc906 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -135,7 +135,7 @@ void SwPageBreakWin::dispose()
MenuButton::dispose();
}
-void SwPageBreakWin::Paint( const Rectangle& )
+void SwPageBreakWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
const Rectangle aRect( Rectangle( Point( 0, 0 ), PixelToLogic( GetSizePixel() ) ) );
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index fcb3eb65e4c7..e43bb81fe90c 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -151,7 +151,7 @@ void SidebarTxtControl::Draw(OutputDevice* pDev, const Point& rPt, const Size& r
}
}
-void SidebarTxtControl::Paint( const Rectangle& rRect)
+void SidebarTxtControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
{
if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
{
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index 4bd1fe89b7d8..a8e873e2736b 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -39,7 +39,7 @@ class SidebarTxtControl : public Control
SwPostItMgr& mrPostItMgr;
protected:
- virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index d9485d76dda2..4a53ece0428f 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -208,7 +208,7 @@ void SwSidebarWin::dispose()
vcl::Window::dispose();
}
-void SwSidebarWin::Paint( const Rectangle& rRect)
+void SwSidebarWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
{
Window::Paint(rRect);
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 7801d589559a..1b69c0aebee9 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -444,7 +444,7 @@ void SwEditWin::PrePaint()
}
}
-void SwEditWin::Paint(const Rectangle& rRect)
+void SwEditWin::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
{
SwWrtShell* pWrtShell = GetView().GetWrtShellPtr();
if(!pWrtShell)
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 5d2dac64c01f..cd66ace9bb49 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -479,7 +479,7 @@ void TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
}
}
-void TextViewOutWin::Paint( const Rectangle& rRect )
+void TextViewOutWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
pTextView->Paint( rRect );
}
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index 2c5df5343023..829457655579 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -348,7 +348,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwColumnOnlyExample(vc
return new SwColumnOnlyExample(pParent);
}
-void SwColumnOnlyExample::Paint( const Rectangle& /*rRect*/ )
+void SwColumnOnlyExample::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
const Color& rFieldColor = rStyleSettings.GetFieldColor();
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx
index 4ab2efaa91fa..42367941edf9 100644
--- a/sw/source/uibase/inc/DashedLine.hxx
+++ b/sw/source/uibase/inc/DashedLine.hxx
@@ -22,7 +22,7 @@ public:
SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() );
virtual ~SwDashedLine( );
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index 32e30f5cc70b..76241f648c98 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -35,7 +35,7 @@ public:
void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd );
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Select( ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index d1b048fbc1a3..ab18dd86c4d9 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -37,7 +37,7 @@ public:
virtual ~SwPageBreakWin( );
virtual void dispose() SAL_OVERRIDE;
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
virtual void Select( ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Activate( ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx
index e18d636052e6..c1f80e8e2af9 100644
--- a/sw/source/uibase/inc/bmpwin.hxx
+++ b/sw/source/uibase/inc/bmpwin.hxx
@@ -36,7 +36,7 @@ private:
bool bGraphic : 1;
bool bLeftAlign : 1;
- virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index 638b3c78ab2a..39a677bae422 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.hxx
@@ -95,7 +95,7 @@ private:
SwFmtCol m_aCols;
protected:
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
public:
SwColumnOnlyExample(vcl::Window*);
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index aaf06adaa854..3bdf785cf1b3 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -188,7 +188,7 @@ protected:
virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
virtual void PrePaint() SAL_OVERRIDE;
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 962dd8ca8dd1..fd4691a66453 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -42,7 +42,7 @@ class Printer;
class SwEnvPreview : public vcl::Window
{
- void Paint(const Rectangle&) SAL_OVERRIDE;
+ void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
public:
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index deb715c98e79..e13634dc04a7 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window
void DrawText_Impl( const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected);
- virtual void Paint(const Rectangle&) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx
index bec5210fa7ce..175bed1573bc 100644
--- a/sw/source/uibase/inc/numprevw.hxx
+++ b/sw/source/uibase/inc/numprevw.hxx
@@ -35,7 +35,7 @@ class NumberingPreview : public vcl::Window
sal_uInt16 nActLevel;
protected:
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
public:
NumberingPreview(vcl::Window* pParent, const ResId& rResId)
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 8c873f184bd0..4f5e10d147c5 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -100,7 +100,7 @@ public:
SwCaptionPreview( vcl::Window* pParent, WinBits nStyle );
void Init();
void SetPreviewText( const OUString& rText );
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
};
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index efe7ebda59e4..fa8901d40d0e 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -313,7 +313,7 @@ class SwMarkPreview : public vcl::Window
using OutputDevice::DrawRect;
void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor);
- void Paint(const Rectangle&) SAL_OVERRIDE;
+ void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
void PaintPage(const Rectangle &rRect);
void InitColors();
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index fc29eeb74910..58990911a55d 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -64,7 +64,7 @@ public:
virtual ~SwPagePreviewWin();
// calls SwViewShell::Paint
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent & ) SAL_OVERRIDE;
virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index 8e1a411c645a..823e3cd28a68 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -43,7 +43,7 @@ class TextViewOutWin : public vcl::Window
ExtTextView* pTextView;
protected:
- virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx
index 7e57c2abe0ae..35938f1cebf3 100644
--- a/sw/source/uibase/inc/swruler.hxx
+++ b/sw/source/uibase/inc/swruler.hxx
@@ -40,7 +40,7 @@ public:
* Paint the ruler.
* \param rRect ignored
*/
- virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
protected:
SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index db2adb767018..1e1fdea90dc3 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -60,7 +60,7 @@ void SwCommentRuler::dispose()
SvxRuler::dispose();
}
-void SwCommentRuler::Paint( const Rectangle& rRect )
+void SwCommentRuler::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
SvxRuler::Paint( rRect );
// Don't draw if there is not any note
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index ac5a8f4e7cef..373026005082 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -210,7 +210,7 @@ SwPagePreviewWin::~SwPagePreviewWin()
{
}
-void SwPagePreviewWin::Paint( const Rectangle& rRect )
+void SwPagePreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
if( !mpViewShell || !mpViewShell->GetLayout() )
return;