[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source

[Libreoffice Gerrit user]

 svx/source/tbxctrls/verttexttbxctrl.cxx |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit c2aa763bd762d161eca9c07f1f31885d6bc751f6
Author: Noel Power <noel.power at suse.com>
Date:   Wed Nov 14 09:39:21 2012 +0000

    allow hiding of rtl or ltr buttons on toolbars when ctl selected fdo#33356
    
    Change-Id: I56ce5da755578e35215aa5ca2d37835dcbffbf7d
    Reviewed-on: https://gerrit.libreoffice.org/1054
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>
    Reviewed-on: https://gerrit.libreoffice.org/1055
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index f70daf2..d6f6da2 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -83,16 +83,10 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
         return;
     }
 
-    if(bEnabled)
-    {
-        if(!bVisible)
-        {
-            GetToolBox().ShowItem( GetId(), sal_True );
-            bCalc = sal_True;
-        }
-    }
-    else if(bVisible)
+    if(!bEnabled)
     {
+        // always hide if either IsVerticalTextEnabled or IsCTLFontEnabled
+        // is false
         GetToolBox().HideItem( GetId() );
         bCalc = sal_True;
     }