diff options
| author | Noel Grandin <noel@peralex.com> | 2014-07-10 17:05:19 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-25 08:13:39 +0000 |
| commit | 2295697df9c66f4b19d6874106729fede51ec93d (patch) | |
| tree | 765182178b130dda94660baf2307bcd8853d89ef /include/sfx2 | |
| parent | 5a4a54a4de6255e768543aaf635289b48aefa17d (diff) | |
convert the weak reference macro in tools into a template
which required making SfxFrame subclass SvCompatWeakBase,
but that makes the relationships clearer anyhow.
Change-Id: I209d05359d50111eacac72c971bb46ccf569ba49
Reviewed-on: https://gerrit.libreoffice.org/10285
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/frame.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 18bf6cd08099..7a64d9b2f52d 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -75,7 +75,6 @@ class SfxDispatcher; class Rectangle; class SfxRequest; class SfxUnoControllerItem; -class SvCompatWeakHdl; class SystemWindow; class SfxFrame; @@ -97,7 +96,7 @@ typedef ::std::vector<OUString> TargetList; // from their parent frames. -class SFX2_DLLPUBLIC SfxFrame +class SFX2_DLLPUBLIC SfxFrame : public SvCompatWeakBase<SfxFrame> { friend class SfxFrameIterator; friend class SfxFrameWindow_Impl; @@ -125,7 +124,6 @@ public: CreateBlankFrame(); static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ); - SvCompatWeakHdl* GetHdl(); Window& GetWindow() const { return *pWindow;} void CancelTransfers( bool bCancelLoadEnv = true ); bool DoClose(); @@ -209,7 +207,7 @@ private: SAL_DLLPRIVATE void Construct_Impl(); }; -SV_DECL_COMPAT_WEAK_REF( SfxFrame ) +typedef SvCompatWeakRef<SfxFrame> SfxFrameWeakRef; class SfxFrameIterator { |