[Libreoffice-commits] core.git: wizards/source

Jean-Pierre Ledure jp at ledure.be
Mon Oct 28 00:38:54 PDT 2013


 wizards/source/access2base/Application.xba   |    7 +++-
 wizards/source/access2base/Collect.xba       |    7 +++-
 wizards/source/access2base/Compatible.xba    |    7 +++-
 wizards/source/access2base/Control.xba       |    9 ++++-
 wizards/source/access2base/DataDef.xba       |    7 +++-
 wizards/source/access2base/Database.xba      |    9 ++++-
 wizards/source/access2base/Dialog.xba        |    7 +++-
 wizards/source/access2base/DoCmd.xba         |   22 +++++++++++---
 wizards/source/access2base/Event.xba         |    7 +++-
 wizards/source/access2base/Field.xba         |    7 +++-
 wizards/source/access2base/Form.xba          |   41 +++++++++++++++++++--------
 wizards/source/access2base/L10N.xba          |    7 +++-
 wizards/source/access2base/Methods.xba       |    7 +++-
 wizards/source/access2base/OptionGroup.xba   |    7 +++-
 wizards/source/access2base/PropertiesGet.xba |    7 +++-
 wizards/source/access2base/PropertiesSet.xba |    7 +++-
 wizards/source/access2base/Property.xba      |    7 +++-
 wizards/source/access2base/Recordset.xba     |    9 ++++-
 wizards/source/access2base/SubForm.xba       |    7 +++-
 wizards/source/access2base/Trace.xba         |    7 +++-
 wizards/source/access2base/Utils.xba         |    7 +++-
 wizards/source/access2base/_License.xba      |   10 +++---
 wizards/source/access2base/acConstants.xba   |    7 +++-
 wizards/source/access2base/dlgTrace.xdl      |   19 ++++++------
 24 files changed, 186 insertions(+), 52 deletions(-)

New commits:
commit 0bb042d4427b746b547c31c25e6594ec5c064116
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Sun Oct 27 15:05:18 2013 +0100

    Access2Base : Reference to documentation added in every module
    
    + workaround for setPosSize issue (LO 4.1)
    + "Sidebar" argument for RunCommand
    + Trace dialog layout revisit for cleaner display in Linux
    
    Change-Id: I0d5c4da5681ab1649d062a7133d507163163343e
    Reviewed-on: https://gerrit.libreoffice.org/6449
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index 680c546..3497669 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Application" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Application" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 'DATABASE
 '	Name property
diff --git a/wizards/source/access2base/Collect.xba b/wizards/source/access2base/Collect.xba
index 43cd91a..34abbfb 100644
--- a/wizards/source/access2base/Collect.xba
+++ b/wizards/source/access2base/Collect.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Collect" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Collect" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
diff --git a/wizards/source/access2base/Compatible.xba b/wizards/source/access2base/Compatible.xba
index 1e26300..f3d3ad9 100644
--- a/wizards/source/access2base/Compatible.xba
+++ b/wizards/source/access2base/Compatible.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Compatible" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Compatible" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option Explicit
 
 REM -----------------------------------------------------------------------------------------------------------------------
diff --git a/wizards/source/access2base/Control.xba b/wizards/source/access2base/Control.xba
index b922416..42ff713 100644
--- a/wizards/source/access2base/Control.xba
+++ b/wizards/source/access2base/Control.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Control" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Control" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
@@ -471,7 +476,7 @@ Dim vRowSource() As Variant, iCount As Integer, i As Integer
 	If pvIndex < -1 Or pvIndex > iCount + 1 Then Goto Error_Index
 	ReDim Preserve vRowSource(0 To iCount + 1)
 	If pvIndex = -1 Then pvIndex = iCount + 1
-	For i =iCount + 1 To pvIndex + 1 Step -1
+	For i = iCount + 1 To pvIndex + 1 Step -1
 		vRowSource(i) = vRowSource(i - 1)
 	Next i
 	vRowSource(pvIndex) = pvItem
