summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/acccfg.cxx4
-rw-r--r--cui/source/customize/cfg.cxx8
-rw-r--r--cui/source/customize/macropg.cxx14
-rw-r--r--cui/source/dialogs/thesdlg.cxx5
-rw-r--r--cui/source/dialogs/thesdlg_impl.hxx3
-rw-r--r--cui/source/options/optHeaderTabListbox.cxx6
-rw-r--r--cui/source/options/optlingu.cxx18
-rw-r--r--cui/source/tabpages/autocdlg.cxx10
8 files changed, 38 insertions, 30 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index d0cc24a65358..78b9e7358e7d 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -630,7 +630,7 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString
virtual ~SfxAccCfgLBoxString_Impl();
virtual void Paint(
- const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvTreeListEntry* pEntry);
+ const Point& aPos, SvTreeListBox& rDevice, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
};
//-----------------------------------------------
@@ -647,7 +647,7 @@ SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
}
void SfxAccCfgLBoxString_Impl::Paint(
- const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvTreeListEntry* pEntry)
+ const Point& aPos, SvTreeListBox& rDevice, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
{
if (!pEntry)
return;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d657db009d64..72e9097284a9 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1360,10 +1360,10 @@ public:
~PopupPainter() { }
- void Paint( const Point& rPos, SvTreeListBox& rOutDev,
- sal_uInt16 nViewDataEntryFlags, SvTreeListEntry* pEntry )
+ virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev,
+ const SvViewDataEntry* pView, const SvTreeListEntry* pEntry)
{
- SvLBoxString::Paint( rPos, rOutDev, nViewDataEntryFlags, pEntry );
+ SvLBoxString::Paint(rPos, rOutDev, pView, pEntry);
Color aOldFillColor = rOutDev.GetFillColor();
@@ -1376,7 +1376,7 @@ public:
nX -= pVScroll->GetSizePixel().Width();
}
- SvViewDataItem* pItem = rOutDev.GetViewDataItem( pEntry, this );
+ const SvViewDataItem* pItem = rOutDev.GetViewDataItem( pEntry, this );
nX -= pItem->maSize.Height();
long nSize = pItem->maSize.Height() / 2;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 376d75188142..691c4e764759 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -433,10 +433,11 @@ class IconLBoxString : public SvLBoxString
Image* m_pComponentImg;
int m_nxImageOffset;
- public:
- IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText,
- Image* pMacroImg, Image* pComponentImg );
- virtual void Paint(const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvTreeListEntry* pEntry );
+public:
+ IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText,
+ Image* pMacroImg, Image* pComponentImg );
+ virtual void Paint(
+ const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
};
@@ -450,8 +451,9 @@ IconLBoxString::IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, cons
}
//===============================================
-void IconLBoxString::Paint( const Point& aPos, SvTreeListBox& aDevice,
- sal_uInt16 /*nFlags*/, SvTreeListEntry* /*pEntry*/ )
+void IconLBoxString::Paint(
+ const Point& aPos, SvTreeListBox& aDevice, const SvViewDataEntry* /*pView*/,
+ const SvTreeListEntry* /*pEntry*/)
{
String aTxt( GetText() );
if( aTxt.Len() )
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index b222b19efa1b..c0ec8004e312 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -139,9 +139,8 @@ AlternativesString::AlternativesString(
}
void AlternativesString::Paint(
- const Point& rPos,
- SvTreeListBox& rDev, sal_uInt16,
- SvTreeListEntry* pEntry )
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
+ const SvTreeListEntry* pEntry)
{
AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry );
Point aPos( rPos );
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 1349ab3cb7b0..e0dbad90ebca 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -56,7 +56,8 @@ public:
AlternativesString( ThesaurusAlternativesCtrl &rControl,
SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr );
- virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry);
+ virtual void Paint(
+ const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
};
#endif
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 93909bf8716b..7a6351816b61 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -33,12 +33,14 @@ public:
OptLBoxString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
SvLBoxString( pEntry, nFlags, rTxt ) {}
- virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry );
+ virtual void Paint(
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
};
// -----------------------------------------------------------------------
-void OptLBoxString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry )
+void OptLBoxString_Impl::Paint(
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
{
Font aOldFont( rDev.GetFont() );
Font aFont( aOldFont );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 542d7ebabb83..ae328c02e5b8 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -286,12 +286,13 @@ public:
BrwStringDic_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags,
const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {}
- virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
- SvTreeListEntry* pEntry);
+ virtual void Paint(
+ const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
};
-void BrwStringDic_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16,
- SvTreeListEntry* pEntry )
+void BrwStringDic_Impl::Paint(
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
+ const SvTreeListEntry* pEntry)
{
ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData();
Point aPos(rPos);
@@ -451,12 +452,13 @@ public:
BrwString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags,
const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {}
- virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
- SvTreeListEntry* pEntry);
+ virtual void Paint(
+ const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
};
-void BrwString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16,
- SvTreeListEntry* pEntry )
+void BrwString_Impl::Paint(
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
+ const SvTreeListEntry* pEntry)
{
Point aPos(rPos);
aPos.X() += 20;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 483735853a27..024bcf877b8f 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -333,12 +333,14 @@ public:
OfaImpBrwString( SvTreeListEntry* pEntry, sal_uInt16 nFlags,
const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr){}
- virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
- SvTreeListEntry* pEntry);
+ virtual void Paint(
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView,
+ const SvTreeListEntry* pEntry);
};
-void OfaImpBrwString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/,
- SvTreeListEntry* pEntry )
+void OfaImpBrwString::Paint(
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
+ const SvTreeListEntry* pEntry)
{
rDev.DrawText( rPos, GetText() );
if(pEntry->GetUserData())