[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Stephan Bergmann (via logerrit)]

 sfx2/source/dialog/versdlg.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6bf4d1ed9193f16ec75e2daf62ac4d723cd5a0fa
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jan 6 18:23:37 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 7 22:07:28 2021 +0100

    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 at redhat.com>
    (cherry picked from commit 29e36c699c610be4fe6f8a2fe21ae3e4c8bdbd38)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108909
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 68abca31ba61..88a1f3115e39 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));