sc/source/ui/unoobj/docuno.cxx | 11 +++--------
sfx2/source/doc/objxtor.cxx | 2 +-
2 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit a27e830309aa292833dfd9d3ffb08932df855341
Author: Noel Power <noel.po...@suse.com>
Date: Tue Sep 11 11:59:45 2012 +0100
missing part of fix for fdo#54721
commit id cea414bfe8fe356793778bdf09f5ca3b3a42daa0 for
"fix vba not tracking currently selected doc correctly" was missing
necessary
change in sfx2
Change-Id: I1697c005374b3d26dc63c78702a46c6d9879adaa
Signed-off-by: Petr Mladek <pmla...@suse.cz>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 3d09010..248480c 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -144,7 +144,7 @@ static VBAConstantNameMap s_aRegisteredVBAConstants;
if( xProps.is() ) try
{
::rtl::OUString aConstName;
- xProps->getPropertyValue( ::rtl::OUString( "VBAGlobalConstantName" )
) >>= aConstName;
+ xProps->getPropertyValue( ::rtl::OUString( "ThisVBADocObj" ) ) >>=
aConstName;
return ::rtl::OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US
);
}
catch (const uno::Exception&) // not supported
commit 79122fdf3a21782b9156868f94582ef99405815a
Author: Noel Power <noel.po...@suse.com>
Date: Sun Sep 9 11:50:41 2012 +0100
fdo#54721 fix vba not tracking currently selected doc correctly
Change-Id: I43b17dfc621d0aba76cdd33ebf97c457fa1da912
Signed-off-by: Petr Mladek <pmla...@suse.cz>
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index c43047c..7f8d707 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},
@@ -1834,15 +1834,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 ) )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
