[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-0' - svx/source vcl/source

[Caolán McNamara]

 svx/source/dialog/ruler.src    |   22 +++++++++++-----------
 vcl/source/control/tabctrl.cxx |    2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 9162fcf25a0661095169ec0c606ee81ffcd5707b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 19 15:38:56 2015 +0000

    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
    (cherry picked from commit 251737f0dd186b0f169f5ba237e1e8c28a320e00)
    Reviewed-on: https://gerrit.libreoffice.org/14017
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 83cb667fe9ad08ccbb3621b982edcb6fa8e4ab38)
    Reviewed-on: https://gerrit.libreoffice.org/14038
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
index d100a91..b1942de 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 2fb87dc..950377e 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 );