[ooo-build-commit] 3 commits - patches/vba
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 11 07:46:58 PDT 2009
patches/vba/ObjectModule.diff | 26 +++++++++++++-------------
patches/vba/vba-error-object.diff | 12 ++++++------
patches/vba/vba-userform.diff | 6 ++----
3 files changed, 21 insertions(+), 23 deletions(-)
New commits:
commit fcda9971ea5d603fcd9e4a11ff06fec34da2700a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 17:45:32 2009 +0300
Upstream has translated some comments to English
* patches/vba/vba-userform.diff: Adapt for dev300-m54.
diff --git a/patches/vba/vba-userform.diff b/patches/vba/vba-userform.diff
index 1ee7468..5b4763e 100644
--- a/patches/vba/vba-userform.diff
+++ b/patches/vba/vba-userform.diff
@@ -65,8 +65,6 @@ index cb581c1..96cbe9b 100644
#ifndef __SB_SBOBJMODULEREF_HXX
#define __SB_SBOBJMODULEREF_HXX
-diff --git basic/source/classes/sb.cxx basic/source/classes/sb.cxx
-index 5226d3f..e47234f 100644
--- basic/source/classes/sb.cxx
+++ basic/source/classes/sb.cxx
@@ -715,6 +715,9 @@ SbModule* StarBASIC::MakeModule32( const
@@ -88,8 +86,8 @@ index 5226d3f..e47234f 100644
- continue;
+ if ( nType == com::sun::star::script::ModuleType::Document || nType == com::sun::star::script::ModuleType::Form )
+ continue;
- // Sonst testen, ob das Element vorhanden ist
- // GBLSEARCH-Flag rausnehmen (wg. Rekursion)
+ // otherwise check if the element is available
+ // unset GBLSEARCH-Flag (due to Rekursion)
USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx
index 8ea4b64..d3dd8d5 100644
commit 3a451d3b156b014ea06469a8f507c746ee9055d0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 17:42:47 2009 +0300
Upstream has translated some comments to English
* patches/vba/ObjectModule.diff: Adapt for dev300-m54.
diff --git a/patches/vba/ObjectModule.diff b/patches/vba/ObjectModule.diff
index 4cb9e95..e1d3b7f 100644
--- a/patches/vba/ObjectModule.diff
+++ b/patches/vba/ObjectModule.diff
@@ -370,23 +370,23 @@
+#endif
+#endif
+
---- basic/inc/basic/sbstar.hxx.old 2009-04-02 10:49:18.000000000 +0000
-+++ basic/inc/basic/sbstar.hxx 2009-04-06 16:41:59.000000000 +0000
+--- basic/inc/basic/sbstar.hxx
++++ basic/inc/basic/sbstar.hxx
@@ -40,6 +40,7 @@
#include <basic/sbdef.hxx>
#include <basic/sberrors.hxx>
+#include <com/sun/star/script/ModuleInfo.hpp>
- class SbModule; // fertiges Modul
- class SbiInstance; // Laufzeit-Instanz
+ class SbModule; // completed module
+ class SbiInstance; // runtime instance
@@ -71,6 +72,7 @@ class StarBASIC : public SbxObject
- BOOL bNoRtl; // TRUE: RTL nicht durchsuchen
- BOOL bBreak; // TRUE: Break, sonst Step
+ BOOL bNoRtl; // if TRUE: do not search RTL
+ BOOL bBreak; // if TRUE: Break, otherwise Step
BOOL bDocBasic;
+ BOOL bVBAEnabled;
- BasicLibInfo* pLibInfo; // Infoblock fuer Basic-Manager
- SbLanguageMode eLanguageMode; // LanguageMode des Basic-Objekts
+ BasicLibInfo* pLibInfo; // Info block for basic manager
+ SbLanguageMode eLanguageMode; // LanguageMode of the basic object
protected:
@@ -113,7 +115,8 @@ public:
@@ -405,7 +405,7 @@
+ void SetVBAEnabled( BOOL bEnabled );
+ BOOL isVBAEnabled();
- // #60175 TRUE: SFX-Resource wird bei Basic-Fehlern nicht angezogen
+ // #60175 TRUE: SFX-Resource is not displayed on basic errors
static void StaticSuppressSfxResource( BOOL bSuppress );
--- basic/source/basmgr/basmgr.cxx.old 2009-04-06 16:41:59.000000000 +0000
+++ basic/source/basmgr/basmgr.cxx 2009-04-06 16:41:59.000000000 +0000
@@ -516,8 +516,8 @@
pLib->SetModified( FALSE );
}
---- basic/source/classes/sb.cxx.old 2009-04-06 16:41:59.000000000 +0000
-+++ basic/source/classes/sb.cxx 2009-04-06 16:41:59.000000000 +0000
+--- basic/source/classes/sb.cxx
++++ basic/source/classes/sb.cxx
@@ -52,12 +52,17 @@
#include "disas.hxx"
#include "runtime.hxx"
@@ -613,8 +613,8 @@
+ //if ( nType == com::sun::star::script::ModuleType::Class || nType == com::sun::star::script::ModuleType::Document )
+ if ( nType == com::sun::star::script::ModuleType::Document )
+ continue;
- // Sonst testen, ob das Element vorhanden ist
- // GBLSEARCH-Flag rausnehmen (wg. Rekursion)
+ // otherwise check if the element is available
+ // unset GBLSEARCH-Flag (due to Rekursion)
USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
--- basic/source/classes/sbxmod.cxx.old 2009-04-06 16:41:59.000000000 +0000
+++ basic/source/classes/sbxmod.cxx 2009-04-06 16:41:59.000000000 +0000
commit 8309432f71d7f85301fa211c52165a28be30c10a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 17:37:10 2009 +0300
Upstream has translated some comments to English
* patches/vba/vba-error-object.diff: Adapt for dev300-m54.
diff --git a/patches/vba/vba-error-object.diff b/patches/vba/vba-error-object.diff
index 6ddfcc9..1d3af07 100644
--- a/patches/vba/vba-error-object.diff
+++ b/patches/vba/vba-error-object.diff
@@ -307,14 +307,14 @@
}
void SbiRuntime::FatalError( SbError n )
---- basic/source/classes/sb.cxx.old 2009-04-02 10:49:17.000000000 +0000
-+++ basic/source/classes/sb.cxx 2009-04-06 16:41:58.000000000 +0000
+--- basic/source/classes/sb.cxx
++++ basic/source/classes/sb.cxx
@@ -199,6 +199,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB
{ 1004, SbERR_METHOD_FAILED },
{ 1005, SbERR_SETPROP_FAILED },
{ 1006, SbERR_GETPROP_FAILED },
+ { 1007, SbERR_BASIC_COMPAT },
- { 0xFFFF, 0xFFFFFFFFL } // End-Marke
+ { 0xFFFF, 0xFFFFFFFFL } // End mark
};
--- basic/source/classes/sb.src.old 2009-04-02 10:49:17.000000000 +0000
@@ -332,15 +332,15 @@
};
// Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
String IDS_SBERR_TERMINATED
---- basic/inc/basic/sberrors.hxx.old 2009-04-02 10:49:18.000000000 +0000
-+++ basic/inc/basic/sberrors.hxx 2009-04-06 16:41:58.000000000 +0000
+--- basic/inc/basic/sberrors.hxx
++++ basic/inc/basic/sberrors.hxx
@@ -290,6 +290,8 @@ typedef ULONG SbError;
#define ERRCODE_BASIC_LOOP_NOT_INIT ((LAST_SBX_ERROR_ID+109UL) | ERRCODE_AREA_SBX | \
ERRCODE_CLASS_COMPILER) // For loop not initialized
+#define ERRCODE_BASIC_COMPAT ((LAST_SBX_ERROR_ID+103UL)| ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME)
+
- // Alte Codes auf neue mappen
+ // Map old codes to new codes
#define SbERR_SYNTAX ERRCODE_BASIC_SYNTAX
#define SbERR_NO_GOSUB ERRCODE_BASIC_NO_GOSUB
@@ -413,6 +415,7 @@ typedef ULONG SbError;
More information about the ooo-build-commit
mailing list