diff options
| author | Eike Rathke <erack@redhat.com> | 2013-07-11 18:25:40 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-07-11 19:15:50 +0200 |
| commit | b49892872ef2c73c3f2b745c00baa1c735837ec1 (patch) | |
| tree | 0cc0be83054ce1357f5939f0dd3ddfcc290d595c /sfx2 | |
| parent | 3dd16c6838778b8a947cc5daddc89a354712cb47 (diff) | |
comparing Locales without Variant is now insufficient
Previous code also had some odd notion of inequality ...
Change-Id: I0e75035a0618a3a0a177d22296155b9ae2a26185
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 18ebc7234651..78d8ac256ea8 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1133,9 +1133,10 @@ void SfxDocTplService_Impl::setLocale( const Locale &rLocale ) { ::osl::MutexGuard aGuard( maMutex ); - if ( mbLocaleSet && - ( maLocale.Language != rLocale.Language ) && - ( maLocale.Country != rLocale.Country ) ) + if ( mbLocaleSet && ( + ( maLocale.Language != rLocale.Language ) || + ( maLocale.Country != rLocale.Country ) || + ( maLocale.Variant != rLocale.Variant ) ) ) mbIsInitialized = sal_False; maLocale = rLocale; |