commit 60d622d807f4f3bcc8a699458adf5d6690f9dc4b
author Muhammet Kara <muhammet.kara@pardus.org.tr> Fri Aug 18 09:56:52 2017 +0300
committer Katarina Behrens <Katarina.Behrens@cib.de> Mon Sep 04 22:39:46 2017 +0200
tree c3fe39c8d41184b1644b400979c8a05dcabb4550
parent c525dc764114f45ec9ff33837e8ae7cb74ce72b1

Implement "Remove" button in the Customize dialog

By using the already implemented DeleteSelectedContent function.

Now toolbar and menu/context menu items can be removed by using
the "Remove" (Left Arrow) button which is between the commands
list and the enrtries list boxes.

Change-Id: If445ec6d431bc10263d961563bdd204e7868b931
Reviewed-on: https://gerrit.libreoffice.org/41272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

cui/source/customize/SvxMenuConfigPage.cxx

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 8c85eb4..2c67232 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -126,7 +126,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe
    m_pMoveDownButton->SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) );

    m_pAddCommandButton->SetClickHdl( LINK( this, SvxMenuConfigPage, AddCommandHdl ) );
    //m_pRemoveCommandButton->SetClickHdl( LINK( this, SvxMenuConfigPage, RemoveCommandHdl ) );
    m_pRemoveCommandButton->SetClickHdl( LINK( this, SvxMenuConfigPage, RemoveCommandHdl ) );
}

SvxMenuConfigPage::~SvxMenuConfigPage()
@@ -297,10 +297,14 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, AddCommandHdl, Button *, void )
    AddFunction();
}

/*IMPL_LINK_NOARG( SvxMenuConfigPage, RemoveCommandHdl, Button *, void )
IMPL_LINK_NOARG( SvxMenuConfigPage, RemoveCommandHdl, Button *, void )
{
    //TODO:Implement
}*/
    DeleteSelectedContent();
    if ( GetSaveInData()->IsModified() )
    {
        UpdateButtonStates();
    }
}

SaveInData* SvxMenuConfigPage::CreateSaveInData(
    const css::uno::Reference< css::ui::XUIConfigurationManager >& xCfgMgr,

cui/source/customize/SvxToolbarConfigPage.cxx

diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index f5f6d7b..5adc6a7 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -136,7 +136,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe
    m_pMoveUpButton->Enable();

    m_pAddCommandButton->SetClickHdl( LINK( this, SvxToolbarConfigPage, AddCommandHdl ) );
    //m_pRemoveCommandButton->SetClickHdl( LINK( this, SvxToolbarConfigPage, RemoveCommandHdl ) );
    m_pRemoveCommandButton->SetClickHdl( LINK( this, SvxToolbarConfigPage, RemoveCommandHdl ) );

    // default toolbar to select is standardbar unless a different one
    // has been passed in
@@ -329,10 +329,10 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, AddCommandHdl, Button *, void )
    AddFunction();
}

/*IMPL_LINK_NOARG( SvxToolbarConfigPage, RemoveCommandHdl, Button *, void )
IMPL_LINK_NOARG( SvxToolbarConfigPage, RemoveCommandHdl, Button *, void )
{
    //TODO:Implement
}*/
    DeleteSelectedContent();
}


void SvxToolbarConfigPage::UpdateButtonStates()

cui/source/inc/SvxMenuConfigPage.hxx

diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx
index 9110ede..162adc9 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -57,7 +57,7 @@ private:
    DECL_LINK( SelectCategory, ListBox&, void );

    DECL_LINK( AddCommandHdl, Button *, void );
    //DECL_LINK( RemoveCommandHdl, Button *, void );
    DECL_LINK( RemoveCommandHdl, Button *, void );

    void            Init() override;
    void            UpdateButtonStates() override;

cui/source/inc/SvxToolbarConfigPage.hxx

diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx
index e472155..29e4807 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -58,7 +58,7 @@ private:
    DECL_LINK( SelectCategory, ListBox&, void );

    DECL_LINK( AddCommandHdl, Button *, void );
    //DECL_LINK( RemoveCommandHdl, Button *, void );
    DECL_LINK( RemoveCommandHdl, Button *, void );

    void            UpdateButtonStates() override;
    short           QueryReset() override;