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

[Jean-Pierre Ledure]

 wizards/source/access2base/Application.xba |    2 +-
 wizards/source/access2base/Database.xba    |   24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit a7e469a286d73440479393f33c05797621d553e8
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Fri Nov 11 13:30:37 2016 +0100

    Access2Base - New properties in Database class
    
    Name, Connect and Version
    
    Change-Id: Ief0da378fd8927df7accdfc0157547670ca203de

diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index ec3f729..19a8720 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1046,7 +1046,7 @@ Const cstThisSub = "OpenConnection"
 				.URL = vDocContainer.URL
 				ReDim vDbContainers(0 To 0)
 				Set vDbContainers(0) = vDbContainer
-				TraceLog(TRACEANY, .MetaData.getDatabaseProductName() & " " & .MetaData.getDatabaseProductVersion, False)
+				TraceLog(TRACEANY, .Version, False)
 				TraceLog(TRACEANY, UCase(cstThisSub) & " " & .URL, False)
 			End With
 		Case Else
diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba
index a68c64e..1f44cf7 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -88,11 +88,26 @@ REM ----------------------------------------------------------------------------
 REM --- CLASS GET/LET/SET PROPERTIES					        														---
 REM -----------------------------------------------------------------------------------------------------------------------
 
+Property Get Connect() As String
+	Connect = _PropertyGet("Connect")
+End Property		'	Connect (get)
+
+REM -----------------------------------------------------------------------------------------------------------------------
+Property Get Name() As String
+	Name = _PropertyGet("Name")
+End Property		'	Name (get)
+
+REM -----------------------------------------------------------------------------------------------------------------------
 Property Get ObjectType() As String
 	ObjectType = _PropertyGet("ObjectType")
 End Property		'	ObjectType (get)
 
 REM -----------------------------------------------------------------------------------------------------------------------
+Property Get Version() As String
+	Version = _PropertyGet("Version")
+End Property		'	Version (get)
+
+REM -----------------------------------------------------------------------------------------------------------------------
 REM --- CLASS METHODS	 								        														---
 REM -----------------------------------------------------------------------------------------------------------------------
 
@@ -1580,7 +1595,7 @@ End Function	'	_OutputToHTML	V1.4.0
 REM -----------------------------------------------------------------------------------------------------------------------
 Private Function _PropertiesList() As Variant
 
-	_PropertiesList = Array("ObjectType")
+	_PropertiesList = Array("Connect", "Name", "ObjectType", "Version")
 
 End Function	'	_PropertiesList
 
@@ -1594,8 +1609,15 @@ Dim vEMPTY As Variant
 	_PropertyGet = vEMPTY
 	
 	Select Case UCase(psProperty)
+		Case UCase("Connect")
+			_PropertyGet = Document.Datasource.URL
+		'	Location = ConvertFromUrl(URL)
+		Case UCase("Name")
+			_PropertyGet = Title
 		Case UCase("ObjectType")
 			_PropertyGet = _Type
+		Case UCase("Version")
+			_PropertyGet = MetaData.getDatabaseProductName() & " " & MetaData.getDatabaseProductVersion
 		Case Else
 			Goto Trace_Error
 	End Select