[Libreoffice-commits] core.git: cui/source

[Jim Raykowski (via logerrit)]

 cui/source/customize/cfg.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9f32d341b80e1f1ffe28542f33003bfe5750639b
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Fri Apr 19 17:51:28 2019 -0800
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Mon Apr 22 22:03:27 2019 +0200

    tdf#124846 Make main menu items really move when moved
    
    This patch also fixes the Move Menu dialog move up button being enabled
    when dialog is created.
    
    Change-Id: I8432bd8d582e8a9ef449bce1d5cba703b2404c75
    Reviewed-on: https://gerrit.libreoffice.org/71001
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    Tested-by: Heiko Tietze <tietze.heiko at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 817622140b77..05c6e1fdacb6 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1757,6 +1757,8 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
 
     m_xMoveUpButton->connect_clicked(LINK( this, SvxMainMenuOrganizerDialog, MoveHdl));
     m_xMoveDownButton->connect_clicked(LINK( this, SvxMainMenuOrganizerDialog, MoveHdl));
+
+    UpdateButtonStates();
 }
 
 SvxMainMenuOrganizerDialog::~SvxMainMenuOrganizerDialog()
@@ -1818,6 +1820,8 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, weld::Button&, rButton, void )
     m_xMenuListBox->insert(nTargetEntry, sEntry, &sId, nullptr, nullptr);
     m_xMenuListBox->select(nTargetEntry);
 
+    std::swap(mpEntries->at(nSourceEntry), mpEntries->at(nTargetEntry));
+
     UpdateButtonStates();
 }