[ooo-build-commit] .: patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                 |    2 ++
 patches/vba/vba-fixerror-nonvba.diff |   13 +++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit faa388053127e3dd9134e979f37eaab421fbbc86
Author: Noel Power <noel.power at novell.com>
Date:   Mon Apr 19 20:53:01 2010 +0100

    fix for n#597884, fix resolution of Err symbol in vba/non-vba mode
    
    * patches/dev300/apply:
    * patches/vba/vba-fixerror-nonvba.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7cb058e..2a8da0f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1878,6 +1878,8 @@ vba-import-xlsm.diff
 fix-containercontrols-wizardresize.diff, n#591768
 # fix strange ranges seperator regression problem
 fix-name-range-separator.diff, n#597351
+# fix resolving of Err function/object in vba/non-vba mode
+vba-fixerror-nonvba.diff, n#597884 
 [ VBAUntested ]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/vba-fixerror-nonvba.diff b/patches/vba/vba-fixerror-nonvba.diff
new file mode 100644
index 0000000..b57b186
--- /dev/null
+++ b/patches/vba/vba-fixerror-nonvba.diff
@@ -0,0 +1,13 @@
+diff --git basic/source/runtime/stdobj.cxx basic/source/runtime/stdobj.cxx
+index 4c8c807..9341037 100644
+--- basic/source/runtime/stdobj.cxx
++++ basic/source/runtime/stdobj.cxx
+@@ -773,7 +773,7 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
+ 	// #TODO #FIXME hack for substituting ooo-basic Err with vba-ish
+ 	// ErrObject object
+ 	static String sErr( RTL_CONSTASCII_USTRINGPARAM("Err") );
+-	if (  rName.EqualsIgnoreCaseAscii( sErr ) ) 
++	if (  SbiRuntime::isVBAEnabled() && rName.EqualsIgnoreCaseAscii( sErr ) ) 
+ 		return SbxErrObject::getErrObject();
+     // Bereits eingetragen?
+     SbxVariable* pVar = SbxObject::Find( rName, t );