avmedia/source/viewer/mediawindow_impl.cxx | 2 - avmedia/source/viewer/mediawindow_impl.hxx | 2 - basctl/source/basicide/baside2.cxx | 4 +-- basctl/source/basicide/baside2.hxx | 12 ++++----- basctl/source/basicide/baside2b.cxx | 8 +++--- basctl/source/basicide/baside3.cxx | 2 - basctl/source/basicide/linenumberwindow.cxx | 2 - basctl/source/basicide/linenumberwindow.hxx | 2 - basctl/source/inc/baside3.hxx | 2 - chart2/source/controller/main/ChartWindow.cxx | 6 ++-- chart2/source/controller/main/ChartWindow.hxx | 2 - cui/source/dialogs/about.cxx | 2 - cui/source/dialogs/colorpicker.cxx | 12 ++++----- cui/source/dialogs/cuicharmap.cxx | 2 - cui/source/dialogs/cuigrfflt.cxx | 4 +-- cui/source/dialogs/hangulhanjadlg.cxx | 4 +-- cui/source/dialogs/hlmarkwn.cxx | 4 +-- cui/source/dialogs/thesdlg.cxx | 4 +-- cui/source/inc/about.hxx | 2 - cui/source/inc/cuicharmap.hxx | 2 - cui/source/inc/cuigrfflt.hxx | 2 - cui/source/inc/grfpage.hxx | 2 - cui/source/inc/hlmarkwn.hxx | 2 - cui/source/inc/numfmt.hxx | 2 - cui/source/inc/numpages.hxx | 2 - cui/source/inc/thesdlg.hxx | 2 - cui/source/tabpages/backgrnd.cxx | 8 +++--- cui/source/tabpages/grfpage.cxx | 2 - cui/source/tabpages/numfmt.cxx | 2 - cui/source/tabpages/numpages.cxx | 2 - cui/source/tabpages/tabstpge.cxx | 4 +-- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 +-- dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 - dbaccess/source/ui/app/AppDetailView.cxx | 4 +-- dbaccess/source/ui/app/AppDetailView.hxx | 2 - dbaccess/source/ui/browser/dataview.cxx | 4 +-- dbaccess/source/ui/control/marktree.cxx | 6 ++-- dbaccess/source/ui/inc/JoinTableView.hxx | 2 - dbaccess/source/ui/inc/TableWindow.hxx | 2 - dbaccess/source/ui/inc/marktree.hxx | 2 - dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 - dbaccess/source/ui/querydesign/TableWindow.cxx | 6 ++-- dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 2 - dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 2 - desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 - desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 2 - desktop/source/splash/splash.cxx | 10 +++---- extensions/source/scanner/grid.cxx | 12 +++------ extensions/source/scanner/sanedlg.cxx | 6 ++-- filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 4 +-- filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 2 - forms/source/richtext/richtextviewport.cxx | 2 - forms/source/richtext/richtextviewport.hxx | 2 - include/dbaccess/dataview.hxx | 2 - include/sfx2/dockwin.hxx | 2 - include/sfx2/infobar.hxx | 2 - include/sfx2/recentdocsview.hxx | 2 - include/sfx2/sidebar/SidebarToolBox.hxx | 2 - include/sfx2/templateabstractview.hxx | 2 - include/sfx2/thumbnailview.hxx | 2 - include/sfx2/titledockwin.hxx | 2 - include/svtools/brwbox.hxx | 2 - include/svtools/calendar.hxx | 2 - include/svtools/editbrowsebox.hxx | 2 - include/svtools/headbar.hxx | 2 - include/svtools/ivctrl.hxx | 2 - include/svtools/ruler.hxx | 2 - include/svtools/simptabl.hxx | 2 - include/svtools/svtabbx.hxx | 2 - include/svtools/tabbar.hxx | 2 - include/svtools/toolbarmenu.hxx | 2 - include/svtools/toolpanel/paneltabbar.hxx | 2 - include/svtools/treelistbox.hxx | 2 - include/svtools/valueset.hxx | 2 - include/svx/charmap.hxx | 2 - include/svx/connctrl.hxx | 2 - include/svx/dialcontrol.hxx | 2 - include/svx/dlgctl3d.hxx | 4 +-- include/svx/dlgctrl.hxx | 10 +++---- include/svx/fntctrl.hxx | 2 - include/svx/frmsel.hxx | 2 - include/svx/galctrl.hxx | 2 - include/svx/graphctl.hxx | 2 - include/svx/gridctrl.hxx | 2 - include/svx/measctrl.hxx | 2 - include/svx/pagectrl.hxx | 2 - include/svx/paraprev.hxx | 2 - include/svx/rubydialog.hxx | 2 - include/svx/sidebar/PopupControl.hxx | 2 - include/svx/swframeexample.hxx | 2 - include/vcl/button.hxx | 6 ++-- include/vcl/dockingarea.hxx | 2 - include/vcl/edit.hxx | 2 - include/vcl/fixed.hxx | 8 +++--- include/vcl/group.hxx | 2 - include/vcl/imgctrl.hxx | 2 - include/vcl/openglwin.hxx | 2 - include/vcl/prgsbar.hxx | 2 - include/vcl/scrbar.hxx | 2 - include/vcl/slider.hxx | 2 - include/vcl/spin.hxx | 2 - include/vcl/spinfld.hxx | 2 - include/vcl/split.hxx | 2 - include/vcl/splitwin.hxx | 2 - include/vcl/status.hxx | 2 - include/vcl/tabctrl.hxx | 2 - include/vcl/tabpage.hxx | 2 - include/vcl/toolbox.hxx | 2 - include/vcl/window.hxx | 3 -- reportdesign/source/ui/inc/EndMarker.hxx | 2 - reportdesign/source/ui/inc/ReportSection.hxx | 2 - reportdesign/source/ui/inc/StartMarker.hxx | 2 - reportdesign/source/ui/inc/ViewsWindow.hxx | 2 - reportdesign/source/ui/report/EndMarker.cxx | 2 - reportdesign/source/ui/report/ReportSection.cxx | 4 +-- reportdesign/source/ui/report/StartMarker.cxx | 2 - reportdesign/source/ui/report/ViewsWindow.cxx | 4 +-- sc/source/ui/app/inputwin.cxx | 20 +++++++-------- sc/source/ui/cctrl/checklistmenu.cxx | 6 ++-- sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 12 ++++----- sc/source/ui/dbgui/csvgrid.cxx | 2 - sc/source/ui/dbgui/csvruler.cxx | 2 - sc/source/ui/inc/autofmt.hxx | 2 - sc/source/ui/inc/checklistmenu.hxx | 4 +-- sc/source/ui/inc/csvgrid.hxx | 2 - sc/source/ui/inc/csvruler.hxx | 2 - sc/source/ui/inc/gridwin.hxx | 2 - sc/source/ui/inc/hdrcont.hxx | 2 - sc/source/ui/inc/hintwin.hxx | 2 - sc/source/ui/inc/inputwin.hxx | 6 ++-- sc/source/ui/inc/navipi.hxx | 4 +-- sc/source/ui/inc/olinewin.hxx | 2 - sc/source/ui/inc/preview.hxx | 2 - sc/source/ui/inc/tabsplit.hxx | 2 - sc/source/ui/inc/tabview.hxx | 2 - sc/source/ui/inc/tbzoomsliderctrl.hxx | 2 - sc/source/ui/inc/tphfedit.hxx | 2 - sc/source/ui/miscdlgs/autofmt.cxx | 2 - sc/source/ui/navipi/navipi.cxx | 4 +-- sc/source/ui/navipi/scenwnd.cxx | 4 +-- sc/source/ui/pagedlg/tphfedit.cxx | 6 ++-- sc/source/ui/view/gridwin4.cxx | 2 - sc/source/ui/view/hdrcont.cxx | 2 - sc/source/ui/view/hintwin.cxx | 2 - sc/source/ui/view/olinewin.cxx | 2 - sc/source/ui/view/preview.cxx | 24 +++++++++---------- sc/source/ui/view/tabsplit.cxx | 2 - sc/source/ui/view/tabview.cxx | 4 +-- sd/source/filter/html/htmlattr.cxx | 2 - sd/source/filter/html/htmlattr.hxx | 2 - sd/source/ui/animations/CustomAnimationList.cxx | 4 +-- sd/source/ui/animations/CustomAnimationList.hxx | 2 - sd/source/ui/annotations/annotationwindow.cxx | 6 ++-- sd/source/ui/annotations/annotationwindow.hxx | 4 +-- sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2 - sd/source/ui/dlg/RemoteDialogClientBox.hxx | 2 - sd/source/ui/dlg/animobjs.cxx | 2 - sd/source/ui/dlg/docprev.cxx | 2 - sd/source/ui/dlg/headerfooterdlg.cxx | 4 +-- sd/source/ui/inc/Window.hxx | 2 - sd/source/ui/inc/animobjs.hxx | 2 - sd/source/ui/inc/docprev.hxx | 2 - sd/source/ui/sidebar/LayoutMenu.cxx | 4 +-- sd/source/ui/sidebar/LayoutMenu.hxx | 2 - sd/source/ui/slideshow/showwin.cxx | 2 - sd/source/ui/slideshow/showwindow.hxx | 2 - sd/source/ui/slidesorter/shell/SlideSorter.cxx | 4 +-- sd/source/ui/view/ViewTabBar.cxx | 6 ++-- sd/source/ui/view/sdwindow.cxx | 2 - sfx2/source/control/recentdocsview.cxx | 4 +-- sfx2/source/control/templateabstractview.cxx | 4 +-- sfx2/source/control/thumbnailview.cxx | 6 +--- sfx2/source/dialog/backingwindow.cxx | 2 - sfx2/source/dialog/backingwindow.hxx | 2 - sfx2/source/dialog/dockwin.cxx | 2 - sfx2/source/dialog/infobar.cxx | 8 +++--- sfx2/source/dialog/titledockwin.cxx | 4 +-- sfx2/source/doc/doctemplates.cxx | 4 +-- sfx2/source/doc/new.cxx | 2 - sfx2/source/inc/preview.hxx | 2 - sfx2/source/sidebar/Deck.cxx | 4 +-- sfx2/source/sidebar/Deck.hxx | 4 +-- sfx2/source/sidebar/MenuButton.cxx | 4 +-- sfx2/source/sidebar/MenuButton.hxx | 2 - sfx2/source/sidebar/Panel.cxx | 4 +-- sfx2/source/sidebar/Panel.hxx | 2 - sfx2/source/sidebar/SidebarToolBox.cxx | 4 +-- sfx2/source/sidebar/TabBar.cxx | 4 +-- sfx2/source/sidebar/TabBar.hxx | 2 - sfx2/source/sidebar/TabItem.cxx | 4 +-- sfx2/source/sidebar/TabItem.hxx | 2 - sfx2/source/sidebar/TitleBar.cxx | 2 - sfx2/source/sidebar/TitleBar.hxx | 2 - starmath/inc/ElementsDockingWindow.hxx | 2 - starmath/inc/dialog.hxx | 8 +++--- starmath/inc/edit.hxx | 2 - starmath/inc/view.hxx | 4 +-- starmath/source/ElementsDockingWindow.cxx | 2 - starmath/source/dialog.cxx | 14 +++++------ starmath/source/edit.cxx | 2 - starmath/source/view.cxx | 4 +-- svtools/inc/roadmap.hxx | 2 - svtools/source/brwbox/brwbox2.cxx | 2 - svtools/source/brwbox/datwin.cxx | 2 - svtools/source/brwbox/datwin.hxx | 4 +-- svtools/source/brwbox/ebbcontrols.cxx | 4 +-- svtools/source/contnr/ivctrl.cxx | 2 - svtools/source/contnr/simptabl.cxx | 4 +-- svtools/source/contnr/svtabbx.cxx | 4 +-- svtools/source/contnr/treelistbox.cxx | 8 +++--- svtools/source/control/calendar.cxx | 2 - svtools/source/control/headbar.cxx | 2 - svtools/source/control/roadmap.cxx | 6 +--- svtools/source/control/ruler.cxx | 22 ++++++++--------- svtools/source/control/tabbar.cxx | 12 ++++----- svtools/source/control/toolbarmenu.cxx | 2 - svtools/source/control/valueset.cxx | 2 - svtools/source/hatchwindow/ipwin.cxx | 2 - svtools/source/hatchwindow/ipwin.hxx | 2 - svtools/source/table/tabledatawindow.cxx | 2 - svtools/source/table/tabledatawindow.hxx | 2 - svtools/source/toolpanel/paneltabbar.cxx | 2 - svtools/source/toolpanel/toolpaneldrawer.cxx | 4 +-- svtools/source/toolpanel/toolpaneldrawer.hxx | 2 - svx/source/dialog/_bmpmask.cxx | 4 +-- svx/source/dialog/charmap.cxx | 2 - svx/source/dialog/connctrl.cxx | 2 - svx/source/dialog/contwnd.cxx | 4 +-- svx/source/dialog/contwnd.hxx | 2 - svx/source/dialog/dialcontrol.cxx | 2 - svx/source/dialog/dlgctl3d.cxx | 6 ++-- svx/source/dialog/dlgctrl.cxx | 10 +++---- svx/source/dialog/fntctrl.cxx | 2 - svx/source/dialog/frmsel.cxx | 2 - svx/source/dialog/graphctl.cxx | 2 - svx/source/dialog/measctrl.cxx | 2 - svx/source/dialog/pagectrl.cxx | 2 - svx/source/dialog/paraprev.cxx | 2 - svx/source/dialog/rubydialog.cxx | 2 - svx/source/dialog/swframeexample.cxx | 2 - svx/source/fmcomp/gridctrl.cxx | 4 +-- svx/source/gallery2/galctrl.cxx | 4 +-- svx/source/sidebar/line/LineWidthControl.cxx | 4 +-- svx/source/sidebar/line/LineWidthControl.hxx | 2 - svx/source/sidebar/tools/PopupControl.cxx | 4 +-- svx/source/tbxctrls/layctrl.cxx | 8 +++--- svx/workben/pixelctl.cxx | 6 ++-- sw/inc/SidebarWin.hxx | 2 - sw/source/ui/chrdlg/drpcps.cxx | 4 +-- sw/source/ui/config/optload.cxx | 4 +-- sw/source/ui/config/optpage.cxx | 2 - sw/source/ui/envelp/envlop1.cxx | 2 - sw/source/ui/envelp/labfmt.cxx | 2 - sw/source/ui/envelp/labfmt.hxx | 2 - sw/source/ui/frmdlg/frmpage.cxx | 2 - sw/source/ui/misc/outline.cxx | 2 - sw/source/ui/table/tautofmt.cxx | 4 +-- sw/source/uibase/dbui/mailmergehelper.cxx | 2 - sw/source/uibase/docvw/AnnotationMenuButton.cxx | 2 - sw/source/uibase/docvw/AnnotationMenuButton.hxx | 2 - sw/source/uibase/docvw/DashedLine.cxx | 2 - sw/source/uibase/docvw/HeaderFooterWin.cxx | 2 - sw/source/uibase/docvw/PageBreakWin.cxx | 2 - sw/source/uibase/docvw/SidebarTxtControl.cxx | 2 - sw/source/uibase/docvw/SidebarTxtControl.hxx | 2 - sw/source/uibase/docvw/SidebarWin.cxx | 4 +-- sw/source/uibase/docvw/edtwin2.cxx | 2 - sw/source/uibase/docvw/srcedtw.cxx | 2 - sw/source/uibase/frmdlg/colex.cxx | 2 - sw/source/uibase/inc/DashedLine.hxx | 2 - sw/source/uibase/inc/HeaderFooterWin.hxx | 2 - sw/source/uibase/inc/PageBreakWin.hxx | 2 - sw/source/uibase/inc/bmpwin.hxx | 2 - sw/source/uibase/inc/colex.hxx | 2 - sw/source/uibase/inc/edtwin.hxx | 2 - sw/source/uibase/inc/envlop.hxx | 2 - sw/source/uibase/inc/mailmergehelper.hxx | 2 - sw/source/uibase/inc/numprevw.hxx | 2 - sw/source/uibase/inc/optload.hxx | 2 - sw/source/uibase/inc/optpage.hxx | 2 - sw/source/uibase/inc/pview.hxx | 2 - sw/source/uibase/inc/srcedtw.hxx | 2 - sw/source/uibase/inc/swruler.hxx | 2 - sw/source/uibase/misc/swruler.cxx | 4 +-- sw/source/uibase/uiview/pview.cxx | 2 - vcl/inc/brdwin.hxx | 2 - vcl/inc/helpwin.hxx | 2 - vcl/inc/ilstbox.hxx | 4 +-- vcl/inc/printdlg.hxx | 4 +-- vcl/source/app/help.cxx | 2 - vcl/source/control/button.cxx | 6 ++-- vcl/source/control/edit.cxx | 6 ++-- vcl/source/control/fixed.cxx | 8 +++--- vcl/source/control/fixedhyper.cxx | 4 +-- vcl/source/control/group.cxx | 2 - vcl/source/control/ilstbox.cxx | 4 +-- vcl/source/control/imgctrl.cxx | 2 - vcl/source/control/prgsbar.cxx | 2 - vcl/source/control/scrbar.cxx | 4 +-- vcl/source/control/slider.cxx | 2 - vcl/source/control/spinbtn.cxx | 6 ++-- vcl/source/control/spinfld.cxx | 14 +++++------ vcl/source/control/tabctrl.cxx | 2 - vcl/source/edit/vclmedit.cxx | 4 +-- vcl/source/window/brdwin.cxx | 6 ++-- vcl/source/window/dockingarea.cxx | 2 - vcl/source/window/dockmgr.cxx | 4 +-- vcl/source/window/menubarwindow.cxx | 2 - vcl/source/window/menubarwindow.hxx | 2 - vcl/source/window/menufloatingwindow.cxx | 2 - vcl/source/window/menufloatingwindow.hxx | 2 - vcl/source/window/openglwin.cxx | 2 - vcl/source/window/paint.cxx | 8 +++--- vcl/source/window/printdlg.cxx | 7 +++-- vcl/source/window/scrwnd.cxx | 2 - vcl/source/window/scrwnd.hxx | 2 - vcl/source/window/split.cxx | 2 - vcl/source/window/splitwin.cxx | 2 - vcl/source/window/status.cxx | 2 - vcl/source/window/tabpage.cxx | 2 - vcl/source/window/toolbox.cxx | 2 - vcl/source/window/window.cxx | 7 ----- vcl/workben/icontest.cxx | 6 ++-- vcl/workben/mtfdemo.cxx | 6 ++-- vcl/workben/outdevgrind.cxx | 4 +-- vcl/workben/svdem.cxx | 6 ++-- vcl/workben/svpclient.cxx | 6 ++-- vcl/workben/svptest.cxx | 6 ++-- vcl/workben/vcldemo.cxx | 8 +++--- 329 files changed, 544 insertions(+), 555 deletions(-)
New commits: commit 8839e76b21117ef5e155862021b06a7b318ab9c7 Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> Date: Tue Apr 28 15:09:39 2015 +0900 fix compile: delegate RenderContext parameter to super Change-Id: I1c08e29c45d8334db52b129a957098481f3e57a4 diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 30c89ec..72de31c 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -55,9 +55,9 @@ Size GraphicPreviewWindow::GetOptimalSize() const -void GraphicPreviewWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Control::Paint( rRect ); + Control::Paint(rRenderContext, rRect); const Size aOutputSize( GetOutputSizePixel() ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d94d992..6269043 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1285,9 +1285,9 @@ bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl return bRet; } -void OPreviewWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void OPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Window::Paint( rRect ); + Window::Paint(rRenderContext, rRect); if( ImplGetGraphicCenterRect( m_aGraphicObj.GetGraphic(), m_aPreviewRect ) ) { diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index b1e2006..48cc1c5 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -87,7 +87,7 @@ namespace dbaui { } - void ODataView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) + void ODataView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) { // draw the background { @@ -96,7 +96,7 @@ namespace dbaui } // let the base class do anything it needs - Window::Paint( _rRect ); + Window::Paint(rRenderContext, _rRect); } void ODataView::resizeAll( const Rectangle& _rPlayground ) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index c2a2f56..44c9e7d 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -306,10 +306,10 @@ void OTableWindow::DataChanged(const DataChangedEvent& rDCEvt) } } -void OTableWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void OTableWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { - Rectangle aRect( Point(0,0), GetOutputSizePixel() ); - Window::Paint( rRect ); + Rectangle aRect(Point(0,0), GetOutputSizePixel()); + Window::Paint(rRenderContext, rRect); Draw3DBorder( aRect ); } diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 9520f6c..f46a6bd 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -507,9 +507,9 @@ void GridWindow::drawHandles() } } -void GridWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void GridWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { - Window::Paint(rRect); + Window::Paint(rRenderContext, rRect); drawGrid(); drawOriginal(); drawNew(); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index a8c5181..ddab7ab 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -879,9 +879,9 @@ void ScanPreview::UpdatePreviewBounds() } } -void ScanPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void ScanPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Window::Paint(rRect); + Window::Paint(rRenderContext, rRect); SetMapMode(MAP_APPFONT); SetFillColor( Color( COL_WHITE ) ); SetLineColor( Color( COL_WHITE ) ); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 43af541..328b55a 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -127,9 +127,9 @@ OReportSection::~OReportSection() } } -void OReportSection::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void OReportSection::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { - Window::Paint(rRect); + Window::Paint(rRenderContext, rRect); if ( m_pView && m_nPaintEntranceCount == 0) { diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index cd45002..51dbe3f 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -254,9 +254,9 @@ void OViewsWindow::Resize() } } -void OViewsWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void OViewsWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Window::Paint( rRect ); + Window::Paint(rRenderContext, rRect); Size aOut = GetOutputSizePixel(); Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index b989912..23133df 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -712,7 +712,7 @@ void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? } } -void ScNavigatorDlg::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void ScNavigatorDlg::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { if (mbUseStyleSettingsBackground) { @@ -730,7 +730,7 @@ void ScNavigatorDlg::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectan aFtRow.SetBackground(Wallpaper()); } - Window::Paint( rRect ); + Window::Paint(rRenderContext, rRect); } void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index a4d36c4..0d5fb34 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -228,14 +228,14 @@ ScScenarioWindow::~ScScenarioWindow() { } -void ScScenarioWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void ScScenarioWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetFaceColor(); SetBackground( aBgColor ); - Window::Paint( rRect ); + Window::Paint(rRenderContext, rRect); } void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index c0b05b4..a305aa8 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -212,7 +212,7 @@ void ScEditWindow::SetCharAttriutes() } } -void ScEditWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void ScEditWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetWindowColor(); @@ -221,9 +221,9 @@ void ScEditWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangl SetBackground( aBgColor ); - Control::Paint( rRect ); + Control::Paint(rRenderContext, rRect); - pEdView->Paint( rRect ); + pEdView->Paint(rRect); if( HasFocus() ) pEdView->ShowCursor(true,true); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 2702f8e..f0cfdb0 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -80,7 +80,7 @@ ScCornerButton::~ScCornerButton() { } -void ScCornerButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void ScCornerButton::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { Size aSize = GetOutputSizePixel(); long nPosX = aSize.Width()-1; @@ -88,7 +88,7 @@ void ScCornerButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectan const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - Window::Paint(rRect); + Window::Paint(rRenderContext, rRect); bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); long nDarkX = bLayoutRTL ? 0 : nPosX; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 32fdcaa..5c7fe76 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -644,9 +644,9 @@ void AnnotationWindow::Deactivate() Engine()->GetUndoManager().Clear(); } -void AnnotationWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void AnnotationWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - FloatingWindow::Paint( rRect ); + FloatingWindow::Paint(rRenderContext, rRect); if(mpMeta->IsVisible() && !mbReadonly) { diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 217919f..59e2251 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -146,7 +146,7 @@ void SfxInfoBarWindow::addButton(PushButton* pButton) { Resize(); } -void SfxInfoBarWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rPaintRect) +void SfxInfoBarWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect) { const ViewInformation2D aNewViewInfos; const unique_ptr<BaseProcessor2D> pProcessor( @@ -189,7 +189,7 @@ void SfxInfoBarWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Recta pProcessor->process(aSeq); - Window::Paint(rPaintRect); + Window::Paint(rRenderContext, rPaintRect); } void SfxInfoBarWindow::Resize() diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index 2e4a447..24a027c 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -43,7 +43,7 @@ MenuButton::~MenuButton() { } -void MenuButton::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) +void MenuButton::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) { switch(mePaintType) { @@ -74,7 +74,7 @@ void MenuButton::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& break; } case PT_Native: - Button::Paint(rUpdateArea); + Button::Paint(rRenderContext, rUpdateArea); // DrawImage(maIconPosition, maIcon); break; } diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index d1ab0950..7284c9e 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -128,9 +128,9 @@ bool Panel::HasIdPredicate (const ::rtl::OUString& rsId) const return msPanelId.equals(rsId); } -void Panel::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) +void Panel::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) { - Window::Paint(rUpdateArea); + Window::Paint(rRenderContext, rUpdateArea); } void Panel::Resize() diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index a536173..35518cc 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -66,9 +66,9 @@ TabBar::~TabBar() { } -void TabBar::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) +void TabBar::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) { - Window::Paint(rUpdateArea); + Window::Paint(rRenderContext, rUpdateArea); const sal_Int32 nHorizontalPadding (Theme::GetInteger(Theme::Int_TabMenuSeparatorPadding)); SetLineColor(Theme::GetColor(Theme::Color_TabMenuSeparator)); diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index 9449f95..74927c9 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -46,7 +46,7 @@ TabItem::~TabItem() { } -void TabItem::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) +void TabItem::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) { switch(mePaintType) { @@ -78,7 +78,7 @@ void TabItem::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rU break; } case PT_Native: - Button::Paint(rUpdateArea); + Button::Paint(rRenderContext, rUpdateArea); break; } } diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 50e1f95..d9aa54a 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -228,9 +228,9 @@ SfxTabPage* SmPrintOptionsTabPage::Create(vcl::Window* pWindow, const SfxItemSet /**************************************************************************/ -void SmShowFont::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { - Window::Paint( rRect ); + Window::Paint(rRenderContext, rRect); OUString Text (GetFont().GetName()); Size TextSize(GetTextWidth(Text), GetTextHeight()); @@ -1302,9 +1302,9 @@ void SmShowSymbol::setFontSize(vcl::Font &rFont) const rFont.SetSize(Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3)); } -void SmShowSymbol::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) +void SmShowSymbol::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect) { - Control::Paint( rRect ); + Control::Paint(rRenderContext, rRect); vcl::Font aFont(GetFont()); setFontSize(aFont); @@ -1571,9 +1571,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowChar(vcl::Window return new SmShowChar(pParent, nWinStyle); } -void SmShowChar::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) +void SmShowChar::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect) { - Control::Paint( rRect ); + Control::Paint(rRenderContext, rRect); OUString aText( GetText() ); if (!aText.isEmpty()) diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 4c562a8..a2db9a4 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -294,9 +294,9 @@ namespace svt } - void CheckBoxControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rClientRect) + void CheckBoxControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rClientRect) { - Control::Paint(rClientRect); + Control::Paint(rRenderContext, rClientRect); if (HasFocus()) ShowFocus(aFocusRect); } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index f1616b9..ee44374 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2549,9 +2549,9 @@ void SvTreeListBox::AdjustEntryHeightAndRecalc( const vcl::Font& rFont ) RecalcViewData(); } -void SvTreeListBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void SvTreeListBox::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { - Control::Paint( rRect ); + Control::Paint(rRenderContext, rRect); if( nTreeFlags & SvTreeFlags::RECALCTABS ) SetTabs(); pImp->Paint( rRect ); diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index ecbe1d2..118829e 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -552,10 +552,9 @@ namespace svt } - void ORoadmap::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) + void ORoadmap::Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) { - Control::Paint( _rRect ); - + Control::Paint(rRenderContext, _rRect); // draw the bitmap if ( !!m_pImpl->getPicture() ) @@ -569,7 +568,6 @@ namespace svt DrawBitmapEx( aBitmapPos, m_pImpl->getPicture() ); } - // draw the headline DrawHeadline(); } diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index 52c961a..17eafc9 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -61,9 +61,9 @@ namespace svt } - void DrawerVisualization::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rBoundingBox ) + void DrawerVisualization::Paint( vcl::RenderContext& rRenderContext, const Rectangle& i_rBoundingBox ) { - Window::Paint( i_rBoundingBox ); + Window::Paint(rRenderContext, i_rBoundingBox); m_rDrawer.Paint(); } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 94ef657..893cb7a 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -696,9 +696,9 @@ void DbGridControl::NavigationBar::Resize() ArrangeControls(); } -void DbGridControl::NavigationBar::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void DbGridControl::NavigationBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Control::Paint(rRect); + Control::Paint(rRenderContext, rRect); Point aAbsolutePos = m_aAbsolute.GetPosPixel(); Size aAbsoluteSize = m_aAbsolute.GetSizePixel(); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 1c70cd6..5c123d0 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -131,9 +131,9 @@ bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl return bRet; } -void GalleryPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void GalleryPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Window::Paint( rRect ); + Window::Paint(rRenderContext, rRect); if( ImplGetGraphicCenterRect( aGraphicObj.GetGraphic(), aPreviewRect ) ) { diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx index b01c9ce..dfa34b9 100644 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ b/svx/source/sidebar/tools/PopupControl.cxx @@ -45,9 +45,9 @@ PopupControl::~PopupControl() -void PopupControl::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rBox) +void PopupControl::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rBox) { - Control::Paint(rBox); + Control::Paint(rRenderContext, rBox); // The background is taken care of by setting the background color // in the constructor. Here we just paint the border. diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx index ac69f79..94e878f 100644 --- a/svx/workben/pixelctl.cxx +++ b/svx/workben/pixelctl.cxx @@ -146,9 +146,9 @@ void MyWin::KeyUp( const KeyEvent& rKEvt ) WorkWindow::KeyUp( rKEvt ); } -void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - WorkWindow::Paint( rRect ); + WorkWindow::Paint(rRenderContext, rRect); } void MyWin::Resize() diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 8d7bf07..582e6ba 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -401,9 +401,9 @@ Size SwCaptionPreview::GetOptimalSize() const return LogicToPixel(Size(106 , 20), MapMode(MAP_APPFONT)); } -void SwCaptionPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Window::Paint( rRect ); + Window::Paint(rRenderContext, rRect); DrawRect( Rectangle( Point( 0, 0 ), GetSizePixel() ) ); DrawText( Point( 4, 6 ), maText ); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 20d2604..88e171f 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -203,9 +203,9 @@ SwSidebarWin::~SwSidebarWin() Application::RemoveUserEvent( mnEventId ); } -void SwSidebarWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void SwSidebarWin::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Window::Paint(rRect); + Window::Paint(rRenderContext, rRect); if (mpMetadataAuthor->IsVisible() ) { diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index b863e76..e751ac8 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1059,12 +1059,12 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) vcl::Region oldRgn( pBorder->GetClipRegion() ); pBorder->SetClipRegion( aClipRgn ); - pBorder->Paint( Rectangle() ); + pBorder->Paint(*pBorder, Rectangle()); pBorder->SetClipRegion( oldRgn ); } else - pBorder->Paint( Rectangle() ); + pBorder->Paint(*pBorder, Rectangle()); } } diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index a71f04e..7702738 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1304,8 +1304,8 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* if ( (aCtrlType == CTRL_SPINBOX) && !pCtrl->IsNativeControlSupported( CTRL_SPINBOX, PART_BUTTON_UP ) ) { Edit *pEdit = static_cast<Edit*>(pCtrl)->GetSubEdit(); - if ( pEdit ) - pCtrl->Paint( Rectangle() ); // make sure the buttons are also drawn as they might overwrite the border + if (pEdit) + pCtrl->Paint(*pCtrl, Rectangle()); // make sure the buttons are also drawn as they might overwrite the border } } diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index c86edec..95b4ea4 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -122,7 +122,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) { m_pWindow->BeginPaint(); m_pWindow->PushPaintHelper(this); - m_pWindow->Paint(m_aPaintRect); + m_pWindow->Paint(*m_pWindow, m_aPaintRect); m_pWindow->EndPaint(); } } @@ -677,7 +677,7 @@ void Window::PrePaint() { } -void Window::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void Window::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { CallEventListeners(VCLEVENT_WINDOW_PAINT, (void*)&rRect); } @@ -1085,7 +1085,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP if( ! IsPaintTransparent() && IsBackground() && ! (GetParentClipMode() & PARENTCLIPMODE_NOCLIP ) ) Erase(); // foreground - Paint( aPaintRect ); + Paint(*this, aPaintRect); // put a pop action to metafile Pop(); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 738fcde..afcd513 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -317,9 +317,10 @@ Size PrintDialog::ShowNupOrderWindow::GetOptimalSize() const return Size(70, 70); } -void PrintDialog::ShowNupOrderWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rRect ) +void PrintDialog::ShowNupOrderWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& i_rRect ) { - Window::Paint( i_rRect ); + Window::Paint(rRenderContext, i_rRect); + SetMapMode( MAP_PIXEL ); SetTextColor( GetSettings().GetStyleSettings().GetFieldTextColor() ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6fdb764..fca2563 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3384,7 +3384,7 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& assert(mpOutDevData); mpOutDevData->mpRecordLayout = pLayout; mpOutDevData->maRecordRect = rRect; - Paint( rRect ); + Paint(*this, rRect); mpOutDevData->mpRecordLayout = NULL; } diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index 7ea7a42..b2ed276 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -102,7 +102,7 @@ void MyWorkWindow::LoadGraphic( const OUString& sImageFile ) } } -void MyWorkWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void MyWorkWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { std::cout << "==> Paint! " << mnPaintCount++ << " (vcl) " << GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl; @@ -123,7 +123,7 @@ void MyWorkWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangl mpFixedBitmap->SetBitmap( *mpBitmap ); mpFixedBitmap->SetSizePixel( aSize ); - WorkWindow::Paint( rRect ); + WorkWindow::Paint(rRenderContext, rRect); if (mnPaintCount == 100) Application::Quit(); diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx index 3701ba2..13be648 100644 --- a/vcl/workben/mtfdemo.cxx +++ b/vcl/workben/mtfdemo.cxx @@ -55,14 +55,14 @@ public: } } - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; }; -void DemoMtfWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void DemoMtfWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { maMtf.Play(this, maMtf.GetActionSize()); - WorkWindow::Paint( rRect ); + WorkWindow::Paint(rRenderContext, rRect); } class DemoMtfApp : public Application diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index 0d9c25a..5207fbf 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -118,9 +118,9 @@ void MyWin::KeyUp( const KeyEvent& rKEvt ) WorkWindow::KeyUp( rKEvt ); } -void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - WorkWindow::Paint( rRect ); + WorkWindow::Paint(rRenderContext, rRect); } void MyWin::Resize() diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index f0e5b37..a11a4cb 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -290,9 +290,9 @@ void MyWin::KeyUp( const KeyEvent& rKEvt ) WorkWindow::KeyUp( rKEvt ); } -void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - WorkWindow::Paint( rRect ); + WorkWindow::Paint(rRenderContext, rRect); } void MyWin::Resize() diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 5532d45..19cd45c 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -219,9 +219,9 @@ static Color approachColor( const Color& rFrom, const Color& rTo ) } #define DELTA 5.0 -void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void MyWin::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { - WorkWindow::Paint( rRect ); + WorkWindow::Paint(rRenderContext, rRect); Push( PushFlags::ALL ); MapMode aMapMode( MAP_100TH_MM ); commit d14ef1c42e8baf18faa201aa9997505492c2e5f8 Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> Date: Tue Apr 28 12:55:45 2015 +0900 remove old Paint(Rect&) method in vcl::Window Change-Id: I0f3377eaeb68f4933ccc3f86c9136c97c09c464d diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 344527a..507a175 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -719,7 +719,6 @@ public: virtual void KeyUp( const KeyEvent& rKEvt ); virtual void PrePaint(); virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); - virtual void Paint(const Rectangle& rRect); virtual void Erase() SAL_OVERRIDE; virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); } diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 1384dfe..c86edec 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -677,9 +677,9 @@ void Window::PrePaint() { } -void Window::Paint( const Rectangle& rRect ) +void Window::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - CallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect ); + CallEventListeners(VCLEVENT_WINDOW_PAINT, (void*)&rRect); } void Window::SetPaintTransparent( bool bTransparent ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 7b90e8a..6fdb764 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3893,11 +3893,6 @@ Any Window::GetSystemDataAny() const return aRet; } -void Window::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) -{ - Paint(rRect); -} - } /* namespace vcl */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit a3f12e1823982cf7e253dff58f8775e1874c7e5e Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> Date: Tue Apr 28 12:53:27 2015 +0900 replace Paint calls to Invalidate + fix compilation Change-Id: Id716c47d56922ab6ce0c3adb3d426ea814980674 diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 0ba8d3b..5deae8a 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -96,12 +96,12 @@ void ChartWindow::PrePaint() } } -void ChartWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void ChartWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { m_bInPaint = true; if (m_pOpenGLWindow && m_pOpenGLWindow->IsVisible()) { - m_pOpenGLWindow->Paint(rRect); + m_pOpenGLWindow->Paint(rRenderContext, rRect); } else if (m_pWindowController) { @@ -109,7 +109,7 @@ void ChartWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle } else { - Window::Paint( rRect ); + Window::Paint(rRenderContext, rRect); } m_bInPaint = false; } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 8acf9c2..ada0bd6 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -86,11 +86,11 @@ Size SvxHlmarkTreeLBox::GetOptimalSize() const return LogicToPixel(Size(103, 162), MAP_APPFONT); } -void SvxHlmarkTreeLBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void SvxHlmarkTreeLBox::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { if (!mpParentWnd || mpParentWnd->mnError == LERR_NOERROR) { - SvTreeListBox::Paint(rRect); + SvTreeListBox::Paint(rRenderContext, rRect); } else { diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 3e31956..457852e 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -245,7 +245,7 @@ void ThesaurusAlternativesCtrl::KeyInput( const KeyEvent& rKEvt ) SvxCheckListBox::KeyInput( rKEvt ); } -void ThesaurusAlternativesCtrl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void ThesaurusAlternativesCtrl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { if (!m_pDialog->WordFound()) { @@ -259,7 +259,7 @@ void ThesaurusAlternativesCtrl::Paint( vcl::RenderContext& /*rRenderContext*/, c } else - SvxCheckListBox::Paint( rRect ); + SvxCheckListBox::Paint(rRenderContext, rRect); } uno::Sequence< uno::Reference< linguistic2::XMeaning > > SvxThesaurusDialog::queryMeanings_Impl( diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index efc54cf..d7d6d09 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -212,7 +212,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) , nTransparency(0) { SetBorderStyle(WindowBorderStyle::MONO); - Paint(aDrawRect); + Invalidate(aDrawRect); } extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBackgroundPreview(vcl::Window *pParent, VclBuilder::stringmap &) @@ -243,7 +243,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor ) nTransparency = lcl_TransparencyToPercent( rColor.GetTransparency() ); SetFillColor( rColor == aTranspCol ? GetSettings().GetStyleSettings().GetFieldColor() : Color(rColor.GetRGBColor()) ); - Paint( aDrawRect ); + Invalidate(aDrawRect); } } diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 432708f..d95de1f 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -85,13 +85,13 @@ OCreationList::OCreationList( OTasksWindow& _rParent ) EnableEntryMnemonics(); } -void OCreationList::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) +void OCreationList::Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) { if ( m_pMouseDownEntry ) m_aOriginalFont = GetFont(); m_aOriginalBackgroundColor = GetBackground().GetColor(); - SvTreeListBox::Paint( _rRect ); + SvTreeListBox::Paint(rRenderContext, _rRect); SetBackground( m_aOriginalBackgroundColor ); if ( m_pMouseDownEntry ) diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index b508d4f..6423ab5 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -41,7 +41,7 @@ OMarkableTreeListBox::~OMarkableTreeListBox() } -void OMarkableTreeListBox::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect) +void OMarkableTreeListBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) { if (!IsEnabled()) { @@ -52,11 +52,11 @@ void OMarkableTreeListBox::Paint(vcl::RenderContext& /*rRenderContext*/, const R aNewFont.SetColor(aSystemStyle.GetDisableColor()); SetFont(aNewFont); - DBTreeListBox::Paint(_rRect); + DBTreeListBox::Paint(rRenderContext, _rRect); SetFont(aOldFont); } else - DBTreeListBox::Paint(_rRect); + DBTreeListBox::Paint(rRenderContext, _rRect); } void OMarkableTreeListBox::InitButtonData() diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 393e505..11f1c43 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -171,7 +171,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange) if ( _eBitmapMode == BM_FULLSCREEN ) ShowFullScreenMode( true ); Show(); - Paint(Rectangle()); + Invalidate(); Flush(); } } @@ -325,7 +325,7 @@ void SplashScreen::updateStatus() { if (!_bVisible || _bProgressEnd) return; if (!_bPaintProgress) _bPaintProgress = true; - Paint(Rectangle()); + Invalidate(); Flush(); } @@ -337,7 +337,7 @@ IMPL_LINK( SplashScreen, AppEventListenerHdl, VclWindowEvent *, inEvent ) switch ( inEvent->GetId() ) { case VCLEVENT_WINDOW_SHOW: - Paint( Rectangle() ); + Invalidate(); break; default: break; diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 8731520..9520f6c 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -557,8 +557,7 @@ void GridWindow::MouseButtonUp( const MouseEvent& rEvt ) { m_nDragIndex = 0xffffffff; computeNew(); - Invalidate( m_aGridArea ); - Paint( m_aGridArea ); + Invalidate(m_aGridArea); } } @@ -608,8 +607,7 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt ) } computeNew(); - Invalidate( m_aGridArea ); - Paint( m_aGridArea ); + Invalidate(m_aGridArea); } Window::MouseButtonDown( rEvt ); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 548835a..4a6066b 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1448,9 +1448,9 @@ XMLFilterListBox::XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl -void XMLFilterListBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void XMLFilterListBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - SvTabListBox::Paint( rRect ); + SvTabListBox::Paint(rRenderContext, rRect); } IMPL_LINK( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTabListBox*, /* pList */ ) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 1bb0f6a..107270b 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -546,9 +546,9 @@ void ScInputWindow::Select() } } -void ScInputWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void ScInputWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - ToolBox::Paint( rRect ); + ToolBox::Paint(rRenderContext, rRect); // draw a line at the bottom to distinguish that from the grid // (we have space for that thanks to ADDITIONAL_BORDER) @@ -1314,12 +1314,12 @@ static void lcl_ModifyRTLDefaults( SfxItemSet& rSet ) { rSet.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); - // always using rtl writing direction would break formulas + // always using rtl writing direction would break formulas //rSet.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) ); - // PaperSize width is limited to USHRT_MAX in RTL mode (because of EditEngine's - // sal_uInt16 values in EditLine), so the text may be wrapped and line spacing must be - // increased to not see the beginning of the next line. + // PaperSize width is limited to USHRT_MAX in RTL mode (because of EditEngine's + // sal_uInt16 values in EditLine), so the text may be wrapped and line spacing must be + // increased to not see the beginning of the next line. SvxLineSpacingItem aItem( SVX_LINESPACE_TWO_LINES, EE_PARA_SBL ); aItem.SetPropLineSpace( 200 ); rSet.Put( aItem ); @@ -1405,8 +1405,8 @@ void ScMultiTextWnd::InitEditEngine() if (!maAccTextDatas.empty()) maAccTextDatas.back()->StartEdit(); - // as long as EditEngine and DrawText sometimes differ for CTL text, - // repaint now to have the EditEngine's version visible + // as long as EditEngine and DrawText sometimes differ for CTL text, + // repaint now to have the EditEngine's version visible if (pDocSh) { ScDocument& rDoc = pDocSh->GetDocument(); // any document diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 42e667f..149732d 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1277,9 +1277,9 @@ bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt) return ScMenuFloatingWindow::Notify(rNEvt); } -void ScCheckListMenuWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void ScCheckListMenuWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - ScMenuFloatingWindow::Paint(rRect); + ScMenuFloatingWindow::Paint(rRenderContext, rRect); const StyleSettings& rStyle = GetSettings().GetStyleSettings(); Color aMemberBackColor = rStyle.GetFieldColor(); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index e904e67..65911d2 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -275,7 +275,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) Rectangle aRect( Point( 0, 0 ), aSliderWindowSize ); - Paint( aRect ); + Invalidate(aRect); mpImpl->mbOmitPaint = true; SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom ); @@ -310,8 +310,8 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) { mpImpl->mnCurrentZoom = Offset2Zoom( aPoint.X() ); - Rectangle aRect( Point( 0, 0 ), aSliderWindowSize ); - Paint( aRect ); + Rectangle aRect(Point(0, 0), aSliderWindowSize); + Invalidate(aRect); mpImpl->mbOmitPaint = true; // optimization: paint before executing command, @@ -376,10 +376,10 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) } Size aSliderWindowSize = GetOutputSizePixel(); - Rectangle aRect( Point( 0, 0 ), aSliderWindowSize ); + Rectangle aRect(Point(0, 0), aSliderWindowSize); if ( !mpImpl->mbOmitPaint ) - Paint(aRect); + Invalidate(aRect); } void ScZoomSliderWnd::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 7046144..a5cc3c7 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -857,7 +857,7 @@ void ScPreview::SetXOffset( long nX ) Invalidate(); } InvalidateLocationData( SC_HINT_ACC_VISAREACHANGED ); - Paint(Rectangle()); + Invalidate(); } void ScPreview::SetYOffset( long nY ) @@ -883,7 +883,7 @@ void ScPreview::SetYOffset( long nY ) Invalidate(); } InvalidateLocationData( SC_HINT_ACC_VISAREACHANGED ); - Paint(Rectangle()); + Invalidate(); } void ScPreview::DoInvalidate() @@ -1077,17 +1077,17 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) if(( bLeftRulerChange || bRightRulerChange ) && ( aButtonUpPt.X() <= ( 0 - aOffset.X() ) || aButtonUpPt.X() > nWidth * HMM_PER_TWIPS - aOffset.X() ) ) { bMoveRulerAction = false; - Paint(Rectangle(0,0,10000,10000)); + Invalidate(Rectangle(0, 0, 10000, 10000)); } else if( bLeftRulerChange && ( aButtonUpPt.X() / HMM_PER_TWIPS > nWidth - aLRItem.GetRight() - aOffset.X() / HMM_PER_TWIPS ) ) { bMoveRulerAction = false; - Paint(Rectangle(0,0,10000,10000)); + Invalidate(Rectangle(0, 0, 10000, 10000)); } else if( bRightRulerChange && ( aButtonUpPt.X() / HMM_PER_TWIPS < aLRItem.GetLeft() - aOffset.X() / HMM_PER_TWIPS ) ) { bMoveRulerAction = false; - Paint(Rectangle(0,0,10000,10000)); + Invalidate(Rectangle(0, 0, 10000, 10000)); } else if( aButtonDownPt.X() == aButtonUpPt.X() ) { @@ -1126,7 +1126,7 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) } Rectangle aRect(0,0,10000,10000); - Paint( aRect ); + Invalidate(aRect); aModificator.SetDocumentModified(); bLeftRulerChange = false; bRightRulerChange = false; @@ -1144,7 +1144,7 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) if( ( bTopRulerChange || bBottomRulerChange || bHeaderRulerChange || bFooterRulerChange ) && ( aButtonUpPt.Y() <= ( 0 - aOffset.Y() ) || aButtonUpPt.Y() > nHeight * HMM_PER_TWIPS -aOffset.Y() ) ) { bMoveRulerAction = false; - Paint( Rectangle(0,0,10000,10000) ); + Invalidate(Rectangle(0, 0, 10000, 10000)); } else if( aButtonDownPt.Y() == aButtonUpPt.Y() ) { @@ -1227,8 +1227,8 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) aPrintFunc.UpdatePages(); } - Rectangle aRect(0,0,10000,10000); - Paint( aRect ); + Rectangle aRect(0, 0, 10000, 10000); + Invalidate(aRect); aModificator.SetDocumentModified(); bTopRulerChange = false; bBottomRulerChange = false; @@ -1284,8 +1284,8 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) ScPrintFunc aPrintFunc( this, pDocShell, nTab ); aPrintFunc.UpdatePages(); } - Rectangle nRect(0,0,10000,10000); - Paint( nRect ); + Rectangle aRect(0, 0, 10000, 10000); + Invalidate(aRect); } bColRulerMove = false; } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index f881bb7..1b99215 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -915,12 +915,12 @@ void CustomAnimationList::notify_change() mpController->onSelect(); } -void CustomAnimationList::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void CustomAnimationList::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { if( mbIgnorePaint ) return; - SvTreeListBox::Paint( rRect ); + SvTreeListBox::Paint(rRenderContext, rRect); // draw help text if list box is still empty if( First() == 0 ) diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 60efe857..e850192 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -171,7 +171,7 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void PrePaint() SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(::vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 81d8bf9..a789426 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -256,14 +256,14 @@ ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth) return ui::LayoutSize(nPreferredHeight,nPreferredHeight,nPreferredHeight); } -void LayoutMenu::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void LayoutMenu::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) { if (mbSelectionUpdatePending) { mbSelectionUpdatePending = false; UpdateSelection(); } - ValueSet::Paint (rRect); + ValueSet::Paint(rRenderContext, rRect); } void LayoutMenu::Resize() diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 8d68c5b..6fef8ef 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -53,7 +53,7 @@ public: ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter); virtual ~ContentWindow(); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); - virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(::vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; virtual void MouseButtonUp (const MouseEvent& rEvent) SAL_OVERRIDE; @@ -467,7 +467,7 @@ void ContentWindow::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction mpCurrentFunction = rpFunction; } -void ContentWindow::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void ContentWindow::Paint (::vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { mrSlideSorter.Paint(rRect); } diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index e475027..f3acdfc 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -566,7 +566,7 @@ TabBarControl::TabBarControl ( { } -void TabBarControl::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void TabBarControl::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) { Color aOriginalFillColor (GetFillColor()); Color aOriginalLineColor (GetLineColor()); @@ -578,7 +578,7 @@ void TabBarControl::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectang SetFillColor (GetSettings().GetStyleSettings().GetDialogColor()); SetLineColor (); DrawRect (rRect); - ::TabControl::Paint (rRect); + ::TabControl::Paint(rRenderContext, rRect); SetFillColor (aOriginalFillColor); SetLineColor (aOriginalLineColor); diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index fb5fe09..84d4cb1 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -256,7 +256,7 @@ void RecentDocsView::OnItemDblClicked(ThumbnailViewItem *pItem) pRecentItem->OpenDocument(); } -void RecentDocsView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle &aRect ) +void RecentDocsView::Paint(vcl::RenderContext& rRenderContext, const Rectangle &aRect) { if ( mItemList.size() == 0 ) { @@ -286,7 +286,7 @@ void RecentDocsView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectan SetFont(aOldFont); } else - ThumbnailView::Paint(aRect); + ThumbnailView::Paint(rRenderContext, aRect); } void RecentDocsView::LoseFocus() diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 4be0da6..7a8a53a 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -292,9 +292,9 @@ void TemplateAbstractView::OnItemDblClicked (ThumbnailViewItem *pItem) } } -void TemplateAbstractView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void TemplateAbstractView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - ThumbnailView::Paint( rRect ); + ThumbnailView::Paint(rRenderContext, rRect); Rectangle aRect(rRect.TopLeft(), Point(rRect.BottomRight().X(), mnHeaderHeight)); diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index e362c71..c29f30d 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -874,7 +874,7 @@ void ThumbnailView::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangl } if (mpScrBar && mpScrBar->IsVisible()) - mpScrBar->Paint(aRect); + mpScrBar->Invalidate(aRect); } void ThumbnailView::GetFocus() @@ -1349,5 +1349,3 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL) } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - - diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 5de9db6..9320507 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -134,12 +134,12 @@ namespace sfx2 } - void TitledDockingWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rArea ) + void TitledDockingWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& i_rArea ) { if ( m_bLayoutPending ) impl_layout(); - SfxDockingWindow::Paint( i_rArea ); + SfxDockingWindow::Paint(rRenderContext, i_rArea); Push( PushFlags::FONT | PushFlags::FILLCOLOR | PushFlags::LINECOLOR ); diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index a1f6927..04d5949 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -89,9 +89,9 @@ void SidebarToolBox::InsertItem(const OUString& rCommand, RegisterHandlers(); } -void SidebarToolBox::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void SidebarToolBox::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - ToolBox::Paint(rRect); + ToolBox::Paint(rRenderContext, rRect); if (Theme::GetBoolean(Theme::Bool_UseToolBoxItemSeparator)) { diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 4dc5996..36bd4b6 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -187,7 +187,7 @@ inline void BrowserDataWin::Repaint() { if ( GetUpdateMode() ) Update(); - Paint( Rectangle( Point(), GetOutputSizePixel() ) ); + Invalidate(Rectangle(Point(), GetOutputSizePixel())); } diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 453f568..d7f808b 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -172,9 +172,9 @@ void SvSimpleTable::SetTabs(const long* pTabs, MapUnit eMapUnit) SvHeaderTabListBox::SetTabs(pTabs,eMapUnit); } -void SvSimpleTable::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void SvSimpleTable::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { - SvHeaderTabListBox::Paint(rRect ); + SvHeaderTabListBox::Paint(rRenderContext, rRect); sal_uInt16 nPrivTabCount = TabCount(); diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index a3575d3..5a5d184 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -525,13 +525,13 @@ SvHeaderTabListBox::~SvHeaderTabListBox() -void SvHeaderTabListBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void SvHeaderTabListBox::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { if ( m_bFirstPaint ) { m_bFirstPaint = false; } - SvTabListBox::Paint( rRect ); + SvTabListBox::Paint(rRenderContext, rRect); } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index b7a93cb..f1616b9 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3816,8 +3816,8 @@ void SvTreeListBox::EnableList( bool _bEnable ) { // call base class method Window::Enable(_bEnable); - // then paint immediately - Paint( Rectangle( Point(), GetSizePixel() ) ); + // then invalidate + Invalidate(Rectangle(Point(), GetSizePixel())); } ::com::sun::star::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible() diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 7a86139..e3918a4 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1933,7 +1933,7 @@ void Ruler::ImplDrag( const Point& rPos ) Drag(); // and redraw - Paint(Rectangle()); + Invalidate(); // reset the data as before cancel *mpDragData = aTempData; @@ -1954,7 +1954,7 @@ void Ruler::ImplDrag( const Point& rPos ) // redraw if ( mbFormat ) - Paint(Rectangle()); + Invalidate(); } } @@ -1983,7 +1983,7 @@ void Ruler::ImplEndDrag() mnStartDragPos = 0; // redraw - Paint(Rectangle()); + Invalidate(); } IMPL_LINK_NOARG(Ruler, ImplUpdateHdl) @@ -1994,7 +1994,7 @@ IMPL_LINK_NOARG(Ruler, ImplUpdateHdl) if ( mnUpdateFlags & RULER_UPDATE_DRAW ) { mnUpdateFlags = 0; - Paint(Rectangle()); + Invalidate(); } else if ( mnUpdateFlags & RULER_UPDATE_LINES ) { @@ -2016,7 +2016,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt ) // update ruler if ( mbFormat ) { - Paint(Rectangle()); + Invalidate(); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } @@ -2124,7 +2124,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt ) if ( mbFormat ) { - Paint(Rectangle()); + Invalidate(); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } mxPreviousHitTest.swap(mxCurrentHitTest); @@ -2251,7 +2251,7 @@ void Ruler::StateChanged( StateChangedType nType ) else if ( nType == StateChangedType::UPDATEMODE ) { if ( IsReallyVisible() && IsUpdateMode() ) - Paint(Rectangle()); + Invalidate(); } else if ( (nType == StateChangedType::ZOOM) || (nType == StateChangedType::CONTROLFONT) ) @@ -2353,7 +2353,7 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType ) // update ruler if ( mbFormat ) { - Paint(Rectangle()); + Invalidate(); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } @@ -2419,7 +2419,7 @@ RulerType Ruler::GetType( const Point& rPos, sal_uInt16* pAryPos ) // update ruler if ( IsReallyVisible() && mbFormat ) { - Paint(Rectangle()); + Invalidate(); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } @@ -2844,7 +2844,7 @@ RulerUnitData Ruler::GetCurrentRulerUnit() const void Ruler::DrawTicks() { mbFormat = true; - Paint(Rectangle()); + Invalidate(); } uno::Reference< XAccessible > Ruler::CreateAccessible() diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index ca0660a..95916e2 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -2464,7 +2464,7 @@ sal_uInt16 TabBar::ShowDropPos( const Point& rPos ) Rectangle aRect( mnOffX, 0, mnLastOffX, maWinSize.Height() ); SetFillColor( GetBackground().GetColor() ); DrawRect( aRect ); - Paint( aRect ); + Invalidate(aRect); } } @@ -2541,7 +2541,7 @@ void TabBar::HideDropPos() Rectangle aRect( nX-1, nY1, nX+3, nY2 ); vcl::Region aRegion( aRect ); SetClipRegion( aRegion ); - Paint( aRect ); + Invalidate(aRect); SetClipRegion(); } if ( (mnDropPos > 0) && (mnDropPos < nItemCount+1) ) @@ -2552,7 +2552,7 @@ void TabBar::HideDropPos() Rectangle aRect( nX-2, nY1, nX+1, nY2 ); vcl::Region aRegion( aRect ); SetClipRegion( aRegion ); - Paint( aRect ); + Invalidate(aRect); SetClipRegion(); } diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 1137b26..5bf75d3 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -147,7 +147,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) SetPolyPolygon( tools::PolyPolygon() ); aWorkRect = Rectangle( aLogPt, aLogPt ); - Paint( Rectangle( Point(), GetGraphicSize() ) ); + Invalidate(Rectangle(Point(), GetGraphicSize())); SetEditMode( true ); } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index eef45ef..8e5754f 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -530,9 +530,9 @@ void Svx3DLightControl::TrySelection(Point aPosPixel) } } -void Svx3DLightControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void Svx3DLightControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - Svx3DPreviewControl::Paint(rRect); + Svx3DPreviewControl::Paint(rRenderContext, rRect); } void Svx3DLightControl::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index b5612b1..b7cf74c 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -72,9 +72,9 @@ LineWidthControl::~LineWidthControl() -void LineWidthControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rect) +void LineWidthControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect) { - svx::sidebar::PopupControl::Paint(rect); + svx::sidebar::PopupControl::Paint(rRenderContext, rect); Color aOldLineColor = GetLineColor(); Color aOldFillColor = GetFillColor(); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 3b88273..87d7b53 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -53,9 +53,9 @@ SwCommentRuler::~SwCommentRuler() { } -void SwCommentRuler::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - SvxRuler::Paint( rRect ); + SvxRuler::Paint(rRenderContext, rRect); // Don't draw if there is not any note if ( mpViewShell->GetPostItMgr() && mpViewShell->GetPostItMgr()->HasNotes() ) diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index 6926a0c..8f4b807 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -93,14 +93,14 @@ void FixedHyperlink::RequestHelp( const HelpEvent& rHEvt ) void FixedHyperlink::GetFocus() { SetTextColor( Color( COL_LIGHTRED ) ); - Paint( Rectangle( Point(), GetSizePixel() ) ); + Invalidate(Rectangle(Point(), GetSizePixel())); ShowFocus( Rectangle( Point( 1, 1 ), Size( m_nTextLen + 4, GetSizePixel().Height() - 2 ) ) ); } void FixedHyperlink::LoseFocus() { SetTextColor( GetControlForeground() ); - Paint( Rectangle( Point(), GetSizePixel() ) ); + Invalidate(Rectangle(Point(), GetSizePixel())); HideFocus(); } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index be90161..682a87b 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1300,7 +1300,7 @@ bool ScrollBar::PreNotify( NotifyEvent& rNEvt ) } SetClipRegion( aClipRegion ); - Paint( aClipRegion.GetBoundRect() ); + Invalidate(aClipRegion.GetBoundRect()); SetClipRegion( aRgn ); } diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 85a3b17..15c7590 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -462,13 +462,13 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt ) if( pLastRect ) { SetClipRegion(vcl::Region(*pLastRect)); - Paint( *pLastRect ); + Invalidate(*pLastRect); SetClipRegion( aRgn ); } if( pRect ) { SetClipRegion(vcl::Region(*pRect)); - Paint( *pRect ); + Invalidate(*pRect); SetClipRegion( aRgn ); } } diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 1f3b187..fe1f058 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -408,7 +408,7 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) { // put DropDownButton to the right mbInDropDown = ShowDropDown( mbInDropDown ? false : true ); - Paint( Rectangle( Point(), GetOutputSizePixel() ) ); + Invalidate(Rectangle(Point(), GetOutputSizePixel())); } if ( mbUpperIn || mbLowerIn ) @@ -524,7 +524,7 @@ bool SpinField::Notify( NotifyEvent& rNEvt ) else if ( ( nMod == KEY_MOD2 ) && !mbInDropDown && ( GetStyle() & WB_DROPDOWN ) ) { mbInDropDown = ShowDropDown( true ); - Paint( Rectangle( Point(), GetOutputSizePixel() ) ); + Invalidate( Rectangle( Point(), GetOutputSizePixel() ) ); nDone = true; } } @@ -597,7 +597,7 @@ void SpinField::FillLayoutData() const Edit::FillLayoutData(); } -void SpinField::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void SpinField::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { if ( mbSpin ) { @@ -623,7 +623,7 @@ void SpinField::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& aView.DrawSymbol( aInnerRect, eSymbol, GetSettings().GetStyleSettings().GetButtonTextColor(), nStyle ); } - Edit::Paint( rRect ); + Edit::Paint(rRenderContext, rRect); } void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ) @@ -883,13 +883,13 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt ) if( pLastRect ) { SetClipRegion(vcl::Region(*pLastRect)); - Paint( *pLastRect ); + Invalidate( *pLastRect ); SetClipRegion( aRgn ); } if( pRect ) { SetClipRegion(vcl::Region(*pRect)); - Paint( *pRect ); + Invalidate( *pRect ); SetClipRegion( aRgn ); } } @@ -904,7 +904,7 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt ) void SpinField::EndDropDown() { mbInDropDown = false; - Paint( Rectangle( Point(), GetOutputSizePixel() ) ); + Invalidate( Rectangle( Point(), GetOutputSizePixel() ) ); } bool SpinField::ShowDropDown( bool ) diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 656bfea..af2612a 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1369,7 +1369,7 @@ class DemoWin : public WorkWindow SolarMutexGuard aGuard; fprintf (stderr, "render from a different thread\n"); - mrWin.Paint(Rectangle()); + mrWin.Invalidate(); } }; rtl::Reference<RenderThread> mxThread; commit 92f522f40b8507ca8927517f5c26a1fc8d3dcc07 Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> Date: Tue Apr 28 11:00:54 2015 +0900 mass rewrite Paint(Rect&) to Paint(RenderContext&, Rect&) Change-Id: Ia1667246064d11827dbd149def15e5bf08b119b8 diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 7a6863b..180b889 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -661,7 +661,7 @@ void MediaWindowImpl::StateChanged( StateChangedType eType ) -void MediaWindowImpl::Paint( const Rectangle& ) +void MediaWindowImpl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if( mxPlayerWindow.is() ) mxPlayerWindow->update(); diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index c5c65fa..1d82857 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -125,7 +125,7 @@ namespace avmedia virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; // const + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE; // const virtual void GetFocus() SAL_OVERRIDE; // DropTargetHelper diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 1c11bb1..7e68ed5 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -250,7 +250,7 @@ void ModulWindow::DoInit() } -void ModulWindow::Paint( const Rectangle& ) +void ModulWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { } @@ -1475,7 +1475,7 @@ void ModulWindowLayout::UpdateDebug (bool bBasicStopped) aStackWindow.UpdateCalls(); } -void ModulWindowLayout::Paint (Rectangle const&) +void ModulWindowLayout::Paint (vcl::RenderContext& /*rRenderContext*/, Rectangle const&) { DrawText(Point(), IDEResId(RID_STR_NOMODULE).toString()); } diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 3d840d8..9e04718 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -120,7 +120,7 @@ private: TextSelection GetLastHighlightPortionTextSelection(); protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -176,7 +176,7 @@ private: void setBackgroundColor(Color aColor); protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; BreakPoint* FindBreakPoint( const Point& rMousePos ); void ShowMarker( bool bShow ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -232,7 +232,7 @@ private: protected: virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; DECL_LINK( ButtonHdl, ImageButton * ); DECL_LINK(TreeListHdl, void *); @@ -260,7 +260,7 @@ private: protected: virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; public: StackWindow (Layout* pParent); @@ -318,7 +318,7 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; virtual void DoInit() SAL_OVERRIDE; virtual void DoScroll( ScrollBar* pCurScrollBar ) SAL_OVERRIDE; @@ -432,7 +432,7 @@ public: protected: // Window: - virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; // Layout: virtual void OnFirstSize (long nWidth, long nHeight) SAL_OVERRIDE; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 4679621..9d43624 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -908,7 +908,7 @@ void EditorWindow::SetupAndShowCodeCompleteWnd( const std::vector< OUString >& a pEditView->GetWindow()->GrabFocus(); } -void EditorWindow::Paint( const Rectangle& rRect ) +void EditorWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if ( !pEditEngine ) // We need it now at latest CreateEditEngine(); @@ -1382,7 +1382,7 @@ BreakPointWindow::~BreakPointWindow() -void BreakPointWindow::Paint( const Rectangle& ) +void BreakPointWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if ( SyncYOffset() ) return; @@ -1679,7 +1679,7 @@ WatchWindow::~WatchWindow() -void WatchWindow::Paint( const Rectangle& ) +void WatchWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { DrawText( Point( DWBORDER, 7 ), aWatchStr ); lcl_DrawIDEWindowFrame( this ); @@ -1918,7 +1918,7 @@ StackWindow::~StackWindow() -void StackWindow::Paint( const Rectangle& ) +void StackWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { DrawText( Point( DWBORDER, 7 ), aStackStr ); lcl_DrawIDEWindowFrame( this ); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 12af692..25f6663 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -113,7 +113,7 @@ void DialogWindow::LoseFocus() -void DialogWindow::Paint( const Rectangle& rRect ) +void DialogWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { pEditor->Paint( rRect ); } diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 2ba7043..297904a 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -28,7 +28,7 @@ LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin LineNumberWindow::~LineNumberWindow() { } -void LineNumberWindow::Paint( const Rectangle& ) +void LineNumberWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if(SyncYOffset()) return; diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index caa7f15..511cb04 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -26,7 +26,7 @@ private: virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE; public: LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index b73b9e5..848a609 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -62,7 +62,7 @@ private: OUString aCurPath; protected: - 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; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index c46bab4..0ba8d3b 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -96,7 +96,7 @@ void ChartWindow::PrePaint() } } -void ChartWindow::Paint( const Rectangle& rRect ) +void ChartWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { m_bInPaint = true; if (m_pOpenGLWindow && m_pOpenGLWindow->IsVisible()) diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 2afa38a..fddc9a7 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -42,7 +42,7 @@ public: //from base class Window: 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 MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index f5761d3..26c30cf 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -203,7 +203,7 @@ void AboutDialog::Resize() } } -void AboutDialog::Paint( const Rectangle& rRect ) +void AboutDialog::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { SetClipRegion(vcl::Region(rRect)); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index d1015e84..0583002 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -260,7 +260,7 @@ class ColorPreviewControl : public Control public: ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; void SetColor( const Color& rColor ); private: @@ -296,7 +296,7 @@ void ColorPreviewControl::SetColor( const Color& rCol ) } } -void ColorPreviewControl::Paint( const Rectangle& rRect ) +void ColorPreviewControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { DrawRect( rRect ); } @@ -314,7 +314,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -633,7 +633,7 @@ void ColorFieldControl::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -void ColorFieldControl::Paint( const Rectangle& rRect ) +void ColorFieldControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if( !mpBitmap ) UpdateBitmap(); @@ -707,7 +707,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; void UpdateBitmap(); @@ -898,7 +898,7 @@ void ColorSliderControl::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -void ColorSliderControl::Paint( const Rectangle& /*rRect*/ ) +void ColorSliderControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { if( !mpBitmap ) UpdateBitmap(); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index f239f7f..dde1749 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -176,7 +176,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxShowText(vcl::Windo -void SvxShowText::Paint( const Rectangle& ) +void SvxShowText::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Color aTextCol = GetTextColor(); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 9eb4749..30c89ec 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -55,7 +55,7 @@ Size GraphicPreviewWindow::GetOptimalSize() const -void GraphicPreviewWindow::Paint( const Rectangle& rRect ) +void GraphicPreviewWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Control::Paint( rRect ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index ade5858..9de209c 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -217,7 +217,7 @@ namespace svx virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& _rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) SAL_OVERRIDE; private: PseudoRubyText m_aRubyText; @@ -234,7 +234,7 @@ namespace svx } - void RubyRadioButton::Paint( const Rectangle& ) + void RubyRadioButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { HideFocus(); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index a2b8383..8acf9c2 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -86,7 +86,7 @@ Size SvxHlmarkTreeLBox::GetOptimalSize() const return LogicToPixel(Size(103, 162), MAP_APPFONT); } -void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) +void SvxHlmarkTreeLBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if (!mpParentWnd || mpParentWnd->mnError == LERR_NOERROR) { diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 5ad4a5d..3e31956 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -245,7 +245,7 @@ void ThesaurusAlternativesCtrl::KeyInput( const KeyEvent& rKEvt ) SvxCheckListBox::KeyInput( rKEvt ); } -void ThesaurusAlternativesCtrl::Paint( const Rectangle& rRect ) +void ThesaurusAlternativesCtrl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if (!m_pDialog->WordFound()) { diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 132ab54..ef2b30c 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -61,7 +61,7 @@ private: protected: virtual bool Close() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; public: diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index a2e30e5..0d39350 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -52,7 +52,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; private: long mnY; diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 1fb1393..507db05 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -42,7 +42,7 @@ private: double mfScaleX; double mfScaleY; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 8d7392a..da32811 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -35,7 +35,7 @@ class SvxCropExample : public vcl::Window public: SvxCropExample( vcl::Window* pPar, WinBits nStyle ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 2108beb..29862e6 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -49,7 +49,7 @@ public: mpParentWnd = pParent; } - 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/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index e866670..d0eca9f 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -51,7 +51,7 @@ private: void InitSettings( bool bForeground, bool bBackground ); protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 8398776..e24dba1 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -48,7 +48,7 @@ class SvxNumberingPreview : 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: SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits = WB_BORDER); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index a2dcc85..91654dc 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -94,7 +94,7 @@ public: AlternativesExtraData * GetExtraData( const SvTreeListEntry *pEntry ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; }; class ReplaceEdit : public Edit diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 795b8b9..efc54cf 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -188,7 +188,7 @@ public: void NotifyChange( const Bitmap* pBitmap ); protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -316,7 +316,7 @@ void BackgroundPreviewImpl::Resize() -void BackgroundPreviewImpl::Paint( const Rectangle& ) +void BackgroundPreviewImpl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); SetBackground(Wallpaper(rStyleSettings.GetWindowColor())); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index eeac4d7..324963c 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -775,7 +775,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxCropExample(vcl::Wi return new SvxCropExample(pParent, nWinStyle); } -void SvxCropExample::Paint( const Rectangle& ) +void SvxCropExample::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Size aWinSize( PixelToLogic(GetOutputSizePixel() )); SetLineColor(); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 04c8e6e..aed7434 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -147,7 +147,7 @@ void SvxNumberPreview::NotifyChange( const OUString& rPrevStr, #* #************************************************************************/ -void SvxNumberPreview::Paint( const Rectangle& ) +void SvxNumberPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { vcl::Font aDrawFont = GetFont(); Size aSzWnd = GetOutputSizePixel(); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 921e7db..9c6fd66 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2290,7 +2290,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberingPreview(vc } // paint preview of numeration -void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) +void SvxNumberingPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { Size aSize(PixelToLogic(GetOutputSizePixel())); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 7772da1..0b397e9 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -51,7 +51,7 @@ public: { } - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; } void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } @@ -84,7 +84,7 @@ void FillUpWithDefTabs_Impl( long nDefDist, SvxTabStopItem& rTabs ) // class TabWin_Impl ----------------------------------------------------- -void TabWin_Impl::Paint( const Rectangle& ) +void TabWin_Impl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { // Paint tabulators Point aPnt; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index f01c26b..d94d992 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1285,7 +1285,7 @@ bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl return bRet; } -void OPreviewWindow::Paint( const Rectangle& rRect ) +void OPreviewWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Window::Paint( rRect ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index fb86bdd..fe495c6 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -69,7 +69,7 @@ namespace dbaui OPreviewWindow(vcl::Window* _pParent); // Window overrides - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; void setGraphic(const Graphic& _rGraphic ) { m_aGraphicObj.SetGraphic(_rGraphic); } }; diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 256f0ed..432708f 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -85,7 +85,7 @@ OCreationList::OCreationList( OTasksWindow& _rParent ) EnableEntryMnemonics(); } -void OCreationList::Paint( const Rectangle& _rRect ) +void OCreationList::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) { if ( m_pMouseDownEntry ) m_aOriginalFont = GetFont(); diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index f900482..e64516a 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -61,7 +61,7 @@ namespace dbaui virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index dc27afe..b1e2006 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -87,7 +87,7 @@ namespace dbaui { } - void ODataView::Paint( const Rectangle& _rRect ) + void ODataView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) { // draw the background { diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 2fc45e7..b508d4f 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -41,7 +41,7 @@ OMarkableTreeListBox::~OMarkableTreeListBox() } -void OMarkableTreeListBox::Paint(const Rectangle& _rRect) +void OMarkableTreeListBox::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect) { if (!IsEnabled()) { diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index f43cdd2..c204dad 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -269,7 +269,7 @@ namespace dbaui virtual void MouseButtonUp( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void ConnDoubleClicked( OTableConnection* pConnection ); void SetDefaultTabWinPosSize( OTableWindow* pTabWin ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 004139a..33f2662 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -77,7 +77,7 @@ namespace dbaui protected: virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index 2e10a99..531d172 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -49,7 +49,7 @@ public: void SetCheckHandler(const Link& _rHdl) { m_aCheckButtonHandler = _rHdl; } protected: - virtual void Paint(const Rectangle& _rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) SAL_OVERRIDE; virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry); SvButtonState implDetermineState(SvTreeListEntry* _pEntry); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index eb76c32..71ee255 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -919,7 +919,7 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) } } -void OJoinTableView::Paint( const Rectangle& rRect ) +void OJoinTableView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { DrawConnections( rRect ); } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 3588846..c2a2f56 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -306,7 +306,7 @@ void OTableWindow::DataChanged(const DataChangedEvent& rDCEvt) } } -void OTableWindow::Paint( const Rectangle& rRect ) +void OTableWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Rectangle aRect( Point(0,0), GetOutputSizePixel() ); Window::Paint( rRect ); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 1cd013e..4e8456d 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -106,7 +106,7 @@ void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr ) getGenPage()->SaveData( pFieldDescr ); } -void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ ) +void OTableFieldDescWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { // 3D-line at the top window border const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index f2092ff..0dad108 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -50,7 +50,7 @@ namespace dbaui protected: virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; public: OTableFieldDescWin( vcl::Window* pParent); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index b9500a1..df86aa7 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -748,7 +748,7 @@ bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode ) } -void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ ) ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits