summaryrefslogtreecommitdiff
path: root/cui
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 /cui
parentd36da8c19378f4772c896ca4df94117077e823d6 (diff)
mass rewrite Paint(Rect&) to Paint(RenderContext&, Rect&)
Change-Id: Ia1667246064d11827dbd149def15e5bf08b119b8
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/about.cxx2
-rw-r--r--cui/source/dialogs/colorpicker.cxx12
-rw-r--r--cui/source/dialogs/cuicharmap.cxx2
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx2
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx4
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx2
-rw-r--r--cui/source/dialogs/thesdlg.cxx2
-rw-r--r--cui/source/inc/about.hxx2
-rw-r--r--cui/source/inc/cuicharmap.hxx2
-rw-r--r--cui/source/inc/cuigrfflt.hxx2
-rw-r--r--cui/source/inc/grfpage.hxx2
-rw-r--r--cui/source/inc/hlmarkwn.hxx2
-rw-r--r--cui/source/inc/numfmt.hxx2
-rw-r--r--cui/source/inc/numpages.hxx2
-rw-r--r--cui/source/inc/thesdlg.hxx2
-rw-r--r--cui/source/tabpages/backgrnd.cxx4
-rw-r--r--cui/source/tabpages/grfpage.cxx2
-rw-r--r--cui/source/tabpages/numfmt.cxx2
-rw-r--r--cui/source/tabpages/numpages.cxx2
-rw-r--r--cui/source/tabpages/tabstpge.cxx4
20 files changed, 28 insertions, 28 deletions
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;