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

[Jean-Pierre Ledure]

 wizards/source/access2base/L10N.xba  |    2 +-
 wizards/source/access2base/Root_.xba |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit acfe27b4043895c482298d2e6db816e9c2700c1b
Author: Jean-Pierre Ledure <j...@ledure.be>
Date:   Thu Nov 10 09:06:38 2016 +0100

    Access2Base - Call GetLocale() only once
    
    and not for each individual label
    
    Change-Id: I7014be30569a275fa20faaa2ba9255d3968b70dd

diff --git a/wizards/source/access2base/L10N.xba 
b/wizards/source/access2base/L10N.xba
index 463e9a5..7782779 100644
--- a/wizards/source/access2base/L10N.xba
+++ b/wizards/source/access2base/L10N.xba
@@ -14,7 +14,7 @@ REM 
----------------------------------------------------------------------------
 Public Function _GetLabel(ByVal psShortlabel As String, Optional ByVal 
psLocale As String) As String
 &apos; Return the localized label corresponding with ShortLabel
 
-       If IsMissing(psLocale) Then psLocale = UCase(Left(_GetLocale(), 2)) 
Else psLocale = UCase(psLocale)
+       If IsMissing(psLocale) Then psLocale = UCase(Left(_A2B_.Locale, 2)) 
Else psLocale = UCase(psLocale)
        On Local Error Goto Error_Function
        If Not Utils._InList(psLocale, Array( _
                                &quot;EN&quot;, &quot;FR&quot;, &quot;ES&quot; _
diff --git a/wizards/source/access2base/Root_.xba 
b/wizards/source/access2base/Root_.xba
index 5245b66..4351d62 100644
--- a/wizards/source/access2base/Root_.xba
+++ b/wizards/source/access2base/Root_.xba
@@ -27,6 +27,7 @@ Private TraceLogMaxEntries    As Integer
 Private CalledSub                      As String
 Private Introspection          As Object                               &apos;  
com.sun.star.beans.Introspection        
 Private VersionNumber          As String                               &apos;  
Actual Access2Base version number
+Private Locale                         As String
 Private FindRecord                     As Object
 Private StatusBar                      As Object
 Private Dialogs                                As Object                       
        &apos;  Collection
@@ -46,6 +47,7 @@ Dim vCurrentDoc() As Variant
        TraceLogLast = 0
        TraceLogMaxEntries = 0
        CalledSub = &quot;&quot;
+       Locale = L10N._GetLocale()
        Set Introspection = 
CreateUnoService(&quot;com.sun.star.beans.Introspection&quot;)
        Set FindRecord = Nothing
        Set StatusBar = Nothing
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits