summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-11-25 19:05:20 +0100
committerEike Rathke <erack@redhat.com>2016-11-25 20:04:40 +0100
commit86bf3f8b69692a82fdf0d9d408f0690028e6e3e0 (patch)
tree7093fb67c795b23921305967cc6bf7180e7332eb /sd
parent7c43cba9804e70b23b71783d362401c75f9caa54 (diff)
give us a chance to see *which* property failed
Change-Id: I378bce4d8e1f57a51d88a59691d6917f58eedf20
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/stlsheet.cxx10
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx4
-rw-r--r--sd/source/ui/unoidl/SdUnoDrawView.cxx4
-rw-r--r--sd/source/ui/unoidl/SdUnoOutlineView.cxx4
-rw-r--r--sd/source/ui/unoidl/SdUnoSlideView.cxx7
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx4
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx4
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.cxx4
-rw-r--r--sd/source/ui/unoidl/unopback.cxx10
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx4
11 files changed, 28 insertions, 31 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index cf76a458c067..c0b7a0d98523 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -974,7 +974,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName );
if( pEntry == nullptr )
{
- throw UnknownPropertyException();
+ throw UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this));
}
else
{
@@ -1061,7 +1061,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( PropertyName );
if( pEntry == nullptr )
{
- throw UnknownPropertyException();
+ throw UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
}
else
{
@@ -1174,7 +1174,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( PropertyName );
if( pEntry == nullptr )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
if( pEntry->nWID == WID_STYLE_FAMILY )
{
@@ -1268,7 +1268,7 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName )
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( PropertyName );
if( pEntry == nullptr )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
SfxItemSet &rStyleSet = GetItemSet();
@@ -1292,7 +1292,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName );
if( pEntry == nullptr )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this));
Any aRet;
if( pEntry->nWID == WID_STYLE_FAMILY )
{
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 902c8690e9b2..2cbdf1e6dd52 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -503,7 +503,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const
}
default:
- throw UnknownPropertyException();
+ throw UnknownPropertyException( OUString::number(pEntry ? pEntry->nWID : -1), static_cast<cppu::OWeakObject*>(this));
}
if( bIllegalArgument )
@@ -575,7 +575,7 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U
}
default:
- throw UnknownPropertyException();
+ throw UnknownPropertyException( OUString::number(pEntry ? pEntry->nWID : -1), static_cast<cppu::OWeakObject*>(this));
}
}
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 8d5fad88f62e..4fc83e1d00a5 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -370,7 +370,7 @@ void SdUnoDrawView::setFastPropertyValue (
}
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( OUString::number(nHandle), static_cast<cppu::OWeakObject*>(this));
}
}
@@ -414,7 +414,7 @@ Any SAL_CALL SdUnoDrawView::getFastPropertyValue (
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( OUString::number(nHandle), static_cast<cppu::OWeakObject*>(this));
}
return aValue;
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index cf97b61cd6ba..21e0353c8669 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -125,7 +125,7 @@ void SdUnoOutlineView::setFastPropertyValue (
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( OUString::number(nHandle), static_cast<cppu::OWeakObject*>(this));
}
}
@@ -150,7 +150,7 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue (
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( OUString::number(nHandle), static_cast<cppu::OWeakObject*>(this));
}
return aValue;
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index c220a74910f0..15a3cc7e6d20 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -157,10 +157,9 @@ void SdUnoSlideView::setFastPropertyValue (
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception)
{
- (void)nHandle;
(void)rValue;
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( OUString::number(nHandle), static_cast<cppu::OWeakObject*>(this));
}
Any SAL_CALL SdUnoSlideView::getFastPropertyValue (
@@ -169,10 +168,8 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue (
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception)
{
- (void)nHandle;
-
if( nHandle != DrawController::PROPERTY_VIEWOFFSET )
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( OUString::number(nHandle), static_cast<cppu::OWeakObject*>(this));
return Any();
}
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 8e408bb28bee..89a62ddd05b3 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -944,7 +944,7 @@ throw (UnknownPropertyException, PropertyVetoException,
break;
default:
- throw UnknownPropertyException();
+ throw UnknownPropertyException( OUString::number((*ppEntries)->mnHandle), static_cast<cppu::OWeakObject*>(this));
}
if( !bOk )
@@ -1189,7 +1189,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::
break;
default:
- throw UnknownPropertyException();
+ throw UnknownPropertyException( OUString::number((*ppEntries)->mnHandle), static_cast<cppu::OWeakObject*>(this));
}
}
}
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 4d44236d066a..d40cd0cc97e0 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -235,7 +235,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un
}
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this));
}
if( pLayerManager->GetDocShell() )
@@ -278,7 +278,7 @@ uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName )
aValue <<= OUString( pLayer->GetDescription() );
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
}
return aValue;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 510256abd9ea..e44b7f948719 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1294,7 +1294,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam
setGrabBagItem(aValue);
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this));
}
SetModified();
@@ -1418,7 +1418,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property
getGrabBagItem(aAny);
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
}
return aAny;
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 9e5f6feff2dc..52cbf5b82d68 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1011,7 +1011,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this));
}
GetModel()->SetModified();
@@ -1327,7 +1327,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
}
return aAny;
}
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 77b63c0bda99..6995461f1da1 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -217,7 +217,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa
if( pEntry == nullptr )
{
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this));
}
else
{
@@ -275,7 +275,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert
if( pEntry == nullptr )
{
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
}
else
{
@@ -332,7 +332,7 @@ beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUStr
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry(PropertyName);
if( pEntry == nullptr )
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
if( mpSet )
{
@@ -396,7 +396,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyToDefault( const OUString& Propert
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry(PropertyName);
if( pEntry == nullptr )
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
if( mpSet )
{
@@ -419,7 +419,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry(aPropertyName);
if( pEntry == nullptr || mpSet == nullptr )
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this));
uno::Any aAny;
if( mpSet )
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 92384457209c..f043d04eab36 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -773,7 +773,7 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aP
bOk = (aValue >>= mbWords);
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this));
}
if( !bOk )
@@ -801,7 +801,7 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString
aAny <<= mbWords;
break;
default:
- throw beans::UnknownPropertyException();
+ throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this));
}
return aAny;