l10ntools/inc/po.hxx | 2 +-
l10ntools/source/merge.cxx | 13 +++++--------
l10ntools/source/po.cxx | 2 +-
sc/source/ui/dbgui/tpsort.cxx | 3 +++
sw/source/core/unocore/unoobj.cxx | 2 +-
vcl/Library_vcl.mk | 2 ++
6 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit da05c05edef729a2865158db4086b74785c45208
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Nov 14 13:04:17 2015 +0000
presumably I need to put cairo external here
Change-Id: Ic2cc5aa50be39c1337c9831303ae2e5238573ddc
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7592860..914637f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -623,6 +623,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\
))
$(eval $(call gb_Library_use_externals,vcl,\
+ cairo \
freetype \
))
ifneq ($(OS),EMSCRIPTEN)
@@ -653,6 +654,7 @@ $(eval $(call gb_Library_use_static_libraries,vcl,\
))
$(eval $(call gb_Library_use_externals,vcl,\
+ cairo \
fontconfig \
freetype \
expat \
commit f7990b41817df73bb6e96777796a152535cad3c6
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Nov 14 13:00:36 2015 +0000
coverity#1339306 Using invalid iterator
Change-Id: I72d9b1a2729d455431583177208597c554945629
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 3367c50..522bc0e 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -461,6 +461,9 @@ IMPL_LINK_TYPED( ScTabPageSortFields, SelectHdl, ListBox&,
rLb, void )
if ( (*pIter)->m_pLbSort == &rLb ) break;
}
+ if (pIter == maSortKeyItems.end())
+ return;
+
// If not selecting the last Listbox, modify the succeeding ones
++pIter;
if ( std::distance(maSortKeyItems.begin(), pIter) < nSortKeyCount )
commit c8b77ecc6d3d910578223055fa88937e2b9a5bc7
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Nov 14 12:58:22 2015 +0000
coverity#1339308 Uncaught exception
Change-Id: Id63bbdd11af66de6be8a3e9dfca1c7efbe74b08a
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 830db7d..24f9c28 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -123,7 +123,7 @@ private:
public:
- enum Exception { INVALIDENTRY };
+ class Exception : public std::exception { };
PoIfstream();
PoIfstream( const OString& rFileName );
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index e7b5522..dd6639b 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -45,15 +45,12 @@ namespace
{
rPoFile.readEntry( o_rPoEntry );
}
- catch( PoIfstream::Exception& aException )
+ catch (const PoIfstream::Exception&)
{
- if( aException == PoIfstream::INVALIDENTRY )
- {
- printf(
- "Warning : %s contains invalid entry\n",
- rFileName.getStr() );
- return false;
- }
+ printf(
+ "Warning : %s contains invalid entry\n",
+ rFileName.getStr() );
+ return false;
}
return true;
}
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 00f7d82..3019006c 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -596,7 +596,7 @@ void PoIfstream::readEntry( PoEntry& rPoEntry )
}
else
{
- throw INVALIDENTRY;
+ throw PoIfstream::Exception();
}
}
}
commit b3bc0b369cee21f6fbe50e74534b21e9d968b1cd
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Nov 14 12:54:09 2015 +0000
coverity#1339307 Uncaught exception
Change-Id: I1d8b40843de8d9bb9e4113442bc083c21a7b278d
diff --git a/sw/source/core/unocore/unoobj.cxx
b/sw/source/core/unocore/unoobj.cxx
index 5766623..76f85dc 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -208,7 +208,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam,
OUString & rBuffer)
static void
lcl_setCharStyle(SwDoc *const pDoc, const uno::Any & rValue, SfxItemSet & rSet)
- throw (lang::IllegalArgumentException, std::exception)
+ throw (lang::IllegalArgumentException, uno::RuntimeException,
std::exception)
{
SwDocShell *const pDocSh = pDoc->GetDocShell();
if(pDocSh)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
