unotools/source/config/syslocaleoptions.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5138bde880dcd9c7cf7f0d5ff57510d4d6702846
Author: Eike Rathke <er...@redhat.com>
Date: Fri Nov 16 13:36:15 2012 +0100
merge failure
Change-Id: I5c716353b231d9c36972bce8c99d9c3c3e74b1e4
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index e37725f..f3febee 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(); }
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
