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

[Thorsten Behrens (via logerrit)]

 include/basegfx/color/bcolormodifier.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 80c9e7fe5360e3262ec49e174afc3133fbdb88e0
Author:     Thorsten Behrens <thorsten.behrens at allotropia.de>
AuthorDate: Sun May 9 23:21:16 2021 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Mon May 10 07:19:11 2021 +0200

    Some more vtables are still needed outside mergedlib
    
    Fixup 99af09bf36ffab37ac5ca19c8cc03b741525021b with a few more
    methods - otherwise BColorModifierTest.cxx doesn't link for
    release builds.
    
    Change-Id: I13f0d57e56ba4344564e2534c0ee4e4883ec4d23
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115294
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index 5e6fe8ebfce9..0ce8cbf1b4ed 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -84,7 +84,7 @@ namespace basegfx
 
     /** convert color to gray
     */
-    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_gray final : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_gray final : public BColorModifier
     {
     public:
         BColorModifier_gray()
@@ -105,7 +105,7 @@ namespace basegfx
 
         returns a color where red green and blue are inverted using 1.0 - n
     */
-    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_invert final : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_invert final : public BColorModifier
     {
     public:
         BColorModifier_invert()
@@ -153,7 +153,7 @@ namespace basegfx
         given color, replacing everything. Useful e.g. for unified shadow
         creation
     */
-    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_replace final : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_replace final : public BColorModifier
     {
     private:
         ::basegfx::BColor           maBColor;
@@ -307,7 +307,7 @@ namespace basegfx
         All references to BColorModifier members use shared pointers, thus instances of
         BColorModifierStack can be copied by the default mechanisms if needed.
     */
-    class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifierStack final
+    class BASEGFX_DLLPUBLIC BColorModifierStack final
     {
         ::std::vector< BColorModifierSharedPtr >        maBColorModifiers;