svx/source/tbxctrls/layctrl.cxx | 2 +- sw/source/uibase/ribbar/workctrl.cxx | 2 +- sw/source/uibase/ribbar/workctrl.src | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit 5f45400ca17d52a4ee40672ac409b6521ad86f76 Author: Samuel Mehrbrodt <[email protected]> Date: Wed Oct 1 14:17:07 2014 +0200 fdo#84550 Make 'Insert field' entry dropdown only and reorder items; rename "Other" to "More" Change-Id: I8a6f2a68fd43af2c7c25a2d14bdad09409964037 diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index ff70be3..6b51a18 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 0362623..4acde4c 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..." ; }; }; }; commit 92bbd7bc99103df5136b012bf3b6652a2a721ab0 Author: Samuel Mehrbrodt <[email protected]> Date: Wed Oct 1 13:49:54 2014 +0200 fdo#84551 Make 'Insert table' entry dropdown only Change-Id: I26a3f2672fa9a849c370a24a5d21162cfb2a91c5 diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 2794af2..920669e 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -704,7 +704,7 @@ SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n SfxToolBoxControl( nSlotId, nId, rTbx ), bEnabled( true ) { - rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); + rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); rTbx.Invalidate(); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
