summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/_bmpmask.cxx4
-rw-r--r--svx/source/dialog/charmap.cxx2
-rw-r--r--svx/source/dialog/connctrl.cxx2
-rw-r--r--svx/source/dialog/contwnd.cxx2
-rw-r--r--svx/source/dialog/contwnd.hxx2
-rw-r--r--svx/source/dialog/dialcontrol.cxx2
-rw-r--r--svx/source/dialog/dlgctl3d.cxx4
-rw-r--r--svx/source/dialog/dlgctrl.cxx10
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/frmsel.cxx2
-rw-r--r--svx/source/dialog/graphctl.cxx2
-rw-r--r--svx/source/dialog/measctrl.cxx2
-rw-r--r--svx/source/dialog/pagectrl.cxx2
-rw-r--r--svx/source/dialog/paraprev.cxx2
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/dialog/swframeexample.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/gallery2/galctrl.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthControl.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthControl.hxx2
-rw-r--r--svx/source/sidebar/tools/PopupControl.cxx2
-rw-r--r--svx/source/tbxctrls/layctrl.cxx8
-rw-r--r--svx/workben/pixelctl.cxx4
23 files changed, 33 insertions, 33 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 8588f9862428..0ae2ed0c9bd6 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -74,7 +74,7 @@ public:
Invalidate();
}
- 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
{
@@ -321,7 +321,7 @@ IMPL_LINK_NOARG(MaskData, ExecHdl)
return 0L;
}
-void ColorWindow::Paint( const Rectangle &/*Rect*/ )
+void ColorWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*Rect*/ )
{
const Color& rOldLineColor = GetLineColor();
const Color& rOldFillColor = GetFillColor();
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 9071e536139a..26508ad425e9 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -318,7 +318,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt )
-void SvxShowCharSet::Paint( const Rectangle& )
+void SvxShowCharSet::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
DrawChars_Impl( FirstInView(), LastInView() );
}
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 3db87d5b7564..47772831534c 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -207,7 +207,7 @@ void SvxXConnectionPreview::Construct()
AdaptSize();
}
-void SvxXConnectionPreview::Paint( const Rectangle& )
+void SvxXConnectionPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
if( pObjList )
{
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 8b4fded5ab8b..2b238fdafc24 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -217,7 +217,7 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt)
GraphCtrl::MouseButtonUp( rMEvt );
}
-void ContourWindow::Paint( const Rectangle& rRect )
+void ContourWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
// #i75482#
// encapsulate the redraw using Begin/End and use the returned
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index e96118c8527c..6937bf9fd8ab 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -42,7 +42,7 @@ protected:
virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
virtual void SdrObjCreated( const SdrObject& rObj ) SAL_OVERRIDE;
virtual void InitSdrModel() SAL_OVERRIDE;
- 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;
void CreatePolyPolygon();
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 0735098c3cae..7900913aacaa 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -278,7 +278,7 @@ void DialControl::Resize()
InvalidateControl();
}
-void DialControl::Paint( const Rectangle& )
+void DialControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
Point aPos;
DrawBitmapEx( aPos, mpImpl->mxBmpBuffered->GetBitmapEx( aPos, mpImpl->maWinSize ) );
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index fb4923ebd747..45428b555dff 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -166,7 +166,7 @@ void Svx3DPreviewControl::Resize()
mpScene->SetSnapRect( aRect );
}
-void Svx3DPreviewControl::Paint(const Rectangle& rRect)
+void Svx3DPreviewControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
{
mp3DView->CompleteRedraw(this, vcl::Region(rRect));
}
@@ -530,7 +530,7 @@ void Svx3DLightControl::TrySelection(Point aPosPixel)
}
}
-void Svx3DLightControl::Paint(const Rectangle& rRect)
+void Svx3DLightControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
{
Svx3DPreviewControl::Paint(rRect);
}
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 5ab4213297ce..e799033780f2 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -388,7 +388,7 @@ void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
// the control (rectangle with 9 circles)
-void SvxRectCtl::Paint( const Rectangle& )
+void SvxRectCtl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
Point aPtDiff( PixelToLogic( Point( 1, 1 ) ) );
@@ -889,7 +889,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
// Draws the Control (Rectangle with nine circles)
-void SvxPixelCtl::Paint( const Rectangle& )
+void SvxPixelCtl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
if (!aRectSize.Width() || !aRectSize.Height())
return;
@@ -2049,7 +2049,7 @@ void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet)
-void SvxXLinePreview::Paint( const Rectangle& )
+void SvxXLinePreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
LocalPrePaint();
@@ -2125,7 +2125,7 @@ void SvxXRectPreview::SetAttributes(const SfxItemSet& rItemSet)
mpRectangleObject->SetMergedItem(XLineStyleItem(drawing::LineStyle_NONE));
}
-void SvxXRectPreview::Paint( const Rectangle& )
+void SvxXRectPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
LocalPrePaint();
@@ -2198,7 +2198,7 @@ void SvxXShadowPreview::SetShadowPosition(const Point& rPos)
maShadowOffset = rPos;
}
-void SvxXShadowPreview::Paint( const Rectangle& )
+void SvxXShadowPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
LocalPrePaint();
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index feb6a20466fc..3bb540aa8ad2 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -621,7 +621,7 @@ void SvxFontPrevWindow::UseResourceText( bool bUse )
-void SvxFontPrevWindow::Paint( const Rectangle& )
+void SvxFontPrevWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
Printer* pPrinter = pImpl->pPrinter;
const SvxFont& rFont = pImpl->aFont;
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 5897a876200f..123368477466 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -1043,7 +1043,7 @@ Rectangle FrameSelector::GetClickBoundRect( FrameBorderType eBorder ) const
}
// virtual functions from base class
-void FrameSelector::Paint( const Rectangle& )
+void FrameSelector::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
mxImpl->CopyVirDevToControl();
if( HasFocus() )
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 236f046a8c69..997c3ee38e13 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -241,7 +241,7 @@ void GraphCtrl::Resize()
Invalidate();
}
-void GraphCtrl::Paint( const Rectangle& rRect )
+void GraphCtrl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
// #i72889# used splitted repaint to be able to paint an own background
// even to the buffered view
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index e2ed6e0a1016..c07f41a580a3 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -94,7 +94,7 @@ void SvxXMeasurePreview::dispose()
Control::dispose();
}
-void SvxXMeasurePreview::Paint( const Rectangle& )
+void SvxXMeasurePreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
pMeasureObj->SingleObjectPainter(*this);
}
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index d1e4c5c04232..aa9154a90ded 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -107,7 +107,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPageWindow(vcl::Win
-void SvxPageWindow::Paint(const Rectangle&)
+void SvxPageWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&)
{
Fraction aXScale(aWinSize.Width(),std::max((long)(aSize.Width() * 2 + aSize.Width() / 8),1L));
Fraction aYScale(aWinSize.Height(),std::max(aSize.Height(),1L));
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index f80d08e39d3a..523cfe4247cb 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -57,7 +57,7 @@ Size SvxParaPrevWindow::GetOptimalSize() const
-void SvxParaPrevWindow::Paint( const Rectangle& )
+void SvxParaPrevWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
DrawParagraph( true );
}
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 29d0ae7c9e39..d965b9f5743c 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -804,7 +804,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyPreview(vcl::Windo
return new RubyPreview(pParent);
}
-void RubyPreview::Paint( const Rectangle& /* rRect */ )
+void RubyPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /* rRect */ )
{
Size aWinSize = GetOutputSize();
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 964899b8c45a..5a48a357bbed 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -463,7 +463,7 @@ Rectangle SvxSwFrameExample::DrawInnerFrame_Impl(const Rectangle &rRect, const C
return aRect;
}
-void SvxSwFrameExample::Paint(const Rectangle&)
+void SvxSwFrameExample::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&)
{
InitAllRects_Impl();
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index f8fb4b43dc79..10974bf3adac 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -716,7 +716,7 @@ void DbGridControl::NavigationBar::Resize()
ArrangeControls();
}
-void DbGridControl::NavigationBar::Paint(const Rectangle& rRect)
+void DbGridControl::NavigationBar::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
{
Control::Paint(rRect);
Point aAbsolutePos = m_aAbsolute->GetPosPixel();
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 3b21ddf2f796..eb0d9b3aa0a5 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -131,7 +131,7 @@ bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl
return bRet;
}
-void GalleryPreview::Paint( const Rectangle& rRect )
+void GalleryPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
Window::Paint( rRect );
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index fd986ee94f54..35b2cf54c6f5 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -79,7 +79,7 @@ void LineWidthControl::dispose()
-void LineWidthControl::Paint(const Rectangle& rect)
+void LineWidthControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rect)
{
svx::sidebar::PopupControl::Paint(rect);
diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx
index 5af26026e92a..a1f5e43ccc0e 100644
--- a/svx/source/sidebar/line/LineWidthControl.hxx
+++ b/svx/source/sidebar/line/LineWidthControl.hxx
@@ -41,7 +41,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
- virtual void Paint(const Rectangle& rect) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect) SAL_OVERRIDE;
void SetWidthSelect( long lValue, bool bValuable, SfxMapUnit eMapUnit);
bool IsCloseByEdit() { return mbCloseByEdit;}
diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx
index 660798090a72..4cf85a9b8fd1 100644
--- a/svx/source/sidebar/tools/PopupControl.cxx
+++ b/svx/source/sidebar/tools/PopupControl.cxx
@@ -35,7 +35,7 @@ PopupControl::PopupControl (
SetBackground(Theme::GetWallpaper(Theme::Paint_DropDownBackground));
}
-void PopupControl::Paint (const Rectangle& rBox)
+void PopupControl::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rBox)
{
Control::Paint(rBox);
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index a5ec5ebd8159..c45f89c03db2 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -84,7 +84,7 @@ public:
void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE;
virtual void PopupModeEnd() SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
@@ -269,7 +269,7 @@ void TableWindow::MouseButtonUp( const MouseEvent& rMEvt )
-void TableWindow::Paint( const Rectangle& )
+void TableWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
const long nSelectionWidth = mnTablePosX + nCol*mnTableCellWidth;
const long nSelectionHeight = mnTablePosY + nLine*mnTableCellHeight;
@@ -428,7 +428,7 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE;
virtual void PopupModeEnd() SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE;
};
@@ -631,7 +631,7 @@ void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt )
-void ColumnsWindow::Paint( const Rectangle& )
+void ColumnsWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
{
long i;
long nLineWidth;
diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx
index 591e0011f9a9..58b29367c239 100644
--- a/svx/workben/pixelctl.cxx
+++ b/svx/workben/pixelctl.cxx
@@ -90,7 +90,7 @@ public:
void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
- void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
void Resize() SAL_OVERRIDE;
bool Close() SAL_OVERRIDE;
@@ -153,7 +153,7 @@ void MyWin::KeyUp( const KeyEvent& rKEvt )
WorkWindow::KeyUp( rKEvt );
}
-void MyWin::Paint( const Rectangle& rRect )
+void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
{
WorkWindow::Paint( rRect );
}