[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source

[Kohei Yoshida]

 chart2/source/controller/main/ControllerCommandDispatch.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3b61e6ceca567ea94a0ec35e49f49addd216358b
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Jun 6 11:23:02 2014 -0400

    fdo#78860: Swap the logic here: Disable -> Enable.
    
    Because the UNO property logic had been swapped earlier.
    
    Change-Id: I35af3e8cee3c4cbc8da43d7bc478f506048887b0
    (cherry picked from commit c4ac853409afcb451bed0d044d36131a08e8e403)

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index fe3fbb3..7f4f4c1 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -525,7 +525,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
     bool bShapeContext = m_pChartController && m_pChartController->isShapeContext();
 
-    bool bDisableDataTableDialog = false;
+    bool bEnableDataTableDialog = false;
     if ( m_xController.is() )
     {
         Reference< beans::XPropertySet > xProps( m_xController->getModel(), uno::UNO_QUERY );
@@ -533,7 +533,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
         {
             try
             {
-                xProps->getPropertyValue(  "EnableDataTableDialog" ) >>= bDisableDataTableDialog;
+                xProps->getPropertyValue("EnableDataTableDialog") >>= bEnableDataTableDialog;
             }
             catch( const uno::Exception& e )
             {
@@ -613,7 +613,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
     // depending on own data
     m_aCommandAvailability[ ".uno:DataRanges" ] = bIsWritable && bModelStateIsValid && (! m_apModelState->bHasOwnData);
-    m_aCommandAvailability[ ".uno:DiagramData" ] = bIsWritable && bModelStateIsValid &&  m_apModelState->bHasOwnData && !bDisableDataTableDialog;
+    m_aCommandAvailability[ ".uno:DiagramData" ] = bIsWritable && bModelStateIsValid &&  m_apModelState->bHasOwnData && bEnableDataTableDialog;
 
     // titles
     m_aCommandAvailability[ ".uno:MainTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainTitle;
@@ -649,9 +649,9 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
     // series arrangement
     m_aCommandAvailability[ ".uno:Forward" ] = ( bShapeContext ? isShapeControllerCommandAvailable( ".uno:Forward" ) :
-        ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesForward && !bDisableDataTableDialog ) );
+        ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesForward && bEnableDataTableDialog ) );
     m_aCommandAvailability[ ".uno:Backward" ] = ( bShapeContext ? isShapeControllerCommandAvailable( ".uno:Backward" ) :
-        ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesBackward && !bDisableDataTableDialog ) );
+        ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesBackward && bEnableDataTableDialog ) );
 
     m_aCommandAvailability[ ".uno:InsertDataLabels" ] = bIsWritable;
     m_aCommandAvailability[ ".uno:InsertDataLabel" ] = bIsWritable;