diff --git a/wizards/source/access2base/DataDef.xba b/wizards/source/access2base/DataDef.xba
index ed8b386..2de30f8 100644
--- a/wizards/source/access2base/DataDef.xba
+++ b/wizards/source/access2base/DataDef.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="DataDef" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="DataDef" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba
index 0eab341..b09b7dd 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Database" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Database" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
@@ -22,7 +27,7 @@ Private FindRecord				As Object
 Private StatusBar				As Object
 Private Dialogs					As Object				'	Collection
 Private RecordsetMax			As Integer
-Private	RecordsetsColl			As Object				'	Collection of actice recordsets
+Private	RecordsetsColl			As Object				'	Collection of active recordsets
 
 REM -----------------------------------------------------------------------------------------------------------------------
 REM --- CONSTRUCTORS / DESTRUCTORS						        														---
diff --git a/wizards/source/access2base/Dialog.xba b/wizards/source/access2base/Dialog.xba
index befa7d1..146e060 100644
--- a/wizards/source/access2base/Dialog.xba
+++ b/wizards/source/access2base/Dialog.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Dialog" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Dialog" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index 1489d48..91abb04 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="DoCmd" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="DoCmd" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 Type _FindParams
 	FindRecord				As Integer		'	Set to 1 at first invocation of FindRecord
@@ -690,10 +695,16 @@ Dim iPosSize As Integer
 
 Dim oWindow As Object
 	Set oWindow = _SelectWindow()
-	If Not IsNull(oWindow.Frame) Then
-		oWindow.Frame.ContainerWindow.setPosSize(pvRight, pvDown, pvWidth, pvHeight, iPosSize)
-		MoveSize = True
-	End If
+	With oWindow
+		If Not IsNull(.Frame) Then
+			If Utils._hasUNOProperty(.Frame.ContainerWindow, "IsMaximized") Then	'	Ignored when <= OO3.2
+				.Frame.ContainerWindow.IsMaximized = False
+				.Frame.ContainerWindow.IsMinimized = False
+			End If
+			.Frame.ContainerWindow.setPosSize(pvRight, pvDown, pvWidth, pvHeight, iPosSize)
+			MoveSize = True
+		End If
+	End With
 	
 Exit_Function:
 	Utils._ResetCalledSub("MoveSize")
@@ -1319,6 +1330,7 @@ Dim iVBACommand As Integer, sOOCommand As String, sDispatch As String
 		Case iVBACommand = acCmdSelectAllRecords  Or UCase(sOOCommand) = "SELECTALL" : sDispatch = "SelectAll"
 		Case iVBACommand = acCmdSendToBack  Or UCase(sOOCommand) = "SENDTOBACK" : sDispatch = "SendToBack"
 		Case UCase(sOOCommand) = "SHOWFMEXPLORER" : sDispatch = "ShowFmExplorer"
+		Case UCase(sOOCommand) = "SIDEBAR" : sDispatch = "Sidebar"
 		Case iVBACommand = acCmdSortDescending  Or UCase(sOOCommand) = "SORTDOWN" : sDispatch = "SortDown"
 		Case iVBACommand = acCmdSortAscending  Or UCase(sOOCommand) = "SORTUP" : sDispatch = "Sortup"
 		Case UCase(sOOCommand) = "SPINBUTTON" : sDispatch = "SpinButton"
diff --git a/wizards/source/access2base/Event.xba b/wizards/source/access2base/Event.xba
index ec2ee24..65d38f7 100644
--- a/wizards/source/access2base/Event.xba
+++ b/wizards/source/access2base/Event.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Event" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Event" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
diff --git a/wizards/source/access2base/Field.xba b/wizards/source/access2base/Field.xba
index 78431f5..39fbfec 100644
--- a/wizards/source/access2base/Field.xba
+++ b/wizards/source/access2base/Field.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Field" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Field" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
diff --git a/wizards/source/access2base/Form.xba b/wizards/source/access2base/Form.xba
index 43581aa..da4673b 100644
--- a/wizards/source/access2base/Form.xba
+++ b/wizards/source/access2base/Form.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Form" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Form" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
@@ -119,14 +124,14 @@ Property Let Height(ByVal pvValue As Variant)
 End Property	'	Height (set)
 
 REM -----------------------------------------------------------------------------------------------------------------------
