Simplify some static variable initializations

Change-Id: I6cdd44aa66b9597ccc51fc3fd69b57485ccb3230
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113515
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 5 insertions, 12 deletions

diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 2f89a90a8149..9addf7140adf 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -71,23 +71,16 @@ static Reference< XCalendar4 > const & getLocaleCalendar()
 {
     static Reference< XCalendar4 > xCalendar = LocaleCalendar2::create(getProcessComponentContext());
     static css::lang::Locale aLastLocale;
-    static bool bNeedsInit = true;
+    static bool bNeedsReload = true;
 
     css::lang::Locale aLocale = Application::GetSettings().GetLanguageTag().getLocale();
-    bool bNeedsReload = false;
-    if( bNeedsInit )
-    {
-        bNeedsInit = false;
-        bNeedsReload = true;
-    }
-    else if( aLocale.Language != aLastLocale.Language ||
+    bNeedsReload = bNeedsReload ||
+           ( aLocale.Language != aLastLocale.Language ||
              aLocale.Country  != aLastLocale.Country ||
-             aLocale.Variant  != aLastLocale.Variant )
-    {
-        bNeedsReload = true;
-    }
+             aLocale.Variant  != aLastLocale.Variant );
     if( bNeedsReload )
     {
+        bNeedsReload = false;
         aLastLocale = aLocale;
         xCalendar->loadDefaultCalendar( aLocale );
     }