diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-08 14:15:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-12 20:25:54 +0100 |
| commit | 033aaeec9ee6d7ab78690054ebf1ad8af5e3eff3 (patch) | |
| tree | 4c60a5e567922d944188151d74a07aa96e6e1cbc /vcl | |
| parent | a993b2823a106d15a50005567266acfe2f65e28f (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 'vcl')
| -rw-r--r-- | vcl/inc/headless/BitmapHelper.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/headless/CairoCommon.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/scrptrun.h | 3 | ||||
| -rw-r--r-- | vcl/inc/sft.hxx | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/vcl/inc/headless/BitmapHelper.hxx b/vcl/inc/headless/BitmapHelper.hxx index 2b6598464703..1500f6d3397e 100644 --- a/vcl/inc/headless/BitmapHelper.hxx +++ b/vcl/inc/headless/BitmapHelper.hxx @@ -23,7 +23,7 @@ #include <headless/svpbmp.hxx> #include <basegfx/utils/systemdependentdata.hxx> -class VCL_DLLPUBLIC BitmapHelper : public SurfaceHelper +class UNLESS_MERGELIBS(VCL_DLLPUBLIC) BitmapHelper : public SurfaceHelper { private: #ifdef HAVE_CAIRO_FORMAT_RGB24_888 @@ -37,7 +37,7 @@ public: unsigned char* getBits(sal_Int32& rStride); }; -class VCL_DLLPUBLIC MaskHelper : public SurfaceHelper +class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MaskHelper : public SurfaceHelper { public: explicit MaskHelper(const SalBitmap& rAlphaBitmap); diff --git a/vcl/inc/headless/CairoCommon.hxx b/vcl/inc/headless/CairoCommon.hxx index 13e0398dd679..802e02b14f0f 100644 --- a/vcl/inc/headless/CairoCommon.hxx +++ b/vcl/inc/headless/CairoCommon.hxx @@ -89,7 +89,7 @@ VCL_DLLPUBLIC size_t AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rP const basegfx::B2DHomMatrix& rObjectToDevice, bool bPixelSnap, bool bPixelSnapHairline); -class VCL_DLLPUBLIC PixelSnapper +class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PixelSnapper { public: basegfx::B2DPoint snap(const basegfx::B2DPolygon& rPolygon, @@ -240,7 +240,7 @@ private: sal_Int32 nWidth) const; }; -class VCL_DLLPUBLIC SurfaceHelper +class UNLESS_MERGELIBS(VCL_DLLPUBLIC) SurfaceHelper { private: cairo_surface_t* pSurface; diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h index d2dee3e155a7..09a5abc28478 100644 --- a/vcl/inc/scrptrun.h +++ b/vcl/inc/scrptrun.h @@ -37,6 +37,7 @@ #ifndef INCLUDED_VCL_INC_SCRPTRUN_H #define INCLUDED_VCL_INC_SCRPTRUN_H +#include <config_options.h> #include <sal/config.h> #include <vcl/dllapi.h> @@ -58,7 +59,7 @@ struct ParenStackEntry } }; -class VCL_DLLPUBLIC ScriptRun final : public icu::UObject +class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ScriptRun final : public icu::UObject { public: ScriptRun(const UChar chars[], int32_t length); diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 96553ba7d8fa..9eede97886b2 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -40,6 +40,7 @@ #ifndef INCLUDED_VCL_INC_SFT_HXX #define INCLUDED_VCL_INC_SFT_HXX +#include <config_options.h> #include <rtl/ustring.hxx> #include <vcl/dllapi.h> #include <vcl/fontcapabilities.hxx> @@ -643,7 +644,7 @@ constexpr int O_fpgm = 14; /* 'fpgm' - only used in TT->TT generation */ constexpr int O_CFF = 15; /* 'CFF' */ constexpr int NUM_TAGS = 16; -class VCL_DLLPUBLIC AbstractTrueTypeFont +class UNLESS_MERGELIBS(VCL_DLLPUBLIC) AbstractTrueTypeFont { std::string m_sFileName; sal_uInt32 m_nGlyphs; |