[Libreoffice-commits] core.git: include/basegfx include/svx

[Stephan Bergmann (via logerrit)]

 include/basegfx/color/bcolormodifier.hxx |    2 +-
 include/svx/shapepropertynotifier.hxx    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 99af09bf36ffab37ac5ca19c8cc03b741525021b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu May 14 15:14:28 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu May 14 22:35:02 2020 +0200

    Some vtables are still needed outside mergedlib
    
    ...with a combination of --enable-mergelibs and --disable-optimized (see e.g.
    <https://ci.libreoffice.org/job/lo_tb_random_config_linux/2368/>):
    
    > /usr/bin/ld: workdir/CxxObject/sw/source/core/unocore/unodraw.o: in function `svx::IPropertyValueProvider::IPropertyValueProvider()':
    > unodraw.cxx:(.text._ZN3svx22IPropertyValueProviderC2Ev[_ZN3svx22IPropertyValueProviderC5Ev]+0xb): undefined reference to `vtable for svx::IPropertyValueProvider'
    > /usr/bin/ld: workdir/CxxObject/sw/source/uibase/docvw/PageBreakWin.o: in function `basegfx::BColorModifier::BColorModifier()':
    > PageBreakWin.cxx:(.text._ZN7basegfx14BColorModifierC2Ev[_ZN7basegfx14BColorModifierC5Ev]+0xb): undefined reference to `vtable for basegfx::BColorModifier'
    > collect2: error: ld returned 1 exit status
    > make[1]: *** [sw/Library_sw.mk:20: instdir/program/libswlo.so] Error 1
    
    Change-Id: I1e41ddd8a6c8aa4f7fe2f02adde89034a3cd3c07
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94204
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index 2c6cf25ba8de..5e6fe8ebfce9 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -56,7 +56,7 @@ namespace basegfx
         All usages should handle instances of BColorModifier encapsulated
         into these shared pointers.
     */
-    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier
     {
     private:
         BColorModifier(const BColorModifier&) = delete;
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index a9a416614162..455acddeed32 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -46,7 +46,7 @@ namespace svx
 
     /** a provider for a property value
     */
-    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) IPropertyValueProvider
+    class SVXCORE_DLLPUBLIC IPropertyValueProvider
     {
     public:
         /** returns the name of the property which this provider is responsible for