ooo-build r15370 - in trunk: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Feb 18 18:01:32 2009
New Revision: 15370
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15370&view=rev

Log:
2009-02-17  Noel Power <noel power novell com>

        * patches/vba/vba-word-support.diff: fix memory sucking userforms
        * patches/vba/vba-word-support-m0.diff: 



Modified:
   trunk/ChangeLog
   trunk/patches/vba/vba-word-support-m0.diff
   trunk/patches/vba/vba-word-support.diff

Modified: trunk/patches/vba/vba-word-support-m0.diff
==============================================================================
--- trunk/patches/vba/vba-word-support-m0.diff	(original)
+++ trunk/patches/vba/vba-word-support-m0.diff	Wed Feb 18 18:01:32 2009
@@ -31306,3 +31306,18 @@
 +	local:
 +		*;
 +};
+diff --git basic/source/uno/namecont.cxx basic/source/uno/namecont.cxx
+index 1719de0..e5db980 100644
+--- basic/source/uno/namecont.cxx
++++ basic/source/uno/namecont.cxx
+@@ -2731,6 +2731,10 @@ OUString SfxLibraryContainer::expand_url( const OUString& url )
+ 	{
+ 		// get the standard library
+ 		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++
++                if ( pBasMgr->GetName().Len() )
++                    aLibName = pBasMgr->GetName();
++
+ 		StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
+ 		if( pBasic )
+ 			bVBACompat = pBasic->isVBAEnabled();

Modified: trunk/patches/vba/vba-word-support.diff
==============================================================================
--- trunk/patches/vba/vba-word-support.diff	(original)
+++ trunk/patches/vba/vba-word-support.diff	Wed Feb 18 18:01:32 2009
@@ -31303,3 +31303,18 @@
 +	local:
 +		*;
 +};
+diff --git basic/source/uno/namecont.cxx basic/source/uno/namecont.cxx
+index 1719de0..e5db980 100644
+--- basic/source/uno/namecont.cxx
++++ basic/source/uno/namecont.cxx
+@@ -2731,6 +2731,10 @@ OUString SfxLibraryContainer::expand_url( const OUString& url )
+ 	{
+ 		// get the standard library
+ 		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++
++                if ( pBasMgr->GetName().Len() )
++                    aLibName = pBasMgr->GetName();
++
+ 		StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
+ 		if( pBasic )
+ 			bVBACompat = pBasic->isVBAEnabled();