summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-11-29 14:17:48 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-11-29 16:34:43 -0500
commit251dab0145e15a372ff0fe41ce9647e9df8e9ffd (patch)
tree813037847c767cb8405b2bceef94356bb6bdd2e4 /sd/source/ui
parent764878deacb5018539ff5df71af8bf7e6677a93e (diff)
Pass pointer to view data entry to Paint() instead of its raw flag value.
We need to hide these flags away. Change-Id: I112003a88a92174f5012b3356ba261a039eeccc1
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 62ec3b50044c..f1d4c787cadc 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -205,10 +205,11 @@ public:
CustomAnimationListEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent );
virtual ~CustomAnimationListEntryItem();
void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
- void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* );
SvLBoxItem* Create() const;
void Clone( SvLBoxItem* pSource );
+ virtual void Paint(
+ const Point&, SvTreeListBox& rDev, const SvViewDataEntry* pView,const SvTreeListEntry* pEntry);
private:
CustomAnimationList* mpParent;
OUString maDescription;
@@ -246,10 +247,11 @@ void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeLis
// --------------------------------------------------------------------
-void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry )
+void CustomAnimationListEntryItem::Paint(
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
{
- SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this );
+ const SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this );
Point aPos( rPos );
Size aSize( pViewData->maSize );
@@ -356,9 +358,10 @@ public:
virtual ~CustomAnimationTriggerEntryItem();
virtual sal_uInt16 IsA();
void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
- void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* );
SvLBoxItem* Create() const;
void Clone( SvLBoxItem* pSource );
+ virtual void Paint(
+ const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
private:
OUString maDescription;
@@ -399,7 +402,8 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTree
// --------------------------------------------------------------------
-void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* )
+void CustomAnimationTriggerEntryItem::Paint(
+ const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
{
Size aSize( rDev.GetOutputSizePixel().Width(), static_cast< SvTreeListBox* >(&rDev)->GetEntryHeight() );