summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Dominguez <venccsralph@gmail.com>2012-07-08 16:35:25 -0430
committerRafael Dominguez <venccsralph@gmail.com>2012-07-08 19:57:56 -0430
commitbabc18065fa5185bd0208ce48636b4f6a492ebe5 (patch)
treefa015148f83f0658f1e72dea87126f844ede7493
parent0088d0362381596f64e4218e1aa8af54b3db36e5 (diff)
Remove "No folder" option from move menu.
- We dont support having folders and template files mixed, so we cant move them to the same folders as templates. Change-Id: I07a519e63fef358d915a1d2c8484c6c2d8940642
-rw-r--r--sfx2/source/doc/templatedlg.cxx12
-rw-r--r--sfx2/source/doc/templatedlg.hrc2
-rw-r--r--sfx2/source/doc/templatedlg.src5
3 files changed, 0 insertions, 19 deletions
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index e9d57cbc818c..0e7fe291c2b9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -395,7 +395,6 @@ IMPL_LINK(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox)
pMoveMenu->InsertSeparator();
pMoveMenu->InsertItem(MNI_MOVE_NEW,SfxResId(STR_MOVE_NEW).toString());
- pMoveMenu->InsertItem(MNI_MOVE_DELETE,SfxResId(STR_MOVE_DELETE).toString());
pMoveMenu->Execute(pBox,pBox->GetItemRect(TBI_TEMPLATE_MOVE),
POPUPMENU_EXECUTE_DOWN);
@@ -530,17 +529,6 @@ IMPL_LINK(SfxTemplateManagerDlg, MoveMenuSelectHdl, Menu*, pMenu)
}
}
}
- else if (nMenuId == MNI_MOVE_DELETE)
- {
- std::set<const ThumbnailViewItem*>::const_iterator pIter;
- for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();)
- {
- if (maView->removeTemplate((*pIter)->mnId))
- maSelTemplates.erase(pIter++);
- else
- ++pIter;
- }
- }
else
{
// Try to move the template, if isnt possible try to copy it.
diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc
index 8a46b1113a14..cf94cd3ce37e 100644
--- a/sfx2/source/doc/templatedlg.hrc
+++ b/sfx2/source/doc/templatedlg.hrc
@@ -46,11 +46,9 @@
#define STR_ACTION_SORT_NAME 264
#define MNI_MOVE_NEW 265
-#define MNI_MOVE_DELETE 266
#define MNI_MOVE_FOLDER_BASE 267
#define STR_MOVE_NEW 268
-#define STR_MOVE_DELETE 270
#define STR_INPUT_NEW 271
#define IMG_ONLINE_REPOSITORY 100
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index f9ce918bc781..c634932c92de 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -40,11 +40,6 @@ String STR_MOVE_NEW
Text [ en-US ] = "New folder";
};
-String STR_MOVE_DELETE
-{
- Text [ en-US ] = "No folder";
-};
-
String STR_INPUT_NEW
{
Text [ en-US ] = "Enter folder name:";