diff options
author | Armin Le Grand <alg@apache.org> | 2013-06-10 10:39:36 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-10 14:10:31 +0100 |
commit | d1a0b4f01b9c3a54dfcbee65e13d6dd4d1a78dfe (patch) | |
tree | 87a638a479e95e85bef62d00495dbdf5fc5d921e /svx/source/sidebar/area | |
parent | 721baad94ee81d9d6281edb93ee45936f6e0e496 (diff) |
Resolves: #i122493# Corrected Enable/Disable for some DropDowns/Texts...
in Line/AreaPropertyPanel
(cherry picked from commit 2890568e3ac8e140d12f05d8ac74f3be50ffa45d)
Change-Id: I6436b165a873e6f79af29690170231af939fcccc
Diffstat (limited to 'svx/source/sidebar/area')
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 6340978a4578..df87602696c3 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -656,6 +656,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies() else if(nValue <= 100) { mpLBTransType->Enable(); + mpTrspTextFT->Enable(); mpLBTransType->SelectEntryPos(1); mpBTNGradient->Hide(); mpMTRTransparent->Show(); @@ -678,6 +679,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies() Image* pImage = 0; mpLBTransType->Enable(); + mpTrspTextFT->Enable(); mpMTRTransparent->Hide(); mpBTNGradient->Enable(); mpBTNGradient->Show(); @@ -735,6 +737,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies() if(bZeroValue) { mpLBTransType->Enable(); + mpTrspTextFT->Enable(); mpLBTransType->SelectEntryPos(0); mpBTNGradient->Hide(); mpMTRTransparent->Enable(); @@ -746,6 +749,8 @@ void AreaPropertyPanel::ImpUpdateTransparencies() { // no transparency at all mpLBTransType->SetNoSelection(); + mpLBTransType->Disable(); + mpTrspTextFT->Disable(); mpMTRTransparent->Disable(); mpMTRTransparent->Show(); mpBTNGradient->Disable(); @@ -828,6 +833,7 @@ void AreaPropertyPanel::NotifyItemUpdate( if(bDisabled) { mpLbFillType->Disable(); + mpColorTextFT->Disable(); mpLbFillType->SetNoSelection(); mpLbFillAttr->Show(); mpLbFillAttr->Disable(); @@ -845,6 +851,7 @@ void AreaPropertyPanel::NotifyItemUpdate( { mpStyleItem.reset(dynamic_cast< XFillStyleItem* >(pItem->Clone())); mpLbFillType->Enable(); + mpColorTextFT->Enable(); XFillStyle eXFS = (XFillStyle)mpStyleItem->GetValue(); meLastXFS = eXFS; mpLbFillType->SelectEntryPos(sal::static_int_cast< sal_uInt16 >(eXFS)); |