[Libreoffice-commits] core.git: svx/source

[Armin Le Grand]

 svx/source/sidebar/area/AreaPropertyPanel.cxx |    7 +++++++
 svx/source/sidebar/line/LinePropertyPanel.cxx |    7 +++++++
 2 files changed, 14 insertions(+)

New commits:
commit d1a0b4f01b9c3a54dfcbee65e13d6dd4d1a78dfe
Author: Armin Le Grand <alg at apache.org>
Date:   Mon Jun 10 10:39:36 2013 +0000

    Resolves: #i122493# Corrected Enable/Disable for some DropDowns/Texts...
    
    in Line/AreaPropertyPanel
    
    (cherry picked from commit 2890568e3ac8e140d12f05d8ac74f3be50ffa45d)
    
    Change-Id: I6436b165a873e6f79af29690170231af939fcccc

diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 6340978..df87602 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));
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 915d48b..1302205 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -577,10 +577,12 @@ void LinePropertyPanel::NotifyItemUpdate(
             if(bDisabled)
             {
                 mpLBEdgeStyle->Disable();
+                mpFTEdgeStyle->Disable();
             }
             else
             {
                 mpLBEdgeStyle->Enable();
+                mpFTEdgeStyle->Enable();
             }
 
             if(eState >= SFX_ITEM_DEFAULT)
@@ -635,10 +637,12 @@ void LinePropertyPanel::NotifyItemUpdate(
             if(bDisabled)
             {
                 mpLBCapStyle->Disable();
+                mpFTCapStyle->Disable();
             }
             else
             {
                 mpLBCapStyle->Enable();
+                mpLBCapStyle->Enable();
             }
 
             if(eState >= SFX_ITEM_DEFAULT)
@@ -1052,6 +1056,7 @@ void LinePropertyPanel::SelectLineStyle()
     if( !mpStyleItem.get() || !mpDashItem.get() )
     {
         mpLBStyle->SetNoSelection();
+        mpLBStyle->Disable();
         return;
     }
 
@@ -1097,6 +1102,7 @@ void LinePropertyPanel::SelectEndStyle(bool bStart)
         if( !mpStartItem.get() )
         {
             mpLBStart->SetNoSelection();
+            mpLBStart->Disable();
             return;
         }
 
@@ -1125,6 +1131,7 @@ void LinePropertyPanel::SelectEndStyle(bool bStart)
         if( !mpEndItem.get() )
         {
             mpLBEnd->SetNoSelection();
+            mpLBEnd->Disable();
             return;
         }