[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - wizards/source
wizards/source/access2base/Control.xba |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit f1d572d1518fcfc83c0302c2a06f7de8bf224b5e Author: Jean-Pierre Ledure j...@ledure.be Date: Sun Feb 1 15:19:08 2015 +0100 Access2Base - Patch#2 Bug in Control.RemoveItem Removing last item of a Listbox produces an Index out of range run-time error Bug reported in user forum https://forum.openoffice.org/en/forum/viewtopic.php?f=47t=75008 Change-Id: I713e7b6c29286c3774652a9a06c9392fdbe858fd Reviewed-on: https://gerrit.libreoffice.org/14271 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/wizards/source/access2base/Control.xba b/wizards/source/access2base/Control.xba index 7e15a1d..0575732 100644 --- a/wizards/source/access2base/Control.xba +++ b/wizards/source/access2base/Control.xba @@ -682,21 +682,24 @@ Dim vRowSource() As Variant, iCount As Integer, i As Integer, j As integer, bFou For j = i To iCount - 1 vRowSource(j) = vRowSource(j + 1) Next j - ReDim Preserve vRowSource(0 To iCount - 1) bFound = True Exit Forapos; Remove only 1st occurrence of string End If Next i Case Else If pvIndex lt; 0 Or pvIndex gt; iCount Then Goto Error_Index - bFound = True For i = pvIndex To iCount - 1 vRowSource(i) = vRowSource(i + 1) Next i - ReDim Preserve vRowSource(0 To iCount - 1) + bFound = True End Select If bFound Then + If iCount gt; 0 Then apos; https://forum.openoffice.org/en/forum/viewtopic.php?f=47amp;t=75008 + ReDim Preserve vRowSource(0 To iCount - 1) + Else + vRowSource = Array() + End If If _ParentType lt;gt; CTLPARENTISDIALOG Then ControlModel.ListSource = vRowSource() End If ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - wizards/source
wizards/source/euro/Init.xba | 26 +++---
wizards/source/euro/euro.src |7 +--
2 files changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 244f4abc04aa6773879f19b38f4aa899689978cc
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Aug 23 12:12:12 2014 +0300
added LTL Lithuanian Litas to Euro Converter
Reviewed-on: https://gerrit.libreoffice.org/11090
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit 0b3e1d9b222bf045b03746f1c162bf8077a24a1b)
adapt SBCOUNTRYCOUNT
(cherry picked from commit 375228c2c811412b516fe29bf263a520f4e9be1a)
ditch unused sCurrUNKNOWN and sCurrSYSUNKNOWN strings
(cherry picked from commit 99e1b398f28ee8eb2fc2d6bf5db8362170f32e69)
increment SBCOUNTRYCOUNT again, we have 19 currencies 0..18
(cherry picked from commit dfb48f77ba011661e03b6eb942234adb4e6630d7)
Change-Id: Id4eeb42bbbaec979f60b57ddab2794b38f1e3157
Reviewed-on: https://gerrit.libreoffice.org/12952
Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 33d9eb8..ccd63b7 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -90,15 +90,14 @@ Public sCurrMALTESE as String
Public sCurrSLOVAK as String
Public sCurrESTONIAN as String
Public sCurrLATVIAN as String
-Public sCurrUNKNOWN as String
-Public sCurrSYSUNKNOWN as String
+Public sCurrLITHUANIAN as String
Public sPrgsRETRIEVAL as String
Public sPrgsCONVERTING as String
Public sPrgsUNPROTECT as String
Public sInclusiveSubDir as String
-Public Const SBCOUNTRYCOUNT = 17
+Public Const SBCOUNTRYCOUNT = 19
Public CurMimeType as String
Public CurCellCount as Long
Public oSheets as Object
@@ -134,8 +133,8 @@ Public CurExtension(2) as String
Public Currfactor as Double
Public CurrSymbolList(2) as String
Public CurrLanguage as String
-Public CurrValue(17,5)
-Public LangIDValue(17,2,2) as String
+Public CurrValue(18,5)
+Public LangIDValue(18,2,2) as String
Public PreName as String
Public Separator as String
Public BitmapDir as String
@@ -216,8 +215,7 @@ Dim LocWorkPath as String
sCurrSLOVAK = GetResText(1515)
sCurrESTONIAN = GetResText(1516)
sCurrLATVIAN = GetResText(1517)
- sCurrUNKNOWN = GetResText(1518)
- sCurrSYSUNKNOWN = GetResText(1519)
+ sCurrLITHUANIAN = GetResText(1518)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -392,6 +390,11 @@ Sub InitializeLanguages()
LangIDValue(17,1,1) = quot;LVquot;
LangIDValue(17,1,2) = quot;-64Bquot;
+apos; CURRENCIES_LITHUANIAN
+LangIDValue(18,0,0) = quot;ltquot;
+LangIDValue(18,0,1) = quot;LTquot;
+LangIDValue(18,0,2) = quot;-427quot;
+
End Sub
@@ -562,6 +565,15 @@ Dim i as Integer
CurrValue(17,4) = quot;Lsquot;
CurrValue(17,5) = quot;LVLquot;
+ CurrValue(18,0) = sCurrLITHUANIAN
+ apos; real conversion rate
+ CurrValue(18,1) = 3.45280
+ apos; rounded conversion rate
+ CurrValue(18,2) = 3.5
+ CurrValue(18,3) = quot;Ltquot;
+ CurrValue(18,4) = quot;Ltquot;
+ CurrValue(18,5) = quot;LTLquot;
+
i = -1
CurrSymbolList(0) = quot;quot;
CurrSymbolList(1) = quot;quot;
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index bf795ba..0f1b44b 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -412,12 +412,7 @@ Text [ en-US ] = Latvian Lats;
String CURRENCIES + 18
{
-Text [ en-US ] = The currency set for the document is not a European
currency!;
-};
-
-String CURRENCIES + 19
-{
-Text [ en-US ] = The language set for your operating system is not a language
of the European Monetary Union.;
+Text [ en-US ] = Lithuanian Litas;
};
String STEP_LASTPAGE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - wizards/source
wizards/source/access2base/Field.xba |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 8718bcc3d74e5eed7499ec1359aff10659faaebc Author: Jean-Pierre Ledure j...@ledure.be Date: Fri Aug 29 22:24:06 2014 +0200 Access2Base - PATCH-01 Field.setValue Gives erroneously an error message when argument is Null and field is nullable https://forum.openoffice.org/en/forum/viewtopic.php?f=47t=61447sid=48e231a12084933d9da1b47e50b186ea#p323714 Change-Id: I37be06e5c30f1294756d28ba88d903f9fa28d8bb Reviewed-on: https://gerrit.libreoffice.org/11198 Reviewed-by: Jean-Pierre Ledure j...@ledure.be Tested-by: Jean-Pierre Ledure j...@ledure.be diff --git a/wizards/source/access2base/Field.xba b/wizards/source/access2base/Field.xba index 871133f..3e27216 100644 --- a/wizards/source/access2base/Field.xba +++ b/wizards/source/access2base/Field.xba @@ -514,7 +514,13 @@ Dim oParent As Object If _ParentDatabase.Recordsets(_ParentName)._EditMode = dbEditNone Then Goto Trace_Error_Update With com.sun.star.sdbc.DataType If IsNull(pvValue) Then - If Column.IsNullable = com.sun.star.sdbc.ColumnValue.NULLABLE Then Column.updateNull() Else Goto Trace_Null +REMIf Column.IsNullable = com.sun.star.sdbc.ColumnValue.NULLABLE Then Column.updateNull() Else Goto Trace_Null + If Column.IsNullable = com.sun.star.sdbc.ColumnValue.NULLABLE Then + Column.updateNull() + Goto Exit_Function + Else + Goto Trace_Null + End If End If Select Case Column.Type Case .BIT, .BOOLEAN ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - wizards/source
wizards/source/access2base/Application.xba |2 +- wizards/source/access2base/DoCmd.xba |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit fb242d587ba2aebc1940a6cf5386685ba89f7944 Author: Jean-Pierre Ledure j...@ledure.be Date: Fri May 23 17:42:39 2014 +0200 Access2Base - Bug when event triggered by toolbar button cfr. Change 9452 on master Argument given by LO to macro triggered by toolbar button is an integer, not an object. This should not cause a visible error for the end-user from within the Events() Sub Change-Id: I4a307270b0d5cf2992b3bb304deb8cd30222dd95 Reviewed-on: https://gerrit.libreoffice.org/9452 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu (cherry picked from commit 4916efd5c69684f12fa062f734345627291b49e4) Reviewed-on: https://gerrit.libreoffice.org/9540 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba index 1350464..04dceb0 100644 --- a/wizards/source/access2base/Application.xba +++ b/wizards/source/access2base/Application.xba @@ -641,7 +641,7 @@ Const cstThisSub = quot;Eventsquot; If IsMissing(poEvent) Then Goto Exit_Function If IsNull(poEvent) Then Goto Exit_Function - If Not Utils._CheckArgument(poEvent, 1, vbObject) Then Goto Exit_Function + If Not Utils._CheckArgument(poEvent, 1, vbObject, , False) Then Goto Exit_Function apos; No error handling in CheckArgument If Not Utils._hasUNOProperty(poEvent, quot;Sourcequot;) Then Goto Trace_Error Set vEvent = New Event vEvent._Initialize(poEvent) diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba index 2ece700..54249ef 100644 --- a/wizards/source/access2base/DoCmd.xba +++ b/wizards/source/access2base/DoCmd.xba @@ -1297,7 +1297,7 @@ Error_Function: Set OpenForm = Nothing GoTo Exit_Function Error_NotApplicable: - TraceError(TRACEFATAL, ERRMETHOD, Utils._CalledSub(), 0, 1, cstThisSub) + TraceError(TRACEFATAL, ERRACTION, Utils._CalledSub(), 0, 1, cstThisSub) Goto Exit_Function End Function apos; QuitV1.1.0 @@ -1792,7 +1792,7 @@ Exit_Function: Utils._ResetCalledSub(cstThisSub) Exit Function Error_NotApplicable: - TraceError(TRACEFATAL, ERRMETHOD, Utils._CalledSub(), 0, 1, cstThisSub) + TraceError(TRACEFATAL, ERRACTION, Utils._CalledSub(), 0, 1, cstThisSub) Goto Exit_Function Error_Function: TraceError(TRACEABORT, Err, cstThisSub, Erl) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - wizards/source
wizards/source/access2base/DataDef.xba |9 + wizards/source/access2base/Field.xba |9 + wizards/source/access2base/Recordset.xba |9 + 3 files changed, 27 insertions(+) New commits: commit 125ac1d2d79fe72cb65f765b32c39f0d964e230f Author: Jean-Pierre Ledure j...@ledure.be Date: Sun May 25 18:46:57 2014 +0200 Access2Base - setProperty erroneously omitted cfr. Change 9479 on master Change-Id: I5d2a1b37d80137e6b8fd080d8c2d73372ad0512c Reviewed-on: https://gerrit.libreoffice.org/9479 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu (cherry picked from commit c3fe2934ffc1d3c14c19bcb758d125a5d6df783f) Reviewed-on: https://gerrit.libreoffice.org/9541 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/wizards/source/access2base/DataDef.xba b/wizards/source/access2base/DataDef.xba index 4236548..061a7c7 100644 --- a/wizards/source/access2base/DataDef.xba +++ b/wizards/source/access2base/DataDef.xba @@ -419,6 +419,15 @@ Exit_Function: Exit Function End Function apos; Properties +REM --- +Public Function setProperty(ByVal Optional psProperty As String, ByVal Optional pvValue As Variant) As Boolean +apos; Return True if property setting OK +Dim cstThisSub As String + cstThisSub = Utils._PCase(_Type) amp; quot;.getPropertyquot; + Utils._SetCalledSub(cstThisSub) + setProperty = _PropertySet(psProperty, pvValue) + Utils._ResetCalledSub(cstThisSub) +End Function REM --- REM --- PRIVATE FUNCTIONS --- diff --git a/wizards/source/access2base/Field.xba b/wizards/source/access2base/Field.xba index 4819e83..871133f 100644 --- a/wizards/source/access2base/Field.xba +++ b/wizards/source/access2base/Field.xba @@ -199,6 +199,15 @@ Exit_Function: End Function apos; ReadAllText REM --- +Public Function setProperty(ByVal Optional psProperty As String, ByVal Optional pvValue As Variant) As Boolean +apos; Return True if property setting OK +Const cstThisSub = quot;Field.setPropertyquot; + Utils._SetCalledSub(cstThisSub) + setProperty = _PropertySet(psProperty, pvValue) + Utils._ResetCalledSub(cstThisSub) +End Function + +REM --- Public Function WriteAllBytes(ByVal Optional pvFile As Variant) As Boolean apos; Write the whole content of a Long Binary Field object to a file diff --git a/wizards/source/access2base/Recordset.xba b/wizards/source/access2base/Recordset.xba index 16fc3a2..1a25e36 100644 --- a/wizards/source/access2base/Recordset.xba +++ b/wizards/source/access2base/Recordset.xba @@ -727,6 +727,15 @@ Exit_Function: End Function apos; Properties REM --- +Public Function setProperty(ByVal Optional psProperty As String, ByVal Optional pvValue As Variant) As Boolean +apos; Return True if property setting OK +Const cstThisSub = quot;Recordset.setPropertyquot; + Utils._SetCalledSub(cstThisSub) + setProperty = _PropertySet(psProperty, pvValue) + Utils._ResetCalledSub(cstThisSub) +End Function + +REM --- Public Function Update() As Boolean apos; Finalize the updates of the current record ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
