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

[Jean-Pierre Ledure]

 wizards/source/access2base/Database.xba     |    2 +-
 wizards/source/access2base/UtilProperty.xba |    8 +++-----
 wizards/source/access2base/Utils.xba        |    1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 45130a1b673a930f8607cd86e655a4b4cc2b89e2
Author: Jean-Pierre Ledure <j...@ledure.be>
Date:   Wed Apr 5 18:00:57 2017 +0200

    Access2Base - Solving some trouble with bigint variables
    
    Bigints are unknown in Basic. Conversions with CLng.
    Removal of a few useless lines
    
    Change-Id: I7bc85e1ee5a53b098e3a2e46bb1829fcc4a2eef4

diff --git a/wizards/source/access2base/Database.xba 
b/wizards/source/access2base/Database.xba
index dd5be2877283..f7463e03a94c 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -1210,7 +1210,7 @@ Const cstSQLITE = &quot;SQLite&quot;
                                        iInfo = iInfo + 1
                                        _ColumnTypeNames(iInfo) = sName
                                        _ColumnTypes(iInfo) = lType
-                                       _ColumnPrecisions(iInfo) = .getLong(3)
+                                       _ColumnPrecisions(iInfo) = 
CLng(.getLong(3))
                                End If
                                .next()
                        Loop
diff --git a/wizards/source/access2base/UtilProperty.xba 
b/wizards/source/access2base/UtilProperty.xba
index 500213fb0997..88c8aa9bc756 100644
--- a/wizards/source/access2base/UtilProperty.xba
+++ b/wizards/source/access2base/UtilProperty.xba
@@ -125,7 +125,7 @@ Dim iPropIndex As Integer, vProp As Variant, vValue As 
Variant, vMatrix As Varia
 End Function   &apos;  _GetPropertyValue V1.3.0
 
 REM 
=======================================================================================================================
-Public Sub _SetPropertyValue(ByRef pvPropertyValuesArray As Variant, ByVal 
psPropName As String, ByVal pvValue)
+Public Sub _SetPropertyValue(ByRef pvPropertyValuesArray As Variant, ByVal 
psPropName As String, ByVal pvValue As Variant)
 &apos; Set the value of a particular named property from an array of 
PropertyValue&apos;s.
 
 Dim iPropIndex As Integer, vProp As Variant, iNumProperties As Integer
@@ -201,10 +201,10 @@ Public Function _PropValuesToStr(ByRef 
pvPropertyValuesArray As Variant) As Stri
 &apos; Semicolons and backslashes are escaped with a backslash (see _CStr and 
_CVar functions)
 
 Dim iNumProperties As Integer, sResult As String, i As Integer, j As Integer, 
vProp As Variant
-Dim sName As String, vValue As Variant, iType As Integer, vVector As Variant
+Dim sName As String, vValue As Variant, iType As Integer
 Dim cstLF As String
 
-       cstLF = Chr(10)
+       cstLF = vbLf()
        iNumProperties = _NumPropertyValues(pvPropertyValuesArray)
 
        sResult = cstHEADER &amp; cstLF
@@ -220,8 +220,6 @@ Dim cstLF As String
                                &apos;  1-dimension but vector of vectors must 
also be considered
                                If VarType(vValue(0)) &gt;= vbArray Then
                                        sResult = sResult &amp; sName &amp; 
&quot; = (&quot; &amp; UBound(vValue) + 1 &amp; &quot;,&quot; &amp; 
UBound(vValue(0)) + 1 &amp; &quot;)&quot; &amp; cstLF
-                                       vVector = Array()
-                                       ReDim vVector(0 To UBound(vValue(0)))
                                        For j = 0 To UBound(vValue)
                                                sResult = sResult &amp; 
Utils._CStr(vValue(j), False) &amp; cstLF
                                        Next j                  
diff --git a/wizards/source/access2base/Utils.xba 
b/wizards/source/access2base/Utils.xba
index 7a1696f7a644..79cebb63d0c6 100644
--- a/wizards/source/access2base/Utils.xba
+++ b/wizards/source/access2base/Utils.xba
@@ -191,6 +191,7 @@ Const cstByteLength = 25
                                sArg = Format(pvArg)
                                If InStr(UCase(sArg), &quot;E&quot;) = 0 Then 
sArg = Format(pvArg, &quot;##0.0##&quot;)
                                sArg = Replace(sArg, &quot;,&quot;, 
&quot;.&quot;)
+                       Case vbBigint                   :               sArg = 
CStr(CLng(pvArg))
                        Case vbDate                             :               
sArg = Year(pvArg) &amp; &quot;-&quot; &amp; Right(&quot;0&quot; &amp; 
Month(pvArg), 2) &amp; &quot;-&quot; &amp; Right(&quot;0&quot; &amp; 
Day(pvArg), 2) _
                                                                                
                        &amp; &quot; &quot; &amp; Right(&quot;0&quot; &amp; 
Hour(pvArg), 2) &amp; &quot;:&quot; &amp; Right(&quot;0&quot; &amp; 
Minute(pvArg), 2)
                        Case Else                               :               
sArg = CStr(pvArg)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits