[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Stephan Bergmann (via logerrit)]

 cui/source/customize/cfg.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 722153a79e045336cc9adeb18be372b86c503d71
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Sep 27 08:51:40 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 27 20:31:36 2019 +0200

    Fix Typo SvxMenuConfigPage -> SvxConfigPage
    
    ...introduced with ccb2b0078f07194befa61f1e3fd88e53ff236871 "weld
    SvxMenuConfigPage/SvxToolbarConfigPage", causing -fsanitize=dynamic-type-
    mismatch during UITest_writer_demo:
    
    > include/tools/link.hxx:163:10: runtime error: downcast of address 0x613000204b40 which does not point to an object of type 'SvxMenuConfigPage'
    > 0x613000204b40: note: object is of type 'SvxConfigPage'
    >  83 01 00 4e  b0 a1 bb 2e f6 7f 00 00  20 c4 56 00 e0 60 00 00  50 f8 a4 00 40 60 00 00  e8 49 38 00
    >               ^~~~~~~~~~~~~~~~~~~~~~~
    >               vptr for 'SvxConfigPage'
    >  #0 in SvxMenuConfigPage* tools::detail::castTo<SvxMenuConfigPage*, SvxConfigPage*>(SvxConfigPage*) at include/tools/link.hxx:163:10
    >  #1 in SvxConfigPage::SvxConfigPage(weld::Container*, weld::DialogController*, SfxItemSet const&) at cui/source/customize/cfg.cxx:997:41
    [...]
    
    Change-Id: Ie36ebabd3075cade590cc504fb06b5319b346dcf
    Reviewed-on: https://gerrit.libreoffice.org/79666
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 2377d937225adb17dc3f76d72937d5cd29d2ef69)
    Reviewed-on: https://gerrit.libreoffice.org/79746
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index bf583d4d37a4..dd245eeff73f 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -987,7 +987,7 @@ SvxConfigPage::SvxConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
     , m_xAddCommandButton(m_xBuilder->weld_button("add"))
     , m_xRemoveCommandButton(m_xBuilder->weld_button("remove"))
 {
-    m_xTopLevelListBox->connect_changed(LINK(this, SvxMenuConfigPage, SelectElementHdl));
+    m_xTopLevelListBox->connect_changed(LINK(this, SvxConfigPage, SelectElementHdl));
 
     weld::TreeView& rTreeView = m_xFunctions->get_widget();
     Size aSize(rTreeView.get_approximate_digit_width() * 40, rTreeView.get_height_rows(8));