[Libreoffice-commits] core.git: 2 commits - solenv/gbuild unotools/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 20 21:04:41 UTC 2019


 solenv/gbuild/TestHelpers.mk             |    4 ++--
 unotools/source/streaming/streamwrap.cxx |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit cb0f4cd9eee8d8f0e0ef92632c6908403a6f4953
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Sep 20 17:45:00 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Sep 20 23:03:31 2019 +0200

    Improve exception message
    
    Change-Id: If608a61f75b63327bed67fc3f752769c3a5bde62
    Reviewed-on: https://gerrit.libreoffice.org/79307
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index 97d05180b020..c24fa09015c1 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -134,9 +134,10 @@ void OInputStreamWrapper::checkError() const
 {
     checkConnected();
 
-    if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE)
+    auto const e = m_pSvStream->SvStream::GetError();
+    if (e != ERRCODE_NONE)
         // TODO: really evaluate the error
-        throw css::io::NotConnectedException(OUString(), const_cast<css::uno::XWeak*>(static_cast<const css::uno::XWeak*>(this)));
+        throw css::io::NotConnectedException("utl::OInputStreamWrapper error " + e.toHexString(), const_cast<css::uno::XWeak*>(static_cast<const css::uno::XWeak*>(this)));
 }
 
 //= OSeekableInputStreamWrapper
commit 51f2f6059168615d6d244d6ffda41b81e474c8e8
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Sep 20 17:04:25 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Sep 20 23:03:19 2019 +0200

    Fix makefile modelines
    
    (cf. TEMPLATE.SOURCECODE.HEADER)
    
    Change-Id: I0fb78f097273b838291241ccf63c308003cac89c
    Reviewed-on: https://gerrit.libreoffice.org/79306
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/TestHelpers.mk b/solenv/gbuild/TestHelpers.mk
index 1cbe308dd0c9..2ce814ecdd30 100644
--- a/solenv/gbuild/TestHelpers.mk
+++ b/solenv/gbuild/TestHelpers.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -44,4 +44,4 @@ endif
 
 endef
 
-# vim: set noet sw=4:
+# vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list