diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-06 11:23:02 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-06 11:25:31 -0400 |
| commit | c4ac853409afcb451bed0d044d36131a08e8e403 (patch) | |
| tree | fdb07ede5b79bd3f42ee6fad28d0fafff774d2a3 | |
| parent | 28e9b5bc01ee25d8f456cf7acb1d618a5c0a8db8 (diff) | |
fdo#78860: Swap the logic here: Disable -> Enable.
Because the UNO property logic had been swapped earlier.
Change-Id: I35af3e8cee3c4cbc8da43d7bc478f506048887b0
| -rw-r--r-- | chart2/source/controller/main/ControllerCommandDispatch.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index fe3fbb3e3c5b..7f4f4c18a59e 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; |