summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-19 15:38:56 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-19 15:52:04 +0000
commit251737f0dd186b0f169f5ba237e1e8c28a320e00 (patch)
treec9e7fa2fe4b86f846d8c964091b000aec2d0f774
parent35b77d0c13f15fc172104881e053e8527eebac2c (diff)
Resolves: fdo#88417 Dropdown for ruler settings should show radio buttons
This reverts commit 9995222d1141b326197a387cc7897b3971ce9e9a and additionally converts the ruler settings to radio buttons and not checkboxes Conflicts: vcl/source/control/tabctrl.cxx Change-Id: Ie0eac5f07729447942065b7f415398165fbf067c
-rw-r--r--svx/source/dialog/ruler.src22
-rw-r--r--vcl/source/control/tabctrl.cxx2
2 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
index d100a9156e09..b1942de57a8d 100644
--- a/svx/source/dialog/ruler.src
+++ b/svx/source/dialog/ruler.src
@@ -26,67 +26,67 @@ Menu RID_SVXMN_RULER
MenuItem
{
Identifier = ID_MM ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Millimeter" ;
};
MenuItem
{
Identifier = ID_CM ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Centimeter" ;
};
MenuItem
{
Identifier = ID_M ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Meter" ;
};
MenuItem
{
Identifier = ID_KM ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Kilometer" ;
};
MenuItem
{
Identifier = ID_INCH ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Inch" ;
};
MenuItem
{
Identifier = ID_FOOT ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Foot" ;
};
MenuItem
{
Identifier = ID_MILE ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Miles" ;
};
MenuItem
{
Identifier = ID_POINT ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Point" ;
};
MenuItem
{
Identifier = ID_PICA ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text [ en-US ] = "Pica" ;
};
MenuItem
{
Identifier = ID_CHAR ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text[ en-US ] = "Char" ;
};
MenuItem
{
Identifier = ID_LINE ;
- Checkable = TRUE ;
+ RadioCheck = TRUE ;
Text[ en-US ] = "Line" ;
};
};
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 3a8f5724f69c..ee09d4074d6b 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1448,7 +1448,7 @@ void TabControl::Command( const CommandEvent& rCEvt )
for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin();
it != mpTabCtrlData->maItemList.end(); ++it )
{
- aMenu.InsertItem( it->mnId, it->maText, MenuItemBits::CHECKABLE );
+ aMenu.InsertItem( it->mnId, it->maText, MenuItemBits::CHECKABLE | MenuItemBits::RADIOCHECK );
if ( it->mnId == mnCurPageId )
aMenu.CheckItem( it->mnId );
aMenu.SetHelpId( it->mnId, it->maHelpId );