diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-04-28 11:00:54 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-04-29 09:19:47 +0900 |
| commit | f50fd9692ed7b9632c0f8dad9508f5a207679be4 (patch) | |
| tree | 50c9598cb186708215899b45c43623447b7b60ff | |
| parent | d36da8c19378f4772c896ca4df94117077e823d6 (diff) | |
mass rewrite Paint(Rect&) to Paint(RenderContext&, Rect&)
Change-Id: Ia1667246064d11827dbd149def15e5bf08b119b8
325 files changed, 413 insertions, 413 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index c84849b2dec3..c0430a0d3fce 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 c56558c375db..755de2948f5c 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 f6e491a03abe..23207dc67667 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 2d5afed4fb17..749bf2315f74 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 fbf4da6470bf..6cbaaf5117ea 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 fa99f7cd2855..1af65b64180b 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 a2f01eea8795..03ee52029492 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 65498937eda8..ada976593556 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 de17eb08403c..7afe56da3c3b 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 cd50dd3fb598..dc61456ebd69 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 ) +void ChartWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { m_bInPaint = true; if (m_pOpenGLWindow && m_pOpenGLWindow->IsVisible()) diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index cd0afaa07d0a..d00c2f6a44be 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -43,7 +43,7 @@ public: //from base class Window: virtual void PrePaint() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index d0e0c01072a8..93b8f4cbb446 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -220,7 +220,7 @@ void AboutDialog::Resize() } } -void AboutDialog::Paint( const Rectangle& rRect ) +void AboutDialog::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { SetClipRegion(vcl::Region(rRect)); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 539c1e5f777b..23ec6c06cceb 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -260,7 +260,7 @@ class ColorPreviewControl : public Control public: ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; void SetColor( const Color& rColor ); private: @@ -296,7 +296,7 @@ void ColorPreviewControl::SetColor( const Color& rCol ) } } -void ColorPreviewControl::Paint( const Rectangle& rRect ) +void ColorPreviewControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { DrawRect( rRect ); } @@ -315,7 +315,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -641,7 +641,7 @@ void ColorFieldControl::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -void ColorFieldControl::Paint( const Rectangle& rRect ) +void ColorFieldControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if( !mpBitmap ) UpdateBitmap(); @@ -716,7 +716,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; void UpdateBitmap(); @@ -914,7 +914,7 @@ void ColorSliderControl::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -void ColorSliderControl::Paint( const Rectangle& /*rRect*/ ) +void ColorSliderControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { if( !mpBitmap ) UpdateBitmap(); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index a351d820c872..85d2057873fb 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -184,7 +184,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxShowText(vcl::Windo return new SvxShowText(pParent); } -void SvxShowText::Paint( const Rectangle& ) +void SvxShowText::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { Color aTextCol = GetTextColor(); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 9e84ce37c102..ac424fee957f 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -55,7 +55,7 @@ Size GraphicPreviewWindow::GetOptimalSize() const -void GraphicPreviewWindow::Paint( const Rectangle& rRect ) +void GraphicPreviewWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Control::Paint( rRect ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 5fea052f03df..c607375618b7 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -217,7 +217,7 @@ namespace svx virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& _rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) SAL_OVERRIDE; private: PseudoRubyText m_aRubyText; @@ -234,7 +234,7 @@ namespace svx } - void RubyRadioButton::Paint( const Rectangle& ) + void RubyRadioButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { HideFocus(); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 80b8690d5713..6ba42590500d 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -97,7 +97,7 @@ Size SvxHlmarkTreeLBox::GetOptimalSize() const return LogicToPixel(Size(103, 162), MAP_APPFONT); } -void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) +void SvxHlmarkTreeLBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if (!mpParentWnd || mpParentWnd->mnError == LERR_NOERROR) { diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 953bbc7b0e69..7dc7b7aea781 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( const Rectangle& rRect ) +void ThesaurusAlternativesCtrl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if (!m_pDialog->WordFound()) { diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 3cb3ccb137b1..beecb6fc890a 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -61,7 +61,7 @@ private: protected: virtual bool Close() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; public: diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 596d3231443e..c89d46249c16 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -51,7 +51,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; private: long mnY; diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index f43685d65fd2..888060e2ecf3 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -42,7 +42,7 @@ private: double mfScaleX; double mfScaleY; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 4ce44f8ec257..1a79416ee305 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -35,7 +35,7 @@ class SvxCropExample : public vcl::Window public: SvxCropExample( vcl::Window* pPar, WinBits nStyle ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 9591a2a0f640..ad1a3f704ee3 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -51,7 +51,7 @@ public: mpParentWnd = pParent; } - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; }; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index e2fa378794a2..78ce3f200d41 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -51,7 +51,7 @@ private: void InitSettings( bool bForeground, bool bBackground ); protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 108f9e3bea39..3fe577afac96 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -48,7 +48,7 @@ class SvxNumberingPreview : public vcl::Window sal_uInt16 nActLevel; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; public: SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits = WB_BORDER); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 661788124c3f..61084cf902d7 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -95,7 +95,7 @@ public: AlternativesExtraData * GetExtraData( const SvTreeListEntry *pEntry ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; }; class ReplaceEdit : public Edit diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 6ff30321d4d3..0bc294550b81 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -189,7 +189,7 @@ public: void NotifyChange( const Bitmap* pBitmap ); protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -323,7 +323,7 @@ void BackgroundPreviewImpl::Resize() -void BackgroundPreviewImpl::Paint( const Rectangle& ) +void BackgroundPreviewImpl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); SetBackground(Wallpaper(rStyleSettings.GetWindowColor())); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index af1c96b4be62..47350ce2ecee 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -800,7 +800,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxCropExample(vcl::Wi return new SvxCropExample(pParent, nWinStyle); } -void SvxCropExample::Paint( const Rectangle& ) +void SvxCropExample::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Size aWinSize( PixelToLogic(GetOutputSizePixel() )); SetLineColor(); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 852607ca84c5..2d600188dcf0 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -147,7 +147,7 @@ void SvxNumberPreview::NotifyChange( const OUString& rPrevStr, #* #************************************************************************/ -void SvxNumberPreview::Paint( const Rectangle& ) +void SvxNumberPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { vcl::Font aDrawFont = GetFont(); Size aSzWnd = GetOutputSizePixel(); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 34a19e76227d..7ef25525ffeb 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2371,7 +2371,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberingPreview(vc } // paint preview of numeration -void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) +void SvxNumberingPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { Size aSize(PixelToLogic(GetOutputSizePixel())); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 2d8b7c0c7326..30f2f71dc353 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -53,7 +53,7 @@ public: virtual ~TabWin_Impl() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { mpPage.clear(); vcl::Window::dispose(); } - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; } void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } @@ -86,7 +86,7 @@ void FillUpWithDefTabs_Impl( long nDefDist, SvxTabStopItem& rTabs ) // class TabWin_Impl ----------------------------------------------------- -void TabWin_Impl::Paint( const Rectangle& ) +void TabWin_Impl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { // Paint tabulators Point aPnt; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 6907968e1fa2..62510e98a7cf 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1295,7 +1295,7 @@ bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl return bRet; } -void OPreviewWindow::Paint( const Rectangle& rRect ) +void OPreviewWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Window::Paint( rRect ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 13c117000381..78f42d8ee377 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -69,7 +69,7 @@ namespace dbaui OPreviewWindow(vcl::Window* _pParent); // Window overrides - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; void setGraphic(const Graphic& _rGraphic ) { m_aGraphicObj.SetGraphic(_rGraphic); } }; diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 5ef2b69be554..eba5b1055fb7 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -85,7 +85,7 @@ OCreationList::OCreationList( OTasksWindow& _rParent ) EnableEntryMnemonics(); } -void OCreationList::Paint( const Rectangle& _rRect ) +void OCreationList::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) { if ( m_pMouseDownEntry ) m_aOriginalFont = GetFont(); diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index fadf67574c38..2f07065a9317 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -61,7 +61,7 @@ namespace dbaui virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index fd7451f34891..5a24a70ba025 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -93,7 +93,7 @@ namespace dbaui { } - void ODataView::Paint( const Rectangle& _rRect ) + void ODataView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) { // draw the background { diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index ddd50aa66e58..d85d0b120ffd 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(const Rectangle& _rRect) +void OMarkableTreeListBox::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect) { if (!IsEnabled()) { diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 608c2d82dc98..d33e84d2b3ee 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -272,7 +272,7 @@ namespace dbaui virtual void MouseButtonUp( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void ConnDoubleClicked( OTableConnection* pConnection ); void SetDefaultTabWinPosSize( OTableWindow* pTabWin ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 2d1aac671a01..0cfa1917b32e 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -77,7 +77,7 @@ namespace dbaui protected: virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index f39d5281ffde..06d9c8aeba62 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -50,7 +50,7 @@ public: void SetCheckHandler(const Link& _rHdl) { m_aCheckButtonHandler = _rHdl; } protected: - virtual void Paint(const Rectangle& _rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) SAL_OVERRIDE; virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry); SvButtonState implDetermineState(SvTreeListEntry* _pEntry); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index efc798032f18..4addf1970279 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -935,7 +935,7 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) } } -void OJoinTableView::Paint( const Rectangle& rRect ) +void OJoinTableView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { DrawConnections( rRect ); } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index e0c1e5bf0ea3..26ddb53b59b3 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -312,7 +312,7 @@ void OTableWindow::DataChanged(const DataChangedEvent& rDCEvt) } } -void OTableWindow::Paint( const Rectangle& rRect ) +void OTableWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Rectangle aRect( Point(0,0), GetOutputSizePixel() ); Window::Paint( rRect ); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index e0b89dbfddbe..5f069b9efec3 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -103,7 +103,7 @@ void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr ) getGenPage()->SaveData( pFieldDescr ); } -void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ ) +void OTableFieldDescWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { // 3D-line at the top window border const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index a8914fd42cb3..68e43b70a048 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -50,7 +50,7 @@ namespace dbaui protected: virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; public: OTableFieldDescWin( vcl::Window* pParent); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 1b3f6a17fc8e..f669ac129d3c 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -746,7 +746,7 @@ bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode ) } -void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ ) +void ExtensionBox_Impl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*rPaintRect*/ ) { if ( !m_bInDelete ) DeleteRemoved(); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index d49e4a132690..0a9a204a1ed3 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -185,7 +185,7 @@ public: virtual void dispose() SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle &rPaintRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle &rPaintRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 156a2d103f11..66fec0ad4ec0 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -58,7 +58,7 @@ public: virtual ~SplashScreenWindow() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; // workwindow - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; }; class SplashScreen @@ -605,7 +605,7 @@ void SplashScreen::determineProgressRatioValues( } } -void SplashScreenWindow::Paint( const Rectangle&) +void SplashScreenWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { if (!pSpl || !pSpl->_bVisible) return; diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 346715b4bc28..0201193acc2b 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -128,7 +128,7 @@ public: void ChangeMode(int nType); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; }; GridWindow::GridWindow(vcl::Window* pParent) @@ -528,7 +528,7 @@ void GridWindow::drawHandles() } } -void GridWindow::Paint( const Rectangle& rRect ) +void GridWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Window::Paint(rRect); drawGrid(); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 384be4d3371d..b83030adbd06 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -81,7 +81,7 @@ public: void EnableDrag() { mbDragEnable = true; } void DisableDrag() { mbDragEnable = false; } bool IsDragEnabled() { return mbDragEnable; } - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; @@ -914,7 +914,7 @@ void ScanPreview::UpdatePreviewBounds() } } -void ScanPreview::Paint(const Rectangle& rRect) +void ScanPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { Window::Paint(rRect); SetMapMode(MAP_APPFONT); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 5865d812f555..f5270c4fa4ca 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1481,7 +1481,7 @@ void XMLFilterListBox::dispose() SvTabListBox::dispose(); } -void XMLFilterListBox::Paint( const Rectangle& rRect ) +void XMLFilterListBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { SvTabListBox::Paint( rRect ); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index df26aaf95685..60ba423f8a36 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -77,7 +77,7 @@ public: void changeEntry( const filter_info_impl* pInfo ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; }; diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index 440b3a43f82f..6862f755237d 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -39,7 +39,7 @@ namespace frm } - void RichTextViewPort::Paint( const Rectangle& _rRect ) + void RichTextViewPort::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) { m_pView->Paint( _rRect ); } diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index a6250a894545..6992576793a8 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -44,7 +44,7 @@ namespace frm bool GetHideInactiveSelection() const { return m_bHideInactiveSelection; } protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& _rKEvt ) SAL_OVERRIDE; diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 4dabda021210..06ee42b21ded 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -72,7 +72,7 @@ namespace dbaui void attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); protected: // window overridables - virtual void Paint( const Rectangle& _rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) SAL_OVERRIDE; /// re-arrange all controls, including the toolbox, it's separator, and the "real view" virtual void resizeAll( const Rectangle& _rPlayground ); diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index e5a5ff8a704b..547e5ae93e84 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -64,7 +64,7 @@ protected: virtual bool Docking( const Point& rPos, Rectangle& rRect ) SAL_OVERRIDE; virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE; virtual void Resizing( Size& rSize ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; virtual void Move() SAL_OVERRIDE; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 7a89267b3bc5..1d3adc6b4412 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -55,7 +55,7 @@ class SfxInfoBarWindow : public vcl::Window virtual void dispose() SAL_OVERRIDE; const OUString& getId() const { return m_sId; } - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; virtual void Resize( ) SAL_OVERRIDE; /** Add button to Infobar. diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 1affc2e23b58..45276d3dd6b8 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -66,7 +66,7 @@ protected: virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 129940de2ccf..a49f6681ebbe 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -50,7 +50,7 @@ public: const Size& rRequestedSize = Size(), sal_uInt16 nPos = TOOLBOX_APPEND) SAL_OVERRIDE; - virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 41979ca0dfc6..e7ce608606fd 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -131,7 +131,7 @@ protected: virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; protected: diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 0e4a7e0af1cf..913aed308a34 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -259,7 +259,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 44d8a68c511a..e09884f1954e 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -92,7 +92,7 @@ namespace sfx2 protected: // Window overridables - virtual void Paint( const Rectangle& i_rArea ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& i_rArea ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType i_nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ) SAL_OVERRIDE; diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index fb8fc3a63aa1..03c35f09a8be 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -436,7 +436,7 @@ public: virtual void LoseFocus() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE; virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 48173a37003c..ec6327656110 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -266,7 +266,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index dbc921b58d80..bd96141dc2f8 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -290,7 +290,7 @@ namespace svt virtual void GetFocus() SAL_OVERRIDE; virtual bool PreNotify(NotifyEvent& rEvt) SAL_OVERRIDE; - virtual void Paint(const Rectangle& rClientRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rClientRect) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& _rEvent ) SAL_OVERRIDE; diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 27fd4e8f7865..7ca5334044a6 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -293,7 +293,7 @@ public: 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( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index d862e7d0b31c..a0699e67cbf9 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -240,7 +240,7 @@ protected: void DocumentRectChanged(); void VisibleRectChanged(); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 97c446c4271c..30cd11f89b91 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -713,7 +713,7 @@ public: 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( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 07eb53d48e59..27208e5a63ba 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -76,7 +76,7 @@ protected: virtual void NotifyScrolled() SAL_OVERRIDE; virtual void SetTabs() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void HBarClick(); void HBarDblClick(); diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 5d1d9e1320b9..0ec02ed53ad8 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -142,7 +142,7 @@ public: virtual ~SvHeaderTabListBox(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; void InitHeaderBar( HeaderBar* pHeaderBar ); static bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ); diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index fc44b0f75d3b..1d7e54e56028 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -391,7 +391,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 7c679ac5bdb3..78d70890c58f 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -58,7 +58,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 3e20b2dede70..ed24a5d84acc 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -70,7 +70,7 @@ namespace svt protected: // Window overridables - virtual void Paint( const Rectangle& i_rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& i_rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 7d55c17ad403..4fbda0bb18b3 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -706,7 +706,7 @@ public: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index a6a8e5e47ffc..a6ceb40665d5 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -293,7 +293,7 @@ public: virtual void Tracking( const TrackingEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index cf05bf2764a3..51b0c31fbf77 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -81,7 +81,7 @@ public: virtual void Resize() SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index 1c037d88584c..dead9dc4ab0f 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -48,7 +48,7 @@ public: virtual ~SvxXConnectionPreview(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 9477de1f7a9b..13a182da1503 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -80,7 +80,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED DialControl : public Control public: explicit DialControl( vcl::Window* pParent, WinBits nBits ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index a9eab331774b..762fa1c9bd22 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -53,7 +53,7 @@ public: virtual ~Svx3DPreviewControl(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -106,7 +106,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DLightControl : public Svx3DPreviewContr public: Svx3DLightControl(vcl::Window* pParent, WinBits nStyle = 0); - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 119aafa84290..788873344b6e 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -102,7 +102,7 @@ public: virtual ~SvxRectCtl(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; @@ -182,7 +182,7 @@ public: virtual ~SvxPixelCtl(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -411,7 +411,7 @@ public: void SetSymbol( Graphic* p, const Size& s ); void ResizeSymbol( const Size& s ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; }; @@ -434,7 +434,7 @@ public: void SetAttributes(const SfxItemSet& rItemSet); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; }; @@ -462,7 +462,7 @@ public: void SetShadowAttributes(const SfxItemSet& rItemSet); void SetShadowPosition(const Point& rPos); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_DLGCTRL_HXX diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 2278f0c3f755..f48ebcc6de39 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -66,7 +66,7 @@ public: void ResetColor(); void SetBackColor( const Color& rColor ); void UseResourceText( bool bUse = true ); - void Paint( const Rectangle& ) SAL_OVERRIDE; + void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; bool IsTwoLines() const; void SetTwoLines(bool bSet); diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 48bb2f90d785..bd262b3e5b5b 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -180,7 +180,7 @@ public: protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index d0ccb6c62323..71ca12449521 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -52,7 +52,7 @@ private: SVX_DLLPRIVATE void InitSettings(); // Window - SVX_DLLPRIVATE virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; SVX_DLLPRIVATE virtual Size GetOptimalSize() const SAL_OVERRIDE; SVX_DLLPRIVATE virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; SVX_DLLPRIVATE virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 3d646afa2baf..aff192e19e71 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -63,7 +63,7 @@ protected: SdrModel* pModel; SdrView* pView; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 94bbad044a2b..ec8ece737dfb 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -195,7 +195,7 @@ public: protected: virtual void Resize() SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; private: diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index 4753ab17a671..347e0f5faaa7 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -45,7 +45,7 @@ public: virtual ~SvxXMeasurePreview(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index 007d4caf5634..6f0c3575a5b5 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -74,7 +74,7 @@ private: OUString aRightText; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void DrawPage( const Point& rPoint, const bool bSecond, diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index bfbd6a2687bc..6a1e785fd3fe 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -62,7 +62,7 @@ private: Rectangle Lines[9]; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; void DrawParagraph( bool bAll ); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 4ea04bcd041d..f77bee62b94f 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -43,7 +43,7 @@ class SvxRubyDialog; class RubyPreview : public vcl::Window { protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; VclPtr<SvxRubyDialog> m_pParentDlg; public: diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx index 626e7074501d..df3f75a97fe7 100644 --- a/include/svx/sidebar/PopupControl.hxx +++ b/include/svx/sidebar/PopupControl.hxx @@ -39,7 +39,7 @@ public : vcl::Window* pParent, const ResId& rResId); - virtual void Paint (const Rectangle& rect) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rect) SAL_OVERRIDE; }; } } // end of namespace svx::sidebar diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index 494c241f74e9..c816c174010b 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -67,7 +67,7 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window Rectangle DrawInnerFrame_Impl(const Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor); void DrawRect_Impl(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 937c4ff75f48..af19505a6ff2 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -159,7 +159,7 @@ public: virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; @@ -341,7 +341,7 @@ public: virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; @@ -456,7 +456,7 @@ public: virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index 4bc2deff6b02..58fcfd7d9256 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -43,7 +43,7 @@ public: WindowAlign GetAlign() const; bool IsHorizontal() const; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index f32c93269f80..30c97d085acc 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -170,7 +170,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 3ba8b2c9fa1c..eb33f9dacffb 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -64,7 +64,7 @@ public: virtual ~FixedText(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; @@ -116,7 +116,7 @@ public: explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); explicit FixedLine( vcl::Window* pParent, const ResId& ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; @@ -142,7 +142,7 @@ private: public: explicit FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; @@ -179,7 +179,7 @@ public: explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); explicit FixedImage( vcl::Window* pParent, const ResId& ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 9e7b933fe228..ec2e119b6135 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -48,7 +48,7 @@ private: public: explicit GroupBox( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index 753ad9f126d2..79f0780dd038 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -43,7 +43,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx index e8c2a1e545a7..b20ba446c925 100644 --- a/include/vcl/openglwin.hxx +++ b/include/vcl/openglwin.hxx @@ -41,7 +41,7 @@ public: void setRenderer(IRenderer* pRenderer); - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 43d340689d18..6cce19cd1733 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -73,7 +73,7 @@ private: public: ProgressBar( vcl::Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 27871afc2cb6..3a16f9e4359e 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -96,7 +96,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index dfc399ba17fe..a2900309abe6 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -77,7 +77,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index ad261f2ef478..a78f3b292b1f 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -62,7 +62,7 @@ public: void Down(); virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index b0474b1685c9..20a3a43f3745 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -82,7 +82,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 86df902692b4..91a1c0df99c5 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -78,7 +78,7 @@ public: virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rPaintRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 009f9e9fb274..d0ffa134a10a 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -136,7 +136,7 @@ public: 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( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Move() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 6824233e43d3..50b52f981a91 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -119,7 +119,7 @@ public: void AdjustItemWidthsForHiDPI(bool bAdjustHiDPI); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Move() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index a3b8aa0f0bec..05fd48e9cef7 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -87,7 +87,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 702a42c756b6..86a81cbd62e9 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -44,7 +44,7 @@ public: virtual ~TabPage(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 269c51883836..b03f05174a01 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -295,7 +295,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Move() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx index 5d09262e2c61..7c050a5ba52a 100644 --- a/reportdesign/source/ui/inc/EndMarker.hxx +++ b/reportdesign/source/ui/inc/EndMarker.hxx @@ -37,7 +37,7 @@ namespace rptui virtual ~OEndMarker(); // windows - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; }; } diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index a34a4fc98322..f806a42543d0 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -71,7 +71,7 @@ namespace rptui virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ) SAL_OVERRIDE; // window overrides - virtual void Paint( 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 Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index 270939c266d0..61a03fdf406d 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -55,7 +55,7 @@ namespace rptui // SfxListener virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint) SAL_OVERRIDE; // Window overrides - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index f16fd59f2f77..11d8da6ff981 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -146,7 +146,7 @@ namespace rptui virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; public: OViewsWindow( diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index d9dc4cf7c891..f840d7902648 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -43,7 +43,7 @@ OEndMarker::~OEndMarker() { } -void OEndMarker::Paint( const Rectangle& /*rRect*/ ) +void OEndMarker::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { Fraction aCornerSpace(long(CORNER_SPACE)); aCornerSpace *= GetMapMode().GetScaleX(); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 22a1d986e98d..4c4670171e69 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -134,7 +134,7 @@ void OReportSection::dispose() vcl::Window::dispose(); } -void OReportSection::Paint( const Rectangle& rRect ) +void OReportSection::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Window::Paint(rRect); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index a435b02a38ed..789269807384 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -104,7 +104,7 @@ sal_Int32 OStartMarker::getMinHeight() const return LogicToPixel(Size(0,m_aText->GetTextHeight())).Height() + (long)aExtraWidth; } -void OStartMarker::Paint( const Rectangle& rRect ) +void OStartMarker::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { (void)rRect; Size aSize = GetOutputSizePixel(); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 49bf68956faf..c35178338f17 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -261,7 +261,7 @@ void OViewsWindow::Resize() } } -void OViewsWindow::Paint( const Rectangle& rRect ) +void OViewsWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Window::Paint( rRect ); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 95bd92d64358..488ab383088b 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -556,7 +556,7 @@ void ScInputWindow::Select() } } -void ScInputWindow::Paint( const Rectangle& rRect ) +void ScInputWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { ToolBox::Paint( rRect ); @@ -1176,7 +1176,7 @@ ScMultiTextWnd::~ScMultiTextWnd() { } -void ScMultiTextWnd::Paint( const Rectangle& rRect ) +void ScMultiTextWnd::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { EditView* pView = GetEditView(); if ( pView ) @@ -1514,7 +1514,7 @@ void ScTextWnd::dispose() ScTextWndBase::dispose(); } -void ScTextWnd::Paint( const Rectangle& rRect ) +void ScTextWnd::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if (pEditView) pEditView->Paint( rRect ); diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 3fa8a6a8d6ab..3ed8db8cc855 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -239,7 +239,7 @@ void ScMenuFloatingWindow::KeyInput(const KeyEvent& rKEvt) Window::KeyInput(rKEvt); } -void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/) +void ScMenuFloatingWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/) { const StyleSettings& rStyle = GetSettings().GetStyleSettings(); Color aBackColor = rStyle.GetMenuColor(); @@ -1307,7 +1307,7 @@ bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt) return ScMenuFloatingWindow::Notify(rNEvt); } -void ScCheckListMenuWindow::Paint(const Rectangle& rRect) +void ScCheckListMenuWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { ScMenuFloatingWindow::Paint(rRect); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index b93ec720901c..35f530f02c83 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -388,7 +388,7 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) Paint(aRect); } -void ScZoomSliderWnd::Paint( const Rectangle& rRect ) +void ScZoomSliderWnd::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { DoPaint( rRect ); } diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index c0adb89e590d..34ac173756ca 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -1010,7 +1010,7 @@ void ScCsvGrid::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 // painting ------------------------------------------------------------------- -void ScCsvGrid::Paint( const Rectangle& ) +void ScCsvGrid::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Repaint(); } diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 4057831ea94b..a8f172a263de 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -518,7 +518,7 @@ void ScCsvRuler::EndMouseTracking( bool bApply ) // painting ------------------------------------------------------------------- -void ScCsvRuler::Paint( const Rectangle& ) +void ScCsvRuler::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Repaint(); } diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 8227376434f3..6edfd3b6bf0c 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -51,7 +51,7 @@ public: void NotifyChange( ScAutoFormatData* pNewData ); protected: - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 11dc8ddf0108..7b09474462c2 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -55,7 +55,7 @@ public: virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void addMenuItem(const OUString& rText, bool bEnabled, Action* pAction); @@ -244,7 +244,7 @@ public: virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 1c5b1dcab4db..eab22d10ca8b 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -276,7 +276,7 @@ protected: // painting --------------------------------------------------------------- protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; public: /** Redraws the entire data grid. */ diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index 991111525b02..8a93f9f614e2 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -141,7 +141,7 @@ private: // painting --------------------------------------------------------------- protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; public: /** Redraws the entire ruler. */ diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 8a0f5d4f7237..07bb2270efab 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -294,7 +294,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou protected: virtual void PrePaint() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index d5719480be41..2fd02e59a116 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -69,7 +69,7 @@ private: protected: // Window overrides - virtual void Paint( 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; diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index f3e8b03c2f86..4b8d2d685c85 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.hxx @@ -33,7 +33,7 @@ private: vcl::Font aHeadFont; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; public: ScHintWindow( vcl::Window* pParent, const OUString& rTit, const OUString& rMsg ); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index f846d7b9b8c0..bd1650a3e877 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -90,7 +90,7 @@ public: DECL_LINK( NotifyHdl, void* ); protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -185,7 +185,7 @@ protected: void SetScrollBarRange(); void InitEditEngine(); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; DECL_LINK( NotifyHdl, EENotify* ); DECL_LINK( ModifyHdl, EENotify* ); private: @@ -243,7 +243,7 @@ public: virtual ~ScInputWindow(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void Select() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 8445a094019c..a7d801741c0c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -107,7 +107,7 @@ public: protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; private: VclPtr<ScScenarioListBox> aLbScenario; @@ -303,7 +303,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; void Resizing( Size& rSize ); public: diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index c95dffef4229..4f0457f5b559 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -207,7 +207,7 @@ private: void ScrollRel( long nEntryDiff, long nEntryStart, long nEntryEnd ); protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 7be36eeca8a3..13d5ba52395a 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -103,7 +103,7 @@ private: using Window::SetZoom; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index e2a5cb597c9e..de3fce78b4bd 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -39,7 +39,7 @@ public: virtual ~ScTabSplitter(); void SetFixed(bool bSet); - virtual void Paint( const Rectangle& rPaintRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index bb06d01fe813..98109e1cf086 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -69,7 +69,7 @@ private: bool bAdd; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 0768db7dba2f..704d53489052 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -60,7 +60,7 @@ public: protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 8a392d1a5b3a..9ad107a9905a 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -75,7 +75,7 @@ public: void SetLocation(ScEditWindowLocation eLoc) { eLocation = eLoc; } protected: - virtual void Paint( 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 MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index f07d19594cde..aad6b77c60f7 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -518,7 +518,7 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) aVD->SetDrawMode( nOldDrawMode ); } -void ScAutoFmtPreview::Paint( const Rectangle& rRect ) +void ScAutoFmtPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { DoPaint( rRect ); } diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 49f516cd35d0..4f42e113232e 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( const Rectangle& rRect ) +void ScNavigatorDlg::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if (mbUseStyleSettingsBackground) { diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 7791cfff9990..cd5dcde2e3e0 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -236,7 +236,7 @@ void ScScenarioWindow::dispose() vcl::Window::dispose(); } -void ScScenarioWindow::Paint( const Rectangle& rRect ) +void ScScenarioWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetFaceColor(); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 87eded513c08..932baf17ee21 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( const Rectangle& rRect ) +void ScEditWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetWindowColor(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 9c4f7c6fbd48..81b6d32627cf 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -299,7 +299,7 @@ void ScGridWindow::PrePaint() } } -void ScGridWindow::Paint( const Rectangle& rRect ) +void ScGridWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { ScDocument* pDoc = pViewData->GetDocument(); if ( pDoc->IsInInterpreter() ) diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 790786c693c4..77e1ce12cab6 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -235,7 +235,7 @@ void ScHeaderControl::DrawShadedRect( long nStart, long nEnd, const Color& rBase DrawRect( Rectangle( nStart, nCenterPos+1, nEnd, nBarSize-1 ) ); } -void ScHeaderControl::Paint( const Rectangle& rRect ) +void ScHeaderControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { // fuer VCL ist es wichtig, wenig Aufrufe zu haben, darum werden die aeusseren // Linien zusammengefasst diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index afa1daf0944d..b9d5113da83c 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -68,7 +68,7 @@ ScHintWindow::~ScHintWindow() { } -void ScHintWindow::Paint( const Rectangle& /* rRect */ ) +void ScHintWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /* rRect */ ) { SetFont( aHeadFont ); DrawText( Point(HINT_MARGIN,HINT_MARGIN), aTitle ); diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 5e5f46dfc892..90cc0a40a75d 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -600,7 +600,7 @@ void ScOutlineWindow::HideFocus() } } -void ScOutlineWindow::Paint( const Rectangle& /* rRect */ ) +void ScOutlineWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /* rRect */ ) { long nEntriesSign = mbMirrorEntries ? -1 : 1; long nLevelsSign = mbMirrorLevels ? -1 : 1; diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 3267fb8a6296..44b283d1973c 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -624,7 +624,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) } } -void ScPreview::Paint( const Rectangle& /* rRect */ ) +void ScPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /* rRect */ ) { bool bWasInPaint = bInPaint; // nested calls shouldn't be necessary, but allow for now bInPaint = true; diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index cebbeb04d19e..785329aaff6b 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -54,7 +54,7 @@ void ScTabSplitter::SetFixed(bool bSet) SetPointer(POINTER_VSPLIT); } -void ScTabSplitter::Paint( const Rectangle& rRect ) +void ScTabSplitter::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { const Color oldFillCol = GetFillColor(); const Color oldLineCol = GetLineColor(); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 57b71dd50d08..99e533bc3e99 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -80,7 +80,7 @@ ScCornerButton::~ScCornerButton() { } -void ScCornerButton::Paint( const Rectangle& rRect ) +void ScCornerButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Size aSize = GetOutputSizePixel(); long nPosX = aSize.Width()-1; diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 40eef52999a3..24e0935878d6 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -42,7 +42,7 @@ SdHtmlAttrPreview::~SdHtmlAttrPreview() { } -void SdHtmlAttrPreview::Paint( const Rectangle& rRect ) +void SdHtmlAttrPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { DecorationView aDecoView( this ); diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index 6cf5491dbb62..2e0b706bb7e1 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -34,7 +34,7 @@ public: SdHtmlAttrPreview( vcl::Window* pParent, WinBits nStyle ); virtual ~SdHtmlAttrPreview(); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; void SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ); diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index dd4441aeebfb..d80956948dac 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -921,7 +921,7 @@ void CustomAnimationList::notify_change() mpController->onSelect(); } -void CustomAnimationList::Paint( const Rectangle& rRect ) +void CustomAnimationList::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if( mbIgnorePaint ) return; diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 18fde3c2db14..58892a0f9607 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -70,7 +70,7 @@ public: virtual void SelectHdl() SAL_OVERRIDE; virtual bool DoubleClickHdl() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 830180347e13..bd8dcf981786 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -127,7 +127,7 @@ void AnnotationTextWindow::dispose() Control::dispose(); } -void AnnotationTextWindow::Paint( const Rectangle& rRect) +void AnnotationTextWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); if ( !bHighContrast ) @@ -657,7 +657,7 @@ void AnnotationWindow::Deactivate() Engine()->GetUndoManager().Clear(); } -void AnnotationWindow::Paint( const Rectangle& rRect) +void AnnotationWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { FloatingWindow::Paint( rRect ); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 766ea975b31f..f81e16d4f0c8 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -53,7 +53,7 @@ private: VclPtr<AnnotationWindow> mpAnnotationWindow; protected: - virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -145,7 +145,7 @@ class AnnotationWindow : public FloatingWindow DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); virtual void Deactivate() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 83abb22a0184..f1796d11ffb3 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -485,7 +485,7 @@ bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode ) return true; } -void ClientBox::Paint( const Rectangle &/*rPaintRect*/ ) +void ClientBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*rPaintRect*/ ) { if ( !m_bInDelete ) DeleteRemoved(); diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 63bf2db5a577..c763e023c70e 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -140,7 +140,7 @@ public: virtual void dispose() SAL_OVERRIDE; void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - void Paint( const Rectangle &rPaintRect ) SAL_OVERRIDE; + void Paint( vcl::RenderContext& rRenderContext, const Rectangle &rPaintRect ) SAL_OVERRIDE; void Resize() SAL_OVERRIDE; Size GetOptimalSize() const SAL_OVERRIDE; bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 272c2f6e16bd..d1d16558b05a 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -82,7 +82,7 @@ void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx ) } } -void SdDisplay::Paint( const Rectangle& ) +void SdDisplay::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Point aPt; Size aSize = GetOutputSize(); diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index e0895092d7fb..5c35ee7d6fab 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -150,7 +150,7 @@ void SdDocPreviewWin::ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ) } } -void SdDocPreviewWin::Paint( const Rectangle& rRect ) +void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if( (!mxSlideShow.is()) || (!mxSlideShow->isRunning() ) ) { diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 84d0da17bd27..3c7c9270ec4a 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -77,7 +77,7 @@ public: PresLayoutPreview( vcl::Window* pParent ); virtual ~PresLayoutPreview(); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; void init( SdPage* pMaster ); @@ -782,7 +782,7 @@ void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisib } } -void PresLayoutPreview::Paint( const Rectangle& ) +void PresLayoutPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Push(); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 50014b2fd4fc..056ac628cc38 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(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/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 20f3ffeccddd..4a02d194040f 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -68,7 +68,7 @@ public: SdDisplay(vcl::Window* pWin); virtual ~SdDisplay(); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; void SetBitmapEx( BitmapEx* pBmpEx ); void SetScale( const Fraction& rFrac ); diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index ea1e5876211d..a5403c7759f7 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -49,7 +49,7 @@ protected: Color maDocumentColor; rtl::Reference< sd::SlideShow > mxSlideShow; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; static void CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ); void ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index c304b981bc45..d4c975123a4d 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -262,7 +262,7 @@ ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth) return ui::LayoutSize(nPreferredHeight,nPreferredHeight,nPreferredHeight); } -void LayoutMenu::Paint (const Rectangle& rRect) +void LayoutMenu::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { if (mbSelectionUpdatePending) { diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 94e16a40ccaa..c5ef058f6588 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -86,7 +86,7 @@ public: virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; // From vcl::Window - virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; /** Show a context menu when the right mouse button is pressed. diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index cb49f89227e5..601009602e85 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -249,7 +249,7 @@ void ShowWindow::MouseButtonUp(const MouseEvent& rMEvt) /** * if FuSlideShow is still available, forward it */ -void ShowWindow::Paint(const Rectangle& rRect) +void ShowWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { if( (meShowWindowMode == SHOWWINDOWMODE_NORMAL) || (meShowWindowMode == SHOWWINDOWMODE_PREVIEW) ) { diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 827dd1054071..ce524c867e3b 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -77,7 +77,7 @@ public: virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; /// Override the sd::Window's CreateAccessible to create a different accessible object virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index ed1dd0f235ef..58b7ad9e1a85 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(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 (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 6fcd11a5f692..077103f96147 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -70,7 +70,7 @@ public: TabBarControl ( vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar); - virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; private: ::rtl::Reference<ViewTabBar> mpViewTabBar; @@ -566,7 +566,7 @@ TabBarControl::TabBarControl ( { } -void TabBarControl::Paint (const Rectangle& rRect) +void TabBarControl::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { Color aOriginalFillColor (GetFillColor()); Color aOriginalLineColor (GetLineColor()); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index aea13b4434b4..84da41d0cd6e 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -213,7 +213,7 @@ void Window::PrePaint() mpViewShell->PrePaint(); } -void Window::Paint(const Rectangle& rRect) +void Window::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { if ( mpViewShell ) mpViewShell->Paint(rRect, this); diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index dc22fddc1910..36478643b3ce 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( const Rectangle &aRect ) +void RecentDocsView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle &aRect ) { if ( mItemList.size() == 0 ) { diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 408fccb50059..3134785d0dde 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -300,7 +300,7 @@ void TemplateAbstractView::OnItemDblClicked (ThumbnailViewItem *pItem) } } -void TemplateAbstractView::Paint( const Rectangle& rRect ) +void TemplateAbstractView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { ThumbnailView::Paint( rRect ); diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 8c6a30e60d0b..31b4d5dad284 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -858,7 +858,7 @@ void ThumbnailView::Command( const CommandEvent& rCEvt ) Control::Command( rCEvt ); } -void ThumbnailView::Paint(const Rectangle &aRect) +void ThumbnailView::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &aRect) { size_t nItemCount = mItemList.size(); diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 103391877907..91878eaa5b48 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -381,7 +381,7 @@ void BackingWindow::setupButton( MenuButton* pButton ) pButton->SetSelectHdl(LINK(this, BackingWindow, MenuSelectHdl)); } -void BackingWindow::Paint( const Rectangle& ) +void BackingWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Resize(); diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index a9a07f662e45..7df6552ffbd1 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -127,7 +127,7 @@ public: virtual ~BackingWindow(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 0ad3e754ca40..6eb392c552d7 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1743,7 +1743,7 @@ bool SfxDockingWindow::Close() -void SfxDockingWindow::Paint(const Rectangle& /*rRect*/) +void SfxDockingWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/) /* [Description] diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 2bf43410a487..af4932e48b7e 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -60,10 +60,10 @@ public: virtual ~SfxCloseButton() {} - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; }; -void SfxCloseButton::Paint(const Rectangle&) +void SfxCloseButton::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { const ViewInformation2D aNewViewInfos; const unique_ptr<BaseProcessor2D> pProcessor( @@ -159,7 +159,7 @@ void SfxInfoBarWindow::dispose() vcl::Window::dispose(); } -void SfxInfoBarWindow::Paint(const Rectangle& rPaintRect) +void SfxInfoBarWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rPaintRect) { const ViewInformation2D aNewViewInfos; const unique_ptr<BaseProcessor2D> pProcessor( diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 6b3c98945139..f6ef4a9e74fb 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -141,7 +141,7 @@ namespace sfx2 } - void TitledDockingWindow::Paint( const Rectangle& i_rArea ) + void TitledDockingWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rArea ) { if ( m_bLayoutPending ) impl_layout(); diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index a4d4ef71da69..de4d02463f06 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -140,7 +140,7 @@ class WaitWindow_Impl : public WorkWindow WaitWindow_Impl(); virtual ~WaitWindow_Impl(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; }; #define X_OFFSET 15 @@ -2459,7 +2459,7 @@ void WaitWindow_Impl::dispose() } -void WaitWindow_Impl::Paint( const Rectangle& /*rRect*/ ) +void WaitWindow_Impl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { DrawText( _aRect, _aText, _nTextStyle ); } diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 1d4f8e6fa858..7a854971df6d 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -111,7 +111,7 @@ void SfxPreviewWin_Impl::ImpPaint( } } -void SfxPreviewWin_Impl::Paint( const Rectangle& rRect ) +void SfxPreviewWin_Impl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { ImpPaint( rRect, xMetaFile.get(), this ); } diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index d343e7ef7723..0c2d1911beab 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -40,7 +40,7 @@ public: class SfxPreviewWin_Impl: public SfxPreviewBase_Impl { protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; public: SfxPreviewWin_Impl(vcl::Window* pParent, WinBits nStyle) : SfxPreviewBase_Impl(pParent, nStyle) diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index de2066defd74..0753cdefef42 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -115,7 +115,7 @@ Rectangle Deck::GetContentArea() const aWindowSize.Height() - 1 - Theme::GetInteger(Theme::Int_DeckBottomPadding) - nBorderSize); } -void Deck::Paint (const Rectangle& rUpdateArea) +void Deck::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) { (void) rUpdateArea; @@ -328,7 +328,7 @@ Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) #endif } -void Deck::ScrollContainerWindow::Paint (const Rectangle& rUpdateArea) +void Deck::ScrollContainerWindow::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) { (void)rUpdateArea; diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index b231b5c9b628..9da5a2557762 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -63,7 +63,7 @@ public: */ void ShowPanel (const Panel& rPanel); - virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; @@ -76,7 +76,7 @@ public: { public: ScrollContainerWindow (vcl::Window* pParentWindow); - virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; void SetSeparators (const ::std::vector<sal_Int32>& rSeparators); private: ::std::vector<sal_Int32> maSeparators; diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index c0e131109dc5..a0a945ecc7cd 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 (const Rectangle& rUpdateArea) +void MenuButton::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) { switch(mePaintType) { diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx index 1d09e14d4e9d..d725fb71c01d 100644 --- a/sfx2/source/sidebar/MenuButton.hxx +++ b/sfx2/source/sidebar/MenuButton.hxx @@ -29,7 +29,7 @@ class MenuButton public: MenuButton (vcl::Window* pParentWindow); - virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE; virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 52c9abc831f7..13b853268ec6 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -130,7 +130,7 @@ bool Panel::HasIdPredicate (const ::rtl::OUString& rsId) const return msPanelId.equals(rsId); } -void Panel::Paint (const Rectangle& rUpdateArea) +void Panel::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) { Window::Paint(rUpdateArea); } diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index 03cd81ca5ec8..86a7358c4518 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -59,7 +59,7 @@ public: bool HasIdPredicate (const ::rtl::OUString& rsId) const; const ::rtl::OUString& GetId() const { return msPanelId;} - virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index af27f4757f07..98f6a2255ec5 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -97,7 +97,7 @@ void SidebarToolBox::InsertItem(const OUString& rCommand, RegisterHandlers(); } -void SidebarToolBox::Paint (const Rectangle& rRect) +void SidebarToolBox::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { ToolBox::Paint(rRect); diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 08cbe7f602a6..df7a184667c8 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -79,7 +79,7 @@ void TabBar::dispose() vcl::Window::dispose(); } -void TabBar::Paint (const Rectangle& rUpdateArea) +void TabBar::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) { Window::Paint(rUpdateArea); diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index 523abb7ba726..37089f873d56 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -70,7 +70,7 @@ public: virtual ~TabBar(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) SAL_OVERRIDE; virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index 678e1f0e80a8..d05c906fb057 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 (const Rectangle& rUpdateArea) +void TabItem::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) { switch(mePaintType) { diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx index 818a38bbc402..f63e4e2ea3cb 100644 --- a/sfx2/source/sidebar/TabItem.hxx +++ b/sfx2/source/sidebar/TabItem.hxx @@ -35,7 +35,7 @@ class TabItem public: TabItem (vcl::Window* pParentWindow); - virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE; virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index f2647b386d6b..fca67caf09b7 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -73,7 +73,7 @@ void TitleBar::SetIcon (const Image& rIcon) Invalidate(); } -void TitleBar::Paint (const Rectangle& rUpdateArea) +void TitleBar::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) { (void)rUpdateArea; diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index 2bb36264202e..77f588d50423 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -40,7 +40,7 @@ public: void SetTitle (const ::rtl::OUString& rsTitle); void SetIcon (const Image& rIcon); - virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; virtual void setPosSizePixel ( long nX, diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index c29d85ca1a87..6877d81bdd04 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -81,7 +81,7 @@ class SmElementsControl : public Control static const sal_uInt16 aFormats[][2]; static const sal_uInt16 aOthers[][2]; - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 8093b9be3d5c..ec8633e980fb 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -79,7 +79,7 @@ public: class SmShowFont : public vcl::Window { - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; public: SmShowFont(vcl::Window *pParent, WinBits nStyle) @@ -279,7 +279,7 @@ class SmShowSymbolSetWindow : public Control void SetScrollBarRange(); Point OffsetPoint(const Point &rPoint) const; - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -324,7 +324,7 @@ class SmShowSymbol : public Control { Link aDblClickHdlLink; - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -389,7 +389,7 @@ public: class SmShowChar : public Control { - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; public: diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 17cea6de1857..7efd852b6c41 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -76,7 +76,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; DECL_LINK(EditStatusHdl ,EditStatus *); DECL_LINK(ScrollHdl, ScrollBar *); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 52f6c1e1df37..285ebc19d44b 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -80,7 +80,7 @@ protected: void SetFormulaDrawPos(const Point &rPos) { aFormulaDrawPos = rPos; } virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; virtual void StateChanged( StateChangedType eChanged ) SAL_OVERRIDE; @@ -173,7 +173,7 @@ protected : // Window virtual void GetFocus() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual Size CalcDockingSize(SfxChildAlignment eAlign) SAL_OVERRIDE; diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 4a5118a5b789..bbff05609fc5 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -254,7 +254,7 @@ void SmElementsControl::setVerticalMode(bool bVerticalMode) mbVerticalMode = bVerticalMode; } -void SmElementsControl::Paint(const Rectangle&) +void SmElementsControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { Push(); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index a78f528978ef..f3cf0e760570 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -247,7 +247,7 @@ VclPtr<SfxTabPage> SmPrintOptionsTabPage::Create(vcl::Window* pWindow, const Sfx /**************************************************************************/ -void SmShowFont::Paint(const Rectangle& rRect ) +void SmShowFont::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Window::Paint( rRect ); @@ -1172,7 +1172,7 @@ Point SmShowSymbolSetWindow::OffsetPoint(const Point &rPoint) const return Point(rPoint.X() + nXOffset, rPoint.Y() + nYOffset); } -void SmShowSymbolSetWindow::Paint(const Rectangle&) +void SmShowSymbolSetWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { Push(PushFlags::MAPMODE); @@ -1427,7 +1427,7 @@ void SmShowSymbol::setFontSize(vcl::Font &rFont) const rFont.SetSize(Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3)); } -void SmShowSymbol::Paint(const Rectangle &rRect) +void SmShowSymbol::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) { Control::Paint( rRect ); @@ -1711,7 +1711,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowChar(vcl::Window return new SmShowChar(pParent, nWinStyle); } -void SmShowChar::Paint(const Rectangle &rRect) +void SmShowChar::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) { Control::Paint( rRect ); diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index fa9ebaa138f9..cc0493072371 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -531,7 +531,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt) } } -void SmEditWindow::Paint(const Rectangle& rRect) +void SmEditWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { if (!pEditView) CreateEditView(); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index e3b5f6f64df2..c967936c2f5c 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -385,7 +385,7 @@ const SmNode * SmGraphicWindow::SetCursorPos(sal_uInt16 nRow, sal_uInt16 nCol) return pNode; } -void SmGraphicWindow::Paint(const Rectangle&) +void SmGraphicWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { SAL_WARN_IF( !pViewShell, "starmath", "view shell missing" ); @@ -762,7 +762,7 @@ void SmCmdBoxWindow::Resize() Invalidate(); } -void SmCmdBoxWindow::Paint(const Rectangle& /*rRect*/) +void SmCmdBoxWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/) { Rectangle aRect = Rectangle(Point(0, 0), GetOutputSizePixel()); aRect.Left() += CMD_BOX_PADDING; diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index b4b75782e17c..07766378882b 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -52,7 +52,7 @@ namespace svt protected: RoadmapImpl* m_pImpl; // Window overridables - void Paint( const Rectangle& _rRect ) SAL_OVERRIDE; + void Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) SAL_OVERRIDE; void implInit(); public: diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index e371f5c993fe..30f71ddff50a 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -612,7 +612,7 @@ void BrowseBox::Resize() -void BrowseBox::Paint( const Rectangle& rRect ) +void BrowseBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { // initializations diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 41635c240e57..2f6cc7eab92a 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -318,7 +318,7 @@ void BrowserDataWin::DataChanged( const DataChangedEvent& rDCEvt ) } -void BrowserDataWin::Paint( const Rectangle& rRect ) +void BrowserDataWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if ( !nUpdateLock && GetUpdateMode() ) { diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index ed739fbf1b76..a821ef8fc501 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -141,7 +141,7 @@ public: virtual void dispose() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 111f6c878aae..3d560d69f5b9 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -300,7 +300,7 @@ namespace svt } - void CheckBoxControl::Paint(const Rectangle& rClientRect) + void CheckBoxControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rClientRect) { Control::Paint(rClientRect); if (HasFocus()) diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 6ed9becbdb4b..4bdb4bc87115 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -121,7 +121,7 @@ OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool ) return pEntry->GetText(); } -void SvtIconChoiceCtrl::Paint( const Rectangle& rRect ) +void SvtIconChoiceCtrl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { _pImp->Paint( rRect ); } diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index f1504b35b233..6237afa993c6 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -190,7 +190,7 @@ void SvSimpleTable::SetTabs(const long* pTabs, MapUnit eMapUnit) SvHeaderTabListBox::SetTabs(pTabs,eMapUnit); } -void SvSimpleTable::Paint( const Rectangle& rRect ) +void SvSimpleTable::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { SvHeaderTabListBox::Paint(rRect ); diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index e44f25c2c566..f5e603cf34f7 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -537,7 +537,7 @@ void SvHeaderTabListBox::dispose() -void SvHeaderTabListBox::Paint( const Rectangle& rRect ) +void SvHeaderTabListBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if ( m_bFirstPaint ) { diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index ab4028684ee9..aecf1f7746c4 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2568,7 +2568,7 @@ void SvTreeListBox::AdjustEntryHeightAndRecalc( const vcl::Font& rFont ) RecalcViewData(); } -void SvTreeListBox::Paint( const Rectangle& rRect ) +void SvTreeListBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Control::Paint( rRect ); if( nTreeFlags & SvTreeFlags::RECALCTABS ) diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 89566f37844f..6fca550f6f0a 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -1631,7 +1631,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) -void Calendar::Paint( const Rectangle& ) +void Calendar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw( true ); } diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 311003eeb5f2..bb5341661885 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -992,7 +992,7 @@ void HeaderBar::Tracking( const TrackingEvent& rTEvt ) -void HeaderBar::Paint( const Rectangle& rRect ) +void HeaderBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if ( mnBorderOff1 || mnBorderOff2 ) { diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 3d15ae367178..1fbb266ed34c 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -556,7 +556,7 @@ namespace svt } - void ORoadmap::Paint( const Rectangle& _rRect ) + void ORoadmap::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) { Control::Paint( _rRect ); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 5536a209c52c..28f57db3686b 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2158,7 +2158,7 @@ void Ruler::Tracking( const TrackingEvent& rTEvt ) ImplDrag( rTEvt.GetMouseEvent().GetPosPixel() ); } -void Ruler::Paint( const Rectangle& ) +void Ruler::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw(); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index c96cf428e4f5..294d9240575e 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -162,7 +162,7 @@ private: virtual void dispose() SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; Point maStartPos; long mnStartWidth; @@ -221,7 +221,7 @@ void ImplTabSizer::Tracking( const TrackingEvent& rTEvt ) ImplTrack( OutputToScreenPixel( rTEvt.GetMouseEvent().GetPosPixel() ) ); } -void ImplTabSizer::Paint( const Rectangle& ) +void ImplTabSizer::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { DecorationView aDecoView(this); Rectangle aOutputRect(Point(0, 0), GetOutputSizePixel()); @@ -1223,7 +1223,7 @@ private: } // anonymous namespace -void TabBar::Paint( const Rectangle& rect ) +void TabBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rect ) { if(IsNativeControlSupported(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL)) DrawNativeControl(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL,rect, diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index af6805cb22e9..40f3422f1d0f 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1483,7 +1483,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted ) -void ToolbarMenu::Paint( const Rectangle& ) +void ToolbarMenu::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { SetFillColor( GetSettings().GetStyleSettings().GetMenuColor() ); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index ca07369dc0c3..b39d8ad7919c 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1415,7 +1415,7 @@ void ValueSet::Command( const CommandEvent& rCommandEvent ) Control::Command( rCommandEvent ); } -void ValueSet::Paint( const Rectangle& ) +void ValueSet::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if ( GetStyle() & WB_FLATVALUESET ) { diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index 0d55780c2a6e..f0787a15d14f 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -612,7 +612,7 @@ void SvResizeWindow::Resize() |* |* Description *************************************************************************/ -void SvResizeWindow::Paint( const Rectangle & /*rRect*/ ) +void SvResizeWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle & /*rRect*/ ) { m_aResizer.Draw( this ); } diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index 534f0d4a6ac6..c706caed5260 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -90,7 +90,7 @@ public: virtual void MouseButtonDown( const MouseEvent & rEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent & rEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - virtual void Paint( const Rectangle & ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle & ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index 2b819033d610..fad922d5baef 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -60,7 +60,7 @@ namespace svt { namespace table Window::dispose(); } - void TableDataWindow::Paint( const Rectangle& rUpdateRect ) + void TableDataWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateRect ) { m_rTableControl.doPaintContent( rUpdateRect ); } diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index d5ce17192b11..1da914e79622 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -55,7 +55,7 @@ namespace svt { namespace table inline const Link& GetSelectHdl() const { return m_aSelectHdl; } // Window overridables - virtual void Paint( 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 MouseButtonDown( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 58b59e903cfa..47aa13398ddf 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -1044,7 +1044,7 @@ namespace svt } - void PanelTabBar::Paint( const Rectangle& i_rRect ) + void PanelTabBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rRect ) { m_pImpl->EnsureItemsCache(); diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index 60b9d06cd2c0..c82584cba903 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -56,7 +56,7 @@ namespace svt } - void DrawerVisualization::Paint( const Rectangle& i_rBoundingBox ) + void DrawerVisualization::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rBoundingBox ) { Window::Paint( i_rBoundingBox ); m_rDrawer.Paint(); diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index b13a12e34629..55faf3ec80a5 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -49,7 +49,7 @@ namespace svt protected: // Window overridables - virtual void Paint( const Rectangle& i_rBoundingBox ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& i_rBoundingBox ) SAL_OVERRIDE; private: ToolPanelDrawer& m_rDrawer; diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 8588f9862428..0ae2ed0c9bd6 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -74,7 +74,7 @@ public: Invalidate(); } - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE { @@ -321,7 +321,7 @@ IMPL_LINK_NOARG(MaskData, ExecHdl) return 0L; } -void ColorWindow::Paint( const Rectangle &/*Rect*/ ) +void ColorWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*Rect*/ ) { const Color& rOldLineColor = GetLineColor(); const Color& rOldFillColor = GetFillColor(); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 9071e536139a..26508ad425e9 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -318,7 +318,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt ) -void SvxShowCharSet::Paint( const Rectangle& ) +void SvxShowCharSet::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { DrawChars_Impl( FirstInView(), LastInView() ); } diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 3db87d5b7564..47772831534c 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -207,7 +207,7 @@ void SvxXConnectionPreview::Construct() AdaptSize(); } -void SvxXConnectionPreview::Paint( const Rectangle& ) +void SvxXConnectionPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if( pObjList ) { diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 8b4fded5ab8b..2b238fdafc24 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -217,7 +217,7 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) GraphCtrl::MouseButtonUp( rMEvt ); } -void ContourWindow::Paint( const Rectangle& rRect ) +void ContourWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { // #i75482# // encapsulate the redraw using Begin/End and use the returned diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index e96118c8527c..6937bf9fd8ab 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -42,7 +42,7 @@ protected: virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void SdrObjCreated( const SdrObject& rObj ) SAL_OVERRIDE; virtual void InitSdrModel() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; void CreatePolyPolygon(); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 0735098c3cae..7900913aacaa 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -278,7 +278,7 @@ void DialControl::Resize() InvalidateControl(); } -void DialControl::Paint( const Rectangle& ) +void DialControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Point aPos; DrawBitmapEx( aPos, mpImpl->mxBmpBuffered->GetBitmapEx( aPos, mpImpl->maWinSize ) ); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index fb4923ebd747..45428b555dff 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -166,7 +166,7 @@ void Svx3DPreviewControl::Resize() mpScene->SetSnapRect( aRect ); } -void Svx3DPreviewControl::Paint(const Rectangle& rRect) +void Svx3DPreviewControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { mp3DView->CompleteRedraw(this, vcl::Region(rRect)); } @@ -530,7 +530,7 @@ void Svx3DLightControl::TrySelection(Point aPosPixel) } } -void Svx3DLightControl::Paint(const Rectangle& rRect) +void Svx3DLightControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { Svx3DPreviewControl::Paint(rRect); } diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 5ab4213297ce..e799033780f2 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -388,7 +388,7 @@ void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) // the control (rectangle with 9 circles) -void SvxRectCtl::Paint( const Rectangle& ) +void SvxRectCtl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Point aPtDiff( PixelToLogic( Point( 1, 1 ) ) ); @@ -889,7 +889,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt ) // Draws the Control (Rectangle with nine circles) -void SvxPixelCtl::Paint( const Rectangle& ) +void SvxPixelCtl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if (!aRectSize.Width() || !aRectSize.Height()) return; @@ -2049,7 +2049,7 @@ void SvxXLinePreview::SetLineAttributes(const SfxItemSet& rItemSet) -void SvxXLinePreview::Paint( const Rectangle& ) +void SvxXLinePreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { LocalPrePaint(); @@ -2125,7 +2125,7 @@ void SvxXRectPreview::SetAttributes(const SfxItemSet& rItemSet) mpRectangleObject->SetMergedItem(XLineStyleItem(drawing::LineStyle_NONE)); } -void SvxXRectPreview::Paint( const Rectangle& ) +void SvxXRectPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { LocalPrePaint(); @@ -2198,7 +2198,7 @@ void SvxXShadowPreview::SetShadowPosition(const Point& rPos) maShadowOffset = rPos; } -void SvxXShadowPreview::Paint( const Rectangle& ) +void SvxXShadowPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { LocalPrePaint(); diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index feb6a20466fc..3bb540aa8ad2 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -621,7 +621,7 @@ void SvxFontPrevWindow::UseResourceText( bool bUse ) -void SvxFontPrevWindow::Paint( const Rectangle& ) +void SvxFontPrevWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Printer* pPrinter = pImpl->pPrinter; const SvxFont& rFont = pImpl->aFont; diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 5897a876200f..123368477466 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1043,7 +1043,7 @@ Rectangle FrameSelector::GetClickBoundRect( FrameBorderType eBorder ) const } // virtual functions from base class -void FrameSelector::Paint( const Rectangle& ) +void FrameSelector::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { mxImpl->CopyVirDevToControl(); if( HasFocus() ) diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 236f046a8c69..997c3ee38e13 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -241,7 +241,7 @@ void GraphCtrl::Resize() Invalidate(); } -void GraphCtrl::Paint( const Rectangle& rRect ) +void GraphCtrl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { // #i72889# used splitted repaint to be able to paint an own background // even to the buffered view diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index e2ed6e0a1016..c07f41a580a3 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -94,7 +94,7 @@ void SvxXMeasurePreview::dispose() Control::dispose(); } -void SvxXMeasurePreview::Paint( const Rectangle& ) +void SvxXMeasurePreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { pMeasureObj->SingleObjectPainter(*this); } diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index d1e4c5c04232..aa9154a90ded 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -107,7 +107,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPageWindow(vcl::Win -void SvxPageWindow::Paint(const Rectangle&) +void SvxPageWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { Fraction aXScale(aWinSize.Width(),std::max((long)(aSize.Width() * 2 + aSize.Width() / 8),1L)); Fraction aYScale(aWinSize.Height(),std::max(aSize.Height(),1L)); diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index f80d08e39d3a..523cfe4247cb 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -57,7 +57,7 @@ Size SvxParaPrevWindow::GetOptimalSize() const -void SvxParaPrevWindow::Paint( const Rectangle& ) +void SvxParaPrevWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { DrawParagraph( true ); } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 29d0ae7c9e39..d965b9f5743c 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -804,7 +804,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyPreview(vcl::Windo return new RubyPreview(pParent); } -void RubyPreview::Paint( const Rectangle& /* rRect */ ) +void RubyPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /* rRect */ ) { Size aWinSize = GetOutputSize(); diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 964899b8c45a..5a48a357bbed 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -463,7 +463,7 @@ Rectangle SvxSwFrameExample::DrawInnerFrame_Impl(const Rectangle &rRect, const C return aRect; } -void SvxSwFrameExample::Paint(const Rectangle&) +void SvxSwFrameExample::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { InitAllRects_Impl(); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index f8fb4b43dc79..10974bf3adac 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -716,7 +716,7 @@ void DbGridControl::NavigationBar::Resize() ArrangeControls(); } -void DbGridControl::NavigationBar::Paint(const Rectangle& rRect) +void DbGridControl::NavigationBar::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { Control::Paint(rRect); Point aAbsolutePos = m_aAbsolute->GetPosPixel(); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 3b21ddf2f796..eb0d9b3aa0a5 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -131,7 +131,7 @@ bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl return bRet; } -void GalleryPreview::Paint( const Rectangle& rRect ) +void GalleryPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Window::Paint( rRect ); diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index fd986ee94f54..35b2cf54c6f5 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -79,7 +79,7 @@ void LineWidthControl::dispose() -void LineWidthControl::Paint(const Rectangle& rect) +void LineWidthControl::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rect) { svx::sidebar::PopupControl::Paint(rect); diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index 5af26026e92a..a1f5e43ccc0e 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -41,7 +41,7 @@ public: virtual void dispose() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; - virtual void Paint(const Rectangle& rect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect) SAL_OVERRIDE; void SetWidthSelect( long lValue, bool bValuable, SfxMapUnit eMapUnit); bool IsCloseByEdit() { return mbCloseByEdit;} diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx index 660798090a72..4cf85a9b8fd1 100644 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ b/svx/source/sidebar/tools/PopupControl.cxx @@ -35,7 +35,7 @@ PopupControl::PopupControl ( SetBackground(Theme::GetWallpaper(Theme::Paint_DropDownBackground)); } -void PopupControl::Paint (const Rectangle& rBox) +void PopupControl::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rBox) { Control::Paint(rBox); diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index a5ec5ebd8159..c45f89c03db2 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -84,7 +84,7 @@ public: void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE; virtual void PopupModeEnd() SAL_OVERRIDE; virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE; @@ -269,7 +269,7 @@ void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) -void TableWindow::Paint( const Rectangle& ) +void TableWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { const long nSelectionWidth = mnTablePosX + nCol*mnTableCellWidth; const long nSelectionHeight = mnTablePosY + nLine*mnTableCellHeight; @@ -428,7 +428,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE; virtual void PopupModeEnd() SAL_OVERRIDE; virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE; }; @@ -631,7 +631,7 @@ void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) -void ColumnsWindow::Paint( const Rectangle& ) +void ColumnsWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { long i; long nLineWidth; diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx index 591e0011f9a9..58b29367c239 100644 --- a/svx/workben/pixelctl.cxx +++ b/svx/workben/pixelctl.cxx @@ -90,7 +90,7 @@ public: void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; void Resize() SAL_OVERRIDE; bool Close() SAL_OVERRIDE; @@ -153,7 +153,7 @@ void MyWin::KeyUp( const KeyEvent& rKEvt ) WorkWindow::KeyUp( rKEvt ); } -void MyWin::Paint( const Rectangle& rRect ) +void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index e660b9bcc7c4..8790c623ac50 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -182,7 +182,7 @@ class SwSidebarWin : public vcl::Window protected: virtual void DataChanged( const DataChangedEvent& aEvent) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual VclPtr<MenuButton> CreateMenuButton() = 0; diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index cd402d033ad0..0e024ab3cac6 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -91,7 +91,7 @@ class SwDropCapsPict : public Control Size maTextSize; Reference< css::i18n::XBreakIterator > xBreak; - virtual void Paint(const Rectangle &rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) SAL_OVERRIDE; void CheckScript(); Size CalcTextSize(); inline void InitPrinter(); @@ -345,7 +345,7 @@ void SwDropCapsPict::UpdatePaintSettings() Invalidate(); } -void SwDropCapsPict::Paint(const Rectangle &/*rRect*/) +void SwDropCapsPict::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*rRect*/) { if (!IsVisible()) return; diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 0ce66ad8b874..87ba77f90ebb 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -425,7 +425,7 @@ Size SwCaptionPreview::GetOptimalSize() const return LogicToPixel(Size(106 , 20), MapMode(MAP_APPFONT)); } -void SwCaptionPreview::Paint( const Rectangle& rRect ) +void SwCaptionPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { Window::Paint( rRect ); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 8a595b87285f..287429ba43e6 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1647,7 +1647,7 @@ void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt ) InitColors(); } -void SwMarkPreview::Paint(const Rectangle &/*rRect*/) +void SwMarkPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*rRect*/) { const Size aSz(GetOutputSizePixel()); diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index d0fcedae9073..e6072f718899 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -69,7 +69,7 @@ void SwEnvPreview::DataChanged( const DataChangedEvent& rDCEvt ) SetBackground( GetSettings().GetStyleSettings().GetDialogColor() ); } -void SwEnvPreview::Paint(const Rectangle &) +void SwEnvPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &) { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 646da3d044b4..92e77b99effd 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -89,7 +89,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwLabPreview(vcl::Wind return new SwLabPreview(pParent); } -void SwLabPreview::Paint(const Rectangle &) +void SwLabPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &) { const Size aSz(GetOutputSizePixel()); diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index d35833a7122b..c81acc1b2180 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -54,7 +54,7 @@ class SwLabPreview : public vcl::Window SwLabItem aItem; - virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index aa7f9d67f1b7..1f357799563a 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2666,7 +2666,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBmpWindow(vcl::Window return new BmpWindow(pParent, 0); } -void BmpWindow::Paint( const Rectangle& ) +void BmpWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Point aPntPos; Size aPntSz( GetSizePixel() ); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index c66b86947e80..f2a15a30cad9 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -927,7 +927,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumberingPreview(vcl:: } // paint numbering's preview -void NumberingPreview::Paint( const Rectangle& /*rRect*/ ) +void NumberingPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { const Size aSize(PixelToLogic(GetOutputSizePixel())); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 36a0cccf0061..a60439cd3ec0 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -57,7 +57,7 @@ public: virtual void Resize() SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; private: SwTableAutoFmt aCurData; @@ -924,7 +924,7 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ ) aVD->SetDrawMode( nOldDrawMode ); } -void AutoFmtPreview::Paint( const Rectangle& rRect ) +void AutoFmtPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { DoPaint( rRect ); } diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 8f7baa658f91..e3cbddea71e0 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -315,7 +315,7 @@ void SwAddressPreview::UpdateScrollBar() } } -void SwAddressPreview::Paint(const Rectangle&) +void SwAddressPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); SetFillColor(rSettings.GetWindowColor()); diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index 14c486369ca8..cfa3dc38b1ab 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -120,7 +120,7 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt ) MenuButton::MouseButtonDown( rMEvt ); } -void AnnotationMenuButton::Paint( const Rectangle& /*rRect*/ ) +void AnnotationMenuButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) SetFillColor(COL_BLACK); diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx index 9682bcf491fe..a7c1df80a11f 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx @@ -40,7 +40,7 @@ class AnnotationMenuButton : public MenuButton // override vcl::Window methods virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; private: diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx index f7104cbccb46..8dc146cc88ae 100644 --- a/sw/source/uibase/docvw/DashedLine.cxx +++ b/sw/source/uibase/docvw/DashedLine.cxx @@ -29,7 +29,7 @@ SwDashedLine::~SwDashedLine( ) { } -void SwDashedLine::Paint( const Rectangle& ) +void SwDashedLine::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { const drawinglayer::geometry::ViewInformation2D aNewViewInfos; boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor( diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 61dcbd21964e..78d24ba09cb7 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -262,7 +262,7 @@ bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const return false; } -void SwHeaderFooterWin::Paint( const Rectangle& ) +void SwHeaderFooterWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { const Rectangle aRect( Rectangle( Point( 0, 0 ), PixelToLogic( GetSizePixel() ) ) ); drawinglayer::primitive2d::Primitive2DSequence aSeq( 3 ); diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index d806eb332395..23b5902bc906 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -135,7 +135,7 @@ void SwPageBreakWin::dispose() MenuButton::dispose(); } -void SwPageBreakWin::Paint( const Rectangle& ) +void SwPageBreakWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { const Rectangle aRect( Rectangle( Point( 0, 0 ), PixelToLogic( GetSizePixel() ) ) ); diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index fcb3eb65e4c7..e43bb81fe90c 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -151,7 +151,7 @@ void SidebarTxtControl::Draw(OutputDevice* pDev, const Point& rPt, const Size& r } } -void SidebarTxtControl::Paint( const Rectangle& rRect) +void SidebarTxtControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx index 4bd1fe89b7d8..a8e873e2736b 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx @@ -39,7 +39,7 @@ class SidebarTxtControl : public Control SwPostItMgr& mrPostItMgr; protected: - virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index d9485d76dda2..4a53ece0428f 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -208,7 +208,7 @@ void SwSidebarWin::dispose() vcl::Window::dispose(); } -void SwSidebarWin::Paint( const Rectangle& rRect) +void SwSidebarWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { Window::Paint(rRect); diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 7801d589559a..1b69c0aebee9 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -444,7 +444,7 @@ void SwEditWin::PrePaint() } } -void SwEditWin::Paint(const Rectangle& rRect) +void SwEditWin::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { SwWrtShell* pWrtShell = GetView().GetWrtShellPtr(); if(!pWrtShell) diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 5d2dac64c01f..cd66ace9bb49 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -479,7 +479,7 @@ void TextViewOutWin::KeyInput( const KeyEvent& rKEvt ) } } -void TextViewOutWin::Paint( const Rectangle& rRect ) +void TextViewOutWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { pTextView->Paint( rRect ); } diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 2c5df5343023..829457655579 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -348,7 +348,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwColumnOnlyExample(vc return new SwColumnOnlyExample(pParent); } -void SwColumnOnlyExample::Paint( const Rectangle& /*rRect*/ ) +void SwColumnOnlyExample::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const Color& rFieldColor = rStyleSettings.GetFieldColor(); diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index 4ab2efaa91fa..42367941edf9 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -22,7 +22,7 @@ public: SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); virtual ~SwDashedLine( ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 32e30f5cc70b..76241f648c98 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -35,7 +35,7 @@ public: void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Select( ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index d1b048fbc1a3..ab18dd86c4d9 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -37,7 +37,7 @@ public: virtual ~SwPageBreakWin( ); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Select( ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Activate( ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index e18d636052e6..c1f80e8e2af9 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -36,7 +36,7 @@ private: bool bGraphic : 1; bool bLeftAlign : 1; - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 638b3c78ab2a..39a677bae422 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -95,7 +95,7 @@ private: SwFmtCol m_aCols; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; public: SwColumnOnlyExample(vcl::Window*); diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index aaf06adaa854..3bdf785cf1b3 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -188,7 +188,7 @@ protected: virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; virtual void PrePaint() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 962dd8ca8dd1..fd4691a66453 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -42,7 +42,7 @@ class Printer; class SwEnvPreview : public vcl::Window { - void Paint(const Rectangle&) SAL_OVERRIDE; + void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; public: diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index deb715c98e79..e13634dc04a7 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window void DrawText_Impl( const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); - 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; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index bec5210fa7ce..175bed1573bc 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -35,7 +35,7 @@ class NumberingPreview : public vcl::Window sal_uInt16 nActLevel; protected: - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; public: NumberingPreview(vcl::Window* pParent, const ResId& rResId) diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 8c873f184bd0..4f5e10d147c5 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -100,7 +100,7 @@ public: SwCaptionPreview( vcl::Window* pParent, WinBits nStyle ); void Init(); void SetPreviewText( const OUString& rText ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index efe7ebda59e4..fa8901d40d0e 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -313,7 +313,7 @@ class SwMarkPreview : public vcl::Window using OutputDevice::DrawRect; void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); - void Paint(const Rectangle&) SAL_OVERRIDE; + void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; void PaintPage(const Rectangle &rRect); void InitColors(); diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index fc29eeb74910..58990911a55d 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -64,7 +64,7 @@ public: virtual ~SwPagePreviewWin(); // calls SwViewShell::Paint - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent & ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 8e1a411c645a..823e3cd28a68 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -43,7 +43,7 @@ class TextViewOutWin : public vcl::Window ExtTextView* pTextView; protected: - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 7e57c2abe0ae..35938f1cebf3 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -40,7 +40,7 @@ public: * Paint the ruler. * \param rRect ignored */ - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; protected: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index db2adb767018..1e1fdea90dc3 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -60,7 +60,7 @@ void SwCommentRuler::dispose() SvxRuler::dispose(); } -void SwCommentRuler::Paint( const Rectangle& rRect ) +void SwCommentRuler::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { SvxRuler::Paint( rRect ); // Don't draw if there is not any note diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index ac5a8f4e7cef..373026005082 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -210,7 +210,7 @@ SwPagePreviewWin::~SwPagePreviewWin() { } -void SwPagePreviewWin::Paint( const Rectangle& rRect ) +void SwPagePreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if( !mpViewShell || !mpViewShell->GetLayout() ) return; diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 77a690c75dc0..a82aa82ad92c 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -127,7 +127,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index c092d292d4ea..bcdb80ba152a 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -43,7 +43,7 @@ private: protected: DECL_LINK( TimerHdl, Timer* ); - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual OUString GetText() const SAL_OVERRIDE; void ImplShow(); diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index dfab1ad7185b..37a4a4327fee 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -244,7 +244,7 @@ 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( 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; @@ -570,7 +570,7 @@ public: ImplWin( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index a071c9d5cbac..770d1777f26a 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -66,7 +66,7 @@ namespace vcl virtual ~PrintPreviewWindow(); virtual void dispose() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Command( const CommandEvent& ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; @@ -90,7 +90,7 @@ namespace vcl virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; void setValues( int i_nOrderMode, int i_nColumns, int i_nRows ) { diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 2f52375d1e02..68bb91ed5c7b 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -352,7 +352,7 @@ void HelpTextWindow::ImplShow() Update(); } -void HelpTextWindow::Paint( const Rectangle& ) +void HelpTextWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { // paint native background bool bNativeOK = false; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index bf23b10fb9d4..bbe85b894735 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1326,7 +1326,7 @@ void PushButton::FillLayoutData() const const_cast<PushButton*>(this)->ImplDrawPushButton( true ); } -void PushButton::Paint( const Rectangle& ) +void PushButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDrawPushButton(); } @@ -2412,7 +2412,7 @@ void RadioButton::FillLayoutData() const const_cast<RadioButton*>(this)->ImplDrawRadioButton( true ); } -void RadioButton::Paint( const Rectangle& ) +void RadioButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDrawRadioButton(); } @@ -3294,7 +3294,7 @@ void CheckBox::FillLayoutData() const const_cast<CheckBox*>(this)->ImplDrawCheckBox( true ); } -void CheckBox::Paint( const Rectangle& ) +void CheckBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDrawCheckBox(); } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 6efac8a766b7..85bbbeb46e99 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1761,7 +1761,7 @@ void Edit::FillLayoutData() const const_cast<Edit*>(this)->ImplRepaint(true); } -void Edit::Paint( const Rectangle& ) +void Edit::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if ( !mpSubEdit ) ImplRepaint(); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 69922de6df07..e4858f163c3d 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -234,7 +234,7 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, ); } -void FixedText::Paint( const Rectangle& ) +void FixedText::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } @@ -641,7 +641,7 @@ void FixedLine::FillLayoutData() const const_cast<FixedLine*>(this)->ImplDraw( true ); } -void FixedLine::Paint( const Rectangle& ) +void FixedLine::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw(); } @@ -773,7 +773,7 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */, } } -void FixedBitmap::Paint( const Rectangle& ) +void FixedBitmap::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } @@ -943,7 +943,7 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, } } -void FixedImage::Paint( const Rectangle& ) +void FixedImage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 209bd14d9a9b..77cd1a6f994e 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -188,7 +188,7 @@ void GroupBox::FillLayoutData() const const_cast<GroupBox*>(this)-> ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true ); } -void GroupBox::Paint( const Rectangle& ) +void GroupBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 083faf072e96..01a18d211d53 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -1914,7 +1914,7 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) ImplShowFocusRect(); } -void ImplListBoxWindow::Paint( const Rectangle& rRect ) +void ImplListBoxWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { ImplDoPaint( rRect ); } @@ -2766,7 +2766,7 @@ void ImplWin::ImplDraw( bool bLayout ) } } -void ImplWin::Paint( const Rectangle& ) +void ImplWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw(); } diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index efd64c825d68..288cb04b835e 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -131,7 +131,7 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi } // switch ( mnScaleMode ) } -void ImageControl::Paint( const Rectangle& /*rRect*/ ) +void ImageControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ ) { ImplDraw( *this, 0, Point(), GetOutputSizePixel() ); diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index a89afac723bb..8bdf2fe9d850 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -145,7 +145,7 @@ void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ) Rectangle( Point(), GetSizePixel() ) ); } -void ProgressBar::Paint( const Rectangle& ) +void ProgressBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDrawProgress( 0, mnPercent ); } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index b239c623e3ff..4050560c7605 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1120,7 +1120,7 @@ void ScrollBar::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -void ScrollBar::Paint( const Rectangle& ) +void ScrollBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw( SCRBAR_DRAW_ALL, this ); } diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 773f31087ebc..e85ce8099702 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -808,7 +808,7 @@ void Slider::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -void Slider::Paint( const Rectangle& ) +void Slider::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDraw( SLIDER_DRAW_ALL ); } diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index c9feafa07663..4a7da9bead2a 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -165,7 +165,7 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } -void SpinButton::Paint( const Rectangle& ) +void SpinButton::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { HideFocus(); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index fe1feea8ef05..66cabf6d1ca6 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -604,7 +604,7 @@ void SpinField::FillLayoutData() const Edit::FillLayoutData(); } -void SpinField::Paint( const Rectangle& rRect ) +void SpinField::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if ( mbSpin ) { diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index a0553a3c120e..72c1357ef267 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1048,7 +1048,7 @@ void TabControl::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -void TabControl::Paint( const Rectangle& rRect ) +void TabControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { if ( !( GetStyle() & WB_NOBORDER ) ) ImplPaint( rRect, false ); diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index cc3a5898cab7..a6313801be94 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -60,7 +60,7 @@ public: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; @@ -805,7 +805,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent ) Window::KeyInput( rKEvent ); } -void TextWindow::Paint( const Rectangle& rRect ) +void TextWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { mpExtTextView->Paint( rRect ); } diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 88ef65a07391..464a7e940d47 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1877,7 +1877,7 @@ void ImplBorderWindow::Tracking( const TrackingEvent& rTEvt ) mpBorderView->Tracking( rTEvt ); } -void ImplBorderWindow::Paint( const Rectangle& ) +void ImplBorderWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL ); } diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 43ce7bdb3c4d..e94d6073931a 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -159,7 +159,7 @@ WindowAlign DockingAreaWindow::GetAlign() const return mpImplData->meAlign; } -void DockingAreaWindow::Paint( const Rectangle& ) +void DockingAreaWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { EnableNativeWidget( true ); // only required because the toolkit currently switches this flag off if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) ) diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 160e21074029..7d0f826c4406 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -487,7 +487,7 @@ public: virtual void dispose() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -713,7 +713,7 @@ void ImplPopupFloatWin::DrawGrip() SetFillColor(); } -void ImplPopupFloatWin::Paint( const Rectangle& ) +void ImplPopupFloatWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { Point aPt; Rectangle aRect( aPt, GetOutputSizePixel() ); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 47f61ad6829d..ef83cacb83da 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -871,7 +871,7 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) return bDone; } -void MenuBarWindow::Paint( const Rectangle& ) +void MenuBarWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if( ! pMenu ) return; diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index bb3c8be22073..348d167e6469 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -119,7 +119,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 227cc8bb5932..a48152eeffc7 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -1086,7 +1086,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) } } -void MenuFloatingWindow::Paint( const Rectangle& ) +void MenuFloatingWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if( ! pMenu ) return; diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index 3157be8d493f..021247af51a5 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -90,7 +90,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx index 21af6cc53598..6111cbca0a1a 100644 --- a/vcl/source/window/openglwin.cxx +++ b/vcl/source/window/openglwin.cxx @@ -58,7 +58,7 @@ OpenGLContext& OpenGLWindow::getContext() return mxImpl->getContext(); } -void OpenGLWindow::Paint(const Rectangle&) +void OpenGLWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { if(mpRenderer) mpRenderer->update(); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f24755d92904..83ba36286f70 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -161,7 +161,7 @@ void PrintDialog::PrintPreviewWindow::Resize() } -void PrintDialog::PrintPreviewWindow::Paint( const Rectangle& ) +void PrintDialog::PrintPreviewWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { long nTextHeight = maHorzDim->GetTextHeight(); Size aSize( GetSizePixel() ); @@ -322,7 +322,7 @@ Size PrintDialog::ShowNupOrderWindow::GetOptimalSize() const return Size(70, 70); } -void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect ) +void PrintDialog::ShowNupOrderWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& i_rRect ) { Window::Paint( i_rRect ); SetMapMode( MAP_PIXEL ); diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index a40ef10dc592..009dc14422bc 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -286,7 +286,7 @@ PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY ) return eStyle; } -void ImplWheelWindow::Paint( const Rectangle& ) +void ImplWheelWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { ImplDrawWheel(); } diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index 6ec18c4e2b73..82ba04f29e51 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -63,7 +63,7 @@ private: protected: - virtual void Paint( 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; diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 70482c02a039..026b40fbbbb2 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -697,7 +697,7 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) } } -void Splitter::Paint( const Rectangle& rPaintRect ) +void Splitter::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rPaintRect ) { DrawRect( rPaintRect ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 293479151943..6be4c7ea10fd 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2514,7 +2514,7 @@ bool SplitWindow::PreNotify( NotifyEvent& rNEvt ) return Window::PreNotify( rNEvt ); } -void SplitWindow::Paint( const Rectangle& ) +void SplitWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if ( mnWinStyle & WB_BORDER ) ImplDrawBorder( this ); diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 7f43c18e2b1a..37397f912471 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -700,7 +700,7 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) } } -void StatusBar::Paint( const Rectangle& ) +void StatusBar::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { if ( mbFormat ) ImplFormat(); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 964f96043d78..308ca926afe7 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -126,7 +126,7 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } -void TabPage::Paint( const Rectangle& ) +void TabPage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) { // draw native tabpage only inside tabcontrols, standalone tabpages look ugly (due to bad dialog design) if( IsNativeControlSupported(CTRL_TAB_BODY, PART_ENTIRE_CONTROL) && GetParent() && (GetParent()->GetType() == WINDOW_TABCONTROL) ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 2369a7d25da5..bffd15ae8f2f 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4014,7 +4014,7 @@ void ToolBox::Tracking( const TrackingEvent& rTEvt ) DockingWindow::Tracking( rTEvt ); } -void ToolBox::Paint( const Rectangle& rPaintRect ) +void ToolBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rPaintRect ) { if( mpData->mbIsPaintLocked ) return; diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index cef8ac6755c8..326f1f586b91 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -78,7 +78,7 @@ public: virtual void dispose() SAL_OVERRIDE { mpFixedBitmap.clear(); WorkWindow::dispose(); } void LoadGraphic( const OUString& sImageFile ); - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; }; @@ -103,7 +103,7 @@ void MyWorkWindow::LoadGraphic( const OUString& sImageFile ) } } -void MyWorkWindow::Paint( const Rectangle& rRect ) +void MyWorkWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { std::cout << "==> Paint! " << mnPaintCount++ << " (vcl) " << GetSizePixel() << " " << getTimeNow() - mnStartTime << std::endl; diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx index 05ab64430972..ad88f1e65e5c 100644 --- a/vcl/workben/mtfdemo.cxx +++ b/vcl/workben/mtfdemo.cxx @@ -55,10 +55,10 @@ public: } } - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; }; -void DemoMtfWin::Paint( const Rectangle& rRect ) +void DemoMtfWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { maMtf.Play(this, maMtf.GetActionSize()); diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index da14e1aac673..e647baa7c7b6 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -72,7 +72,7 @@ class TestWindow : public Dialog Show(); } - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; }; typedef boost::function1<void, OutputDevice*> functor_type; @@ -879,7 +879,7 @@ void outDevGrind( OutputDevice& rTarget, sal_Int32 nTurns=100 ) } } -void TestWindow::Paint( const Rectangle& ) +void TestWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) { outDevGrind( *this ); fflush( stdout ); diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index e349934a5af1..d509643b4f3d 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -75,7 +75,7 @@ public: void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; void Resize() SAL_OVERRIDE; }; @@ -118,7 +118,7 @@ void MyWin::KeyUp( const KeyEvent& rKEvt ) WorkWindow::KeyUp( rKEvt ); } -void MyWin::Paint( const Rectangle& rRect ) +void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 01ad3e9d5f08..b82c89bc23b0 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -104,7 +104,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; @@ -301,7 +301,7 @@ void MyWin::KeyUp( const KeyEvent& rKEvt ) WorkWindow::KeyUp( rKEvt ); } -void MyWin::Paint( const Rectangle& rRect ) +void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index ac2c5527a8e0..4ee02591027b 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -85,7 +85,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; }; @@ -220,7 +220,7 @@ static Color approachColor( const Color& rFrom, const Color& rTo ) } #define DELTA 5.0 -void MyWin::Paint( const Rectangle& rRect ) +void MyWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) { WorkWindow::Paint( rRect ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 4f42f9353445..e85da2eae2b5 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1417,7 +1417,7 @@ public: mrRenderer.SetSizePixel(GetSizePixel()); mrRenderer.KeyInput(rKEvt); } - virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE { mrRenderer.SetSizePixel(GetSizePixel()); fprintf(stderr, "DemoWin::Paint(%ld,%ld,%ld,%ld)\n", rRect.getX(), rRect.getY(), rRect.getWidth(), rRect.getHeight()); @@ -1489,7 +1489,7 @@ public: mpButton.disposeAndClear(); WorkWindow::dispose(); } - virtual void Paint(const Rectangle&) SAL_OVERRIDE + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) SAL_OVERRIDE { Rectangle aWholeSize(Point(0, 0),GetOutputSizePixel()); vcl::Region aClip(aWholeSize); @@ -1530,7 +1530,7 @@ class DemoPopup : public FloatingWindow Update(); } - virtual void Paint( const Rectangle& ) SAL_OVERRIDE + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) SAL_OVERRIDE { // Interestingly in GL mode on Windows, this doesn't render. |