[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Sun Jun 28 18:19:10 UTC 2020
cui/Library_cui.mk | 3 ++-
cui/source/factory/dlgfact.cxx | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 9eb3aabbf497dba2093f4394645bad3079286cf0
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Sun Jun 28 19:57:01 2020 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Sun Jun 28 20:18:36 2020 +0200
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 at collabora.com>
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>
More information about the Libreoffice-commits
mailing list