-Property Get IsLoaded() As Boolean
+Function IsLoaded() As Boolean
 'Return True if form open
 
-	If _ErrorHandler() Then On Local Error Goto Error_Property
+	If _ErrorHandler() Then On Local Error Goto Error_Function
 	Utils._SetCalledSub("Form.getIsLoaded")
 	If _IsLoaded Then			'	For performance reasons, a form object, once detected as loaded, is presumed remaining loaded
 		IsLoaded = True
-		Goto Exit_Property
+		Goto Exit_Function
 	End If
 	IsLoaded = False
 	
@@ -168,13 +173,13 @@ Dim i As Integer
 	Set oComp = Nothing
 	IsLoaded = _IsLoaded
 
-Exit_Property:
+Exit_Function:
 	Utils._ResetCalledSub("Form.getIsLoaded")
-	Exit Property
-Error_Property:
+	Exit Function
+Error_Function:
 	TraceError(TRACEABORT, Err, "Form.getIsLoaded", Erl)
-	GoTo Exit_Property
-End Property
+	GoTo Exit_Function
+End Function
 
 REM -----------------------------------------------------------------------------------------------------------------------
 Property Get Name() As String
@@ -438,7 +443,13 @@ Dim iPosSize As Integer
 	If pvTop >= 0		Then iPosSize = iPosSize + com.sun.star.awt.PosSize.Y
 	If pvWidth > 0		Then iPosSize = iPosSize + com.sun.star.awt.PosSize.WIDTH
 	If pvHeight > 0		Then iPosSize = iPosSize + com.sun.star.awt.PosSize.HEIGHT
-	If iPosSize > 0 Then ContainerWindow.setPosSize(pvLeft, pvTop, pvWidth, pvHeight, iPosSize)
+	If iPosSize > 0 Then
+		If Utils._hasUNOProperty(ContainerWindow, "IsMaximized") Then	'	Ignored when <= OO3.2
+			ContainerWindow.IsMaximized = False
+			ContainerWindow.IsMinimized = False
+		End If
+		ContainerWindow.setPosSize(pvLeft, pvTop, pvWidth, pvHeight, iPosSize)
+	End If
 	Move = True
 	
 Exit_Function:
@@ -605,7 +616,7 @@ Dim oObject As Object
 		Case UCase("Bookmark")
 			On Local Error Resume Next			'	Disable error handler because bookmarking does not always react well in events ...
 			If DatabaseForm.IsBookmarkable Then vBookmark = DatabaseForm.getBookmark() Else vBookmark = Nothing
-			On Local Error Goto Error_Function
+			If _ErrorHandler() Then On Local Error Goto Error_Function Else On Local Error Goto 0
 			If IsNull(vBookmark) Then Goto Trace_Error
 			_PropertyGet = vBookmark
 		Case UCase("Caption")
@@ -727,6 +738,10 @@ Dim oDatabase As Object
 			DatabaseForm.reload()
 		Case UCase("Height")
 			If Not Utils._CheckArgument(pvValue, iArgNr, Utils._AddNumeric(), , False) Then Goto Trace_Error_Value
+			If Utils._hasUNOProperty(ContainerWindow, "IsMaximized") Then	'	Ignored when <= OO3.2
+				ContainerWindow.IsMaximized = False
+				ContainerWindow.IsMinimized = False
+			End If
 			ContainerWindow.setPosSize(0, 0, 0, pvValue, com.sun.star.awt.PosSize.HEIGHT)
 		Case UCase("RecordSource")
 			If Not Utils._CheckArgument(pvValue, iArgNr, vbString, , False) Then Goto Trace_Error_Value
@@ -739,6 +754,10 @@ Dim oDatabase As Object
 			ContainerWindow.setVisible(pvValue)
 		Case UCase("Width")
 			If Not Utils._CheckArgument(pvValue, iArgNr, Utils._AddNumeric()) Then Goto Trace_Error_Value
+			If Utils._hasUNOProperty(ContainerWindow, "IsMaximized") Then	'	Ignored when <= OO3.2
+				ContainerWindow.IsMaximized = False
+				ContainerWindow.IsMinimized = False
+			End If
 			ContainerWindow.setPosSize(0, 0,  pvValue, 0, com.sun.star.awt.PosSize.WIDTH)
 		Case Else
 			Goto Trace_Error
diff --git a/wizards/source/access2base/L10N.xba b/wizards/source/access2base/L10N.xba
index d95a8ce..b8abab0 100644
--- a/wizards/source/access2base/L10N.xba
+++ b/wizards/source/access2base/L10N.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="L10N" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="L10N" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 REM -----------------------------------------------------------------------------------------------------------------------
 REM --- PRIVATE FUNCTIONS 								        														---
diff --git a/wizards/source/access2base/Methods.xba b/wizards/source/access2base/Methods.xba
index ac274c8..609fda0 100644
--- a/wizards/source/access2base/Methods.xba
+++ b/wizards/source/access2base/Methods.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Methods" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Methods" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 REM -----------------------------------------------------------------------------------------------------------------------
 Public Function AddItem(Optional pvBox As Variant, ByVal Optional pvItem As Variant, ByVal Optional pvIndex) As Boolean
diff --git a/wizards/source/access2base/OptionGroup.xba b/wizards/source/access2base/OptionGroup.xba
index 4a4b6ae..2276dfc 100644
--- a/wizards/source/access2base/OptionGroup.xba
+++ b/wizards/source/access2base/OptionGroup.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="OptionGroup" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="OptionGroup" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
diff --git a/wizards/source/access2base/PropertiesGet.xba b/wizards/source/access2base/PropertiesGet.xba
index 12e7ed2..eec79ba 100644
--- a/wizards/source/access2base/PropertiesGet.xba
+++ b/wizards/source/access2base/PropertiesGet.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="PropertiesGet" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="PropertiesGet" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 REM -----------------------------------------------------------------------------------------------------------------------
 Public Function getAbsolutePosition(Optional pvObject As Variant) As Boolean
diff --git a/wizards/source/access2base/PropertiesSet.xba b/wizards/source/access2base/PropertiesSet.xba
index 8f9a7b2..58a3eea 100644
--- a/wizards/source/access2base/PropertiesSet.xba
+++ b/wizards/source/access2base/PropertiesSet.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="PropertiesSet" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="PropertiesSet" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 REM -----------------------------------------------------------------------------------------------------------------------
 Public Function setAbsolutePosition(Optional pvObject As Variant, ByVal Optional pvValue As Variant) As Boolean
diff --git a/wizards/source/access2base/Property.xba b/wizards/source/access2base/Property.xba
index 7d59ef7..f7ca592 100644
--- a/wizards/source/access2base/Property.xba
+++ b/wizards/source/access2base/Property.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Property" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Property" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
diff --git a/wizards/source/access2base/Recordset.xba b/wizards/source/access2base/Recordset.xba
index ae6c4d2..b357cbf 100644
--- a/wizards/source/access2base/Recordset.xba
+++ b/wizards/source/access2base/Recordset.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Recordset" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Recordset" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
@@ -260,7 +265,7 @@ Dim vTemp As Variant
 			End If
 		Next i
 	End With
-	On Local Error Goto Error_Function
+	If _ErrorHandler() Then On Local Error Goto Error_Function Else On Local Error Goto 0
 
 	_EditMode = dbEditAdd
 	AddNew = True
diff --git a/wizards/source/access2base/SubForm.xba b/wizards/source/access2base/SubForm.xba
index dc93a98..0efe7ff 100644
--- a/wizards/source/access2base/SubForm.xba
+++ b/wizards/source/access2base/SubForm.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="SubForm" script:language="StarBasic">Option Compatible
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="SubForm" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Compatible
 Option ClassModule
 
 Option Explicit
diff --git a/wizards/source/access2base/Trace.xba b/wizards/source/access2base/Trace.xba
index 42209d7..5ceaf86 100644
--- a/wizards/source/access2base/Trace.xba
+++ b/wizards/source/access2base/Trace.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Trace" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Trace" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 Public Const cstLogMaxEntries = 20
 
