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

[noelpwer svn gnome org]

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

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

        * patches/vba/vba-word-support.diff: fix bad hand edit of patch
        * 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 11:19:11 2009
@@ -29766,7 +29766,7 @@
 index 0000000..4e3ce8e
 --- /dev/null
 +++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -0,0 +1,1168 @@
+@@ -0,0 +1,1170 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30676,10 +30676,12 @@
 +	// called at this stage tdoc content handler stuff is not set up
 +	// so it fails
 +
-+    const static String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
++       String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
 +	BasicManager* pBasicMgr = pShell-> GetBasicManager();
 +	if ( pBasicMgr )
 +	{
++		if ( pBasicMgr->GetName().Len() )
++			sLibrary =  pBasicMgr->GetName();
 +		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
 +		if ( !pBasic )
 +		{
@@ -31293,21 +31295,3 @@
 +	local:
 +		*;
 +};
-diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
-index 4e3ce8e..9d66ee0 100644
---- vbahelper/source/vbahelper/vbahelper.cxx
-+++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -907,10 +907,12 @@ String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String&
- 	// called at this stage tdoc content handler stuff is not set up
- 	// so it fails
- 
--    const static String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
-+        String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
- 	BasicManager* pBasicMgr = pShell-> GetBasicManager();
- 	if ( pBasicMgr )
- 	{
-+		if ( pBasicMgr->GetName().Len() )
-+			sLibrary =  pBasicMgr->GetName();
- 		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
- 		if ( !pBasic )
- 		{

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 11:19:11 2009
@@ -29764,7 +29764,7 @@
 index 0000000..4e3ce8e
 --- /dev/null
 +++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -0,0 +1,1168 @@
+@@ -0,0 +1,1170 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30674,10 +30674,12 @@
 +	// called at this stage tdoc content handler stuff is not set up
 +	// so it fails
 +
-+    const static String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
++       String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
 +	BasicManager* pBasicMgr = pShell-> GetBasicManager();
 +	if ( pBasicMgr )
 +	{
++		if ( pBasicMgr->GetName().Len() )
++			sLibrary =  pBasicMgr->GetName();
 +		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
 +		if ( !pBasic )
 +		{