diff options
| author | Noel Grandin <noel@peralex.com> | 2014-07-10 15:49:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-07-17 11:56:14 +0000 |
| commit | 490d30281726052bf4c36d4b79136ec7e7fd8395 (patch) | |
| tree | 860947e799376873ea2bd0c30d49426e25c353d7 /sfx2 | |
| parent | 461cb8fb430bfab2f67ae22d40852c3ca42841a2 (diff) | |
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 <thomas@arnhold.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/frame.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 4cb807d7d821..67e7d106906e 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 eb5088541155..eac066e2fb72 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 1c2d4471d9c3..63a82c8ad1a4 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; } |