diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-12 15:16:05 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 20:33:46 +0100 |
| commit | ce8cfbd3b90f11c3f2edc88a0dab625aabb6293d (patch) | |
| tree | 7128c82bf9c71332342de974fd1f0ab32ee0bc72 /include/toolkit | |
| parent | vcl: window destructors calling dispose (diff) | |
| download | core-ce8cfbd3b90f11c3f2edc88a0dab625aabb6293d.tar.gz core-ce8cfbd3b90f11c3f2edc88a0dab625aabb6293d.zip | |
svtools: apply vcl::window refcounting changes
Change-Id: I308f045eaf5c50de26175a2f00f8b0791cdd8ab9
Conflicts:
svtools/source/control/tabbar.cxx
Diffstat (limited to 'include/toolkit')
| -rw-r--r-- | include/toolkit/awt/scrollabledialog.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index e75fac70b0ed..70e2b32be919 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -43,8 +43,8 @@ namespace toolkit template < class T > class ScrollableWrapper : public T, public ScrollableInterface { - ScrollBar maHScrollBar; - ScrollBar maVScrollBar; + VclPtr<ScrollBar> maHScrollBar; + VclPtr<ScrollBar> maVScrollBar; Size maScrollArea; bool mbHasHoriBar; bool mbHasVertBar; @@ -59,6 +59,7 @@ namespace toolkit public: ScrollableWrapper( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); virtual ~ScrollableWrapper(); + virtual void dispose() SAL_OVERRIDE; virtual void SetScrollWidth( long nWidth ) SAL_OVERRIDE; virtual long GetScrollWidth() SAL_OVERRIDE { return maScrollArea.Width(); } virtual void SetScrollHeight( long nHeight ) SAL_OVERRIDE; |