diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-10 13:19:27 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-10 14:09:13 +0100 |
| commit | 77cb655a60a238100b4942b9a41a1a989031c39c (patch) | |
| tree | 0d51ddd633c086ccc37d9945ef3b286c5b622f36 /desktop | |
| parent | WIP: async popup menus (diff) | |
| download | core-private/jmux/current-reorga.tar.gz core-private/jmux/current-reorga.zip | |
catchall
private/jmux/current-reorga
Change-Id: I61e9916a667a92e6bd5489e5ed1d1dead2a61765
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CustomTarget_soffice.mk | 2 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index c7ac35e46f9b..e493d061b4cd 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/desktop/CustomTarget_soffice.mk @@ -13,7 +13,7 @@ $(call gb_CustomTarget_get_target,desktop/soffice) : \ $(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh $(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh : \ - $(SRCDIR)/desktop/scripts/soffice$(if $(DISABLE_DYNLOADING),_nodyn).sh \ + $(SRCDIR)/desktop/scripts/soffice.sh \ $(BUILDDIR)/config_host.mk \ | $(call gb_CustomTarget_get_workdir,desktop/soffice)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 3df0efe8ed34..51c19fa19323 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2003,7 +2003,6 @@ void Desktop::OpenClients() handleCrashReport(); #endif -#if 0 if ( ! bAllowRecoveryAndSessionManagement ) { try @@ -2080,7 +2079,6 @@ void Desktop::OpenClients() } } } -#endif // write this information here to avoid depending on vcl in the crash reporter lib CrashReporter::addKeyValue("Language", Application::GetSettings().GetLanguageTag().getBcp47(), CrashReporter::Create); |