Skip to content

C
core
Kaydet (Commit) b412ee7b authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl
Dosyalara gözat
Seçenekler

Fix bad merge of CharController_Window 

Change-Id: I6d947d90f0505c29b4e301bc1ff30216aa0ed476
üst 9408a1d0
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 20 deletions
chart2/source/controller/main/ChartController_Window.cxx
Dosyayı görüntüle @ b412ee7b
...@@ -1129,9 +1129,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) ...@@ -1129,9 +1129,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
} }
if( bHasDataLabelsAtSeries ) if( bHasDataLabelsAtSeries )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatDataLabels" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatDataLabels" );
//if( xTrendline.is() )
// lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendline" );
if( bHasEquation ) if( bHasEquation )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatTrendlineEquation" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatTrendlineEquation" );
if( xMeanValue.is() ) if( xMeanValue.is() )
...@@ -1144,12 +1142,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) ...@@ -1144,12 +1142,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
xPopupMenu->insertSeparator( -1 ); xPopupMenu->insertSeparator( -1 );
if( !bHasDataLabelsAtSeries ) if( !bHasDataLabelsAtSeries )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertDataLabels" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertDataLabels" );
//if( !xTrendline.is() ) lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertTrendline" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendline" );
//else if( !bHasEquation )
//lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" );
if( !xMeanValue.is() ) if( !xMeanValue.is() )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertMeanValue" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertMeanValue" );
...@@ -1157,12 +1152,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) ...@@ -1157,12 +1152,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertXErrorBars" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertXErrorBars" );
if( !bHasYErrorBars ) if( !bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertYErrorBars" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertYErrorBars" );
if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) ) if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteDataLabels" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteDataLabels" );
//if( xTrendline.is() )
// lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendline" );
if( bHasEquation ) if( bHasEquation )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteTrendlineEquation" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteTrendlineEquation" );
if( xMeanValue.is() ) if( xMeanValue.is() )
...@@ -1193,13 +1184,13 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) ...@@ -1193,13 +1184,13 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
} }
else if( OBJECTTYPE_DATA_CURVE == eObjectType ) else if( OBJECTTYPE_DATA_CURVE == eObjectType )
{ {
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendline" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteTrendline" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendlineEquation" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatTrendlineEquation" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertTrendlineEquation" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquationAndR2" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertTrendlineEquationAndR2" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertR2Value" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertR2Value" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendlineEquation" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteTrendlineEquation" );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteR2Value" ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteR2Value" );
} }
else if( OBJECTTYPE_DATA_CURVE_EQUATION == eObjectType ) else if( OBJECTTYPE_DATA_CURVE_EQUATION == eObjectType )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment