diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-01-06 18:23:37 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-01-12 11:13:34 +0100 |
| commit | 4ff1f8153a3155303ea74f09cf4cb03d61e625a6 (patch) | |
| tree | 26bec67e892d2b1acc4c0b45cc886ea65549d441 /sfx2 | |
| parent | e78a8de236d876453a719b9b0e993b9bf1ac8b2c (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/+/108909
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 1901ce9b2c29..525325b72702 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -434,6 +434,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)); |