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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Sep 10 12:49:44 UTC 2018


 codemaker/source/cppumaker/cpputype.cxx        |    2 +-
 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx |    2 --
 sc/source/ui/vba/vbachart.cxx                  |    5 ++---
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit a55711ad4f6f0a39fd26bcd682a1a81b4a6c6fb6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 10 08:22:19 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Sep 10 14:49:23 2018 +0200

    Generate UNO exception classes as SAL_WARN_UNUSED
    
    ...to find more places like 09978dd1fc18ce1ae707bc9e4ea1d2745ff07b61 "clang-tidy
    bugprone-unused-return-value"
    
    Change-Id: Ibe8b6790c701dc8270295dd1e2cbc9023b5ce018
    Reviewed-on: https://gerrit.libreoffice.org/60234
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index dd6476ff9f89..722846b0efa6 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3035,7 +3035,7 @@ void ExceptionType::dumpComprehensiveGetCppuType(FileStream & out)
 
 void ExceptionType::dumpDeclaration(FileStream & out)
 {
-    out << "\nclass CPPU_GCC_DLLPUBLIC_EXPORT " << id_;
+    out << "\nclass CPPU_GCC_DLLPUBLIC_EXPORT SAL_WARN_UNUSED " << id_;
     OUString base(entity_->getDirectBase());
     if (!base.isEmpty()) {
         out << " : public " << codemaker::cpp::scopedCppName(u2b(base));
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 22489894bba3..96b086878f58 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -213,8 +213,6 @@ void CommandEnvironmentImpl::handle(
     deployment::LicenseException licExc;
     deployment::InstallException instExc;
     deployment::PlatformException platExc;
-    deployment::VersionException verExc;
-
 
     if (request >>= wtExc) {
         // ignore intermediate errors of legacy packages, i.e.
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 50c78108ba8b..a49255b1d564 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -971,9 +971,8 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown)
     }
     catch (const uno::Exception&)
     {
-        script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
+        throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
     }
-    return _nNotUpDown;
 }
 
 bool
@@ -988,7 +987,7 @@ ScVbaChart::hasMarkers()
     }
     catch (const uno::Exception&)
     {
-        script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
+        throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
     }
     return bHasMarkers;
 }


More information about the Libreoffice-commits mailing list