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

Akshay Deep akshaydeepiitr at gmail.com
Tue Jun 7 14:48:10 UTC 2016


 sfx2/source/control/templatelocalview.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 665844d8dd0cf4b3fc6cdb56f3e155704ba76b00
Author: Akshay Deep <akshaydeepiitr at gmail.com>
Date:   Tue Jun 7 20:15:06 2016 +0530

    Switch "Delete" and "Rename" in Template context menu
    
    Change-Id: Ib40a27c25d15c4dd65bbfc4d50f55b16496c7a0a
    Reviewed-on: https://gerrit.libreoffice.org/26024
    Reviewed-by: Akshay Deep <akshaydeepiitr at gmail.com>
    Tested-by: Akshay Deep <akshaydeepiitr at gmail.com>

diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 7b93c79..cd3642b 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -190,8 +190,8 @@ void TemplateLocalView::createContextMenu(const bool bIsDefault)
         pItemMenu->InsertItem(MNI_DEFAULT_TEMPLATE,SfxResId(STR_RESET_DEFAULT).toString());
 
     pItemMenu->InsertSeparator();
-    pItemMenu->InsertItem(MNI_DELETE,SfxResId(STR_DELETE).toString());
     pItemMenu->InsertItem(MNI_RENAME,SfxResId(STR_RENAME).toString());
+    pItemMenu->InsertItem(MNI_DELETE,SfxResId(STR_DELETE).toString());
     pItemMenu->InsertSeparator();
     deselectItems();
     maSelectedItem->setSelection(true);
@@ -212,9 +212,6 @@ IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool)
     case MNI_EDIT:
         maEditTemplateHdl.Call(maSelectedItem);
         break;
-    case MNI_DELETE:
-        maDeleteTemplateHdl.Call(maSelectedItem);
-        break;
     case MNI_RENAME:
     {
         ScopedVclPtrInstance< InputDialog > m_pTitleEditDlg( SfxResId(STR_RENAME_TEMPLATE).toString(), this);
@@ -232,6 +229,9 @@ IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool)
         }
     }
         break;
+    case MNI_DELETE:
+        maDeleteTemplateHdl.Call(maSelectedItem);
+        break;
     case MNI_DEFAULT_TEMPLATE:
         maDefaultTemplateHdl.Call(maSelectedItem);
         break;


More information about the Libreoffice-commits mailing list