[Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann (via logerrit)]

 desktop/source/pkgchk/unopkg/unopkg_shared.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5d224d9141a07814f1e93c147de3ba03d643de34
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Aug 18 16:15:46 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Aug 18 23:00:37 2021 +0200

    Avoid LIBO_USE_SOURCE_LOCATION feature on user-facing LockFileException
    
    (see 1d0bc2139759f087d50432f8a2116060676f34e1 "use
    std::experimental::source_location in uno::Exception"), causing the unopkg
    executable to print something like
    
    > ERROR: unopkg cannot be started. The lock file indicates it is already running. If this does not apply, delete the lock file at:
    > ~/.config/libreoffice/4/.lock desktop/source/pkgchk/unopkg/unopkg_shared.h:44
    
    mentioning an unhelpful source location
    
    Change-Id: Ie9ed716c9edc6c73c173a034ce8bd9bfaf05c0c9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120669
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index f86b3248c0d5..df03f594331e 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -38,10 +38,12 @@ struct OptionInfo
     bool m_has_argument;
 };
 
-struct LockFileException : public css::uno::Exception
+struct LockFileException
 {
     explicit LockFileException(OUString const & sMessage) :
-        css::uno::Exception(sMessage, css::uno::Reference< css::uno::XInterface > ()) {}
+        Message(sMessage) {}
+
+    OUString Message;
 };