[Libreoffice-commits] core.git: 5 commits - helpcompiler/inc helpcompiler/source i18npool/inc i18npool/source lotuswordpro/source sw/source vcl/source
Caolán McNamara
caolanm at redhat.com
Fri Nov 6 01:22:33 PST 2015
helpcompiler/inc/HelpLinker.hxx | 2 +-
helpcompiler/source/HelpLinker.cxx | 2 +-
i18npool/inc/localedata.hxx | 2 +-
i18npool/source/localedata/localedata.cxx | 2 +-
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 2 +-
lotuswordpro/source/filter/LotusWordProImportFilter.hxx | 2 +-
sw/source/core/layout/calcmove.cxx | 1 +
vcl/source/filter/sgvtext.cxx | 2 +-
8 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 78f042b9ab83ac43e9e341486bb30660a4258a11
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 6 09:21:59 2015 +0000
coverity#1338235 Uncaught exception
Change-Id: I66bd63a75e9d75cb5d87be5e4573aec891994588
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 17e4fcd..0a13f93 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -89,7 +89,7 @@ private:
bool m_bUseLangRoot;
bool m_bCreateIndex;
void initIndexerPreProcessor();
- void link() throw(HelpProcessingException, BasicCodeTagger::TaggerException);
+ void link() throw(HelpProcessingException, BasicCodeTagger::TaggerException, std::exception);
static void addBookmark( FILE* pFile_DBHelp, std::string thishid,
const std::string& fileB, const std::string& anchorB,
const std::string& jarfileB, const std::string& titleB );
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index 0218028..6c40d14 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -279,7 +279,7 @@ void HelpLinker::initIndexerPreProcessor()
/**
*
*/
-void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerException)
+void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerException, std::exception)
{
if( bExtensionMode )
commit f24b5132ebca9f1103de8cfc022d184ac59eb48e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 6 09:20:56 2015 +0000
coverity#1338234 Uncaught exception
Change-Id: Ice269b722e219ae7b51aa6ea11dea93cfd31f413
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index b45ece5..a0e9c2b 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -128,7 +128,7 @@ private:
css::i18n::Calendar2 ref_cal;
OUString ref_name;
- oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction ) throw( css::uno::RuntimeException );
+ oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction ) throw( css::uno::RuntimeException, std::exception );
sal_Unicode ** SAL_CALL getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount);
sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm);
css::uno::Sequence< css::i18n::CalendarItem2 > &
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index a3ee8c1..f0ceb8b 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1442,7 +1442,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(R
// helper functions
oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction )
- throw(RuntimeException)
+ throw(RuntimeException, std::exception)
{
lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get();
commit 455539173918650c163f814ffb93f5ede1f021a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 6 09:19:44 2015 +0000
coverity#1338233 Uncaught exception
Change-Id: I59ef31ff46b9eff2f4a2b73b7f1d13ff0b4407ae
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index c7fbada..ce185d2 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -61,7 +61,7 @@ using com::sun::star::xml::sax::XParser;
static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
sal_Int32 nLength = aDescriptor.getLength();
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index f529875..e2a953c 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -51,7 +51,7 @@ protected:
css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler;
bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
public:
explicit LotusWordProImportFilter( const css::uno::Reference< css::uno::XComponentContext > &rxContext)
commit 705c0edcf4de6159b0744dc98b61d7c03df82ddd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 6 09:18:32 2015 +0000
coverity#1338232 Explicit null dereferenced
Change-Id: I4be589325b89eac129328f98f9db7ce8c741892d
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index ea5602e..9de4a2f 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -670,6 +670,7 @@ void SwPageFrm::MakeAll(vcl::RenderContext* pRenderContext)
pAccess = o3tl::make_unique<SwBorderAttrAccess>(SwFrm::GetCache(), this);
pAttrs = pAccess->Get();
}
+ assert(pAttrs);
// In BrowseView, we use fixed settings
SwViewShell *pSh = getRootFrm()->GetCurrShell();
if ( pSh && pSh->GetViewOptions()->getBrowseMode() )
commit cf02d0a490ba3761f6599e2ef2ea8c27d4f74c4c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 6 09:17:02 2015 +0000
coverity#1338231 Unchecked return value
Change-Id: I76161e87adc70fb8ae94c5c4cc7157b95f76b6f7
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 1ab48a9..545def3 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -751,7 +751,7 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType&
} while (!(AbsEnd || (Border && ((WordEndCnt>0) || WordEnd || Trenn))));
while (WErec0->Index<WErec->Index) { // to assure Line[] matches }
- ProcessChar(*vOut.get(),TBuf,*WErec0,Atr0,WEnChar0,WEnChar-WEnChar0-1,Line,cLine);
+ (void)ProcessChar(*vOut.get(),TBuf,*WErec0,Atr0,WEnChar0,WEnChar-WEnChar0-1,Line,cLine);
}
(*R)=(*WErec); nChars=WEnChar;
More information about the Libreoffice-commits
mailing list