diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 14:06:05 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 14:06:05 +0000 |
commit | 80204d8fcf35c14168a75765360eb61977653162 (patch) | |
tree | bef084bbf17b8e0d28743b03ea7213aafeae831e /svx/source/tbxctrls/verttexttbxctrl.cxx | |
parent | 45804b0395ec0f8369224229e41f1b099c4754d3 (diff) |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'svx/source/tbxctrls/verttexttbxctrl.cxx')
-rw-r--r-- | svx/source/tbxctrls/verttexttbxctrl.cxx | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 64534aa5e6a0..4b000aa7312f 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: verttexttbxctrl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2002-09-13 13:38:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:05:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,11 +102,20 @@ SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( ) void SvxVertCTLTextTbxCtrl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) { - BOOL bVisible = GetToolBox().IsItemVisible(GetId()); - BOOL bCalc = sal_False; SvtLanguageOptions aLangOptions; - sal_Bool bEnabled = bCheckVertical ? - aLangOptions.IsVerticalTextEnabled() : aLangOptions.IsCTLFontEnabled(); + BOOL bCalc = sal_False; + BOOL bVisible = GetToolBox().IsItemVisible(GetId()); + sal_Bool bEnabled = sal_False; + if ( nSID == SID_VERTICALTEXT_STATE ) + bEnabled = aLangOptions.IsVerticalTextEnabled(); + else if ( nSID == SID_CTLFONT_STATE ) + bEnabled = aLangOptions.IsCTLFontEnabled(); + else + { + SfxToolBoxControl::StateChanged(nSID, eState, pState); + return; + } + if(bEnabled) { if(!bVisible) @@ -132,7 +141,6 @@ void SvxVertCTLTextTbxCtrl::StateChanged( USHORT nSID, SfxItemState eState, pParent->SetOutputSizePixel( aSize ); } } - SfxToolBoxControl::StateChanged(nSID, eState, pState); } /* -----------------------------27.04.01 15:50-------------------------------- |