include/comphelper/errcode.hxx | 4 ++-- include/svtools/DocumentToGraphicRenderer.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 934b634d060ad8c92e91f91cd98450c916acf8b9 Author: Juergen Funk <[email protected]> AuthorDate: Tue Oct 29 05:40:39 2024 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Wed Oct 30 11:15:28 2024 +0100 fix enabled-mergelibs-more build ErrCode::toString is needed by desktop/source/app/ unit tests now Change-Id: Ie7a9e67aca763c958d08f3826bca5df4e0d828f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175769 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/include/comphelper/errcode.hxx b/include/comphelper/errcode.hxx index 547be70a13dd..884a7785f300 100644 --- a/include/comphelper/errcode.hxx +++ b/include/comphelper/errcode.hxx @@ -137,8 +137,8 @@ public: } /// Return a string suitable for debug output, the same as the operator<< function - UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OUString toString() const; - + COMPHELPER_DLLPUBLIC OUString toString() const; + template <typename... Args> bool anyOf(Args... args) const { static_assert(sizeof...(args) > 0); commit be39b8c4ff0500e5d832d097d494f769c2a66288 Author: Noel Grandin <[email protected]> AuthorDate: Fri Jul 26 15:32:39 2024 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Wed Oct 30 11:14:16 2024 +0100 fix enabled-mergelibs-more build DocumentToGraphicRenderer is needed by sw/qa/ unit tests now Change-Id: Idf1aac26afa0001a8affc846b78288a6b588a1f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171073 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx index 75af9b048a2c..cdeb0dfb56c7 100644 --- a/include/svtools/DocumentToGraphicRenderer.hxx +++ b/include/svtools/DocumentToGraphicRenderer.hxx @@ -42,7 +42,7 @@ namespace com::sun::star { } } -class UNLESS_MERGELIBS_MORE(SVT_DLLPUBLIC) DocumentToGraphicRenderer +class SVT_DLLPUBLIC DocumentToGraphicRenderer { const css::uno::Reference<css::lang::XComponent>& mxDocument;
