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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/Application.xba |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit a2a627a6d4e420d83d2aff533d6ef3b73ec74710
Author:     Jean-Pierre Ledure <j...@ledure.be>
AuthorDate: Wed Oct 9 12:55:09 2019 +0200
Commit:     Jean-Pierre Ledure <j...@ledure.be>
CommitDate: Wed Oct 9 12:55:09 2019 +0200

    Access2Base - Support dialogs owned by non-Base docs
    
    So far, AllDialogs found only dialogs stored in
    Base (.odb) documents.
    From now on, dialogs in ThisComponent atr considered as well.
    
    Change-Id: I4977b09140c673ad7aca379c1a67a2d731384782

diff --git a/wizards/source/access2base/Application.xba 
b/wizards/source/access2base/Application.xba
index f821cf270519..3bc2837aac2a 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -217,15 +217,20 @@ Const cstSepar = &quot;!&quot;
 
        Set vAllDialogs = Nothing
 
-       Set vCurrentDocument = _A2B_.CurrentDocument
+       Set vCurrentDocument = Nothing
+       If Not IsNull(_A2B_.CurrentDocument) Then
+               Set vCurrentDocument = _A2B_.CurrentDocument.Document
+       ElseIf Not IsNull(ThisComponent) Then
+               Set vCurrentDocument = ThisComponent
+       End If
        If IsNull(vCurrentDocument) Then
                Set oDocLibraries = Nothing
                vDocLibraries = Array()
        Else
-               Set oDocLibraries = 
_A2B_.CurrentDocument.Document.DialogLibraries      &apos;  
ThisComponent.DialogLibraries
+               Set oDocLibraries = vCurrentDocument.DialogLibraries
                vDocLibraries = oDocLibraries.getElementNames()
        End If
-       Set oMacLibraries = DialogLibraries
+       Set oMacLibraries = GlobalScope.DialogLibraries
        vMacLibraries = oMacLibraries.getElementNames()
        &apos;Remove Access2Base from the list
        If _A2B_.ExcludeA2B Then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits