diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 9d6ac9864a52..0c96240f1b0d 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -69,7 +69,7 @@ class Desktop final : public Application Desktop(); virtual ~Desktop() override; - virtual int Main( ) override; + virtual int Main() override; virtual void Init() override; virtual void InitFinished() override; virtual void DeInit() override; diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index cac261e9bcac..52057cd2645d 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -7509,6 +7509,9 @@ static void preloadData() if(bAbort) std::cerr << "CheckExtensionDependencies failed" << std::endl; + // inhibit forced 2nd synchronization from Main + ::rtl::Bootstrap::set( "DISABLE_EXTENSION_SYNCHRONIZATION", "true"); + std::cerr << "Preload textencodings"; // sal_textenc // Use RTL_TEXTENCODING_MS_1250 to trigger Impl_getTextEncodingData // to dlopen sal_textenclo