editeng/inc/editeng/unotext.hxx | 2 +-
editeng/source/uno/unotext.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1500c9c29950aa09030a9a24b20b09c4ac7d3cf6
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Jun 13 14:50:12 2012 +0300
Drop throw clause that was incomplete anyway
SvxUnoTextRangeBase::SetPropertyValueHelper throws a
css::lang::IllegalArgumentException but its delaration did not mention
that. This caused a crash in sd_filters_test with Apple's Clang which
does not have -fno-enforce-eh-specs. So drop the whole throw clause.
Change-Id: Ib9bbbc885f657aeb8d671c75a41b60a6544ea421
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 2bc6e89..99ae065 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -319,7 +319,7 @@ public:
const SvxItemPropertySet* getPropertySet() const throw() { return
mpPropSet; }
SvxEditSource* GetEditSource() const throw() { return
mpEditSource; }
- static sal_Bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const
SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue,
SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource*
pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
+ static sal_Bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const
SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue,
SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource*
pEditSource = NULL );
static sal_Bool GetPropertyValueHelper( SfxItemSet& rSet, const
SfxItemPropertySimpleEntry* pMap, ::com::sun::star::uno::Any& aAny, const
ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw(
::com::sun::star::uno::RuntimeException );
void attachField( const SvxFieldData* pData ) throw();
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index d7be1db..59bf016 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -498,7 +498,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const
SfxItemPropertySimpleEntry* pM
}
}
-sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const
SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet,
const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* =
NULL*/ ) throw( uno::RuntimeException )
+sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const
SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet,
const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* =
NULL*/ )
{
switch( pMap->nWID )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
