diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-29 15:26:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-29 15:26:37 +0000 |
| commit | f851cc84497986e5af50a102e504270d5f2fbd70 (patch) | |
| tree | 3070653a41da8947d92b6d802c526978701700db /sc/source/ui/unoobj/funcuno.cxx | |
| parent | 179cb343c8534c04b4d53b01290cb93395893133 (diff) | |
| parent | 211dce571775ee68aa32a74a92645fc6caf148fb (diff) | |
ab71: merge with DEV300_m54
Diffstat (limited to 'sc/source/ui/unoobj/funcuno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/funcuno.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 8e56ceedf616..1d9f3a1d9213 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -51,7 +51,7 @@ #include "cell.hxx" #include "docoptio.hxx" #include "optuno.hxx" - +#include <docuno.hxx> // for lcl_CopyData: #include "markdata.hxx" #include "patattr.hxx" @@ -201,6 +201,7 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, ScFunctionAccess::ScFunctionAccess() : pOptions( NULL ), + aPropertyMap( ScDocOptionsHelper::GetPropertyMap() ), bInvalid( FALSE ) { StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING @@ -278,7 +279,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySe { ScUnoGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( - new SfxItemPropertySetInfo( ScDocOptionsHelper::GetPropertyMap() )); + new SfxItemPropertySetInfo( &aPropertyMap )); return aRef; } @@ -295,7 +296,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue( // options aren't initialized from configuration - always get the same default behaviour - BOOL bDone = ScDocOptionsHelper::setPropertyValue( *pOptions, aPropertyName, aValue ); + BOOL bDone = ScDocOptionsHelper::setPropertyValue( *pOptions, aPropertyMap, aPropertyName, aValue ); if (!bDone) throw beans::UnknownPropertyException(); } @@ -311,7 +312,7 @@ uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const rtl::OUString& aProp // options aren't initialized from configuration - always get the same default behaviour - return ScDocOptionsHelper::getPropertyValue( *pOptions, aPropertyName ); + return ScDocOptionsHelper::getPropertyValue( *pOptions, aPropertyMap, aPropertyName ); } SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess ) |