diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-02-22 14:41:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-02-28 11:25:58 +0100 |
| commit | 9e8d8870890b0a60ef9acc4c43c67688b58a42a3 (patch) | |
| tree | 9d7acba07d89c3ae9de7b55b16ba4411adb0601d /include | |
| parent | 3e23161baf5a529d1006b320e9044e436827c764 (diff) | |
address review comments for "Add XWeak constructor..."
for
commit 27352b81638f2f1e792ab48ec532eaacf6f61718 (origin/master, origin/HEAD)
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon Feb 21 16:00:52 2022 +0200
Add XWeak constructor and operator= to uno::WeakReference
I accidentally created a new gerrit change for this, and thus managed to
miss sorting out various review comments.
(*) Fix version number in gcc3.map
(*) Narrow the interface (i.e. assume non-null parameter) in
WeakReferenceHelper
(*) Remove cargo-cult catch and OSL_ASSERT in WeakReferenceHelper
(*) Remove accidental indentation
Change-Id: I8d1b22dd42216e9293959032d92df65405fb054c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130349
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/unotools/weakref.hxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/unotools/weakref.hxx b/include/unotools/weakref.hxx index ca5682416033..104737404054 100644 --- a/include/unotools/weakref.hxx +++ b/include/unotools/weakref.hxx @@ -77,22 +77,15 @@ public: { } - /** Copy ctor. Initialize this reference with a hard reference. + /** Copy ctor. Initialize this reference with a hard reference. @param rRef another hard ref */ -#if defined LIBO_INTERNAL_ONLY WeakReference(interface_type* pRef) : WeakReferenceHelper( css::uno::Reference<css::uno::XWeak>(static_cast<cppu::OWeakObject*>(pRef))) { } -#else - WeakReference(interface_type* pRef) - : WeakReferenceHelper(static_cast<cppu::OWeakObject*>(pRef)) - { - } -#endif /** Releases this reference and takes over hard reference xInt. If the implementation behind xInt does not support XWeak |