core.git: sd/source

[Michael Weghorn (via logerrit)]

 sd/source/ui/dlg/BulletAndPositionDlg.cxx |    5 +++--
 sd/source/ui/inc/BulletAndPositionDlg.hxx |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 94564497514c4419062d13abad057255df9f369d
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jun 20 18:20:42 2025 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Jun 20 21:21:31 2025 +0200

    tdf#167034 sd: Populate graphics bullet menu when creating dlg
    
    Since
    
        commit f075fa01cb4f74185f13eb0a8d7f84cf1f47af49
        Author: Michael Weghorn <m.wegh...@posteo.de>
        Date:   Tue Aug 22 10:26:32 2023 +0200
    
            tdf#141101 tdf#101886 a11y: Restore previous focus on col/line 
popup close
    
    , the menu button toggled handler is no more called before
    the menu shows (at least for the VCL implementation).
    
    Populate the menu entries in the SvxBulletAndPositionDlg
    ctor instead, to ensure they are present when the menu gets
    shown.
    
    Change-Id: I02c65f11bfb532ecfb6e91578d26ea9dfc2e31a7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186771
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx 
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 7479ebb5fc29..44eb256f0775 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -139,7 +139,6 @@ 
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
     m_xBulletPB->connect_clicked(LINK(this, SvxBulletAndPositionDlg, 
BulletHdl_Impl));
     m_xFmtLB->connect_changed(LINK(this, SvxBulletAndPositionDlg, 
NumberTypeSelectHdl_Impl));
     m_xBitmapMB->connect_selected(LINK(this, SvxBulletAndPositionDlg, 
GraphicHdl_Impl));
-    m_xBitmapMB->connect_toggled(LINK(this, SvxBulletAndPositionDlg, 
PopupActivateHdl_Impl));
     m_xLevelLB->set_selection_mode(SelectionMode::Multiple);
     m_xLevelLB->connect_selection_changed(LINK(this, SvxBulletAndPositionDlg, 
LevelHdl_Impl));
     m_xWidthMF->connect_value_changed(LINK(this, SvxBulletAndPositionDlg, 
SizeHdl_Impl));
@@ -205,6 +204,8 @@ 
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
     Size aSize(m_xGrid->get_preferred_size());
     m_xGrid->set_size_request(aSize.Width(), -1);
 
+    PopulateGalleryMenu();
+
     // PageCreated
     FieldUnit eMetric = pView->GetDoc().GetUIUnit();
     SfxAllItemSet aSet(*(rSet.GetPool()));
@@ -885,7 +886,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, GraphicHdl_Impl, const 
OUString&, rIdent, voi
     aInvalidateTimer.Start();
 }
 
-IMPL_LINK_NOARG(SvxBulletAndPositionDlg, PopupActivateHdl_Impl, 
weld::Toggleable&, void)
+void SvxBulletAndPositionDlg::PopulateGalleryMenu()
 {
     if (m_xGalleryMenu)
         return;
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx 
b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index 169484ec3845..933e74dfa32b 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -110,6 +110,7 @@ class SvxBulletAndPositionDlg : public 
weld::GenericDialogController
     std::unique_ptr<weld::Button> m_xReset;
 
     void InitControls();
+    void PopulateGalleryMenu();
     /** To switch between the numbering type
         0 - Number;
         1 - Bullet;
@@ -119,7 +120,6 @@ class SvxBulletAndPositionDlg : public 
weld::GenericDialogController
 
     DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
-    DECL_LINK(PopupActivateHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(GraphicHdl_Impl, const OUString&, void);
     DECL_LINK(BulletHdl_Impl, weld::Button&, void);
     DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void);