[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sfx2/source

[Akshay Deep]

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

New commits:
commit c34baeeca744498d39b116d7bc7739905195daca
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>
    (cherry picked from commit 665844d8dd0cf4b3fc6cdb56f3e155704ba76b00)
    Reviewed-on: https://gerrit.libreoffice.org/26025

diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index c2df6bf..bd1245b 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -185,8 +185,8 @@ void TemplateLocalView::createContextMenu()
     pItemMenu->InsertItem(MNI_EDIT,SfxResId(STR_EDIT_TEMPLATE).toString());
     pItemMenu->InsertItem(MNI_DEFAULT_TEMPLATE,SfxResId(STR_DEFAULT_TEMPLATE).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);
@@ -207,9 +207,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);
@@ -227,6 +224,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;