summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <s.mehrbrodt@gmail.com>2014-10-01 14:17:07 +0200
committerSamuel Mehrbrodt <s.mehrbrodt@gmail.com>2014-10-01 14:20:58 +0200
commit5f45400ca17d52a4ee40672ac409b6521ad86f76 (patch)
tree6f512685982d818eb442b7105adbad8957d48d70
parent92bbd7bc99103df5136b012bf3b6652a2a721ab0 (diff)
fdo#84550 Make 'Insert field' entry dropdown only
and reorder items; rename "Other" to "More" Change-Id: I8a6f2a68fd43af2c7c25a2d14bdad09409964037
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx2
-rw-r--r--sw/source/uibase/ribbar/workctrl.src32
2 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index ff70be3516b6..6b51a180ae76 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -286,7 +286,7 @@ SwTbxFieldCtrl::SwTbxFieldCtrl(
pPopup(0),
pView(0)
{
- rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
+ rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
}
SwTbxFieldCtrl::~SwTbxFieldCtrl()
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
index 0362623fc8aa..4acde4ce689f 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -30,18 +30,6 @@ Menu RID_INSERT_FIELD_CTRL
{
MenuItem
{
- Identifier = FN_INSERT_FLD_DATE ;
- HelpId = CMD_FN_INSERT_FLD_DATE ;
- Text [ en-US ] = "Date" ;
- };
- MenuItem
- {
- Identifier = FN_INSERT_FLD_TIME ;
- HelpId = CMD_FN_INSERT_FLD_TIME ;
- Text [ en-US ] = "Time" ;
- };
- MenuItem
- {
Identifier = FN_INSERT_FLD_PGNUMBER ;
HelpId = CMD_FN_INSERT_FLD_PGNUMBER ;
Text [ en-US ] = "Page Number" ;
@@ -54,9 +42,15 @@ Menu RID_INSERT_FIELD_CTRL
};
MenuItem
{
- Identifier = FN_INSERT_FLD_TOPIC ;
- HelpId = CMD_FN_INSERT_FLD_TOPIC ;
- Text [ en-US ] = "Subject" ;
+ Identifier = FN_INSERT_FLD_DATE ;
+ HelpId = CMD_FN_INSERT_FLD_DATE ;
+ Text [ en-US ] = "Date" ;
+ };
+ MenuItem
+ {
+ Identifier = FN_INSERT_FLD_TIME ;
+ HelpId = CMD_FN_INSERT_FLD_TIME ;
+ Text [ en-US ] = "Time" ;
};
MenuItem
{
@@ -72,13 +66,19 @@ Menu RID_INSERT_FIELD_CTRL
};
MenuItem
{
+ Identifier = FN_INSERT_FLD_TOPIC ;
+ HelpId = CMD_FN_INSERT_FLD_TOPIC ;
+ Text [ en-US ] = "Subject" ;
+ };
+ MenuItem
+ {
Separator = TRUE ;
};
MenuItem
{
Identifier = FN_INSERT_FIELD ;
HelpId = CMD_FN_INSERT_FIELD ;
- Text [ en-US ] = "Other..." ;
+ Text [ en-US ] = "More..." ;
};
};
};