diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-05-02 16:40:19 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-02 16:40:19 +0100 |
commit | 29a2ff580eaa1cfcc3d977b84634e9836856ecc1 (patch) | |
tree | 90eef914d597f38aeacc852c19bcb00d150cd775 /sc/source/ui/inc | |
parent | 201f5fb6367a67cd39fa8e4396f5f86589db6be0 (diff) |
we can just use a PopupMenu* here
rather than a ScPopupMenu*, we don't use anything added by
ScPopupMenu to PopupMenu.
While I'm at it, expose the wrapped selected identity of
the popup through the drop-down menu button
Change-Id: Id92f4a03fca19140e624d577f888135c5b227192
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r-- | sc/source/ui/inc/tphfedit.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 79a38c5f29de..f3d5e3307e6c 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -98,9 +98,10 @@ class SC_DLLPUBLIC ScExtIButton : public ImageButton private: Timer aTimer; - ScPopupMenu* pPopupMenu; + PopupMenu* pPopupMenu; Link aMLink; - sal_uInt16 nSelected; + sal_uInt16 nSelected; + OString aSelectedIdent; SC_DLLPRIVATE DECL_LINK( TimerHdl, void*); @@ -116,9 +117,10 @@ public: ScExtIButton(Window* pParent, const ResId& rResId ); - void SetPopupMenu(ScPopupMenu* pPopUp); + void SetPopupMenu(PopupMenu* pPopUp); - sal_uInt16 GetSelected(); + sal_uInt16 GetSelected() const; + OString GetSelectedIdent() const; void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } const Link& GetMenuHdl() const { return aMLink; } |