diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-02-17 10:59:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-02-17 14:25:27 +0100 |
| commit | 0c8bff4622d9a0b725e035652d1aaf286c87cbd8 (patch) | |
| tree | 7fcf98f22ff3450c733b62e94e043870e0fda449 /sc | |
| parent | 0e90358490fd90a2b45917dd4b076e97082e8fdf (diff) | |
CppunitTest_sc_shapetest needs some more RTTI in UBSan builds now
...since 02e4f6c44295004f5c7201a7aa2744fd0518ba9d "tdf#134355 custom shapes are
never on layer 'controls' in Calc" and ae2e7a2a7f9fc56f0388b823a6e35111c4005619
"tdf#140252 unit test Controls in Calc are always on layer 'controls'":
> DynamicLibraryManagerException: "Failed to load dynamic library: workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so
> workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so: undefined symbol: _ZTI11FuConstruct"
(due to e.g. the derived call to FuConstruct::MouseMove at
sc/qa/unit/scshapetest.cxx:239:17);
> DynamicLibraryManagerException: "Failed to load dynamic library: workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so
> workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so: undefined symbol: _ZTI17FuConstUnoControl"
(due to e.g. the static_cast at sc/qa/unit/scshapetest.cxx:232:37);
> DynamicLibraryManagerException: "Failed to load dynamic library: workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so
> workdir/LinkTarget/CppunitTest/libtest_sc_shapetest.so: undefined symbol: _ZTI18FuConstCustomShape"
(due to e.g. the static_cast at sc/qa/unit/scshapetest.cxx:279:38).
Change-Id: I79a8f5d31647c7b04a3519923cd7fcae58cd8f45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111053
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/fuconcustomshape.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/fuconstr.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/fuconuno.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index c9bad69b33c5..e39416befff6 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -22,7 +22,7 @@ #include "fuconstr.hxx" -class FuConstCustomShape : public FuConstruct +class SAL_DLLPUBLIC_RTTI FuConstCustomShape : public FuConstruct { OUString aCustomShape; diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 7fa20b7c86d0..f5e366b29de7 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -25,7 +25,7 @@ #include <scdllapi.h> // SC_DLLPUBLIC is needed for unittest /** Draw rectangle */ -class FuConstruct : public FuDraw +class SAL_DLLPUBLIC_RTTI FuConstruct : public FuDraw { public: FuConstruct(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 332cdc350034..01d9668de211 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -27,7 +27,7 @@ enum class SdrInventor : sal_uInt32; /** Draw Control */ -class FuConstUnoControl final : public FuConstruct +class SAL_DLLPUBLIC_RTTI FuConstUnoControl final : public FuConstruct { SdrInventor nInventor; SdrObjKind nIdentifier; |