svn commit: r1491400 - in /openoffice/trunk/main/svx/source/sidebar: area/AreaPropertyPanel.cxx line/LinePropertyPanel.cxx

[al...@apache.org]

Author: alg
Date: Mon Jun 10 10:39:36 2013
New Revision: 1491400

URL: http://svn.apache.org/r1491400
Log:
i122493 Corrected Enable/Disable for some DropDowns/Texts in Line/AreaPropertyPanel

Modified:
    openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.cxx
    openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx

Modified: openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.cxx?rev=1491400&r1=1491399&r2=1491400&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.cxx Mon Jun 10 10:39:36 2013
@@ -667,6 +667,7 @@ void AreaPropertyPanel::ImpUpdateTranspa
             else if(nValue <= 100)
             {
                 mpLBTransType->Enable();
+                mpTrspTextFT->Enable();
                 mpLBTransType->SelectEntryPos(1);
                 mpBTNGradient->Hide();
                 mpMTRTransparent->Show();
@@ -690,6 +691,7 @@ void AreaPropertyPanel::ImpUpdateTranspa
                 Image* pImage = 0;
 
                 mpLBTransType->Enable();
+                mpTrspTextFT->Enable();
                 mpMTRTransparent->Hide();
                 mpBTNGradient->Enable();
                 mpBTNGradient->Show();
@@ -747,6 +749,7 @@ void AreaPropertyPanel::ImpUpdateTranspa
         if(bZeroValue)
         {
             mpLBTransType->Enable();
+            mpTrspTextFT->Enable();
             mpLBTransType->SelectEntryPos(0);
             mpBTNGradient->Hide();
             mpMTRTransparent->Enable();
@@ -758,6 +761,8 @@ void AreaPropertyPanel::ImpUpdateTranspa
     {
         // no transparency at all
         mpLBTransType->SetNoSelection();
+        mpLBTransType->Disable();
+        mpTrspTextFT->Disable();
         mpMTRTransparent->Disable();
         mpMTRTransparent->Show();
         mpBTNGradient->Disable();
@@ -840,6 +845,7 @@ void AreaPropertyPanel::NotifyItemUpdate
             if(bDisabled)
             {
                 mpLbFillType->Disable(); 
+                mpColorTextFT->Disable(); 
                 mpLbFillType->SetNoSelection();
                 mpLbFillAttr->Show();
                 mpLbFillAttr->Disable();
@@ -857,6 +863,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));

Modified: openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx?rev=1491400&r1=1491399&r2=1491400&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx Mon Jun 10 10:39:36 2013
@@ -618,10 +618,12 @@ void LinePropertyPanel::NotifyItemUpdate
             if(bDisabled)
             {
                 mpLBEdgeStyle->Disable();
+                mpFTEdgeStyle->Disable();
             }
             else
             {
                 mpLBEdgeStyle->Enable();
+                mpFTEdgeStyle->Enable();
             }
 
             if(eState >= SFX_ITEM_DEFAULT)
@@ -676,10 +678,12 @@ void LinePropertyPanel::NotifyItemUpdate
             if(bDisabled)
             {
                 mpLBCapStyle->Disable();
+                mpFTCapStyle->Disable();
             }
             else
             {
                 mpLBCapStyle->Enable();
+                mpLBCapStyle->Enable();
             }
 
             if(eState >= SFX_ITEM_DEFAULT)
@@ -1093,6 +1097,7 @@ void LinePropertyPanel::SelectLineStyle(
     if( !mpStyleItem.get() || !mpDashItem.get() )
     {
         mpLBStyle->SetNoSelection();
+        mpLBStyle->Disable();
         return;
     }
 
@@ -1138,6 +1143,7 @@ void LinePropertyPanel::SelectEndStyle(b
         if( !mpStartItem.get() )
         {
             mpLBStart->SetNoSelection();
+            mpLBStart->Disable();
             return;
         }
 
@@ -1166,6 +1172,7 @@ void LinePropertyPanel::SelectEndStyle(b
         if( !mpEndItem.get() )
         {
             mpLBEnd->SetNoSelection();
+            mpLBEnd->Disable();
             return;
         }