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 compilerplugins/clang/store/paintmethodconversion.cxx | 95 ++++++++++++++++++ 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 | 12 +- include/vcl/dockingarea.hxx | 2 include/vcl/edit.hxx | 4 include/vcl/fixed.hxx | 10 - include/vcl/group.hxx | 2 include/vcl/imgctrl.hxx | 2 include/vcl/openglwin.hxx | 2 include/vcl/prgsbar.hxx | 5 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 | 4 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 | 8 - vcl/inc/printdlg.hxx | 4 vcl/source/app/help.cxx | 2 vcl/source/control/button.cxx | 46 ++++---- vcl/source/control/edit.cxx | 16 +-- vcl/source/control/fixed.cxx | 20 +-- vcl/source/control/fixedhyper.cxx | 4 vcl/source/control/group.cxx | 4 vcl/source/control/ilstbox.cxx | 11 -- vcl/source/control/imgctrl.cxx | 4 vcl/source/control/prgsbar.cxx | 15 +- vcl/source/control/scrbar.cxx | 6 - 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 | 2 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 - 330 files changed, 695 insertions(+), 600 deletions(-)
New commits: commit f1b0cf258d319f28b36c0c4452f3751248e24b6e Author: Tomaž Vajngerl <[email protected]> Date: Wed Apr 29 11:21:47 2015 +0900 Move paint method rewriter to store Change-Id: If2bbd355a293e0a0feed7db8f179a0bdcf6dce43 diff --git a/compilerplugins/clang/paintmethodconversion.cxx b/compilerplugins/clang/store/paintmethodconversion.cxx similarity index 100% rename from compilerplugins/clang/paintmethodconversion.cxx rename to compilerplugins/clang/store/paintmethodconversion.cxx commit e6c2951f1957224aa0e7dc97b33b0450c41f92f7 Author: Tomaž Vajngerl <[email protected]> Date: Wed Apr 29 11:08:24 2015 +0900 delegate RenderContext, invalidate - prgsbar, scrbar Change-Id: I05d68be744044cc82c0397fac25518a53c270761 diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 6cce19c..28fbec3 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -63,12 +63,13 @@ private: long mnPrgsHeight; sal_uInt16 mnPercent; sal_uInt16 mnPercentCount; + sal_uInt16 mnPreviousPercent; bool mbCalcNew; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit(); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); - SAL_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); + SAL_DLLPRIVATE void ImplDrawProgress(vcl::RenderContext& rRenderContext, sal_uInt16 nOldPerc, sal_uInt16 nNewPerc); public: ProgressBar( vcl::Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 8bdf2fe..609911c 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -27,8 +27,9 @@ void ProgressBar::ImplInit() { - mnPercent = 0; - mbCalcNew = true; + mnPercent = 0; + mnPreviousPercent = 0; + mbCalcNew = true; ImplInitSettings( true, true, true ); } @@ -116,7 +117,7 @@ void ProgressBar::ImplInitSettings( bool bFont, } } -void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ) +void ProgressBar::ImplDrawProgress(vcl::RenderContext& /*rRenderContext*/, sal_uInt16 nOldPerc, sal_uInt16 nNewPerc) { if ( mbCalcNew ) { @@ -145,9 +146,9 @@ void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ) Rectangle( Point(), GetSizePixel() ) ); } -void ProgressBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void ProgressBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) { - ImplDrawProgress( 0, mnPercent ); + ImplDrawProgress(rRenderContext, mnPreviousPercent, mnPercent); } void ProgressBar::Resize() @@ -165,6 +166,7 @@ void ProgressBar::SetValue( sal_uInt16 nNewPercent ) { mbCalcNew = true; mnPercent = nNewPercent; + mnPreviousPercent = 0; if ( IsReallyVisible() ) { Invalidate(); @@ -173,8 +175,9 @@ void ProgressBar::SetValue( sal_uInt16 nNewPercent ) } else { - ImplDrawProgress( mnPercent, nNewPercent ); + mnPreviousPercent = mnPercent; mnPercent = nNewPercent; + Invalidate(); } } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 6f883bf..0d71783 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1120,9 +1120,9 @@ void ScrollBar::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -void ScrollBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void ScrollBar::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) { - ImplDraw( SCRBAR_DRAW_ALL, this ); + ImplDraw(SCRBAR_DRAW_ALL, &rRenderContext); } void ScrollBar::Resize() commit c57a5f310b6168b4fe262656ceb253f4566dd2d9 Author: Tomaž Vajngerl <[email protected]> Date: Wed Apr 29 08:58:38 2015 +0900 delegate RenderContext, invalidate - ilstbox Change-Id: I9d47e828a784bf6b120b4b1e9df332ea85690a19 diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 37a4a43..7e2410a 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -244,14 +244,14 @@ protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) 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 Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; bool SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bool bShift = false, bool bCtrl = false, bool bSelectPosChange = false ); - void ImplPaint( sal_Int32 nPos, bool bErase = false, bool bLayout = false ); - void ImplDoPaint( const Rectangle& rRect, bool bLayout = false ); + void ImplPaint(sal_Int32 nPos, bool bErase = false, bool bLayout = false); + void ImplDoPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bLayout = false); void ImplCalcMetrics(); void ImplUpdateEntryMetrics( ImplEntryType& rEntry ); void ImplCallSelect(); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 01a18d2..c2d53ce 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -1880,11 +1880,10 @@ void ImplListBoxWindow::DrawEntry( sal_Int32 nPos, bool bDrawImage, bool bDrawTe void ImplListBoxWindow::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); - const_cast<ImplListBoxWindow*>(this)-> - ImplDoPaint( Rectangle( Point( 0, 0 ), GetOutputSize() ), true ); + const_cast<ImplListBoxWindow*>(this)->Invalidate(Rectangle(Point(0, 0), GetOutputSize())); } -void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) +void ImplListBoxWindow::ImplDoPaint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect, bool bLayout) { sal_Int32 nCount = mpEntryList->GetEntryCount(); @@ -1914,9 +1913,9 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) ImplShowFocusRect(); } -void ImplListBoxWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) +void ImplListBoxWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { - ImplDoPaint( rRect ); + ImplDoPaint(rRenderContext, rRect); } sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const commit cdb1fa88c8c960cfcc817a14e64c54ef6babeb59 Author: Tomaž Vajngerl <[email protected]> Date: Wed Apr 29 08:51:37 2015 +0900 delegate RenderContext - fixed, group, imgctrl Change-Id: I438eaaa7959465d264ab248234a99c9e37bc56d9 diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index eb33f9d..3f9e134 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -103,7 +103,7 @@ private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); - SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); + SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout = false); protected: virtual void FillLayoutData() const SAL_OVERRIDE; diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index e4858f1..c8acbd1 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -234,9 +234,9 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, ); } -void FixedText::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void FixedText::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) { - ImplDraw( this, 0, Point(), GetOutputSizePixel() ); + ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel()); } void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, @@ -543,7 +543,7 @@ void FixedLine::ImplInitSettings( bool bFont, } } -void FixedLine::ImplDraw( bool bLayout ) +void FixedLine::ImplDraw(vcl::RenderContext& /*rRenderContext*/, bool bLayout) { Size aOutSize = GetOutputSizePixel(); OUString aText = GetText(); @@ -638,12 +638,12 @@ FixedLine::FixedLine( vcl::Window* pParent, const ResId& rResId ) : void FixedLine::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); - const_cast<FixedLine*>(this)->ImplDraw( true ); + const_cast<FixedLine*>(this)->Invalidate(); } -void FixedLine::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void FixedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { - ImplDraw(); + ImplDraw(rRenderContext); } void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uLong ) @@ -773,9 +773,9 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */, } } -void FixedBitmap::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void FixedBitmap::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { - ImplDraw( this, 0, Point(), GetOutputSizePixel() ); + ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel()); } void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, @@ -943,9 +943,9 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, } } -void FixedImage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void FixedImage::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { - ImplDraw( this, 0, Point(), GetOutputSizePixel() ); + ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel()); } Size FixedImage::GetOptimalSize() const diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 77cd1a6..e6b0b9a 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -188,9 +188,9 @@ void GroupBox::FillLayoutData() const const_cast<GroupBox*>(this)-> ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true ); } -void GroupBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void GroupBox::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) { - ImplDraw( this, 0, Point(), GetOutputSizePixel() ); + ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel()); } void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 288cb04..baaaa20 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -131,9 +131,9 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi } // switch ( mnScaleMode ) } -void ImageControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) +void ImageControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) { - ImplDraw( *this, 0, Point(), GetOutputSizePixel() ); + ImplDraw(rRenderContext, 0, Point(), GetOutputSizePixel()); if( HasFocus() ) { commit d0ab8e0cb961c43f7975b496c191ac88859139ed Author: Tomaž Vajngerl <[email protected]> Date: Tue Apr 28 17:48:03 2015 +0900 vcl edit: Delegate RenderContext to sub-methods, use Invalidate Change-Id: Ifb1a54e852bc9011389cac758e6f0dfd6c84d464 diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 30c97d0..dde925f 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -105,7 +105,7 @@ private: SAL_DLLPRIVATE void ImplInitEditData(); SAL_DLLPRIVATE void ImplModified(); SAL_DLLPRIVATE OUString ImplGetText() const; - SAL_DLLPRIVATE void ImplRepaint(bool bLayout = false); + SAL_DLLPRIVATE void ImplRepaint(vcl::RenderContext& rRenderContext, bool bLayout = false); SAL_DLLPRIVATE void ImplInvalidateOrRepaint(); SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode ); SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const Selection* pNewSelection = 0 ); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 4e07e3b..ece4f56 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -475,7 +475,7 @@ void Edit::ImplInvalidateOrRepaint() Update(); } else - ImplRepaint(); + Invalidate(); } long Edit::ImplGetTextYPosition() const @@ -487,7 +487,7 @@ long Edit::ImplGetTextYPosition() const return ( GetOutputSizePixel().Height() - GetTextHeight() ) / 2; } -void Edit::ImplRepaint(bool bLayout) +void Edit::ImplRepaint(vcl::RenderContext& /*rRenderContext*/, bool bLayout) { if ( !IsReallyVisible() ) return; @@ -1758,13 +1758,13 @@ void Edit::KeyInput( const KeyEvent& rKEvt ) void Edit::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); - const_cast<Edit*>(this)->ImplRepaint(true); + const_cast<Edit*>(this)->Invalidate(); } -void Edit::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void Edit::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { - if ( !mpSubEdit ) - ImplRepaint(); + if (!mpSubEdit) + ImplRepaint(rRenderContext); } void Edit::Resize() commit 53ef550ac6fc3505914c3d77e9d0575913e54bb3 Author: Tomaž Vajngerl <[email protected]> Date: Tue Apr 28 17:43:26 2015 +0900 vcl button: Delegate RenderContext to sub-methods, use Invalidate Change-Id: Idd4181180da0bbbac872b58569e30cbc384125fe diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index af19505..8fb9ded 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -123,7 +123,7 @@ protected: SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, const Rectangle& rRect, bool bLayout, bool bMenuBtnSep ); - SAL_DLLPRIVATE void ImplDrawPushButton( bool bLayout = false ); + SAL_DLLPRIVATE void ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLayout = false); using Button::ImplGetTextStyle; SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( sal_uLong nDrawFlags ) const; SAL_DLLPRIVATE bool IsSymbol() const { return ( (meSymbol != SymbolType::DONTKNOW) && (meSymbol != SymbolType::IMAGE) ); } @@ -296,7 +296,7 @@ private: const Point& rPos, const Size& rSize, const Size& rImageSize, Rectangle& rStateRect, Rectangle& rMouseRect, bool bLayout = false ); - SAL_DLLPRIVATE void ImplDrawRadioButton( bool bLayout = false ); + SAL_DLLPRIVATE void ImplDrawRadioButton(vcl::RenderContext& rRenderContext, bool bLayout = false ); SAL_DLLPRIVATE void ImplInvalidateOrDrawRadioButtonState(); SAL_DLLPRIVATE void ImplUncheckAllOther(); SAL_DLLPRIVATE Size ImplGetRadioImageSize() const; @@ -425,7 +425,7 @@ private: const Point& rPos, const Size& rSize, const Size& rImageSize, Rectangle& rStateRect, Rectangle& rMouseRect, bool bLayout ); - SAL_DLLPRIVATE void ImplDrawCheckBox( bool bLayout = false ); + SAL_DLLPRIVATE void ImplDrawCheckBox(vcl::RenderContext& rRenderContext, bool bLayout = false ); SAL_DLLPRIVATE long ImplGetImageToTextDistance() const; SAL_DLLPRIVATE Size ImplGetCheckImageSize() const; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index bbe85b8..3128f11 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -914,7 +914,7 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF pDev->Pop(); // restore clipregion } -void PushButton::ImplDrawPushButton( bool bLayout ) +void PushButton::ImplDrawPushButton(vcl::RenderContext& /*rRenderContext*/, bool bLayout) { if( !bLayout ) HideFocus(); @@ -1190,7 +1190,7 @@ void PushButton::MouseButtonDown( const MouseEvent& rMEvt ) nTrackFlags |= STARTTRACK_BUTTONREPEAT; ImplGetButtonState() |= BUTTON_DRAW_PRESSED; - ImplDrawPushButton(); + Invalidate(); StartTracking( nTrackFlags ); if ( nTrackFlags & STARTTRACK_BUTTONREPEAT ) @@ -1224,7 +1224,7 @@ void PushButton::Tracking( const TrackingEvent& rTEvt ) else ImplGetButtonState() &= ~BUTTON_DRAW_PRESSED; - ImplDrawPushButton(); + Invalidate(); // do not call Click handler if aborted if ( !rTEvt.IsTrackingCanceled() ) @@ -1248,7 +1248,7 @@ void PushButton::Tracking( const TrackingEvent& rTEvt ) else { ImplGetButtonState() |= BUTTON_DRAW_PRESSED; - ImplDrawPushButton(); + Invalidate(); } } else @@ -1256,7 +1256,7 @@ void PushButton::Tracking( const TrackingEvent& rTEvt ) if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED ) { ImplGetButtonState() &= ~BUTTON_DRAW_PRESSED; - ImplDrawPushButton(); + Invalidate(); } } } @@ -1272,7 +1272,7 @@ void PushButton::KeyInput( const KeyEvent& rKEvt ) if ( !(ImplGetButtonState() & BUTTON_DRAW_PRESSED) ) { ImplGetButtonState() |= BUTTON_DRAW_PRESSED; - ImplDrawPushButton(); + Invalidate(); } if ( ( GetStyle() & WB_REPEAT ) && @@ -1282,7 +1282,7 @@ void PushButton::KeyInput( const KeyEvent& rKEvt ) else if ( (ImplGetButtonState() & BUTTON_DRAW_PRESSED) && (aKeyCode.GetCode() == KEY_ESCAPE) ) { ImplGetButtonState() &= ~BUTTON_DRAW_PRESSED; - ImplDrawPushButton(); + Invalidate(); } else Button::KeyInput( rKEvt ); @@ -1310,7 +1310,7 @@ void PushButton::KeyUp( const KeyEvent& rKEvt ) else ImplGetButtonState() &= ~BUTTON_DRAW_PRESSED; - ImplDrawPushButton(); + Invalidate(); if ( !( ( GetStyle() & WB_REPEAT ) && ! ( GetStyle() & WB_TOGGLE ) ) ) @@ -1323,12 +1323,12 @@ void PushButton::KeyUp( const KeyEvent& rKEvt ) void PushButton::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); - const_cast<PushButton*>(this)->ImplDrawPushButton( true ); + const_cast<PushButton*>(this)->Invalidate(); } -void PushButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void PushButton::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { - ImplDrawPushButton(); + ImplDrawPushButton(rRenderContext); } void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, @@ -1589,7 +1589,7 @@ void PushButton::EndSelection() { ImplGetButtonState() &= ~BUTTON_DRAW_PRESSED; if ( !mbPressed ) - ImplDrawPushButton(); + Invalidate(); } } @@ -2112,7 +2112,7 @@ void RadioButton::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, pDev->Pop(); } -void RadioButton::ImplDrawRadioButton( bool bLayout ) +void RadioButton::ImplDrawRadioButton(vcl::RenderContext& /*rRenderContext*/, bool bLayout) { if( !bLayout ) HideFocus(); @@ -2409,12 +2409,12 @@ void RadioButton::KeyUp( const KeyEvent& rKEvt ) void RadioButton::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); - const_cast<RadioButton*>(this)->ImplDrawRadioButton( true ); + const_cast<RadioButton*>(this)->Invalidate(); } -void RadioButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void RadioButton::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) { - ImplDrawRadioButton(); + ImplDrawRadioButton(rRenderContext); } void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, @@ -3136,7 +3136,7 @@ void CheckBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, pDev->Pop(); } -void CheckBox::ImplDrawCheckBox( bool bLayout ) +void CheckBox::ImplDrawCheckBox(vcl::RenderContext& rRenderContext, bool bLayout) { Size aImageSize = ImplGetCheckImageSize(); aImageSize.Width() = CalcZoom( aImageSize.Width() ); @@ -3145,7 +3145,7 @@ void CheckBox::ImplDrawCheckBox( bool bLayout ) if( !bLayout ) HideFocus(); - ImplDraw( this, 0, Point(), GetOutputSizePixel(), aImageSize, + ImplDraw( &rRenderContext, 0, Point(), GetOutputSizePixel(), aImageSize, maStateRect, maMouseRect, bLayout ); if( !bLayout ) @@ -3291,12 +3291,12 @@ void CheckBox::KeyUp( const KeyEvent& rKEvt ) void CheckBox::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); - const_cast<CheckBox*>(this)->ImplDrawCheckBox( true ); + const_cast<CheckBox*>(this)->Invalidate(); } -void CheckBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) +void CheckBox::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) { - ImplDrawCheckBox(); + ImplDrawCheckBox(rRenderContext); } void CheckBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, @@ -3416,7 +3416,7 @@ void CheckBox::GetFocus() aSize.Height() += 2; aSize.Width() += 2; setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL ); - ImplDrawCheckBox(); + Invalidate(); } else ShowFocus( ImplGetFocusRect() ); @@ -3446,7 +3446,7 @@ void CheckBox::LoseFocus() aSize.Height() -= 2; aSize.Width() -= 2; setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL ); - ImplDrawCheckBox(); + Invalidate(); } } commit 6cea2e61cf77bfe5bc53aa6002807c9b38e77499 Author: Tomaž Vajngerl <[email protected]> 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 ac424fe..42cac22 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 62510e9..31b54b1 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1295,9 +1295,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 5a24a70..d959262 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -93,7 +93,7 @@ namespace dbaui { } - void ODataView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) + void ODataView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) { // draw the background { @@ -102,7 +102,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 26ddb53..de29020 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -312,10 +312,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 6e3c54e..ad30530 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -528,9 +528,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 b83030a..28b0322 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -914,9 +914,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 4c46701..7d31fa2 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -134,9 +134,9 @@ void OReportSection::dispose() vcl::Window::dispose(); } -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 c351783..e7d8e97 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -261,9 +261,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 4f42e11..2983591 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -727,7 +727,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) { @@ -745,7 +745,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 cd5dcde..70ca0bd 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -236,14 +236,14 @@ void ScScenarioWindow::dispose() vcl::Window::dispose(); } -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 932baf1..4d84107 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -218,7 +218,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(); @@ -227,9 +227,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 99e533b..961cf7f 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 bd8dcf9..d48fbae 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -657,9 +657,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 af4932e..5ec6407 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -159,7 +159,7 @@ void SfxInfoBarWindow::dispose() vcl::Window::dispose(); } -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( @@ -202,7 +202,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 a0a945e..3bd24c1 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -39,7 +39,7 @@ MenuButton::MenuButton (vcl::Window* pParentWindow) #endif } -void MenuButton::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) +void MenuButton::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) { switch(mePaintType) { @@ -70,7 +70,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 13b8532..f277efd 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -130,9 +130,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 df7a184..fd8695e 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -79,9 +79,9 @@ void TabBar::dispose() vcl::Window::dispose(); } -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 d05c906..0d7f866 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -42,7 +42,7 @@ TabItem::TabItem (vcl::Window* pParentWindow) #endif } -void TabItem::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) +void TabItem::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) { switch(mePaintType) { @@ -74,7 +74,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 f3cf0e7..f562685 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -247,9 +247,9 @@ VclPtr<SfxTabPage> SmPrintOptionsTabPage::Create(vcl::Window* pWindow, const Sfx /**************************************************************************/ -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()); @@ -1427,9 +1427,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); @@ -1711,9 +1711,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 3d560d6..d4d4cfb 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -300,9 +300,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 6bef56e..a624719 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2568,9 +2568,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 1fbb266..bc0673a 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -556,10 +556,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() ) @@ -573,7 +572,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 c82584c..55e9a9d 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -56,9 +56,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 10974bf..f724557 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -716,9 +716,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 eb0d9b3..a9bc302 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 4cf85a9..4fc48ba 100644 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ b/svx/source/sidebar/tools/PopupControl.cxx @@ -35,9 +35,9 @@ PopupControl::PopupControl ( SetBackground(Theme::GetWallpaper(Theme::Paint_DropDownBackground)); } -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 58b2936..0ce3dca 100644 --- a/svx/workben/pixelctl.cxx +++ b/svx/workben/pixelctl.cxx @@ -153,9 +153,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 87ba77f..84cf08a 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -425,9 +425,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 4a53ece..ff2869c 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -208,9 +208,9 @@ void SwSidebarWin::dispose() vcl::Window::dispose(); } -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 85bbbeb..4e07e3b 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1072,12 +1072,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 464a7e9..82aa0be 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1309,8 +1309,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 ae8776b..e022018 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 83ba362..2391f61 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -322,9 +322,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 f991b98..eaec6fe 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3418,7 +3418,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 326f1f5..6cbe371 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -103,7 +103,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; @@ -124,7 +124,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 ad88f1e..22629be 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 d509643..365ad38 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 b82c89b..50f388f 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -301,9 +301,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 4ee0259..f220f32 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -220,9 +220,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 704ebef99de606f5a60c495130e6e3d791981042 Author: Tomaž Vajngerl <[email protected]> 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 8534312..cde2c86 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -703,7 +703,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 1dd9b3a..ae8776b 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 71b93e0..f991b98 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3927,11 +3927,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 9905a8b953953b9ec5e123a17997d5931978acfe Author: Tomaž Vajngerl <[email protected]> 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 dc61456..c050b5a 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -102,12 +102,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) { @@ -115,7 +115,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 6ba4259..5af8082 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -97,11 +97,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 7dc7b7a..4a98eb5 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -267,7 +267,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()) { @@ -281,7 +281,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 0bc2945..e8b92a9 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -213,7 +213,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 &) @@ -250,7 +250,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 eba5b10..06432c7 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 d85d0b1..54634ed 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -46,7 +46,7 @@ void OMarkableTreeListBox::dispose() DBTreeListBox::dispose(); } -void OMarkableTreeListBox::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect) +void OMarkableTreeListBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) { if (!IsEnabled()) { @@ -57,11 +57,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 66fec0a..c56ea26 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -194,7 +194,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange) if ( _eBitmapMode == BM_FULLSCREEN ) pWindow->ShowFullScreenMode( true ); pWindow->Show(); - pWindow->Paint(Rectangle()); + pWindow->Invalidate(); pWindow->Flush(); } } @@ -352,7 +352,7 @@ void SplashScreen::updateStatus() return; if (!_bPaintProgress) _bPaintProgress = true; - pWindow->Paint(Rectangle()); + pWindow->Invalidate(); pWindow->Flush(); } @@ -364,7 +364,7 @@ IMPL_LINK( SplashScreen, AppEventListenerHdl, VclWindowEvent *, inEvent ) switch ( inEvent->GetId() ) { case VCLEVENT_WINDOW_SHOW: - pWindow->Paint( Rectangle() ); + pWindow->Invalidate(); break; default: break; diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 0201193..6e3c54e 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -578,8 +578,7 @@ void GridWindow::MouseButtonUp( const MouseEvent& rEvt ) { m_nDragIndex = 0xffffffff; computeNew(); - Invalidate( m_aGridArea ); - Paint( m_aGridArea ); + Invalidate(m_aGridArea); } } @@ -629,8 +628,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 f5270c4..c9eddec 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1481,9 +1481,9 @@ void XMLFilterListBox::dispose() SvTabListBox::dispose(); } -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 488ab38..a4c64d5 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -556,9 +556,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) @@ -1332,12 +1332,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 ); @@ -1423,8 +1423,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 3ed8db8..c0cce30 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1307,9 +1307,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 35f530f..806d0cb 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -281,7 +281,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) Rectangle aRect( Point( 0, 0 ), aSliderWindowSize ); - Paint( aRect ); + Invalidate(aRect); mpImpl->mbOmitPaint = true; SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom ); @@ -316,8 +316,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, @@ -382,10 +382,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 44b283d..ce2080a 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -863,7 +863,7 @@ void ScPreview::SetXOffset( long nX ) Invalidate(); } InvalidateLocationData( SC_HINT_ACC_VISAREACHANGED ); - Paint(Rectangle()); + Invalidate(); } void ScPreview::SetYOffset( long nY ) @@ -889,7 +889,7 @@ void ScPreview::SetYOffset( long nY ) Invalidate(); } InvalidateLocationData( SC_HINT_ACC_VISAREACHANGED ); - Paint(Rectangle()); + Invalidate(); } void ScPreview::DoInvalidate() @@ -1083,17 +1083,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() ) { @@ -1132,7 +1132,7 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) } Rectangle aRect(0,0,10000,10000); - Paint( aRect ); + Invalidate(aRect); aModificator.SetDocumentModified(); bLeftRulerChange = false; bRightRulerChange = false; @@ -1150,7 +1150,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() ) { @@ -1233,8 +1233,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; @@ -1290,8 +1290,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 d809569..4d7adaf 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -921,12 +921,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 056ac62..14d8aaf 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -172,7 +172,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 d4c9751..65ce70f 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -262,14 +262,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 58b7ad9..3a5320f 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; @@ -455,7 +455,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 077103f..1c39bfa 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 3647864..a398e19 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -252,7 +252,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 ) { @@ -282,7 +282,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 3134785..ccf1aa7 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -300,9 +300,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 31b4d5d..6566719 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -880,7 +880,7 @@ void ThumbnailView::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangl } if (mpScrBar && mpScrBar->IsVisible()) - mpScrBar->Paint(aRect); + mpScrBar->Invalidate(aRect); } void ThumbnailView::GetFocus() @@ -1355,5 +1355,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 f6ef4a9..e4cccd0 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -141,12 +141,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 98f6a22..a29d2aa 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -97,9 +97,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 a821ef8..27b1eb1 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -188,7 +188,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 6237afa..6a42aa3 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -190,9 +190,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 f5e603c..09430f1 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -537,13 +537,13 @@ void SvHeaderTabListBox::dispose() -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 aecf1f7..6bef56e 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3837,8 +3837,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 28f57db..4b802de 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1944,7 +1944,7 @@ void Ruler::ImplDrag( const Point& rPos ) Drag(); // and redraw - Paint(Rectangle()); + Invalidate(); // reset the data as before cancel *mpDragData = aTempData; @@ -1965,7 +1965,7 @@ void Ruler::ImplDrag( const Point& rPos ) // redraw if ( mbFormat ) - Paint(Rectangle()); + Invalidate(); } } @@ -1994,7 +1994,7 @@ void Ruler::ImplEndDrag() mnStartDragPos = 0; // redraw - Paint(Rectangle()); + Invalidate(); } IMPL_LINK_NOARG(Ruler, ImplUpdateHdl) @@ -2005,7 +2005,7 @@ IMPL_LINK_NOARG(Ruler, ImplUpdateHdl) if ( mnUpdateFlags & RULER_UPDATE_DRAW ) { mnUpdateFlags = 0; - Paint(Rectangle()); + Invalidate(); } else if ( mnUpdateFlags & RULER_UPDATE_LINES ) { @@ -2027,7 +2027,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt ) // update ruler if ( mbFormat ) { - Paint(Rectangle()); + Invalidate(); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } @@ -2135,7 +2135,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt ) if ( mbFormat ) { - Paint(Rectangle()); + Invalidate(); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } mxPreviousHitTest.swap(mxCurrentHitTest); @@ -2262,7 +2262,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) ) @@ -2364,7 +2364,7 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType ) // update ruler if ( mbFormat ) { - Paint(Rectangle()); + Invalidate(); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } @@ -2430,7 +2430,7 @@ RulerType Ruler::GetType( const Point& rPos, sal_uInt16* pAryPos ) // update ruler if ( IsReallyVisible() && mbFormat ) { - Paint(Rectangle()); + Invalidate(); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } @@ -2855,7 +2855,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 294d924..547dada 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -2468,7 +2468,7 @@ sal_uInt16 TabBar::ShowDropPos( const Point& rPos ) Rectangle aRect( mnOffX, 0, mnLastOffX, maWinSize.Height() ); SetFillColor( GetBackground().GetColor() ); DrawRect( aRect ); - Paint( aRect ); + Invalidate(aRect); } } @@ -2545,7 +2545,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) ) @@ -2556,7 +2556,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 2b238fd..49e47aa 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -143,7 +143,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 45428b5..e30ec59 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 35b2cf5..b4bf1af 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -79,9 +79,9 @@ void LineWidthControl::dispose() -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 1e1fdea..6e635be 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -60,9 +60,9 @@ void SwCommentRuler::dispose() SvxRuler::dispose(); } -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 db36f90..7430984 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -89,14 +89,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 4050560..6f883bf 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1306,7 +1306,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 4a7da9b..4689ee8 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -458,13 +458,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 66cabf6..c9131b7 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -415,7 +415,7 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) { // put DropDownButton to the right mbInDropDown = ShowDropDown( !mbInDropDown ); - Paint( Rectangle( Point(), GetOutputSizePixel() ) ); + Invalidate(Rectangle(Point(), GetOutputSizePixel())); } if ( mbUpperIn || mbLowerIn ) @@ -531,7 +531,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; } } @@ -604,7 +604,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 ) { @@ -630,7 +630,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 ) @@ -890,13 +890,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 ); } } @@ -911,7 +911,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 e85da2e..eee51b3 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1368,7 +1368,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 f50fd9692ed7b9632c0f8dad9508f5a207679be4 Author: Tomaž Vajngerl <[email protected]> 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 c84849b..c0430a0 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 c56558c..755de29 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -124,7 +124,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 f6e491a..23207dc 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -256,7 +256,7 @@ void ModulWindow::DoInit() } -void ModulWindow::Paint( const Rectangle& ) +void ModulWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { } @@ -1494,7 +1494,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 2d5afed..749bf23 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; @@ -177,7 +177,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; @@ -233,7 +233,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 *); @@ -262,7 +262,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); @@ -322,7 +322,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; @@ -439,7 +439,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 fbf4da6..6cbaaf5 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -915,7 +915,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(); @@ -1383,7 +1383,7 @@ BreakPointWindow::BreakPointWindow (vcl::Window* pParent, ModulWindow* pModulWin SetHelpId(HID_BASICIDE_BREAKPOINTWINDOW); } -void BreakPointWindow::Paint( const Rectangle& ) +void BreakPointWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { if ( SyncYOffset() ) return; @@ -1691,7 +1691,7 @@ void WatchWindow::dispose() -void WatchWindow::Paint( const Rectangle& ) +void WatchWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { DrawText( Point( DWBORDER, 7 ), aWatchStr ); lcl_DrawIDEWindowFrame( this ); @@ -1938,7 +1938,7 @@ void StackWindow::dispose() -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 fa99f7c..1af65b6 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -110,7 +110,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 a2f01ee..03ee520 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -36,7 +36,7 @@ void LineNumberWindow::dispose() Window::dispose(); } -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 6549893..ada9765 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 de17eb0..7afe56d 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 cd50dd3..dc61456 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -102,7 +102,7 @@ void ChartWindow::PrePaint() } } -void ChartWindow::Paint( const Rectangle& rRect ) ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
