[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sc/source sfx2/source

[Libreoffice Gerrit user]

 sc/source/ui/unoobj/docuno.cxx |   11 +++--------
 sfx2/source/doc/objxtor.cxx    |    2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 7fb8aa0256ca18a62d7b87af10248bba3e31829e
Author: Noel Power <noel.power at 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
    
    Conflicts:
    
    	sfx2/source/doc/objxtor.cxx
    
    Change-Id: I1697c005374b3d26dc63c78702a46c6d9879adaa
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index d4e8b56..6d27be4 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -143,7 +143,7 @@ static VBAConstantNameMap s_aRegisteredVBAConstants;
     if( xProps.is() ) try
     {
         ::rtl::OUString aConstName;
-        xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobalConstantName" ) ) ) >>= aConstName;
+        xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(  "ThisVBADocObj"  ) ) ) >>= aConstName;
         return ::rtl::OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US );
     }
     catch( uno::Exception& ) // not supported
commit e59df5556371fd72d349dff8cb3fa174eaf91421
Author: Noel Power <noel.power at 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 <pmladek at suse.cz>

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 125f4a9..60e58c7 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 ) )
         {