diff options
38 files changed, 105 insertions, 109 deletions
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index dc61456ebd69..c050b5a2330a 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 6ba42590500d..5af808240616 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 7dc7b7aea781..4a98eb59a44b 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 0bc294550b81..e8b92a9a8e40 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 eba5b1055fb7..06432c7c07a0 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 d85d0b120ffd..54634ed7d393 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 66fec0ad4ec0..c56ea26a0ac0 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 0201193acc2b..6e3c54e2856c 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 f5270c4fa4ca..c9eddecdc8c9 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 488ab383088b..a4c64d5691ad 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 3ed8db8cc855..c0cce308978e 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 35f530f02c83..806d0cb60fb6 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 44b283d1973c..ce2080a5effe 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 d80956948dac..4d7adafce1f3 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 056ac628cc38..14d8aafb5b03 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 d4c975123a4d..65ce70fa7e04 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 58b7ad9e1a85..3a5320fd4c54 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 077103f96147..1c39bfa07509 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 36478643b3ce..a398e1994bfd 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 3134785d0dde..ccf1aa756777 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 31b4d5dad284..656671998950 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 f6ef4a9e74fb..e4cccd062270 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 98f6a2255ec5..a29d2aaedf97 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 a821ef8fc501..27b1eb10a218 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 6237afa993c6..6a42aa3341e3 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 f5e603cf34f7..09430f193378 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 aecf1f7746c4..6bef56e00490 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 28f57db3686b..4b802def8318 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 294d9240575e..547dada36dd9 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 2b238fdafc24..49e47aae18e5 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 45428b555dff..e30ec5920d8e 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 35b2cf54c6f5..b4bf1af137ba 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 1e1fdea90dc3..6e635be84eae 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 db36f90c2572..74309848605a 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 4050560c7605..6f883bf6e2a8 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 4a7da9bead2a..4689ee84e7e8 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 66cabf6d1ca6..c9131b71c6d6 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 e85da2eae2b5..eee51b3f1636 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; |