i18npool/inc/localedata.hxx | 14 +++++++------- i18npool/source/localedata/localedata.cxx | 14 +++++++------- javaunohelper/source/javaunohelper.cxx | 6 ++---- sd/source/filter/eppt/pptx-epptooxml.cxx | 3 ++- 4 files changed, 18 insertions(+), 19 deletions(-)
New commits: commit e08fbe4c592b25fb88828157ff054431ac8e2d8b Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:37:29 2015 +0000 coverity#1338592 Explicit null dereferenced Change-Id: Ief5c2effbddebe29fc7a4d38ed0af4fed72de40e diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index d4a9722..83c9643 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -69,8 +69,6 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL); if (lib.is()) { - lib.release(); - // ========================= LATEST VERSION ========================= oslGenericFunction pSym = lib.getFunctionSymbol(COMPONENT_GETENV); if (pSym) @@ -124,6 +122,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( } } } + lib.release(); } #endif return bRet ? JNI_TRUE : JNI_FALSE; @@ -159,8 +158,6 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL); if (lib.is()) { - lib.release(); - // ========================= LATEST VERSION ========================= oslGenericFunction pSym = lib.getFunctionSymbol(COMPONENT_GETENV); if (pSym) @@ -228,6 +225,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( } } } + lib.release(); } #endif return joSLL_cpp; commit 2d0341a23f95e322990006d78d3f514a9448ed84 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:33:31 2015 +0000 coverity#1338596 Uncaught exception Change-Id: Ic8b4c6a1718a10d0b9a5a99b069ef4e98de87518 diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 300e756..9ef4ca9 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -111,7 +111,7 @@ public: virtual OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); virtual OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); virtual css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception); virtual bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); virtual bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); virtual OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception); diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 318a34d..9f0931b 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1122,7 +1122,7 @@ LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeExceptio } Sequence< OUString > SAL_CALL -LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) throw(RuntimeException, std::exception) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getFollowPageWords" )); commit e660a0515889ce42e95c57af8c3815a1afc2f1dc Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:32:54 2015 +0000 coverity#1338597 Uncaught exception Change-Id: I1bcb4a70a2b2621a8718e5d4d0741e8eed3848cf diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 365ae37..300e756 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -110,7 +110,7 @@ public: virtual OUString SAL_CALL getDefaultIndexAlgorithm( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); virtual OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); virtual OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); virtual bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); virtual bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 46a8874..318a34d 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1102,7 +1102,7 @@ LocaleDataImpl::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString } Sequence< UnicodeScript > SAL_CALL -LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeException, std::exception) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getUnicodeScripts" )); commit 2d30f347ccdc4539a695f04d91a3706d02a857e1 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:32:19 2015 +0000 coverity#1338598 Uncaught exception Change-Id: I22047ed53eb59716e3da7c6e799867a666d35921 diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index b89735c..365ae37 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -94,7 +94,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException) ; + virtual css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) ; virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 8bac0cb..46a8874 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1221,7 +1221,7 @@ LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) throw(RuntimeExcep } Sequence< OUString > SAL_CALL -LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeException, std::exception) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getBreakIteratorRules" )); commit e9fcefe4640dfa0895dca703a37f27ea5b2e893c Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:31:22 2015 +0000 coverity#1338599 Uncaught exception Change-Id: If1c2f5e8527855e8e537d082156bcd6582e50c58 diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 403a354..b89735c 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -90,7 +90,7 @@ public: virtual css::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override ; diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 771c0a5..8bac0cb 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -931,7 +931,7 @@ LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) throw(Runtime #define COLLATOR_ELEMENTS 3 OUString SAL_CALL -LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) +LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException, std::exception) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollatorImplementation" )); if ( func ) { commit 14e409188b2068e04c63201803039b250113ae37 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:30:39 2015 +0000 coverity#1338600 Uncaught exception Change-Id: I4a257a4eed1064a3fc09f6e2d37dbbc6be64a94c diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 7e1e2af..403a354 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -100,7 +100,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception); // XLocaleData4 virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 7c6970d..771c0a5 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1377,7 +1377,7 @@ public: }; Sequence< Reference<container::XIndexAccess> > SAL_CALL -LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException, std::exception) { // load symbol MyFunc_Type3 func = reinterpret_cast<MyFunc_Type3>(getFunctionSymbol( rLocale, "getOutlineNumberingLevels" )); commit ce6eed613cb2bd79a66cf9c10e3370fcb4949c6d Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:30:09 2015 +0000 coverity#1338601 Uncaught exception Change-Id: I255273601fd460b22aa22e3e366dc040e0795a87 diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 9bd0127..7e1e2af 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -99,7 +99,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); // XLocaleData4 diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 4fef020..7c6970d 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1265,7 +1265,7 @@ LocaleDataImpl::getReservedWord( const Locale& rLocale ) throw(RuntimeException Sequence< Sequence<beans::PropertyValue> > SAL_CALL -LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException, std::exception) { // load symbol MyFunc_Type2 func = reinterpret_cast<MyFunc_Type2>(getFunctionSymbol( rLocale, "getContinuousNumberingLevels" )); commit 9f90d987901f9f69e78370705a7f000f5d7d4902 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:29:26 2015 +0000 coverity#1338602 Uncaught exception Change-Id: I81c71c02888e9c5cab28e77c1464dd5f6d4c1ee5 diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index a0e9c2b..9bd0127 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -114,7 +114,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); virtual bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); virtual bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); - virtual OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 661822a..4fef020 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1207,7 +1207,7 @@ LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeExc } OUString SAL_CALL -LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException, std::exception) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getForbiddenCharacters" )); commit 2dbe457fbcd99ea09e5a97b39e216e575c260cbe Author: Caolán McNamara <caol...@redhat.com> Date: Wed Nov 11 17:27:45 2015 +0000 coverity#1338594 Missing break in switch Change-Id: I32364aff6d99bd67691a27eef439318c21b36695 diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 2924c1a..257de7c 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -548,6 +548,7 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS ) pThruBlk = "true"; bOOXmlSpecificTransition = true; } + break; } case animations::TransitionType::MISCSHAPEWIPE: { @@ -588,8 +589,8 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS ) bOOXmlSpecificTransition = true; break; } + break; } - break; } }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits