add property name when throwing css::uno::UnknownPropertyException

Change-Id: I17f06c9415b9d43b6d8896360e07216c2856367a
Reviewed-on: https://gerrit.libreoffice.org/79627
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

74 files changed, 232 insertions, 253 deletions

diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 2c668165310c..2834ae87234c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4204,7 +4204,7 @@ void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const A
     {
         // TODO: Check vba behavior concerning missing function
         //StarBASIC::Error( ERRCODE_BASIC_NO_METHOD, aFunctionName );
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(aPropertyFunctionName);
     }
 
     // Setup parameter
@@ -4242,7 +4242,7 @@ Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty)
     {
         // TODO: Check vba behavior concerning missing function
         //StarBASIC::Error( ERRCODE_BASIC_NO_METHOD, aFunctionName );
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(aPropertyFunctionName);
     }
 
     // Call method
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 35fdb4bd0937..72811562ac92 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -293,7 +293,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue )
 
     SbPropertyRef pProperty = getProperty( aPropertyName );
     if ( !pProperty.is() )
-       throw UnknownPropertyException();
+       throw UnknownPropertyException(aPropertyName);
     unoToSbxValue( pProperty.get(), aValue );
 }
 
@@ -305,7 +305,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName )
 
     SbPropertyRef pProperty = getProperty( aPropertyName );
     if ( !pProperty.is() )
-       throw UnknownPropertyException();
+       throw UnknownPropertyException(aPropertyName);
 
     SbxVariable* pProp = pProperty.get();
     if ( pProp->GetType() == SbxEMPTY )
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 238069cdf2e1..5fc24786e5ab 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2772,13 +2772,13 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName
             throw lang::IllegalArgumentException( "Property 'SdrViewIsInEditMode' requires value of type sal_Bool", nullptr, 0 );
     }
     else
-        throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", nullptr );
+        throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard " + rPropertyName, nullptr );
 }
 
 Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName )
 {
     if( rPropertyName != "Resolution" )
-        throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard", nullptr );
+        throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard " + rPropertyName, nullptr );
 
     return Any(m_aPageResolution);
 }
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index df8f97d1bbc9..282405c63069 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -143,7 +143,7 @@ Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rP
     const Property* pProperty = findPropertyByName( _rPropertyName );
 
     if ( !pProperty )
-        throw  UnknownPropertyException();
+        throw  UnknownPropertyException(_rPropertyName);
 
     return *pProperty;
 }
@@ -739,7 +739,7 @@ css::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertySta
 
     if (nHandle == -1)
     {
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(_rPropertyName);
     }
 
     OUString aPropName;
@@ -762,7 +762,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString
     sal_Int32 nHandle = rPH.getHandleByName(_rPropertyName);
     if (nHandle == -1)
     {
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(_rPropertyName);
     }
 
     OUString aPropName;
@@ -794,7 +794,7 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const O
     sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
 
     if ( nHandle == -1 )
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(aPropertyName);
 
     OUString aPropName;
     sal_Int32   nOriginalHandle = -1;
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index 43aeee4276d4..ac8fc17ff1b7 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -169,7 +169,7 @@ namespace comphelper
     void PropertyBag::getFastPropertyValue( sal_Int32 _nHandle, Any& _out_rValue ) const
     {
         if ( !hasPropertyByHandle( _nHandle ) )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(_nHandle));
 
         OPropertyContainerHelper::getFastPropertyValue( _out_rValue, _nHandle );
     }
@@ -178,7 +178,7 @@ namespace comphelper
     bool PropertyBag::convertFastPropertyValue( sal_Int32 _nHandle, const Any& _rNewValue, Any& _out_rConvertedValue, Any& _out_rCurrentValue ) const
     {
         if ( !hasPropertyByHandle( _nHandle ) )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(_nHandle));
 
         return const_cast< PropertyBag*  >( this )->OPropertyContainerHelper::convertFastPropertyValue(
             _out_rConvertedValue, _out_rCurrentValue, _nHandle, _rNewValue );
@@ -188,7 +188,7 @@ namespace comphelper
     void PropertyBag::setFastPropertyValue( sal_Int32 _nHandle, const Any& _rValue )
     {
         if ( !hasPropertyByHandle( _nHandle ) )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(_nHandle));
 
         OPropertyContainerHelper::setFastPropertyValue( _nHandle, _rValue );
     }
@@ -197,7 +197,7 @@ namespace comphelper
     void PropertyBag::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _out_rValue ) const
     {
         if ( !hasPropertyByHandle( _nHandle ) )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(_nHandle));
 
         MapInt2Any::const_iterator pos = m_pImpl->aDefaults.find( _nHandle );
         OSL_ENSURE( pos != m_pImpl->aDefaults.end(), "PropertyBag::getPropertyDefaultByHandle: inconsistency!" );
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 252b3aa8179e..c248a620e1ac 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -93,7 +93,7 @@ void OPropertyContainerHelper::revokeProperty( sal_Int32 _nHandle )
 {
     PropertiesIterator aPos = searchHandle( _nHandle );
     if ( aPos == m_aProperties.end() )
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(OUString::number(_nHandle));
     m_aProperties.erase( aPos );
 }
 
diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index 52085f98e80b..d48a72d094cf 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.cxx
@@ -80,7 +80,7 @@ namespace comphelper
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
 
         if (nHandle == -1)
-            throw  css::beans::UnknownPropertyException();
+            throw  css::beans::UnknownPropertyException(_rsName);
 
         return getPropertyStateByHandle(nHandle);
     }
@@ -92,7 +92,7 @@ namespace comphelper
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
 
         if (nHandle == -1)
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(_rsName);
 
         setPropertyToDefaultByHandle(nHandle);
     }
@@ -104,7 +104,7 @@ namespace comphelper
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
 
         if (nHandle == -1)
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(_rsName);
 
         return getPropertyDefaultByHandle(nHandle);
     }
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index a14cf6010aa8..3f39522b008c 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -109,7 +109,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper
                               sizeof( Property ),
                               compare_OUString_Property_Impl ));
     if( !pR ) {
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(PropertyName);
     }
 
     return *pR;
@@ -295,7 +295,7 @@ void OPropertySetHelper::addPropertyChangeListener(
             sal_Int32 nHandle = rPH.getHandleByName( rPropertyName );
             if( nHandle == -1 ) {
                 // property not known throw exception
-                throw  UnknownPropertyException() ;
+                throw  UnknownPropertyException(rPropertyName);
             }
 
             sal_Int16 nAttributes;
@@ -338,7 +338,7 @@ void OPropertySetHelper::removePropertyChangeListener(
             sal_Int32 nHandle = rPH.getHandleByName( rPropertyName );
             if( nHandle == -1 )
                 // property not known throw exception
-                throw UnknownPropertyException();
+                throw UnknownPropertyException(rPropertyName);
             aBoundLC.removeInterface( nHandle, rxListener );
         }
         else {
@@ -371,7 +371,7 @@ void OPropertySetHelper::addVetoableChangeListener(
             sal_Int32 nHandle = rPH.getHandleByName( rPropertyName );
             if( nHandle == -1 ) {
                 // property not known throw exception
-                throw UnknownPropertyException();
+                throw UnknownPropertyException(rPropertyName);
             }
 
             sal_Int16 nAttributes;
@@ -412,7 +412,7 @@ void OPropertySetHelper::removeVetoableChangeListener(
             sal_Int32 nHandle = rPH.getHandleByName( rPropertyName );
             if( nHandle == -1 ) {
                 // property not known throw exception
-                throw UnknownPropertyException();
+                throw UnknownPropertyException(rPropertyName);
             }
             // remove the vetoable listener to the helper container
             aVetoableLC.removeInterface( nHandle, rxListener );
@@ -435,7 +435,7 @@ void OPropertySetHelper::setDependentFastPropertyValue( sal_Int32 i_handle, cons
     IPropertyArrayHelper& rInfo = getInfoHelper();
     if ( !rInfo.fillPropertyMembersByHandle( nullptr, &nAttributes, i_handle ) )
         // unknown property
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(OUString::number(i_handle));
 
     // no need to check for READONLY-ness of the property. The method is intended to be called internally, which
     // implies it might be invoked for properties which are read-only to the instance's clients, but well allowed
@@ -486,7 +486,7 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
     sal_Int16 nAttributes;
     if( !rInfo.fillPropertyMembersByHandle( nullptr, &nAttributes, nHandle ) ) {
         // unknown property
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(OUString::number(nHandle));
     }
     if( nAttributes & PropertyAttribute::READONLY )
         throw PropertyVetoException();
@@ -548,7 +548,7 @@ Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle )
     IPropertyArrayHelper & rInfo = getInfoHelper();
     if( !rInfo.fillPropertyMembersByHandle( nullptr, nullptr, nHandle ) )
         // unknown property
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(OUString::number(nHandle));
 
     Any aRet;
     MutexGuard aGuard( rBHelper.rMutex );
@@ -1073,7 +1073,7 @@ Property OPropertyArrayHelper::getPropertyByName(const OUString& aPropertyName)
                               sizeof( Property ),
                               compare_OUString_Property_Impl ));
     if( !pR ) {
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(aPropertyName);
     }
     return *pR;
 }
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 94ca091bead8..0a20a3e6cadf 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -715,7 +715,7 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName,
 
     const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMap().getByName( aPropertyName );
     if ( !pMap )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     switch( pMap->nWID )
     {
@@ -770,7 +770,7 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam
 
     const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMap().getByName( PropertyName );
     if ( !pMap )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(PropertyName);
 
     switch( pMap->nWID )
     {
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index a8d80c2fb881..8015933395df 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -476,7 +476,7 @@ void SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const
         }
     }
 
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(PropertyName);
 }
 
 void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet )
@@ -618,7 +618,7 @@ uno::Any SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sa
         }
     }
 
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(PropertyName);
 }
 
 void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, uno::Any& rAny, const SfxItemSet& rSet )
@@ -1056,7 +1056,7 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co
             const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( rName );
             if( !_getOnePropertyStates(pSet.get(), pMap, *pState++) )
             {
-                throw beans::UnknownPropertyException();
+                throw beans::UnknownPropertyException(rName);
             }
         }
     }
@@ -1172,7 +1172,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa
         }
     }
 
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(PropertyName);
 }
 
 void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara )
@@ -1258,7 +1258,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp
             }
         }
     }
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(aPropertyName);
 }
 
 // beans::XMultiPropertyStates
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 04f2860d3951..dc861bbeb3e3 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -619,7 +619,7 @@ Any BibliographyLoader::getPropertyValue(const OUString& rPropertyName)
         ISBN_POS                    //BibliographyDataField_ISBN
     };
     if(rPropertyName != "BibliographyDataFieldNames")
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     Sequence<PropertyValue> aSeq(COLUMN_COUNT);
     PropertyValue* pArray = aSeq.getArray();
     BibConfig* pConfig = BibModul::GetConfig();
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index badaab0d23e7..83bbef32496b 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -996,7 +996,7 @@ namespace pcr
     {
         EventMap::const_iterator pos = m_aEvents.find( _rPropertyName );
         if ( pos == m_aEvents.end() )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(_rPropertyName);
         return pos->second;
     }
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 40308ba43d8a..c393e3921137 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -338,7 +338,7 @@ namespace pcr
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_xComponent.is() )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(_rPropertyName);
 
         return m_xComponent->getPropertyValue( _rPropertyName );
     }
@@ -347,7 +347,7 @@ namespace pcr
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_xComponent.is() )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(_rPropertyName);
 
         m_xComponent->setPropertyValue( _rPropertyName, _rValue );
     }
@@ -367,7 +367,7 @@ namespace pcr
 
         PropertyMap::const_iterator pos = m_aProperties.find( _rPropertyName );
         if ( pos == m_aProperties.end() )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(_rPropertyName);
 
         Any aPropertyValue;
         if ( !_rControlValue.hasValue() )
@@ -393,7 +393,7 @@ namespace pcr
 
         PropertyMap::const_iterator pos = m_aProperties.find( _rPropertyName );
         if ( pos == m_aProperties.end() )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(_rPropertyName);
 
         Any aControlValue;
         if ( !_rPropertyValue.hasValue() )
@@ -553,7 +553,7 @@ namespace pcr
 
         PropertyMap::const_iterator pos = m_aProperties.find( _rPropertyName );
         if ( pos == m_aProperties.end() )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(_rPropertyName);
 
         LineDescriptor aDescriptor;
         aDescriptor.DisplayName = _rPropertyName;
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index d261ae48ecbe..c9d021735995 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -290,7 +290,7 @@ namespace pcr
             FindPropertyByName( _rPropertyName )
         );
         if ( pFound == m_aSupportedProperties.end() )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(_rPropertyName);
 
         return *pFound;
     }
@@ -319,7 +319,7 @@ namespace pcr
     {
         PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName );
         if ( nPropId == -1 )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(_rPropertyName);
         return nPropId;
     }
 
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 18fe9599f316..6f510dba8a1a 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -406,7 +406,7 @@ void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName,
         }
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
 
     if ( mbBubbleChanged && mpBubbleWin )
         mpBubbleWin->Show( false );
@@ -432,7 +432,7 @@ uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName)
     else if( rPropertyName == PROPERTY_SHOW_MENUICON )
         aRet <<= mbShowMenuIcon;
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
 
     return aRet;
 }
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 397218a26f85..669df6297e0b 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -220,7 +220,7 @@ Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName
     if ( PropertyName == PROPNAME_UINAME )
         return makeAny( m_aUIName );
 
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(PropertyName);
 }
 
 void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
@@ -252,7 +252,7 @@ Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle )
     if ( nHandle == PROPHANDLE_UINAME )
         return makeAny( m_aUIName );
 
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(OUString::number(nHandle));
 }
 
 ::cppu::IPropertyArrayHelper& ConstItemContainer::getInfoHelper()
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 8f6faa5d544b..e7d6e6fd064e 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1869,7 +1869,7 @@ void SAL_CALL XFrameImpl::setPropertyValue(const OUString& sProperty,
 
     TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(sProperty);
 
     css::beans::Property aPropInfo = pIt->second;
 
@@ -1904,7 +1904,7 @@ css::uno::Any SAL_CALL XFrameImpl::getPropertyValue(const OUString& sProperty)
 
     TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(sProperty);
 
     css::beans::Property aPropInfo = pIt->second;
 
@@ -1923,7 +1923,7 @@ void SAL_CALL XFrameImpl::addPropertyChangeListener(
 
         TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
         if (pIt == m_lProps.end())
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(sProperty);
     }
     // <- SAFE
 
@@ -1940,7 +1940,7 @@ void SAL_CALL XFrameImpl::removePropertyChangeListener(
 
         TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
         if (pIt == m_lProps.end())
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(sProperty);
     }
     // <- SAFE
 
@@ -1959,7 +1959,7 @@ void SAL_CALL XFrameImpl::addVetoableChangeListener(
 
         TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
         if (pIt == m_lProps.end())
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(sProperty);
     }
     // <- SAFE
 
@@ -1976,7 +1976,7 @@ void SAL_CALL XFrameImpl::removeVetoableChangeListener(
 
         TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
         if (pIt == m_lProps.end())
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(sProperty);
     }
     // <- SAFE
 
@@ -2008,7 +2008,7 @@ css::beans::Property SAL_CALL XFrameImpl::getPropertyByName(const OUString& sNam
 
     TPropInfoHash::const_iterator pIt = m_lProps.find(sName);
     if (pIt == m_lProps.end())
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(sName);
 
     return pIt->second;
 }
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index e1a861d52ff6..c5e1b4ae30b5 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -125,7 +125,7 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyN
     else if (aPropertyName == m_aColorPropName)
         return uno::makeAny( m_nColor );
 
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(aPropertyName);
 }
 
 void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ )
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index a50ca358a6ee..34a58cf12bb9 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -139,7 +139,7 @@ Any SAL_CALL GenericPropertySet::getPropertyValue( const OUString& rPropertyName
 {
     PropertyNameMap::iterator aIt = maPropMap.find( rPropertyName );
     if( aIt == maPropMap.end() )
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     return aIt->second;
 }
 
@@ -169,7 +169,7 @@ Property SAL_CALL GenericPropertySet::getPropertyByName( const OUString& rProper
 {
     PropertyNameMap::iterator aIt = maPropMap.find( rPropertyName );
     if( aIt == maPropMap.end() )
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     Property aProperty;
     aProperty.Name = aIt->first;
     aProperty.Handle = 0;
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index ac4e3f101a07..8f15962d3bf0 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -509,7 +509,7 @@ void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName,
             [&aPropertyName](const beans::PropertyValue& rProp) { return rProp.Name == aPropertyName; }))
         throw beans::PropertyVetoException(); // TODO
 
-    throw beans::UnknownPropertyException(); // TODO
+    throw beans::UnknownPropertyException(aPropertyName); // TODO
 }
 
 uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
