diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-03-18 12:37:03 +0100 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-18 14:08:49 +0100 |
commit | 498a39e5184018dd849b35d1ae4cc1c3f4115855 (patch) | |
tree | 569c3d90973cefe6675767cd028d41896e17fbf8 /include/tools/weakbase.h | |
parent | 8ce20d3e062819fdab52d2ce47762ccc02b34ab2 (diff) |
tools::WeakBase still needs to be TOOLS_DLLPUBLIC under --enable-mergelibs
...plus --enable-assert-always-abort: ShapeManagerImpl::checkForImageMap in
slideshow/source/engine/slide/shapemanagerimpl.cxx in Library_slideshow calls
SvxShape::GetSdrObject, which calls tools::WeakBase::get
(include/tools/weakbase.hxx), which contains
> assert(dynamic_cast<reference_type *>(pWeakBase));
requiring RTTI for tools::WeakBase. See e.g.
<https://ci.libreoffice.org//job/lo_tb_random_config_linux/2281/>.
Change-Id: I9598c14bf74eb5a28332d0beecfbe8201b39451e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90697
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/tools/weakbase.h')
-rw-r--r-- | include/tools/weakbase.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/tools/weakbase.h b/include/tools/weakbase.h index 648e1b77e960..458381e47fff 100644 --- a/include/tools/weakbase.h +++ b/include/tools/weakbase.h @@ -22,7 +22,6 @@ #include <sal/types.h> #include <rtl/ref.hxx> #include <tools/toolsdllapi.h> -#include <config_options.h> /** the template classes in this header are helper to implement weak references to implementation objects that are not refcounted. @@ -124,7 +123,7 @@ private: }; /** derive your implementation classes from this class if you want them to support weak references */ -class UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) WeakBase +class TOOLS_DLLPUBLIC WeakBase { template<typename T> friend class WeakReference; |