offapi/com/sun/star/text/XTextConvert.idl | 5 +++--
offapi/com/sun/star/text/XTextPortionAppend.idl | 8 +++++---
svx/source/unodraw/unoshap4.cxx | 11 ++++++++++-
sw/inc/unotext.hxx | 8 ++++++--
sw/source/core/unocore/unotext.cxx | 6 ++++--
5 files changed, 28 insertions(+), 10 deletions(-)
New commits:
commit 0ba251fb2b176df7712b9e7c5ef67ff709c022e0
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Sep 4 09:56:56 2014 +0100
coverity#983930 Uncaught exception
Change-Id: I812916ddd10db6272ca0aeb5409eee8ff163d3fc
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 4d7f298..3fac4a0 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/ucb/CommandFailedException.hpp>
#include <vcl/virdev.hxx>
#include <svx/svdoole2.hxx>
@@ -947,10 +948,18 @@ bool SvxMediaShape::getPropertyValueImpl( const OUString&
rName, const SfxItemPr
catch (const css::ucb::ContentCreationException& e)
{
throw css::lang::WrappedTargetException(
- "Error Getting InputStream!",
+ "ContentCreationException Getting InputStream!",
static_cast < OWeakObject * > ( this ),
makeAny( e ) );
}
+ catch (const css::ucb::CommandFailedException& e)
+ {
+ throw css::lang::WrappedTargetException(
+ "CommandFailedException Getting InputStream!",
+ static_cast < OWeakObject * > ( this ),
+ makeAny( e ) );
+ }
+
break;
case OWN_ATTR_MEDIA_TEMPFILEURL:
commit d47678c990681d0cfc7f2c843bb9aedaeb08511a
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Sep 4 09:49:23 2014 +0100
coverity#707311 Uncaught exception
Change-Id: Ifdab456cb545e552a2efaed03ff00aeac874d47d
diff --git a/offapi/com/sun/star/text/XTextConvert.idl
b/offapi/com/sun/star/text/XTextConvert.idl
index b707489..2de810c 100644
--- a/offapi/com/sun/star/text/XTextConvert.idl
+++ b/offapi/com/sun/star/text/XTextConvert.idl
@@ -22,7 +22,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValues.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
+#include <com/sun/star/beans/PropertyVetoException,idl>
#include <com/sun/star/beans/UnknownPropertyException.idl>
#include <com/sun/star/text/XTextRange.idl>
#include <com/sun/star/text/XTextContent.idl>
@@ -57,7 +57,8 @@ interface XTextConvert : com::sun::star::uno::XInterface
[in] com::sun::star::text::XTextRange End,
[in] com::sun::star::beans::PropertyValues
FrameProperties )
raises( com::sun::star::lang::IllegalArgumentException,
-
com::sun::star::beans::UnknownPropertyException );
+
com::sun::star::beans::UnknownPropertyException,
+ com::sun::star::beans::PropertyVetoException );
/** converts the paragraphs marked in TableRanges into a table.
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index 69490db..4edca63 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -284,6 +284,7 @@ public:
::com::sun::star::beans::PropertyValue >& xFrameProperties)
throw (css::lang::IllegalArgumentException,
css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextTable > SAL_CALL
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 029c596..b6f3979 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1525,7 +1525,7 @@ SwXText::convertToTextFrame(
const uno::Reference< text::XTextRange >& xEnd,
const uno::Sequence< beans::PropertyValue >& rFrameProperties)
throw (lang::IllegalArgumentException, beans::UnknownPropertyException,
- uno::RuntimeException, std::exception)
+ beans::PropertyVetoException, uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit 8de4c7363197c6d4017ff978ff363ff5a75b1bf1
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Sep 4 09:45:16 2014 +0100
coverity#983958 Uncaught exception
Change-Id: Idd9c2dcfbeceb3519b1632a2f9b2651c73451061
diff --git a/offapi/com/sun/star/text/XTextPortionAppend.idl
b/offapi/com/sun/star/text/XTextPortionAppend.idl
index b15ade7..8930ab8 100644
--- a/offapi/com/sun/star/text/XTextPortionAppend.idl
+++ b/offapi/com/sun/star/text/XTextPortionAppend.idl
@@ -22,8 +22,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValues.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/beans/UnknownPropertyException.idl>
+#include <com/sun/star/beans/PropertyVetoException,idl>
#include <com/sun/star/text/XTextRange.idl>
@@ -51,7 +51,8 @@ interface XTextPortionAppend : com::sun::star::uno::XInterface
[in] string Text,
[in] com::sun::star::beans::PropertyValues
CharacterAndParagraphProperties )
raises( com::sun::star::lang::IllegalArgumentException,
-
com::sun::star::beans::UnknownPropertyException );
+
com::sun::star::beans::UnknownPropertyException,
+ com::sun::star::beans::PropertyVetoException );
/** inserts a new text portion to the paragraph at a given position.
@@ -76,7 +77,8 @@ interface XTextPortionAppend : com::sun::star::uno::XInterface
[in] com::sun::star::beans::PropertyValues
CharacterAndParagraphProperties,
[in] com::sun::star::text::XTextRange
TextRange)
raises( com::sun::star::lang::IllegalArgumentException,
-
com::sun::star::beans::UnknownPropertyException );
+
com::sun::star::beans::UnknownPropertyException,
+ com::sun::star::beans::PropertyVetoException );
};
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index d7457a4..69490db 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -228,8 +228,10 @@ public:
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >&
rCharacterAndParagraphProperties)
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException,
+ css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL
@@ -243,6 +245,7 @@ public:
rTextRange)
throw (css::lang::IllegalArgumentException,
css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
css::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 4f05654..029c596 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1363,6 +1363,7 @@ SwXText::insertTextPortion(
rCharacterAndParagraphProperties,
const uno::Reference<text::XTextRange>& xInsertPosition)
throw (lang::IllegalArgumentException, beans::UnknownPropertyException,
+ beans::PropertyVetoException,
uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1443,7 +1444,8 @@ SwXText::appendTextPortion(
const OUString& rText,
const uno::Sequence< beans::PropertyValue > &
rCharacterAndParagraphProperties)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+throw (lang::IllegalArgumentException, beans::UnknownPropertyException,
+ beans::PropertyVetoException, uno::RuntimeException, std::exception)
{
// Right now this doesn't need a guard, as it's just calling the insert
// version, that has it already.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
