[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - wizards/source

[Jean-Pierre Ledure]

 wizards/source/access2base/DoCmd.xba |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit f44099ee12b3caf3dbf977132b266f8230597141
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Fri Dec 6 17:29:51 2013 +0100

    Access2Base correct behaviour of SelectObject on Linux
    
    ( toFront on top of setFocus )
    
    Change-Id: If8184af5f879e2391136f4a265439f0207f6af27
    Reviewed-on: https://gerrit.libreoffice.org/6986
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index 91abb04..4f72c12 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -1434,8 +1434,11 @@ Public Function SelectObject(	Optional pvObjectType As Variant _
 Dim oWindow As Object
 	Set oWindow = _SelectWindow(pvObjectType, pvObjectName)
 	If IsNull(oWindow.Frame) Then Goto Error_NotFound
-	oWindow.Frame.ContainerWindow.setFocus()
-	oWindow.Frame.ContainerWindow.setEnable(True)		'	Added to try to bypass desynchro issue in Linux
+	With oWindow.Frame.ContainerWindow
+		.setFocus()
+		.setEnable(True)		'	Added to try to bypass desynchro issue in Linux
+		.toFront()				'	Added to force window change in Linux
+	End With
 
 Exit_Function:
 	Utils._ResetCalledSub("SelectObject")
@@ -1767,6 +1770,7 @@ Dim oWindow As _Window
 	If _ErrorHandler() Then On Local Error Goto Error_Function
 
 	bActive = IsMissing(piWindowType)
+	If IsMissing(psWindow) Then psWindow = ""
 	Set oWindow.Frame = Nothing
 	If bActive Then
 		oWindow.WindowType = -1
@@ -1881,7 +1885,7 @@ Exit_Function:
 Error_Function:
 	TraceError(TRACEABORT, Err, "SelectWindow", Erl)
 	GoTo Exit_Function
-End Function		'	_SelectWindow	V0.9.0
+End Function		'	_SelectWindow	V1.0.0
 
 REM -----------------------------------------------------------------------------------------------------------------------
 Private Function _SendWithAttachment( _