diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-28 15:14:11 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-28 15:14:11 +0100 |
| commit | ce82146a6be87b239a0bde0b59fddf8865290b99 (patch) | |
| tree | bdce5bc3ccd342e87b8e7416cdf2b426d3b80ecf /include/svx/ruler.hxx | |
| parent | a31991c4188e91326941fbe510ce70129d1ccde8 (diff) | |
| parent | e8b97a52c96df9c8e8055407b1e40ed7cb9cfc67 (diff) | |
Merge remote-tracking branch 'origin/feature/vclptrmerge2'
Diffstat (limited to 'include/svx/ruler.hxx')
| -rw-r--r-- | include/svx/ruler.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 267758ab5cb2..e82af688ef47 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -57,7 +57,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener std::unique_ptr<SvxColumnItem> mxColumnItem; // columns std::unique_ptr<SvxObjectItem> mxObjectItem; // object - vcl::Window* pEditWin; + VclPtr<vcl::Window> pEditWin; std::unique_ptr<SvxRuler_Impl> mxRulerImpl; @@ -254,6 +254,7 @@ public: SvxRuler(vcl::Window* pParent, vcl::Window *pEditWin, sal_uInt16 nRulerFlags, SfxBindings &rBindings, WinBits nWinStyle = WB_STDRULER); virtual ~SvxRuler(); + virtual void dispose() SAL_OVERRIDE; void SetMinFrameSize(long lSize); long GetMinFrameSize() const ; |