diff options
39 files changed, 86 insertions, 87 deletions
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index ac424fee957f..42cac22e856b 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 62510e98a7cf..31b54b1263df 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 5a24a70ba025..d959262953d8 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 26ddb53b59b3..de29020efbce 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 6e3c54e2856c..ad305304c98e 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 b83030adbd06..28b032298cc0 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 4c4670171e69..7d31fa225538 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 c35178338f17..e7d8e9709b83 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 4f42e113232e..298359111626 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 cd5dcde2e3e0..70ca0bd45fbb 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 932baf17ee21..4d8410726a2e 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 99e533bc3e99..961cf7f6f050 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 bd8dcf981786..d48fbae53d3b 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 af4932e48b7e..5ec640735c54 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 a0a945ecc7cd..3bd24c1d4011 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 13b853268ec6..f277efd52165 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 df7a184667c8..fd8695ee0205 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 d05c906fb057..0d7f8667a16b 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 f3cf0e760570..f562685b1683 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 3d560d69f5b9..d4d4cfb21a46 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 6bef56e00490..a6247190ccb8 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 1fbb266ed34c..bc0673a5cdf2 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 c82584cba903..55e9a9da0038 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 10974bf3adac..f72455723b59 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 eb0d9b3aa0a5..a9bc30215615 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 4cf85a9b8fd1..4fc48baee127 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 58b29367c239..0ce3dca53c5a 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 87ba77f90ebb..84cf08a300f8 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 4a53ece0428f..ff2869c0450f 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 85bbbeb46e99..4e07e3b16740 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 464a7e940d47..82aa0bea8d2d 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 ae8776be1012..e0220189c9f2 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 83ba36286f70..2391f61ca8c2 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 f991b98b6fe5..eaec6fe38c81 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 326f1f586b91..6cbe37113914 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 ad88f1e65e5c..22629be87e4c 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 d509643b4f3d..365ad38048e4 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 b82c89bc23b0..50f388f5d2d8 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 4ee02591027b..f220f3280ac7 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 ); |