[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann (via logerrit)]

 sw/source/core/inc/bodyfrm.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f4f05944de661077614585ccaff8614041e73e7
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Aug 6 16:08:40 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Aug 7 09:35:39 2019 +0200

    Fix UBSan SwBodyFrame RTTI usage
    
    ...since 27c46ecf34b32bae1806d3fc0e1684179301feb8 "sw comments on frames:
    improve doc coordinates -> doc model pos conversion":
    
    > DynamicLibraryManagerException: "Failed to load dynamic library: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/LinkTarget/CppunitTest/libtest_sw_layoutwriter.so
    > /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/LinkTarget/CppunitTest/libtest_sw_layoutwriter.so: undefined symbol: _ZTI11SwBodyFrame"
    > Path is '/home/tdf/lode/opt/bin:/usr/lib64/qt-3.3/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.212.b04-0.el7_6.x86_64/bin'
    > warn:unotools.config:18752:18752:unotools/source/config/configmgr.cxx:140: ConfigManager not empty
    >
    > Error: a unit test failed, please do one of:
    >
    > make CppunitTest_sw_layoutwriter CPPUNITTRACE="gdb --args"
    >     # for interactive debugging on Linux
    > make CppunitTest_sw_layoutwriter VALGRIND=memcheck
    >     # for memory checking
    > make CppunitTest_sw_layoutwriter DEBUGCPPUNIT=TRUE
    >     # for exception catching
    
    (<https://ci.libreoffice.org//job/lo_ubsan/1348/>)
    
    Change-Id: Icdbbe98f55918dc70a57c01a67da73792e3726a8
    Reviewed-on: https://gerrit.libreoffice.org/77030
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 5bd046ec4e42..f6b046e9dd32 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -25,7 +25,7 @@ class SwBorderAttrs;
 
 /// Container of body content (i.e. not header or footer). Typical parent is an
 /// SwPageFrame, typical lower is an SwTextFrame.
-class SwBodyFrame: public SwLayoutFrame
+class SAL_DLLPUBLIC_RTTI SwBodyFrame: public SwLayoutFrame
 {
 protected:
     virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override;