diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-11-21 13:16:26 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-12-02 01:18:39 +0100 |
commit | 1648d4e2c27701e8e0bf94a5cf0e1d67358f5d62 (patch) | |
tree | 00425e07b5fb7571f0c9c8ffcd873d7390f36ac5 | |
parent | 1b4c9908887b5260033b431d6c5e4a9c10b9ee53 (diff) |
Initial hacky startup optimisation
Change-Id: I299b8028ce3bac429250d2df4d68c854404bde4b
-rw-r--r-- | comphelper/source/misc/lok.cxx | 2 | ||||
-rw-r--r-- | desktop/source/app/app.cxx | 5 | ||||
-rw-r--r-- | desktop/source/deployment/dp_services.cxx | 11 | ||||
-rw-r--r-- | desktop/source/lib/init.cxx | 10 | ||||
-rw-r--r-- | pyuno/source/loader/pyuno_loader.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 2 |
6 files changed, 14 insertions, 18 deletions
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx index 0ea263f20885..4a0fdc3229e7 100644 --- a/comphelper/source/misc/lok.cxx +++ b/comphelper/source/misc/lok.cxx @@ -47,7 +47,7 @@ void setActive(bool bActive) bool isActive() { - return g_bActive; + return false; } void setPartInInvalidation(bool bPartInInvalidation) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 3fb7b6017c70..0b324f17728a 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -172,6 +172,9 @@ static oslSignalHandler pSignalHandler = nullptr; namespace { +#undef HAVE_FEATURE_EXTENSIONS +#define HAVE_FEATURE_EXTENSIONS 0 + #if HAVE_FEATURE_EXTENSIONS // Remove any existing UserInstallation's extensions cache data remaining from @@ -1436,7 +1439,7 @@ int Desktop::Main() */ Application::GetDefaultDevice(); -#if HAVE_FEATURE_EXTENSIONS +#if 0 // Check if bundled or shared extensions were added /removed // and process those extensions (has to be done before checking // the extension dependencies! diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index ba642fdbff10..7da1fcaf9635 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_services.cxx @@ -32,16 +32,7 @@ SAL_DLLPUBLIC_EXPORT void * deployment_component_getFactory( { return sdecl::component_getFactoryHelper( pImplName, - {&dp_registry::backend::configuration::serviceDecl, - &dp_registry::backend::component::serviceDecl, - &dp_registry::backend::help::serviceDecl, - &dp_registry::backend::script::serviceDecl, - &dp_registry::backend::sfwk::serviceDecl, - &dp_registry::backend::executable::serviceDecl, - &dp_manager::factory::serviceDecl, - &dp_log::serviceDecl, - &dp_info::serviceDecl, - &dp_manager::serviceDecl}); + {}); } } // extern "C" diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 755d980139a2..630fafba9dec 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4652,11 +4652,10 @@ static void preloadData() rtl::Bootstrap::set("UserInstallation", aTempDir.GetURL()); // Register the bundled extensions - desktop::Desktop::SynchronizeExtensionRepositories(true); - bool bAbort = desktop::Desktop::CheckExtensionDependencies(); - if(bAbort) - std::cerr << "CheckExtensionDependencies failed" << std::endl; + //desktop::Desktop::SynchronizeExtensionRepositories(true); + //bool bAbort = desktop::Desktop::CheckExtensionDependencies(); +#if 0 // preload all available dictionaries css::uno::Reference<css::linguistic2::XLinguServiceManager> xLngSvcMgr = css::linguistic2::LinguServiceManager::create(comphelper::getProcessComponentContext()); @@ -4724,7 +4723,8 @@ static void preloadData() nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), COMPLEX); OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne); } - +#endif + // Set user profile's path back to the original one rtl::Bootstrap::set("UserInstallation", sUserPath); } diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 938d53814545..1f2c8126732a 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -245,6 +245,8 @@ static Reference<XInterface> CreateInstance(const Reference<XComponentContext> & Reference< XInterface > ret; + return ret; + PyThreadAttach attach( PyInterpreterState_Head() ); { // note: this can't race against getComponentContext() because diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index d6f9eccf4a20..9ab296c7016e 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -178,7 +178,7 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, StartListening( *SfxGetpApp() ); - if (!utl::ConfigManager::IsFuzzing()) + if (false) { // init color configuration // member <pColorConfig> is created and the color configuration is applied |