[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source

[Stephan Bergmann (via logerrit)]

 sw/source/core/text/porlin.hxx   |    2 +-
 sw/source/core/text/pormulti.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6881023d78e7a328b98328d8bf2d4ef9c67c0d68
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Sep 15 12:53:28 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Thu Sep 16 11:35:04 2021 +0200

    CppunitTest_sw_core_text needs some more RTTI now in UBSan builds
    
    ...presumably since 0c3e47cc2f0570a7cd8ff4889763991a86b29f26 "tdf#144305 sw: fix
    rendering of ruby portions with non-default ruby alignment",
    
    > DynamicLibraryManagerException: "Failed to load dynamic library: ~/lo/core/workdir/LinkTarget/CppunitTest/libtest_sw_core_text.so
    > ~/lo/core/workdir/LinkTarget/CppunitTest/libtest_sw_core_text.so: undefined symbol: _ZTI13SwLinePortion"
    
    and
    
    > DynamicLibraryManagerException: "Failed to load dynamic library: ~/lo/core/workdir/LinkTarget/CppunitTest/libtest_sw_core_text.so
    > ~/lo/core/workdir/LinkTarget/CppunitTest/libtest_sw_core_text.so: undefined symbol: _ZTI14SwMultiPortion"
    
    Change-Id: Iaebffc3c9c0245d6092ef1dfc58213fd2d38d303
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122143
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 485add3cd6240a0faceb7a74784d44b1c0a6705e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122117
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index f0efc86e5888..3dc7ff9e287d 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -46,7 +46,7 @@ class SwPortionHandler;
 
 /// Base class for anything that can be part of a line in the Writer layout.
 /// Typically owned by SwLineLayout.
-class SwLinePortion: public SwPosSize
+class SAL_DLLPUBLIC_RTTI SwLinePortion: public SwPosSize
 {
 protected:
     // Here we have areas with different attributes
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 7c17df2e175c..c1df8b0400f2 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -77,7 +77,7 @@ struct SwBracket
 // or phonetics (ruby)
 // or combined characters
 // or a rotated portion.
-class SwMultiPortion : public SwLinePortion
+class SAL_DLLPUBLIC_RTTI SwMultiPortion : public SwLinePortion
 {
     SwLineLayout m_aRoot;     // One or more lines
     bool m_bTab1      :1;     // First line tabulator