diff --git a/wizards/source/access2base/Utils.xba b/wizards/source/access2base/Utils.xba
index f136c57..93e7ad9 100644
--- a/wizards/source/access2base/Utils.xba
+++ b/wizards/source/access2base/Utils.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Utils" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Utils" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 Global _A2B_			As Variant
 
diff --git a/wizards/source/access2base/_License.xba b/wizards/source/access2base/_License.xba
index 8bcce9e..4fc58ca 100644
--- a/wizards/source/access2base/_License.xba
+++ b/wizards/source/access2base/_License.xba
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
 <script:module xmlns:script="http://openoffice.org/2000/script" script:name="_License" script:language="StarBasic">'      Copyright 2012-2013 Jean-Pierre LEDURE
-'      
-'	The files in this directory are part of Access2Base, a part of the LibreOffice project.
-'	Documentation is available on http://www.access2base.com
-'
+
+REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
 '	Access2Base is distributed in the hope that it will be useful,
 '	but WITHOUT ANY WARRANTY; without even the implied warranty of 
 '	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/wizards/source/access2base/acConstants.xba b/wizards/source/access2base/acConstants.xba
index 5ebcbd2..7f5700c 100644
--- a/wizards/source/access2base/acConstants.xba
+++ b/wizards/source/access2base/acConstants.xba
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="acConstants" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="acConstants" script:language="StarBasic">REM =======================================================================================================================
+REM ===					The Access2Base library is a part of the LibreOffice project.									===
+REM ===					Full documentation is available on http://www.access2base.com									===
+REM =======================================================================================================================
+
+Option Explicit
 
 REM Access2Base -----------------------------------------------------
 Global Const Access2Base_Version = "1.0.0"
diff --git a/wizards/source/access2base/dlgTrace.xdl b/wizards/source/access2base/dlgTrace.xdl
index b60558d..7492450 100644
--- a/wizards/source/access2base/dlgTrace.xdl
+++ b/wizards/source/access2base/dlgTrace.xdl
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="dlgTrace" dlg:left="105" dlg:top="63" dlg:width="364" dlg:height="154" dlg:help-text="Manage the console file and its entries" dlg:closeable="true" dlg:moveable="true" dlg:title="Console">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="dlgTrace" dlg:left="95" dlg:top="63" dlg:width="375" dlg:height="154" dlg:help-text="Manage the console file and its entries" dlg:closeable="true" dlg:moveable="true" dlg:title="Console">
  <dlg:styles>
   <dlg:style dlg:style-id="0" dlg:font-name="Courier New" dlg:font-stylename="Regular" dlg:font-family="modern"/>
-  <dlg:style dlg:style-id="1" dlg:background-color="0xe6e6e6" dlg:border="none"/>
+  <dlg:style dlg:style-id="1" dlg:look="simple"/>
+  <dlg:style dlg:style-id="2" dlg:background-color="0xe6e6e6" dlg:border="none"/>
  </dlg:styles>
  <dlg:bulletinboard>
-  <dlg:text dlg:id="lblEntries" dlg:tab-index="3" dlg:left="232" dlg:top="130" dlg:width="101" dlg:height="9" dlg:help-text="Clear the list and resize the circular buffer" dlg:value="Set max number of entries" dlg:align="right"/>
-  <dlg:numericfield dlg:id="numEntries" dlg:tab-index="4" dlg:left="339" dlg:top="125" dlg:width="22" dlg:height="16" dlg:help-text="Clear the list and resize the circular buffer" dlg:decimal-accuracy="0" dlg:value="20" dlg:value-min="5" dlg:value-max="200" dlg:spin="true"/>
+  <dlg:text dlg:id="lblEntries" dlg:tab-index="3" dlg:left="243" dlg:top="134" dlg:width="101" dlg:height="9" dlg:help-text="Clear the list and resize the circular buffer" dlg:value="Set max number of entries" dlg:align="right"/>
+  <dlg:numericfield dlg:id="numEntries" dlg:tab-index="4" dlg:left="349" dlg:top="129" dlg:width="22" dlg:height="16" dlg:help-text="Clear the list and resize the circular buffer" dlg:decimal-accuracy="0" dlg:value="20" dlg:value-min="5" dlg:value-max="200" dlg:spin="true"/>
   <dlg:textfield dlg:style-id="0" dlg:id="txtTraceLog" dlg:tab-index="0" dlg:left="4" dlg:top="20" dlg:width="305" dlg:height="105" dlg:help-text="Text can be selected, copied, ..." dlg:hscroll="true" dlg:vscroll="true" dlg:multiline="true" dlg:readonly="true" dlg:value="--- Log file is empty ---"/>
-  <dlg:checkbox dlg:id="chkClear" dlg:tab-index="5" dlg:left="53" dlg:top="131" dlg:width="6" dlg:height="9" dlg:help-text="Clear the list" dlg:value="Clear" dlg:checked="false"/>
+  <dlg:checkbox dlg:style-id="1" dlg:id="chkClear" dlg:tab-index="5" dlg:left="54" dlg:top="133" dlg:width="6" dlg:height="9" dlg:help-text="Clear the list" dlg:value="Clear" dlg:checked="false"/>
   <dlg:button dlg:id="cmdCancel" dlg:tab-index="6" dlg:left="323" dlg:top="38" dlg:width="35" dlg:height="12" dlg:help-text="Cancel and close the dialog" dlg:value="Cancel" dlg:button-type="cancel"/>
-  <dlg:text dlg:id="lblClear" dlg:tab-index="7" dlg:left="4" dlg:top="129" dlg:width="46" dlg:height="9" dlg:help-text="Clear the list" dlg:value="Clear the list" dlg:align="right"/>
-  <dlg:text dlg:id="lblMinLevel" dlg:tab-index="8" dlg:left="64" dlg:top="129" dlg:width="107" dlg:height="9" dlg:help-text="Register only logging requests above given level" dlg:value="Set minimal trace level" dlg:align="right"/>
-  <dlg:combobox dlg:id="cboMinLevel" dlg:tab-index="9" dlg:left="176" dlg:top="129" dlg:width="50" dlg:height="9" dlg:help-text="Register only logging requests above given level" dlg:spin="true">
+  <dlg:text dlg:id="lblClear" dlg:tab-index="7" dlg:left="4" dlg:top="133" dlg:width="46" dlg:height="9" dlg:help-text="Clear the list" dlg:value="Clear the list" dlg:align="right"/>
+  <dlg:text dlg:id="lblMinLevel" dlg:tab-index="8" dlg:left="75" dlg:top="133" dlg:width="107" dlg:height="9" dlg:help-text="Register only logging requests above given level" dlg:value="Set minimal trace level" dlg:align="right"/>
+  <dlg:combobox dlg:id="cboMinLevel" dlg:tab-index="9" dlg:left="186" dlg:top="133" dlg:width="50" dlg:height="9" dlg:help-text="Register only logging requests above given level" dlg:spin="true">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="DEBUG"/>
     <dlg:menuitem dlg:value="INFO"/>
@@ -27,6 +28,6 @@
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Access2Base.Trace._DumpToFile?language=Basic&location=application" script:language="Script"/>
   </dlg:button>
   <dlg:text dlg:id="lblNbEntries" dlg:tab-index="10" dlg:left="4" dlg:top="10" dlg:width="105" dlg:height="7" dlg:help-text="Actual size of list" dlg:value="Actual number of entries:"/>
-  <dlg:numericfield dlg:style-id="1" dlg:id="numNbEntries" dlg:tab-index="11" dlg:left="110" dlg:top="8" dlg:width="17" dlg:height="9" dlg:help-text="Actual size of list" dlg:readonly="true" dlg:decimal-accuracy="0" dlg:value="0"/>
+  <dlg:numericfield dlg:style-id="2" dlg:id="numNbEntries" dlg:tab-index="11" dlg:left="109" dlg:top="9" dlg:width="17" dlg:height="9" dlg:help-text="Actual size of list" dlg:readonly="true" dlg:decimal-accuracy="0" dlg:value="0"/>
  </dlg:bulletinboard>
 </dlg:window>
\ No newline at end of file


More information about the Libreoffice-commits mailing list