summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-01-06 18:23:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-01-08 12:09:43 +0100
commitace9232d4b5f47022d30dd9789e4b94448b89e24 (patch)
tree016f0768ee346efead32c89bcb4de9f477b3c35b /sfx2/source
parentbcdd7850e9eab45ca6550b836ac2c7629bc18272 (diff)
Missing construction of SfxCmisVersionsDialog::m_xVersionBox
...ever since b1baf73dc671069bedec18d170f8199b0766ea60 "weld SfxCmisVersionsDialog". (Found by GCC 11 trunk with --enable-optimized, > sfx2/source/dialog/versdlg.cxx: In constructor ‘SfxCmisVersionsDialog::SfxCmisVersionsDialog(weld::Window*, SfxViewFrame*)’: > sfx2/source/dialog/versdlg.cxx:435:36: error: ‘this’ pointer null [-Werror=nonnull] > 435 | m_xVersionBox->set_size_request(m_xVersionBox->get_approximate_digit_width() * 90, > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 436 | m_xVersionBox->get_height_rows(15)); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ) Change-Id: I2720d6bc49af717951a0af6a262fb013a27e09df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108886 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 29e36c699c610be4fe6f8a2fe21ae3e4c8bdbd38) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108908 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/dialog/versdlg.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 256b328e4978..72e55a6fc1f8 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -432,6 +432,7 @@ SfxCmisVersionsDialog::SfxCmisVersionsDialog(weld::Window* pParent, SfxViewFrame
, m_xViewButton(m_xBuilder->weld_button("show"))
, m_xDeleteButton(m_xBuilder->weld_button("delete"))
, m_xCompareButton(m_xBuilder->weld_button("compare"))
+ , m_xVersionBox(m_xBuilder->weld_tree_view("versions"))
{
m_xVersionBox->set_size_request(m_xVersionBox->get_approximate_digit_width() * 90,
m_xVersionBox->get_height_rows(15));