[Libreoffice-commits] .: Branch 'libreoffice-3-3-2' - patches/vba

[Petr Mladek]

 patches/vba/vba-container-controls.diff |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 893b6751feac5ecd53eb147ca90eabb8372e7883
Author: Noel Power <nopower at novell.com>
Date:   Tue Mar 15 16:02:56 2011 +0100

    fix non-working VBA container controls
    
    They use the imported VBA projectname as the library name for imported macros.
    Without this change the event handling code doesn't find the event handlers.
    
    Signed-off-by: Petr Mladek <pmmladek at suse.cz>

diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index 928f06e..1e0746f 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -1161,6 +1161,17 @@ index 5e6e0ff..add8f8e 100755
          member. Do not create the Basic library, if there are no modules
          specified. */
      if( !aModules.empty() ) try
+@@ -374,7 +374,9 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
+         // set library container to VBA compatibility mode
+         try
+         {
+-            Reference< XVBACompatibility >( getLibraryContainer( PROP_BasicLibraries ), UNO_QUERY_THROW )->setVBACompatibilityMode( sal_True );
++            Reference< XVBACompatibility > xVBACompat( getLibraryContainer( PROP_BasicLibraries ), UNO_QUERY_THROW );
++            xVBACompat->setVBACompatibilityMode( sal_True );
++            xVBACompat->setProjectName( maPrjName );
+         }
+         catch( Exception& )
+         {
 diff --git oox/source/token/properties.txt oox/source/token/properties.txt
 index 2a7960a..cb18e82 100644
 --- oox/source/token/properties.txt