diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2013-10-27 15:05:18 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-10-28 07:38:33 +0000 |
| commit | 0bb042d4427b746b547c31c25e6594ec5c064116 (patch) | |
| tree | 97d05f5711b3f1c94c63386f1db55cfa5ac3e9ee /wizards/source/access2base/Form.xba | |
| parent | 71882916f617528a6d6fcc54450674dc3f630319 (diff) | |
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@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'wizards/source/access2base/Form.xba')
| -rw-r--r-- | wizards/source/access2base/Form.xba | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/wizards/source/access2base/Form.xba b/wizards/source/access2base/Form.xba index 43581aa84555..da4673b0e4b3 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 |