diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-16 13:36:15 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-16 13:36:15 +0100 |
| commit | 5138bde880dcd9c7cf7f0d5ff57510d4d6702846 (patch) | |
| tree | c92f7e93ac211619023e5e4a4be58dbf999a5316 /unotools | |
| parent | 2814ecb92f9dc1f60094cfa41ab1fa6eaa03471b (diff) | |
merge failure
Change-Id: I5c716353b231d9c36972bce8c99d9c3c3e74b1e4
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/syslocaleoptions.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index e37725ffaf89..f3febee3a532 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -123,8 +123,8 @@ public: sal_Bool IsReadOnly( SvtSysLocaleOptions::EOption eOption ) const; const Locale& GetRealLocale() { return m_aRealLocale.getLocale(); } const Locale& GetRealUILocale() { return m_aRealUILocale.getLocale(); } - LanguageType GetRealLanguage() { return m_eRealLanguage.getLanguageType(); } - LanguageType GetRealUILanguage() { return m_eRealUILanguage.getLanguageType(); } + LanguageType GetRealLanguage() { return m_eRealLocale.getLanguageType(); } + LanguageType GetRealUILanguage() { return m_eRealUILocale.getLanguageType(); } }; |