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

[Libreoffice Gerrit user]

 wizards/source/access2base/Application.xba |    1 +
 wizards/source/access2base/Database.xba    |    1 +
 wizards/source/access2base/DoCmd.xba       |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit 8ff357981f29f8b9a501f46020167ff11f7bfd4c
Author:     Jean-Pierre Ledure <jp at ledure.be>
AuthorDate: Sat Aug 25 18:00:23 2018 +0200
Commit:     Jean-Pierre Ledure <jp at ledure.be>
CommitDate: Sat Aug 25 18:00:23 2018 +0200

    Access2Base - Add Location to Database object
    
    File location is known by URL property for non-registered databases
    Effective Location now available for all databases
    
    Change-Id: If1551f2644c82dbb4a4128c647810aa6a755f1ab

diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index 38491772887a..0e695e6c1891 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1329,6 +1329,7 @@ Const cstThisSub = "OpenDatabase"
 		If UCase(sDbNames(i)) = UCase(pvDatabaseURL) Then
 			sDatabaseURL = sDbNames(i)
 			Set oBaseSource = oBaseContext.getByName(sDatabaseURL)
+			odbDatabase.Location = oBaseContext.getDatabaseLocation(sDbNames(i))
 			bFound = True
 			Exit For
 		End If
diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba
index 46592218e1f2..7f1d5e726572 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -22,6 +22,7 @@ Private	Title					As String
 Private	Document				As Object				'	com.sun.star.comp.dba.ODatabaseDocument	or SwXTextDocument or ScModelObj
 Private	Connection				As Object				'	com.sun.star.sdbc.drivers.OConnectionWrapper or com.sun.star.sdbc.XConnection
 Private	URL						As String
+Private Location				As String				'	Different from URL for registered databases
 Private _ReadOnly				As Boolean
 Private	MetaData				As Object				'	interface XDatabaseMetaData
 Private _RDBMS					As Integer				'	DBMS constants
diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index 447cd7736856..588a170dc62f 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -363,6 +363,7 @@ Const cstProgressMeterLimit = 100
 										Utils._updateResultSetColumnValue(iRDBMS, oOutput.RowSet, i + 1, vField)
 									End If
 								Next i
+
 								If oOutput.RowSet.IsNew And oOutput.RowSet.IsModified Then oOutput.RowSet.insertRow()
 								oOutput._EditMode = dbEditNone
 								lInputRecs = lInputRecs + 1