summaryrefslogtreecommitdiff
path: root/include/basegfx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-02-08 14:15:37 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-02-12 20:25:54 +0100
commit033aaeec9ee6d7ab78690054ebf1ad8af5e3eff3 (patch)
tree4c60a5e567922d944188151d74a07aa96e6e1cbc /include/basegfx
parenta993b2823a106d15a50005567266acfe2f65e28f (diff)
use more UNLESS_MERGELIBS
Change-Id: I351a9127fb26369d8f598b6d6519d7e490fa476b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163190 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/basegfx')
-rw-r--r--include/basegfx/color/bcolormodifier.hxx2
-rw-r--r--include/basegfx/utils/systemdependentdata.hxx3
2 files changed, 3 insertions, 2 deletions
diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index b1d4620b6e6d..59f277555c30 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -381,7 +381,7 @@ namespace basegfx
/** mix a part of the original color with randomized color (mainly for debug visualizations)
*/
- class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_randomize final : public BColorModifier
+ class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_randomize final : public BColorModifier
{
private:
// [0.0 .. 1.0] where 0.0 is no randomize, 1.0 is all random and in-between
diff --git a/include/basegfx/utils/systemdependentdata.hxx b/include/basegfx/utils/systemdependentdata.hxx
index 9304153c1327..a77a8fb8f886 100644
--- a/include/basegfx/utils/systemdependentdata.hxx
+++ b/include/basegfx/utils/systemdependentdata.hxx
@@ -9,6 +9,7 @@
#pragma once
+#include <config_options.h>
#include <sal/types.h>
#include <basegfx/basegfxdllapi.h>
#include <memory>
@@ -41,7 +42,7 @@ namespace basegfx
virtual void flushAll() = 0;
};
- class BASEGFX_DLLPUBLIC SystemDependentData
+ class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) SystemDependentData
{
private:
// noncopyable