diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-06-28 19:57:01 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-06-28 20:18:36 +0200 |
| commit | 9eb3aabbf497dba2093f4394645bad3079286cf0 (patch) | |
| tree | 19f8bb9276b84c9d26082cd523e09b7084796632 | |
| parent | 6966e751f5e3600f37cc7d9fa4b4d9ef7b0424bf (diff) | |
No need for the AdditionsDialog if --disable-extensions
Change-Id: If1ed6c860256e656846a1516e8170fb0dbd20499
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97346
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | cui/Library_cui.mk | 3 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index ed1e07d5ff13..09f355776341 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -104,7 +104,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/customize/SvxNotebookbarConfigPage \ cui/source/customize/CustomNotebookbarGenerator \ cui/source/dialogs/about \ - cui/source/dialogs/AdditionsDialog \ + $(call gb_Helper_optional,EXTENSIONS, \ + cui/source/dialogs/AdditionsDialog) \ cui/source/dialogs/colorpicker \ cui/source/dialogs/cuicharmap \ cui/source/dialogs/cuifmsearch \ diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index d590b570343f..a31e987202eb 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_extensions.h> + #include <align.hxx> #include "dlgfact.hxx" @@ -1684,8 +1686,13 @@ VclPtr<AbstractQrCodeGenDialog> AbstractDialogFactory_Impl::CreateQrCodeGenDialo VclPtr<AbstractAdditionsDialog> AbstractDialogFactory_Impl::CreateAdditionsDialog( weld::Window* pParent) { +#if HAVE_FEATURE_EXTENSIONS return VclPtr<AbstractAdditionsDialog_Impl>::Create( std::make_unique<AdditionsDialog>(pParent)); +#else + (void) pParent; + return VclPtr<AbstractAdditionsDialog>(nullptr); +#endif } VclPtr<AbstractAboutDialog> |