core.git: include/comphelper

[Juergen Funk (via logerrit)]

 include/comphelper/errcode.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd1d232119dcff9ca0788554a8477d769964d5c6
Author:     Juergen Funk <juergen.funk...@cib.de>
AuthorDate: Tue Oct 29 05:40:39 2024 +0100
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 29 14:12:47 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 <noel.gran...@collabora.co.uk>
    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);