summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-04-28 11:00:54 +0900
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-04-29 09:19:47 +0900
commitf50fd9692ed7b9632c0f8dad9508f5a207679be4 (patch)
tree50c9598cb186708215899b45c43623447b7b60ff /sfx2
parentd36da8c19378f4772c896ca4df94117077e823d6 (diff)
mass rewrite Paint(Rect&) to Paint(RenderContext&, Rect&)
Change-Id: Ia1667246064d11827dbd149def15e5bf08b119b8
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/recentdocsview.cxx2
-rw-r--r--sfx2/source/control/templateabstractview.cxx2
-rw-r--r--sfx2/source/control/thumbnailview.cxx2
-rw-r--r--sfx2/source/dialog/backingwindow.cxx2
-rw-r--r--sfx2/source/dialog/backingwindow.hxx2
-rw-r--r--sfx2/source/dialog/dockwin.cxx2
-rw-r--r--sfx2/source/dialog/infobar.cxx6
-rw-r--r--sfx2/source/dialog/titledockwin.cxx2
-rw-r--r--sfx2/source/doc/doctemplates.cxx4
-rw-r--r--sfx2/source/doc/new.cxx2
-rw-r--r--sfx2/source/inc/preview.hxx2
-rw-r--r--sfx2/source/sidebar/Deck.cxx4
-rw-r--r--sfx2/source/sidebar/Deck.hxx4
-rw-r--r--sfx2/source/sidebar/MenuButton.cxx2
-rw-r--r--sfx2/source/sidebar/MenuButton.hxx2
-rw-r--r--sfx2/source/sidebar/Panel.cxx2
-rw-r--r--sfx2/source/sidebar/Panel.hxx2
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx2
-rw-r--r--sfx2/source/sidebar/TabBar.cxx2
-rw-r--r--sfx2/source/sidebar/TabBar.hxx2
-rw-r--r--sfx2/source/sidebar/TabItem.cxx2
-rw-r--r--sfx2/source/sidebar/TabItem.hxx2
-rw-r--r--sfx2/source/sidebar/TitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/TitleBar.hxx2
24 files changed, 29 insertions, 29 deletions
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,