diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-04-17 11:03:17 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-04-18 21:07:02 +0200 |
| commit | 9ea483e8a90ad377a7e1146647da3466a78c4c18 (patch) | |
| tree | 22a05a407ce148a26e13739a7ffd7125dbbab133 /include | |
| parent | 6b6bf85661ccf80a6166585e02d36e42e2613955 (diff) | |
svtools: valueset.cxx - use scoped_ptr and clean-up
Change-Id: I91528f55af39faccfe1bf95999ac29669ead0aad
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/valueset.hxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 2c4bcbc6bb36..47ff77c3abbd 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -26,6 +26,7 @@ #include <vcl/virdev.hxx> #include <vcl/timer.hxx> #include <vector> +#include <boost/scoped_ptr.hpp> class MouseEvent; class TrackingEvent; @@ -35,7 +36,6 @@ class DataChangedEvent; class ScrollBar; struct ValueSetItem; -typedef ::std::vector< ValueSetItem* > ValueItemList; class ValueSetAcc; class ValueItemAcc; @@ -176,10 +176,11 @@ to be set (before Show) with SetStyle(). *************************************************************************/ +typedef std::vector<ValueSetItem*> ValueItemList; +typedef boost::scoped_ptr<ScrollBar> ScrollBarPtr; +typedef boost::scoped_ptr<ValueSetItem> ValueSetItemPtr; // - ValueSet types - - - #define WB_RADIOSEL ((WinBits)0x00008000) #define WB_ITEMBORDER ((WinBits)0x00010000) #define WB_DOUBLEBORDER ((WinBits)0x00020000) @@ -190,9 +191,6 @@ to be set (before Show) with SetStyle(). #define WB_MENUSTYLEVALUESET ((WinBits)0x08000000) -// - ValueSet - - - #define VALUESET_APPEND ((size_t)-1) #define VALUESET_ITEM_NOTFOUND ((size_t)-1) @@ -203,8 +201,8 @@ private: VirtualDevice maVirDev; Timer maTimer; ValueItemList mItemList; - ValueSetItem* mpNoneItem; - ScrollBar* mpScrBar; + ValueSetItemPtr mpNoneItem; + ScrollBarPtr mpScrollBar; Rectangle maNoneItemRect; Rectangle maItemListRect; long mnItemWidth; @@ -244,6 +242,7 @@ private: friend class ValueSetAcc; friend class ValueItemAcc; + using Control::ImplInitSettings; using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); @@ -282,7 +281,7 @@ protected: protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; public: ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false ); |