include/sfx2/frame.hxx | 4 ++-- include/tools/ref.hxx | 10 +++++----- sfx2/source/doc/docfile.cxx | 2 +- sfx2/source/doc/sfxbasemodel.cxx | 4 ++-- sfx2/source/view/frame.cxx | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 490d30281726052bf4c36d4b79136ec7e7fd8395 Author: Noel Grandin <n...@peralex.com> Date: Thu Jul 10 15:49:31 2014 +0200 rename the Weak stuff in tools/ref.hxx to WeakRef .. which more accurately reflects it's purpose Change-Id: Ibb87a47a3d1f3e35ac2820f14c71adf3b227c961 Reviewed-on: https://gerrit.libreoffice.org/10283 Reviewed-by: Thomas Arnhold <tho...@arnhold.org> Reviewed-by: Noel Grandin <noelgran...@gmail.com> Tested-by: Noel Grandin <noelgran...@gmail.com> diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 8730dbd..18bf6cd 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -209,7 +209,7 @@ private: SAL_DLLPRIVATE void Construct_Impl(); }; -SV_DECL_COMPAT_WEAK( SfxFrame ) +SV_DECL_COMPAT_WEAK_REF( SfxFrame ) class SfxFrameIterator { @@ -229,7 +229,7 @@ public: class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem { SfxFrame* pFrame; - SfxFrameWeak wFrame; + SfxFrameWeakRef wFrame; SAL_DLLPRIVATE void SetFramePtr_Impl( SfxFrame* /*pFrameP*/ ) { pFrame = wFrame; } public: diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx index 1cd1474..1d5a37a 100644 --- a/include/tools/ref.hxx +++ b/include/tools/ref.hxx @@ -221,16 +221,16 @@ public: SvCompatWeakHdl* GetHdl() { return _xHdl; } }; -#define SV_DECL_COMPAT_WEAK( ClassName ) \ -class ClassName##Weak \ +#define SV_DECL_COMPAT_WEAK_REF( ClassName ) \ +class ClassName##WeakRef \ { \ tools::SvRef<SvCompatWeakHdl> _xHdl; \ public: \ - inline ClassName##Weak( ) {} \ - inline ClassName##Weak( ClassName* pObj ) { \ + inline ClassName##WeakRef( ) {} \ + inline ClassName##WeakRef( ClassName* pObj ) { \ if( pObj ) _xHdl = pObj->GetHdl(); } \ inline void Clear() { _xHdl.Clear(); } \ - inline ClassName##Weak& operator = ( ClassName * pObj ) { \ + inline ClassName##WeakRef& operator = ( ClassName * pObj ) { \ _xHdl = pObj ? pObj->GetHdl() : 0; return *this; } \ inline bool Is() const { \ return _xHdl.Is() && _xHdl->GetObj(); } \ diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 4cb807d..67e7d10 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -207,7 +207,7 @@ public: const SfxFilter* pOrigFilter; OUString aOrigURL; DateTime aExpireTime; - SfxFrameWeak wLoadTargetFrame; + SfxFrameWeakRef wLoadTargetFrame; SvKeyValueIteratorRef xAttributes; svtools::AsynchronLink aDoneLink; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index eb50885..eac066e 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -4193,8 +4193,8 @@ namespace sfx { namespace intern { } private: - bool m_bSuccess; - SfxFrameWeak m_aWeakFrame; + bool m_bSuccess; + SfxFrameWeakRef m_aWeakFrame; }; } } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 1c2d447..63a82c8 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -310,7 +310,7 @@ void SfxFrame::CancelTransfers( bool /*bCancelLoadEnv*/ ) GetChildFrame( n )->CancelTransfers(); // Check if StarOne-Loader should be canceled - SfxFrameWeak wFrame( this ); + SfxFrameWeakRef wFrame( this ); if (wFrame.Is()) pImp->bInCancelTransfers = false; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits