diff options
| author | Noel Power <noel.power@suse.com> | 2012-09-09 11:50:41 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-09-11 18:43:06 +0200 |
| commit | e59df5556371fd72d349dff8cb3fa174eaf91421 (patch) | |
| tree | 8485ce2933bee5d97d7784c06d2f4ba8279cc009 | |
| parent | a396652955a40f7e5f344c60a8f69e3bc52c747b (diff) | |
fdo#54721 fix vba not tracking currently selected doc correctly
Change-Id: I43b17dfc621d0aba76cdd33ebf97c457fa1da912
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 125f4a9725e2..60e58c75930f 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -119,7 +119,7 @@ const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(SC_UNO_VBADOCOBJ), 0, &getCppuType((beans::PropertyValue*)0), beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(SC_UNO_VBADOCOBJ), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, @@ -1840,15 +1840,10 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa } else if ( aString.EqualsAscii( SC_UNO_VBADOCOBJ ) ) { - // PropertyValue seems extreme because we store - // the model ( as the value member ) of the PropertyValue that is - // itself a property of the model ( the intention however is to + // Note: the intention really here is to // store something like a Workbook object... but we don't do that ) // yet - beans::PropertyValue aProp; - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc") ); - aProp.Value <<= pDocShell->GetModel(); - aRet <<= aProp; + aRet = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc") ) ); } else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) ) { |