@@ -529,7 +529,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
         aPropertyName = aProp;
 
     if ( aPropertyName == "RelationsInfo" )
-        throw beans::UnknownPropertyException(); // TODO
+        throw beans::UnknownPropertyException(aPropertyName); // TODO
 
     // all the provided properties are accessible
     auto pProp = std::find_if(std::cbegin(m_aProperties), std::cend(m_aProperties),
@@ -537,7 +537,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
     if (pProp != std::cend(m_aProperties))
         return pProp->Value;
 
-    throw beans::UnknownPropertyException(); // TODO
+    throw beans::UnknownPropertyException(aPropertyName); // TODO
 }
 
 void SAL_CALL OInputCompStream::addPropertyChangeListener(
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 27a3d4daa5b7..e4935b94c81d 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -2878,7 +2878,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
         aValue >>= m_pImpl->m_nRelId;
     }
     else
-        throw beans::UnknownPropertyException(); // TODO
+        throw beans::UnknownPropertyException(aPropertyName); // TODO
 
     m_pImpl->m_bHasDataToFlush = true;
     ModifyParentUnlockMutex_Impl( aGuard );
@@ -2937,7 +2937,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
         return uno::makeAny( m_xSeekable->getLength() );
     }
 
-    throw beans::UnknownPropertyException(); // TODO
+    throw beans::UnknownPropertyException(aPropertyName); // TODO
 }
 
 void SAL_CALL OWriteStream::addPropertyChangeListener(
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index f87927339152..5a375e4bfcfa 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4367,7 +4367,7 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u
         throw uno::RuntimeException( THROW_WHERE ); // TODO: Access denied
 
     if ( m_pData->m_nStorageType == embed::StorageFormats::ZIP )
-        throw beans::UnknownPropertyException( THROW_WHERE );
+        throw beans::UnknownPropertyException( aPropertyName );
     else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
     {
         if ( aPropertyName == "MediaType" )
@@ -4400,7 +4400,7 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u
            || aPropertyName == MEDIATYPE_FALLBACK_USED_PROPERTY )
             throw beans::PropertyVetoException( THROW_WHERE );
         else
-            throw beans::UnknownPropertyException( THROW_WHERE );
+            throw beans::UnknownPropertyException( aPropertyName );
     }
     else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
     {
@@ -4439,10 +4439,10 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u
                  || aPropertyName == "IsRoot" )
             throw beans::PropertyVetoException( THROW_WHERE );
         else
-            throw beans::UnknownPropertyException( THROW_WHERE );
+            throw beans::UnknownPropertyException( aPropertyName );
     }
     else
-        throw beans::UnknownPropertyException( THROW_WHERE );
+        throw beans::UnknownPropertyException( aPropertyName );
 
     BroadcastModifiedIfNecessary();
 }
@@ -4538,7 +4538,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
         }
     }
 
-    throw beans::UnknownPropertyException( THROW_WHERE );
+    throw beans::UnknownPropertyException(aPropertyName);
 }
 
 void SAL_CALL OStorage::addPropertyChangeListener(
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 3f3858070a0c..7b2e705e45e5 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1729,7 +1729,7 @@ uno::Reference< XPropertySetInfo > SAL_CALL ZipPackage::getPropertySetInfo()
 void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
 {
     if ( m_nFormat != embed::StorageFormats::PACKAGE )
-        throw UnknownPropertyException(THROW_WHERE );
+        throw UnknownPropertyException(aPropertyName);
 
     if (aPropertyName == HAS_ENCRYPTED_ENTRIES_PROPERTY
       ||aPropertyName == HAS_NONENCRYPTED_ENTRIES_PROPERTY
@@ -1833,7 +1833,7 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const
         m_nChecksumDigestID = xml::crypto::DigestID::SHA512_1K;
     }
     else
-        throw UnknownPropertyException(THROW_WHERE );
+        throw UnknownPropertyException(aPropertyName);
 }
 
 Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
@@ -1878,7 +1878,7 @@ Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
     {
         return Any(m_bMediaTypeFallbackUsed);
     }
-    throw UnknownPropertyException(THROW_WHERE );
+    throw UnknownPropertyException(PropertyName);
 }
 void SAL_CALL ZipPackage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
 {
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 2dfbb72dc567..fdc7231059a6 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -377,7 +377,7 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName,
     else if ( aPropertyName == "Size" )
         aValue >>= aEntry.nSize;
     else
-        throw UnknownPropertyException(THROW_WHERE );
+        throw UnknownPropertyException(aPropertyName);
 }
 uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyName )
 {
@@ -394,7 +394,7 @@ uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyNa
     else if ( PropertyName == "Size" )
         return uno::makeAny ( aEntry.nSize );
     else
-        throw UnknownPropertyException(THROW_WHERE );
+        throw UnknownPropertyException(PropertyName);
 }
 
 void ZipPackageFolder::doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent )
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index f685f891c649..745157cfd02e 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -1271,7 +1271,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName,
         m_bCompressedIsSetFromOutside = true;
     }
     else
-        throw beans::UnknownPropertyException(THROW_WHERE );
+        throw beans::UnknownPropertyException(aPropertyName);
 }
 
 Any SAL_CALL ZipPackageStream::getPropertyValue( const OUString& PropertyName )
@@ -1305,7 +1305,7 @@ Any SAL_CALL ZipPackageStream::getPropertyValue( const OUString& PropertyName )
         return Any(m_aStorageEncryptionKeys);
     }
     else
-        throw beans::UnknownPropertyException(THROW_WHERE );
+        throw beans::UnknownPropertyException(PropertyName);
 }
 
 void ZipPackageStream::setSize ( const sal_Int64 nNewSize )
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index 633f1b1786b3..fa77cd0f133a 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -853,7 +853,7 @@ uno::Reference< beans::XPropertySetInfo> SAL_CALL
 void SAL_CALL PivotTableDataProvider::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue)
 {
     if (rPropertyName != SC_UNONAME_INCLUDEHIDDENCELLS)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
 
     if (!(rValue >>= m_bIncludeHiddenCells))
         throw lang::IllegalArgumentException();
@@ -870,7 +870,7 @@ uno::Any SAL_CALL PivotTableDataProvider::getPropertyValue(const OUString& rProp
         aRet <<= m_pDocument->PastingDrawFromOtherDoc();
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/PivotTableDataSequence.cxx b/sc/source/ui/unoobj/PivotTableDataSequence.cxx
index be583042f1d7..706cedd3e025 100644
--- a/sc/source/ui/unoobj/PivotTableDataSequence.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataSequence.cxx
@@ -220,7 +220,7 @@ void SAL_CALL PivotTableDataSequence::setPropertyValue(const OUString& rProperty
           || rPropertyName == SC_UNONAME_HAS_STRING_LABEL)
     {}
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
 }
 
 uno::Any SAL_CALL PivotTableDataSequence::getPropertyValue(const OUString& rPropertyName)
@@ -244,7 +244,7 @@ uno::Any SAL_CALL PivotTableDataSequence::getPropertyValue(const OUString& rProp
         aReturn <<= false;
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     return aReturn;
 }
 
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index 012e68f4b884..c9192ff402e0 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -204,7 +204,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropert
         }
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     if ( !bSuccess )
         throw lang::IllegalArgumentException();
@@ -270,7 +270,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const OUString& aPro
         aRet <<= aFormatStr;
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     return aRet;
 }
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index f471e7f47e60..737e5bcb4176 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2219,7 +2219,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValue(
     const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     SetOnePropertyValue( pEntry, aValue );
 }
@@ -2431,7 +2431,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyN
     const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     uno::Any aAny;
     GetOnePropertyValue( pEntry, aAny );
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index df3b2bf1c428..2aa0fb870c19 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2229,7 +2229,7 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
 {
     if ( rPropertyName != SC_UNONAME_INCLUDEHIDDENCELLS )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
 
     if ( !(rValue >>= m_bIncludeHiddenCells))
         throw lang::IllegalArgumentException();
@@ -2248,7 +2248,7 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue(
         aRet <<= m_pDocument->PastingDrawFromOtherDoc();
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     return aRet;
 }
 
@@ -3272,7 +3272,7 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue(
         mbTimeBased = bTimeBased;
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     // TODO: support optional properties
 }
 
@@ -3307,7 +3307,7 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rProper
         aRet <<= bHasStringLabel;
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     // TODO: support optional properties
     return aRet;
 }
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index 813ad3515d43..038064c87cc3 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -563,7 +563,7 @@ void SAL_CALL ScCondFormatObj::setPropertyValue(
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     switch(pEntry->nWID)
     {
@@ -601,7 +601,7 @@ uno::Any SAL_CALL ScCondFormatObj::getPropertyValue( const OUString& aPropertyNa
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     uno::Any aAny;
     switch(pEntry->nWID)
@@ -703,7 +703,7 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue(
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     switch(pEntry->nWID)
     {
@@ -766,7 +766,7 @@ uno::Any SAL_CALL ScConditionEntryObj::getPropertyValue( const OUString& aProper
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     uno::Any aAny;
     switch(pEntry->nWID)
@@ -910,7 +910,7 @@ void SAL_CALL ScColorScaleFormatObj::setPropertyValue(
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     switch(pEntry->nWID)
     {
@@ -944,7 +944,7 @@ uno::Any SAL_CALL ScColorScaleFormatObj::getPropertyValue( const OUString& aProp
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     uno::Any aAny;
 
@@ -1160,7 +1160,7 @@ void SAL_CALL ScDataBarFormatObj::setPropertyValue(
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     switch(pEntry->nWID)
     {
@@ -1284,7 +1284,7 @@ uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropert
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     uno::Any aAny;
     switch(pEntry->nWID)
@@ -1535,7 +1535,7 @@ void SAL_CALL ScIconSetFormatObj::setPropertyValue(
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     switch(pEntry->nWID)
     {
@@ -1606,7 +1606,7 @@ uno::Any SAL_CALL ScIconSetFormatObj::getPropertyValue( const OUString& aPropert
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     uno::Any aAny;
 
@@ -1800,7 +1800,7 @@ void SAL_CALL ScCondDateFormatObj::setPropertyValue(
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     switch(pEntry->nWID)
     {
@@ -1842,7 +1842,7 @@ uno::Any SAL_CALL ScCondDateFormatObj::getPropertyValue( const OUString& aProper
     const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap();     // from derived class
     const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     uno::Any aAny;
 
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index a168afccdd4f..9403d73408cc 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -407,7 +407,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
         else if ( aPropertyName == SC_UNO_RASTERSYNC )
             aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
         else
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(aPropertyName);
         aViewOpt.SetGridOptions(aGridOpt);
     }
     rDoc.SetViewOptions(aViewOpt);
@@ -608,7 +608,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
         else if ( aPropertyName == SC_UNO_RASTERSYNC )
             aRet <<= aGridOpt.GetSynchronize();
         else
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(aPropertyName);
     }
 
 
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 5576c994f333..d71b93ff1ba0 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -866,7 +866,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp
                 }
             }
             else
-                throw UnknownPropertyException();
+                throw UnknownPropertyException(aPropertyName);
 
             pDPObject->SetSaveData( aNewData );
         }
@@ -973,7 +973,7 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope
                 }
             }
             else
-                throw UnknownPropertyException();
+                throw UnknownPropertyException(aPropertyName);
         }
     }
 
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index d0d6ae746311..ca4ac662abff 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -124,7 +124,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue(
 
     const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
     if(!pEntry->nWID)
     {
         if(aPropertyName ==SC_UNO_STANDARDDEC)
@@ -206,7 +206,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyN
     uno::Any aRet;
     const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     if (!pEntry->nWID)
     {
@@ -251,7 +251,7 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString
 
     const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     beans::PropertyState eRet = beans::PropertyState_DEFAULT_VALUE;
 
@@ -296,7 +296,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyN
 
     const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     if (pEntry->nWID)
     {
@@ -318,7 +318,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropert
 
     const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     uno::Any aRet;
     if (pEntry->nWID)
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index aa6b1b5c32bb..61948b461c4f 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -653,7 +653,7 @@ void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const css::uno::
                 pURL->SetTargetFrame(aStrVal);
         }
         else
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rName);
 
         pEditEngine->QuickInsertField( SvxFieldItem(*pField, EE_FEATURE_FIELD), aSelection );
         mpEditSource->UpdateData();
@@ -678,7 +678,7 @@ void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const css::uno::
             rData.SetTargetFrame(aStrVal);
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rName);
 }
 
 uno::Any ScEditFieldObj::getPropertyValueURL(const OUString& rName)
@@ -712,7 +712,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const OUString& rName)
         else if (rName == SC_UNONAME_TARGET)
             aRet <<= pURL->GetTargetFrame();
         else
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rName);
     }
     else        // not inserted yet
     {
@@ -725,7 +725,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const OUString& rName)
         else if (rName == SC_UNONAME_TARGET)
             aRet <<= rURL.GetTargetFrame();
         else
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rName);
     }
     return aRet;
 }
@@ -733,7 +733,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const OUString& rName)
 void ScEditFieldObj::setPropertyValueFile(const OUString& rName, const uno::Any& rVal)
 {
     if (rName != SC_UNONAME_FILEFORM)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rName);
 
     sal_Int16 nIntVal = 0;
     if (rVal >>= nIntVal)
@@ -767,7 +767,7 @@ uno::Any ScEditFieldObj::getPropertyValueFile(const OUString& rName)
 {
     uno::Any aRet;
     if (rName != SC_UNONAME_FILEFORM)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rName);
 
     SvxFileFormat eFormat = SvxFileFormat::NameAndExt;
     const SvxFieldData* pField = nullptr;
@@ -830,7 +830,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::
                     p->SetFormat(static_cast<SvxDateFormat>(mnNumFormat));
                 }
                 else
-                    throw beans::UnknownPropertyException();
+                    throw beans::UnknownPropertyException(rName);
             }
             break;
             case text::textfield::Type::TIME:
@@ -838,7 +838,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::
                 // SvxTimeField doesn't have any attributes.
                 if (rName != SC_UNONAME_ISDATE && rName != SC_UNONAME_ISFIXED &&
                     rName != SC_UNONAME_DATETIME && rName != SC_UNONAME_NUMFMT)
-                    throw beans::UnknownPropertyException();
+                    throw beans::UnknownPropertyException(rName);
             }
             break;
             case text::textfield::Type::EXTENDED_TIME:
@@ -865,11 +865,11 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::
                     p->SetFormat(static_cast<SvxTimeFormat>(mnNumFormat));
                 }
                 else
-                    throw beans::UnknownPropertyException();
+                    throw beans::UnknownPropertyException(rName);
             }
             break;
             default:
-                throw beans::UnknownPropertyException();
+                throw beans::UnknownPropertyException(rName);
         }
     }
     else
@@ -883,7 +883,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::
         else if (rName == SC_UNONAME_NUMFMT)
             mnNumFormat = rVal.get<sal_Int32>();
         else
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rName);
     }
 }
 
@@ -989,7 +989,7 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName)
             return uno::makeAny(mnNumFormat);
     }
 
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(rName);
 }
 
 void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any& rVal)
@@ -1014,7 +1014,7 @@ void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any
         SvxTableField* p = static_cast<SvxTableField*>(pField);
 
         if (rName != SC_UNONAME_TABLEPOS)
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rName);
 
         sal_Int32 nTab = rVal.get<sal_Int32>();
         p->SetTab(nTab);
@@ -1028,7 +1028,7 @@ void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any
     // Edit engine instance not yet present.  Store the item data for later use.
     SvxTableField& r = static_cast<SvxTableField&>(getData());
     if (rName != SC_UNONAME_TABLEPOS)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rName);
 
     sal_Int32 nTab = rVal.get<sal_Int32>();
     r.SetTab(nTab);
@@ -1226,7 +1226,7 @@ void SAL_CALL ScEditFieldObj::setPropertyValue(
         break;
         case text::textfield::Type::DOCINFO_TITLE:
         default:
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(OUString::number(meType));
     }
 }
 
@@ -1272,7 +1272,7 @@ uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const OUString& aPropertyNam
             return getPropertyValueDateTime(aPropertyName);
         case text::textfield::Type::DOCINFO_TITLE:
         default:
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(OUString::number(meType));
     }
 }
 
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 4e291a5850c2..b66c71120355 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -246,7 +246,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue(
 
         bool bDone = ScDocOptionsHelper::setPropertyValue( *pOptions, aPropertyMap, aPropertyName, aValue );
         if (!bDone)
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(aPropertyName);
     }
 }
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 35308f8b04ec..a9215095b970 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1201,7 +1201,7 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName )
 
     const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     setPropertyValue_Impl( aPropertyName, pEntry, nullptr );
 }
@@ -1438,7 +1438,7 @@ void SAL_CALL ScStyleObj::setPropertyValue( const OUString& aPropertyName, const
 
     const SfxItemPropertySimpleEntry*  pEntry = pPropSet->getPropertyMap().getByName( aPropertyName );
     if ( !pEntry )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     setPropertyValue_Impl( aPropertyName, pEntry, &aValue );
 }
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index 849bef0005b5..d5e8e8b6b6cc 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -227,7 +227,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue(
             throw lang::IllegalArgumentException();
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 }
 
 uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropertyName )
@@ -259,7 +259,7 @@ uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropert
         aRet <<= maExternalLinks;
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
     return aRet;
 }
 
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 5d4e46e40caa..f56169ecd1ec 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -702,7 +702,7 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue(       ::sal_Int32
              break;
 
         default :
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(OUString::number(nHandle));
     }
 }
 
@@ -720,7 +720,7 @@ css::uno::Any SAL_CALL ShutdownIcon::getFastPropertyValue( ::sal_Int32 nHandle )
              break;
 
         default :
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(OUString::number(nHandle));
     }
 
     return aValue;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 2bbdd75ae027..8b1271545dfb 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -242,7 +242,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, cons
 {
     const SfxItemPropertySimpleEntry*  pEntry = maPropMap.getByName( aPropertyName );
     if( !pEntry )
-         throw beans::UnknownPropertyException();
+         throw beans::UnknownPropertyException(aPropertyName);
     switch( pEntry->nWID )
     {
     case WID_FRAME_URL:
@@ -322,7 +322,7 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName)
 {
     const SfxItemPropertySimpleEntry*  pEntry = maPropMap.getByName( aPropertyName );
     if( !pEntry )
-         throw beans::UnknownPropertyException();
+         throw beans::UnknownPropertyException(aPropertyName);
     uno::Any aAny;
     switch( pEntry->nWID )
     {
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index a5a1ed3e94b0..90ab20e46f15 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -425,11 +425,11 @@ Any SAL_CALL Theme::getPropertyValue (
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rsPropertyName);
 
     const PropertyType eType (GetPropertyType(iId->second));
     if (eType == PT_Invalid)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rsPropertyName);
 
     const ThemeItem eItem (iId->second);
 
@@ -445,11 +445,11 @@ void SAL_CALL Theme::addPropertyChangeListener(
     {
         PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
         if (iId == maPropertyNameToIdMap.end())
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rsPropertyName);
 
         const PropertyType eType (GetPropertyType(iId->second));
         if (eType == PT_Invalid)
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rsPropertyName);
 
         eItem = iId->second;
     }
@@ -467,11 +467,11 @@ void SAL_CALL Theme::removePropertyChangeListener(
     {
         PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
         if (iId == maPropertyNameToIdMap.end())
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rsPropertyName);
 
         const PropertyType eType (GetPropertyType(iId->second));
         if (eType == PT_Invalid)
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rsPropertyName);
 
         eItem = iId->second;
     }
@@ -499,11 +499,11 @@ void SAL_CALL Theme::addVetoableChangeListener(
     {
         PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
         if (iId == maPropertyNameToIdMap.end())
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rsPropertyName);
 
         const PropertyType eType (GetPropertyType(iId->second));
         if (eType == PT_Invalid)
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rsPropertyName);
 
         eItem = iId->second;
     }
@@ -521,11 +521,11 @@ void SAL_CALL Theme::removeVetoableChangeListener(
     {
         PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
         if (iId == maPropertyNameToIdMap.end())
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rsPropertyName);
 
         const PropertyType eType (GetPropertyType(iId->second));
         if (eType == PT_Invalid)
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(rsPropertyName);
 
         eItem = iId->second;
     }
@@ -572,11 +572,11 @@ beans::Property SAL_CALL Theme::getPropertyByName (const OUString& rsPropertyNam
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rsPropertyName);
 
     const PropertyType eType (GetPropertyType(iId->second));
     if (eType == PT_Invalid)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rsPropertyName);
 
     const ThemeItem eItem (iId->second);
 
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 6ba2a66baf3b..0b566b2ac15d 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -1003,7 +1003,7 @@ void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const
     if ( aPropertyName == "URL" || aPropertyName == "OpenMode" )
         throw beans::PropertyVetoException(); // TODO
     else
-        throw beans::UnknownPropertyException(); // TODO
+        throw beans::UnknownPropertyException(aPropertyName); // TODO
 }
 
 
@@ -1019,7 +1019,7 @@ uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName )
     else if ( aPropertyName == "OpenMode" )
         return uno::makeAny( m_pImpl->m_nMode );
 
-    throw beans::UnknownPropertyException(); // TODO
+    throw beans::UnknownPropertyException(aPropertyName); // TODO
 }
 
 
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 6e0d046b93ed..5f4a4aacb6d5 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -107,7 +107,7 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const OUString & rName )
 {
     SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
     if( aIter == m_pImpl->end() )
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rName);
     const SfxItemPropertySimpleEntry* pEntry = &aIter->second;
     beans::Property aProp;
     aProp.Name = rName;
@@ -191,7 +191,7 @@ void SfxItemPropertySet::getPropertyValue( const OUString &rName,
     // detect which-id
     const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName );
     if ( !pEntry )
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rName);
     getPropertyValue( *pEntry,rSet, rAny );
 }
 
@@ -235,7 +235,7 @@ void SfxItemPropertySet::setPropertyValue( const OUString &rName,
     const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName );
     if ( !pEntry )
     {
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rName);
     }
     setPropertyValue(*pEntry, aVal, rSet);
 }
@@ -264,7 +264,7 @@ PropertyState   SfxItemPropertySet::getPropertyState(const OUString& rName, cons
     const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName );
     if( !pEntry || !pEntry->nWID )
     {
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rName);
     }
     sal_uInt16 nWhich = pEntry->nWID;
 
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index aa0d08584f12..5ed7aaa5137e 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -694,7 +694,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty
             aRet <<= OUString();
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     return aRet;
 }
@@ -847,7 +847,7 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aProp
             pFormatter->SetYear2000( nInt16 );
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
 }
 
@@ -874,7 +874,7 @@ uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& a
     else if (aPropertyName == PROPERTYNAME_TWODIGIT)
         aRet <<= static_cast<sal_Int16>( pFormatter->GetYear2000() );
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     return aRet;
 }
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 8f465828352a..8b01fa9edcec 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1466,7 +1466,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName )
         }
         return eState;
     }
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(PropertyName);
 }
 
 
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 11efa6a692ec..ffb53f9c7f69 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2114,7 +2114,7 @@ void SAL_CALL SwChartDataSequence::setPropertyValue(
         throw lang::DisposedException();
 
     if (rPropertyName != UNO_NAME_ROLE)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
 
     if ( !(rValue >>= m_aRole) )
         throw lang::IllegalArgumentException();
@@ -2128,7 +2128,7 @@ uno::Any SAL_CALL SwChartDataSequence::getPropertyValue(
         throw lang::DisposedException();
 
     if (!(rPropertyName == UNO_NAME_ROLE))
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
 
     return uno::Any(m_aRole);
 }
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index d69f7ab1ad10..adab40c9d319 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -459,7 +459,7 @@ SwXReferenceMark::getPropertyValue(const OUString& rPropertyName)
     uno::Any aRet;
     if (! ::sw::GetDefaultTextContentValue(aRet, rPropertyName))
     {
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     }
     return aRet;
 }
@@ -1359,7 +1359,7 @@ SwXMetaField::setPropertyValue(
     }
     else
     {
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     }
 }
 
@@ -1385,7 +1385,7 @@ SwXMetaField::getPropertyValue(const OUString& rPropertyName)
     }
     else
     {
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     }
 
     return any;
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 2da70bd5cdcc..c41d13dea3a8 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2139,7 +2139,7 @@ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const A
         throw IllegalArgumentException();
     }
     else
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
 
     if(pDocRule)
     {
@@ -2189,7 +2189,7 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName )
         aRet <<= pRule->GetDefaultListId();
     }
     else
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     return aRet;
 }
 
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 8926602e8a80..4af7377f4c73 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -83,7 +83,7 @@ void SwSearchProperties_Impl::SetProperties(const uno::Sequence< beans::Property
         auto aIt = std::find_if(aPropertyEntries.begin(), aPropertyEntries.end(),
             [&sName](const SfxItemPropertyNamedEntry& rProp) { return rProp.sName == sName; });
         if( aIt == aPropertyEntries.end() )
-            throw beans::UnknownPropertyException();
+            throw beans::UnknownPropertyException(sName);
         auto nIndex = static_cast<sal_uInt32>(std::distance(aPropertyEntries.begin(), aIt));
         pValueArr[nIndex].reset( new beans::PropertyValue(rSearchAttrib) );
     }
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 02c07eac0b1e..dde6652ff130 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4497,7 +4497,7 @@ css::uno::Any SAL_CALL SwXTextTableStyle::getPropertyValue(const OUString& rProp
     else if (rPropertyName == UNO_NAME_DISPLAY_NAME)
         return uno::makeAny(m_pTableAutoFormat->GetName());
     else
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(rPropertyName);
 
     return uno::makeAny(bIsRow ? OUString("row") : OUString("column"));
 }
@@ -5020,7 +5020,7 @@ void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName,
         }
     }
 
-    throw css::beans::UnknownPropertyException();
+    throw css::beans::UnknownPropertyException(rPropertyName);
 }
 
 css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPropertyName)
@@ -5184,7 +5184,7 @@ css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPrope
         }
     }
 
-    throw css::beans::UnknownPropertyException();
+    throw css::beans::UnknownPropertyException(rPropertyName);
 }
 
 void SAL_CALL SwXTextCellStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ )
@@ -5360,7 +5360,7 @@ css::uno::Sequence<css::beans::PropertyState> SAL_CALL SwXTextCellStyle::getProp
         else
         {
             SAL_WARN("sw.uno", "SwXTextCellStyle unknown property:" + sPropName);
-            throw css::beans::UnknownPropertyException();
+            throw css::beans::UnknownPropertyException(sPropName);
         }
     }
     return aRet;
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 3844ba0969d4..1d5cc277b1b5 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -926,7 +926,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         }
         break;
         default:
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(rInfo.mnHandle));
     }
 }
 
@@ -1382,7 +1382,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
         }
         break;
         default:
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(rInfo.mnHandle));
     }
 }
 
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 1e3fe183463b..6151fb1d785c 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -586,7 +586,7 @@ void SwXAutoTextGroup::setPropertyValue(
     const SfxItemPropertySimpleEntry*   pEntry = pPropSet->getPropertyMap().getByName( rPropertyName );
 
     if(!pEntry)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
 
     std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
     if(!pGlosGroup || pGlosGroup->GetError())
@@ -614,7 +614,7 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName)
     const SfxItemPropertySimpleEntry*   pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
 
     if(!pEntry)
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(rPropertyName);
     std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
     if(!pGlosGroup  || pGlosGroup->GetError())
         throw uno::RuntimeException();
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 8ea1a82934d6..9208c2644ab4 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -869,7 +869,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
 
     const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if (!pCur)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     else if (pCur->nFlags & PropertyAttribute::READONLY)
         throw PropertyVetoException();
     else
@@ -1024,7 +1024,7 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue(
 
     const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if (!pCur)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
 
     switch (pCur->nWID)
     {
@@ -1075,7 +1075,7 @@ void SAL_CALL SwXMailMerge::addPropertyChangeListener(
     {
         const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName );
         if (!pCur)
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(rPropertyName);
         m_aPropListeners.addInterface( pCur->nWID, rListener );
     }
 }
@@ -1089,7 +1089,7 @@ void SAL_CALL SwXMailMerge::removePropertyChangeListener(
     {
         const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName );
         if (!pCur)
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(rPropertyName);
         m_aPropListeners.removeInterface( pCur->nWID, rListener );
     }
 }
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 393a7dd26dbf..5df0c5af9d89 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -392,7 +392,7 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo,
         }
         break;
         default:
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(rInfo.mnHandle));
     }
 }
 
@@ -487,7 +487,7 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo,
         }
         break;
         default:
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(rInfo.mnHandle));
     }
 }
 
@@ -750,7 +750,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
         }
         break;
         default:
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(OUString::number(rInfo.mnHandle));
     }
 }
 
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index dad23f90c389..4ec9e293f74b 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1840,7 +1840,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any&
     const SfxItemPropertySimpleEntry*  pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
 
     if(!pEntry)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     if(pEntry->nFlags & PropertyAttribute::READONLY)
         throw PropertyVetoException();
     switch(pEntry->nWID)
@@ -2016,7 +2016,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
     const SfxItemPropertySimpleEntry*  pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
 
     if(!pEntry)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     Any aAny;
     switch(pEntry->nWID)
     {
@@ -2261,7 +2261,7 @@ PropertyState SAL_CALL SwXTextDocument::getPropertyState( const OUString& rPrope
 
     const SfxItemPropertySimpleEntry*  pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
     if(!pEntry)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     return PropertyState_DIRECT_VALUE;
 }
 
@@ -2284,7 +2284,7 @@ void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyNa
 
     const SfxItemPropertySimpleEntry*  pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
     if(!pEntry)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     switch(pEntry->nWID)
     {
         case 0:default:break;
@@ -2299,7 +2299,7 @@ Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName
 
     const SfxItemPropertySimpleEntry*  pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
     if(!pEntry)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     Any aAny;
     switch(pEntry->nWID)
     {
@@ -4135,9 +4135,9 @@ Reference< XPropertySetInfo >  SwXLinkNameAccessWrapper::getPropertySetInfo()
 }
 
 void SwXLinkNameAccessWrapper::setPropertyValue(
-    const OUString& , const Any& )
+    const OUString& rPropName, const Any& )
 {
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(rPropName);
 }
 
 static Any lcl_GetDisplayBitmap(const OUString& _sLinkSuffix)
@@ -4182,7 +4182,7 @@ Any SwXLinkNameAccessWrapper::getPropertyValue(const OUString& rPropertyName)
         aRet = lcl_GetDisplayBitmap(sLinkSuffix);
     }
     else
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     return aRet;
 }
 
@@ -4240,15 +4240,15 @@ Reference< XPropertySetInfo >  SwXOutlineTarget::getPropertySetInfo()
 }
 
 void SwXOutlineTarget::setPropertyValue(
-    const OUString& /*PropertyName*/, const Any& /*aValue*/)
+    const OUString& rPropertyName, const Any& /*aValue*/)
 {
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(rPropertyName);
 }
 
 Any SwXOutlineTarget::getPropertyValue(const OUString& rPropertyName)
 {
     if(rPropertyName != UNO_LINK_DISPLAY_NAME)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
 
     return Any(sOutlineText);
 }
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index e2430d14ee86..fcbaee259716 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -730,7 +730,7 @@ void SAL_CALL SwXTextView::setPropertyValue(
     SolarMutexGuard aGuard;
     const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if (!pEntry)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
     else if (pEntry->nFlags & PropertyAttribute::READONLY)
         throw PropertyVetoException();
     else
@@ -767,7 +767,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue(
 
     const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if (!pEntry)
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(rPropertyName);
 
     sal_Int16 nWID = pEntry->nWID;
     switch (nWID)
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 2926c365b31c..7bdc01bdfdf6 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1246,7 +1246,7 @@ void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css
         DBG_ASSERT( nPropId, "Invalid ID in UnoControlModel::setPropertyValue" );
     }
     if( !nPropId )
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(rPropertyName);
 
     setFastPropertyValue( nPropId, rValue );
 
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 830d76c0129a..15f35adcfea1 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -533,14 +533,11 @@ Sequence< Property > SAL_CALL CCRS_PropertySetInfo
 Property SAL_CALL CCRS_PropertySetInfo
     ::getPropertyByName( const OUString& aName )
 {
-    if ( aName.isEmpty() )
-        throw UnknownPropertyException();
-
     Property aProp;
     if ( impl_queryProperty( aName, aProp ) )
         return aProp;
 
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(aName);
 }
 
 //virtual
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 99ffd1433364..567fe6328d7c 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -685,7 +685,7 @@ void SAL_CALL ContentResultSetWrapper::removeVetoableChangeListener( const OUStr
         if( !rPropertyName.isEmpty() )
         {
             if( !getPropertySetInfo().is() )
-                throw UnknownPropertyException();
+                throw UnknownPropertyException(rPropertyName);
 
             m_xPropertySetInfo->getPropertyByName( rPropertyName );
             //throws UnknownPropertyException, if so
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index b2aadcec33b0..626951211b63 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -231,7 +231,7 @@ Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName
     if ( queryProperty( aName, aProp ) )
         return aProp;
 
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(aName);
 }
 
 
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 61cd104a58c8..02ef9a4f8241 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -1184,9 +1184,6 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo
 void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aPropertyName,
                                                        const Any& aValue )
 {
-    if ( aPropertyName.isEmpty() )
-        throw UnknownPropertyException();
-
     osl::ClearableGuard< osl::Mutex > aCGuard( m_pImpl->m_aMutex );
 
     Reference< XHierarchicalNameAccess > xRootHierNameAccess(
@@ -1277,7 +1274,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty
         }
     }
 
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(aPropertyName);
 }
 
 
@@ -1285,9 +1282,6 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty
 Any SAL_CALL PersistentPropertySet::getPropertyValue(
                                             const OUString& PropertyName )
 {
-    if ( PropertyName.isEmpty() )
-        throw UnknownPropertyException();
-
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
     Reference< XHierarchicalNameAccess > xNameAccess(
@@ -1304,11 +1298,11 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
         }
         catch (const NoSuchElementException&)
         {
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(aFullPropName);
         }
     }
 
-    throw UnknownPropertyException();
+    throw UnknownPropertyException(PropertyName);
 }
 
 
@@ -1581,7 +1575,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
 
         // Property in set?
         if ( !xRootHierNameAccess->hasByHierarchicalName( aFullPropName ) )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(aFullPropName);
 
         // Property removable?
         try
@@ -2237,7 +2231,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
 
         // Does property exist?
         if ( !xRootHierNameAccess->hasByHierarchicalName( aFullPropName ) )
-            throw UnknownPropertyException();
+            throw UnknownPropertyException(aFullPropName);
 
         try
         {
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 3aa745d290fe..54536c883eb3 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -771,7 +771,7 @@ void SAL_CALL SortedResultSet::setPropertyValue(
     if ( PropertyName == "RowCount" || PropertyName == "IsRowCountFinal" )
         throw IllegalArgumentException();
     else
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(PropertyName);
 }
 
 
@@ -807,7 +807,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
         }
     }
     else
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(PropertyName);
 
     return aRet;
 }
@@ -1796,7 +1796,7 @@ SRSPropertySetInfo::getPropertyByName( const OUString& Name )
     else if ( Name == "IsRowCountFinal" )
         return maProps[1];
     else
-        throw UnknownPropertyException();
+        throw UnknownPropertyException(Name);
 }
 
 
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 7bc6e9d1d93a..bbe5bf79c2e1 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -537,7 +537,7 @@ BaseContent::removeProperty( const OUString& Name )
 {
 
     if( m_nState & Deleted )
-        throw beans::UnknownPropertyException( THROW_WHERE );
+        throw beans::UnknownPropertyException( Name );
 
     m_pMyShell->deassociate( m_aUncPath, Name );
 }
diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index 400513035964..0110be272759 100644
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
@@ -30,12 +30,6 @@ using namespace com::sun::star::ucb;
 
 #include "filinl.hxx"
 
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
 XPropertySetInfo_impl::XPropertySetInfo_impl( TaskManager* pMyShell,const OUString& aUnqPath )
     : m_pMyShell( pMyShell ),
       m_seq( 0 )
@@ -81,7 +75,7 @@ XPropertySetInfo_impl::getPropertyByName( const OUString& aName )
     if (pProp != m_seq.end())
         return *pProp;
 
-    throw beans::UnknownPropertyException( THROW_WHERE );
+    throw beans::UnknownPropertyException( aName );
 }
 
 
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 770d3d38d988..90c9646e8dbb 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -641,7 +641,7 @@ void SAL_CALL XResultSet_impl::setPropertyValue(
     if( aPropertyName == "IsRowCountFinal" ||
         aPropertyName == "RowCount" )
         return;
-    throw beans::UnknownPropertyException( THROW_WHERE );
+    throw beans::UnknownPropertyException( aPropertyName );
 }
 
 
@@ -658,7 +658,7 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue(
         return uno::Any(count);
     }
     else
-        throw beans::UnknownPropertyException( THROW_WHERE );
+        throw beans::UnknownPropertyException( PropertyName );
 }
 
 
@@ -684,7 +684,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener(
         m_pRowCountListeners->addInterface( xListener );
     }
     else
-        throw beans::UnknownPropertyException( THROW_WHERE );
+        throw beans::UnknownPropertyException( aPropertyName );
 }
 
 
@@ -706,7 +706,7 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener(
         m_pRowCountListeners->removeInterface( aListener );
     }
     else
-        throw beans::UnknownPropertyException( THROW_WHERE );
+        throw beans::UnknownPropertyException( aPropertyName );
 }
 
 void SAL_CALL XResultSet_impl::addVetoableChangeListener(
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 3e3afd149c5a..7a56539d276e 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -590,7 +590,7 @@ TaskManager::deassociate( const OUString& aUnqPath,
 
     it1 = properties.find( oldProperty );
     if( it1 == properties.end() )
-        throw beans::UnknownPropertyException( THROW_WHERE );
+        throw beans::UnknownPropertyException( PropertyName );
 
     properties.erase( it1 );
 
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index c222655f4b73..eac7d2b3b01b 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -351,7 +351,7 @@ XPropertySetInfoImpl2::getPropertyByName( const OUString& aName )
     if (pProp != m_seq.end())
         return *pProp;
 
-    throw UnknownPropertyException( THROW_WHERE );
+    throw UnknownPropertyException( aName );
 }
 
 
@@ -416,7 +416,7 @@ FileProvider::setPropertyValue( const OUString& aPropertyName,
     if( !(aPropertyName == "FileSystemNotation" ||
         aPropertyName == "HomeDirectory"      ||
         aPropertyName == "HostName") )
-        throw UnknownPropertyException( THROW_WHERE );
+        throw UnknownPropertyException( aPropertyName );
 }
 
 
@@ -438,7 +438,7 @@ FileProvider::getPropertyValue(
         return Any(m_HostName);
     }
     else
-        throw UnknownPropertyException( THROW_WHERE );
+        throw UnknownPropertyException( aPropertyName );
 }
 
 
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index e18e14212103..69acdf6fcf8a 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -380,7 +380,7 @@ public:
             [&aName](const beans::Property& rProp) { return aName == rProp.Name; });
         if (pProp != m_aSeq.end())
             return *pProp;
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aName);
     }
 
     sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override
@@ -423,7 +423,7 @@ void SAL_CALL ResultSetBase::setPropertyValue(
         aPropertyName == "RowCount" )
         return;
 
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(aPropertyName);
 }
 
 
@@ -440,7 +440,7 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
         return uno::Any(count);
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(PropertyName);
 }
 
 
@@ -466,7 +466,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
         m_pRowCountListeners->addInterface( xListener );
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 }
 
 
@@ -487,7 +487,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
         m_pRowCountListeners->removeInterface( aListener );
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 }
 
 
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 81e2e8c19655..71b62e3e1925 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1009,7 +1009,7 @@ void Content::removeProperty( const OUString& Name,
                     {
                         case UNKNOWN:
                         case DAV:
-                            throw beans::UnknownPropertyException();
+                            throw beans::UnknownPropertyException(Name);
 
                         case FTP:
                         case NON_DAV:
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index e880695656d0..dfa53473e27f 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -983,7 +983,7 @@ void Content::removeProperty( const OUString& Name,
                     {
                     case UNKNOWN:
                     case DAV:
-                        throw beans::UnknownPropertyException();
+                        throw beans::UnknownPropertyException(Name);
 
                     case NON_DAV:
                         // Try to remove property from local store.
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index f5034c2fb2cd..c64bba28212b 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -156,7 +156,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
     if ( queryProperty( aName, aProp ) )
         return aProp;
 
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(aName);
 }
 
 
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 6494bb907914..64991e0a4c7c 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -1245,9 +1245,6 @@ ResultSet::getPropertySetInfo()
 void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName,
                                            const uno::Any& )
 {
-    if ( aPropertyName.isEmpty() )
-        throw beans::UnknownPropertyException();
-
     if ( aPropertyName == "RowCount" )
     {
         // property is read-only.
@@ -1260,7 +1257,7 @@ void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName,
     }
     else
     {
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
     }
 }
 
@@ -1269,9 +1266,6 @@ void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName,
 uno::Any SAL_CALL ResultSet::getPropertyValue(
         const OUString& PropertyName )
 {
-    if ( PropertyName.isEmpty() )
-        throw beans::UnknownPropertyException();
-
     uno::Any aValue;
 
     if ( PropertyName == "RowCount" )
@@ -1284,7 +1278,7 @@ uno::Any SAL_CALL ResultSet::getPropertyValue(
     }
     else
     {
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(PropertyName);
     }
 
     return aValue;
@@ -1303,7 +1297,7 @@ void SAL_CALL ResultSet::addPropertyChangeListener(
     if ( !aPropertyName.isEmpty() &&
          aPropertyName != "RowCount" &&
          aPropertyName != "IsRowCountFinal" )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     if ( !m_pImpl->m_pPropertyChangeListeners )
         m_pImpl->m_pPropertyChangeListeners.reset(
@@ -1324,7 +1318,7 @@ void SAL_CALL ResultSet::removePropertyChangeListener(
     if ( !aPropertyName.isEmpty() &&
          aPropertyName != "RowCount" &&
          aPropertyName != "IsRowCountFinal" )
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 
     if ( m_pImpl->m_pPropertyChangeListeners )
         m_pImpl->m_pPropertyChangeListeners->removeInterface(
@@ -1515,7 +1509,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
     if ( queryProperty( aName, aProp ) )
         return aProp;
 
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(aName);
 }
 
 
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 1d587988478f..201e0433675d 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -112,7 +112,7 @@ public:
             m_pImpl->SetParentWindow(xWindow);
             return;
         }
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(rPropertyName);
     }
 
     virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& rPropertyName) override
@@ -121,7 +121,7 @@ public:
         {
             return uno::Any(m_pImpl->GetParentWindow());
         }
-        throw css::beans::UnknownPropertyException();
+        throw css::beans::UnknownPropertyException(rPropertyName);
     }
 };
 
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index fa9ac9ba6f84..911a74a4b0b9 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -374,7 +374,7 @@ public:
             [&aName](const beans::Property& rProp) { return aName == rProp.Name; });
         if (pProp != m_aSeq.end())
             return *pProp;
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aName);
     }
 
     sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override
@@ -416,7 +416,7 @@ void SAL_CALL ResultSetBase::setPropertyValue(
         aPropertyName == "RowCount" )
         return;
 
-    throw beans::UnknownPropertyException();
+    throw beans::UnknownPropertyException(aPropertyName);
 }
 
 
@@ -433,7 +433,7 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
         return uno::Any(count);
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(PropertyName);
 }
 
 
@@ -459,7 +459,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
         m_pRowCountListeners->addInterface( xListener );
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 }
 
 
@@ -480,7 +480,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
         m_pRowCountListeners->removeInterface( aListener );
     }
     else
-        throw beans::UnknownPropertyException();
+        throw beans::UnknownPropertyException(aPropertyName);
 }