[Libreoffice-commits] core.git: include/vcl

[Stephan Bergmann (via logerrit)]

 include/vcl/layout.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1ad36869781e055638223ed372719b5fb87018e
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Apr 21 11:07:08 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Apr 22 08:13:21 2020 +0200

    typeinfo for VclGrid still needed with --enable-mergelibs
    
    ...for the dynamic_casts in SAL_WARN_IF and assertin VclBuilder::get,
    
    > LNK] Library/libbiblo.so
    > include/vcl/builder.hxx:430: error: undefined reference to 'typeinfo for VclGrid'
    > include/vcl/builder.hxx:430: error: undefined reference to 'typeinfo for VclGrid'
    > include/vcl/builder.hxx:433: error: undefined reference to 'typeinfo for VclGrid'
    > collect2: error: ld returned 1 exit status
    > make[1]: *** [extensions/Library_bib.mk:12: instdir/program/libbiblo.so] Error 1
    
    (see e.g., <https://ci.libreoffice.org/job/lo_tb_random_config_linux/2358/>).
    Broken with 01159643623de55f9e1de84d568032ca919dbd8f "make more classes private
    in mergedlibs mode".
    
    Change-Id: Ic20abe22b52026907a5624993008e497b173d14c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92613
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 39c69ff91543..4eb1d72bc464 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -307,7 +307,7 @@ private:
     }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) VclGrid final : public VclContainer
+class VCL_DLLPUBLIC VclGrid final : public VclContainer
 {
 private:
     bool m_bRowHomogeneous;