diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2016-11-10 09:06:38 +0100 |
|---|---|---|
| committer | Jean-Pierre Ledure <jp@ledure.be> | 2016-11-10 09:06:38 +0100 |
| commit | acfe27b4043895c482298d2e6db816e9c2700c1b (patch) | |
| tree | 9c3ef52ab8f82543edb25aab5cb60509c9016d71 /wizards | |
| parent | ee0e713b5333dd363e443bf471ecb5cecec09d17 (diff) | |
Access2Base - Call GetLocale() only once
and not for each individual label
Change-Id: I7014be30569a275fa20faaa2ba9255d3968b70dd
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/access2base/L10N.xba | 2 | ||||
| -rw-r--r-- | wizards/source/access2base/Root_.xba | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/wizards/source/access2base/L10N.xba b/wizards/source/access2base/L10N.xba index 463e9a5790a5..77827795963f 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 ' 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( _ "EN", "FR", "ES" _ diff --git a/wizards/source/access2base/Root_.xba b/wizards/source/access2base/Root_.xba index 5245b6689e88..4351d623cc56 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 ' com.sun.star.beans.Introspection Private VersionNumber As String ' Actual Access2Base version number +Private Locale As String Private FindRecord As Object Private StatusBar As Object Private Dialogs As Object ' Collection @@ -46,6 +47,7 @@ Dim vCurrentDoc() As Variant TraceLogLast = 0 TraceLogMaxEntries = 0 CalledSub = "" + Locale = L10N._GetLocale() Set Introspection = CreateUnoService("com.sun.star.beans.Introspection") Set FindRecord = Nothing Set StatusBar = Nothing |