summaryrefslogtreecommitdiff
path: root/accessibility/inc/accessibility
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-03-16 13:59:09 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 11:06:37 +0100
commitde6b9148eb64dfa4b31c87c1ac46fda0821645e3 (patch)
tree41e363118efd45867628563e84577933ced1c672 /accessibility/inc/accessibility
parent122577ba7888edded1456e8c8210b1945e037cd0 (diff)
accessibility: cleanup for updated toolkit API.
Change-Id: I828f0e3841c396008cb5e51dec322d9d89f3a7c1
Diffstat (limited to 'accessibility/inc/accessibility')
-rw-r--r--accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx6
-rw-r--r--accessibility/inc/accessibility/extended/accessiblelistbox.hxx2
2 files changed, 3 insertions, 5 deletions
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
index 99757a9144ce..38d583b2673d 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
@@ -30,11 +30,8 @@
class SvtIconChoiceCtrl;
-
namespace accessibility
{
-
-
typedef ::cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessible
, ::com::sun::star::accessibility::XAccessibleSelection> AccessibleIconChoiceCtrl_BASE;
@@ -55,7 +52,8 @@ namespace accessibility
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
- SvtIconChoiceCtrl* getCtrl();
+ VclPtr< SvtIconChoiceCtrl > getCtrl();
+
public:
/** OAccessibleBase needs a valid view
@param _rIconCtrl
diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
index 739153c2fa0c..b056f386c433 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
@@ -62,7 +62,7 @@ namespace accessibility
virtual void ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
- SvTreeListBox* getListBox() const;
+ VclPtr< SvTreeListBox > getListBox() const;
void RemoveChildEntries(SvTreeListEntry*);