[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/inc

[Stephan Bergmann (via logerrit)]

 sc/inc/cellsuno.hxx |    3 ++-
 sc/inc/docuno.hxx   |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 839b7e863ae934a8fd5277772c86993a2380a996
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jan 3 17:19:49 2020 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Mar 22 11:49:19 2021 +0100

    UBSan now needs RTTI of some Library_sc types in Library_scfilt
    
    ...after 4992d61600536fe14b97b718dbb11f00e936c6a9 "tdf#129228 speedup opening of
    xlsx file with lots of comments" added
    
    >         ScTableSheetObj* pAnnosSupp = static_cast<ScTableSheetObj*>(getSheet().get());
    >         rtl::Reference<ScAnnotationsObj> xAnnos = static_cast<ScAnnotationsObj*>(pAnnosSupp->getAnnotations().get());
    
    to Comment::finalizeImport in sc/source/filter/oox/commentsbuffer.cxx.  (See
    <https://ci.libreoffice.org/job/lo_ubsan/1493/>).
    
    (cherry picked from commit 2dcd8b7d9faa0c7e144f71f43053e5abbea06108)
    
    Change-Id: Ia8a99297151abfe4f052fbf46504795db1ba87b7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112646
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 96d7000cef67..0fd9bbf991cf 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -25,6 +25,7 @@
 
 #include <formula/grammar.hxx>
 #include <rtl/ref.hxx>
+#include <sal/types.h>
 #include <tools/link.hxx>
 #include <svl/lstner.hxx>
 #include <svl/listener.hxx>
@@ -763,7 +764,7 @@ public:
     virtual sal_Int16 SAL_CALL resetActionLocks() override;
 };
 
-class ScTableSheetObj : public ScCellRangeObj,
+class SAL_DLLPUBLIC_RTTI ScTableSheetObj : public ScCellRangeObj,
                         public css::sheet::XSpreadsheet,
                         public css::container::XNamed,
                         public css::sheet::XSheetPageBreak,
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 6108c7a3e9a4..f2b507c2e4fa 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -21,6 +21,8 @@
 #define INCLUDED_SC_INC_DOCUNO_HXX
 
 #include "address.hxx"
+
+#include <sal/types.h>
 #include <sfx2/sfxbasemodel.hxx>
 #include <svl/lstner.hxx>
 #include <svx/fmdmod.hxx>
@@ -658,7 +660,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
-class ScAnnotationsObj final : public cppu::WeakImplHelper<
+class SAL_DLLPUBLIC_RTTI ScAnnotationsObj final : public cppu::WeakImplHelper<
                                 css::sheet::XSheetAnnotations,
                                 css::container::XEnumerationAccess,
                                 css::lang::XServiceInfo>,