comphelper/source/misc/errcode.cxx | 4 ++-- include/basegfx/utils/systemdependentdata.hxx | 3 +-- include/comphelper/seqstream.hxx | 2 +- include/editeng/unoedsrc.hxx | 2 +- include/vcl/toolkit/field.hxx | 2 +- vcl/inc/headless/CairoCommon.hxx | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-)
New commits: commit 34a09df2d112a9d6828a9a65d9965aacae6c7c41 Author: Noel Grandin <[email protected]> AuthorDate: Tue Feb 13 16:15:43 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Feb 13 18:53:21 2024 +0100 fix windows --enable-mergelibs build after commit b663d94cf67a5af4fd89c1ac8bdffd6059f6bf85 Author: Noel Grandin <[email protected]> Date: Mon Feb 5 08:50:24 2024 +0200 create --enable-mergelibs=more Change-Id: Ib9f0b3b28df70a9bab10d9bb0aa77a2b2decc616 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163308 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/comphelper/source/misc/errcode.cxx b/comphelper/source/misc/errcode.cxx index e7b667745808..716daab1793e 100644 --- a/comphelper/source/misc/errcode.cxx +++ b/comphelper/source/misc/errcode.cxx @@ -21,7 +21,7 @@ #include <rtl/ustrbuf.hxx> #include <o3tl/runtimetooustring.hxx> -COMPHELPER_DLLPUBLIC OUString ErrCode::toString() const +UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OUString ErrCode::toString() const { std::u16string_view pWarningError; if (IsWarning()) @@ -150,7 +150,7 @@ COMPHELPER_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& e return os; } -COMPHELPER_DLLPUBLIC OUString ErrCodeMsg::toString() const +UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OUString ErrCodeMsg::toString() const { OUString s = mnCode.toString(); if (!maArg1.isEmpty()) diff --git a/include/basegfx/utils/systemdependentdata.hxx b/include/basegfx/utils/systemdependentdata.hxx index a77a8fb8f886..9304153c1327 100644 --- a/include/basegfx/utils/systemdependentdata.hxx +++ b/include/basegfx/utils/systemdependentdata.hxx @@ -9,7 +9,6 @@ #pragma once -#include <config_options.h> #include <sal/types.h> #include <basegfx/basegfxdllapi.h> #include <memory> @@ -42,7 +41,7 @@ namespace basegfx virtual void flushAll() = 0; }; - class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) SystemDependentData + class BASEGFX_DLLPUBLIC SystemDependentData { private: // noncopyable diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index 405b7937407b..8e2ae36d17c2 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -33,7 +33,7 @@ namespace comphelper { /** Base class for wrappers around memory data that want to be exposed as an XInputStream */ -class UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) MemoryInputStream +class COMPHELPER_DLLPUBLIC MemoryInputStream : public ::cppu::WeakImplHelper< css::io::XInputStream, css::io::XSeekable >, public comphelper::ByteReader { diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 82695e2e9031..1537f00a743c 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -138,7 +138,7 @@ public: SvxEditSource::UpdateData(). This copies back the data to the model's EditTextObject/OutlinerParaObject. */ -class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) SvxTextForwarder +class EDITENG_DLLPUBLIC SvxTextForwarder { public: virtual ~SvxTextForwarder() COVERITY_NOEXCEPT_FALSE; diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx index cbff835934f6..699d7bb74416 100644 --- a/include/vcl/toolkit/field.hxx +++ b/include/vcl/toolkit/field.hxx @@ -160,7 +160,7 @@ private: }; -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetricFormatter : public NumericFormatter +class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter { public: virtual ~MetricFormatter() override; diff --git a/vcl/inc/headless/CairoCommon.hxx b/vcl/inc/headless/CairoCommon.hxx index 802e02b14f0f..80ada0dd2c61 100644 --- a/vcl/inc/headless/CairoCommon.hxx +++ b/vcl/inc/headless/CairoCommon.hxx @@ -20,7 +20,7 @@ #pragma once #include <sal/config.h> - +#include <config_options.h> #include <cairo.h> #include <vcl/dllapi.h>
