From 0f99330f33868594ad253656805918115823f59d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 23 Sep 2020 19:32:33 +0100
Subject: fix disable qrcodegen option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic554f01125653022987c70d03c8c9d86fe3f547a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103271
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 cui/source/dialogs/QrCodeGenDialog.cxx | 4 ++--
 cui/source/inc/QrCodeGenDialog.hxx     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'cui')

diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
index bc56c2ddf4e1..7f3f6a806cf5 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -17,8 +17,6 @@
 #include <utility>
 #include <vcl/svapp.hxx>
 
-#include <config_qrcodegen.h>
-
 #if ENABLE_QRCODEGEN
 #if defined(SYSTEM_QRCODEGEN)
 #include <qrcodegen/QrCode.hpp>
@@ -74,7 +72,9 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, Reference<XModel> xModel
               m_xBuilder->weld_radio_button("button_quartile"),
               m_xBuilder->weld_radio_button("button_high") }
     , m_xSpinBorder(m_xBuilder->weld_spin_button("edit_border"))
+#if ENABLE_QRCODEGEN
     , mpParent(pParent)
+#endif
 {
     if (!bEditExisting)
     {
diff --git a/cui/source/inc/QrCodeGenDialog.hxx b/cui/source/inc/QrCodeGenDialog.hxx
index af4a3a86a87e..c0f338f91812 100644
--- a/cui/source/inc/QrCodeGenDialog.hxx
+++ b/cui/source/inc/QrCodeGenDialog.hxx
@@ -8,6 +8,8 @@
  */
 #pragma once
 
+#include <config_qrcodegen.h>
+
 #include <vcl/weld.hxx>
 
 #include <com/sun/star/frame/XModel.hpp>
@@ -31,7 +33,9 @@ private:
     std::unique_ptr<weld::Entry> m_xEdittext;
     std::unique_ptr<weld::RadioButton> m_xECC[4];
     std::unique_ptr<weld::SpinButton> m_xSpinBorder;
+#if ENABLE_QRCODEGEN
     weld::Widget* mpParent;
+#endif
 
     css::uno::Reference<css::beans::XPropertySet> m_xExistingShapeProperties;
 
-- 
cgit