summaryrefslogtreecommitdiff
path: root/chart2/source/controller
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-01-17 17:38:29 +0100
committerKohei Yoshida <kyoshida@novell.com>2011-01-18 12:17:31 -0500
commit0cd32bec488d80cef111ccbff8c172b35421a394 (patch)
tree84f7a83d6c44938dfacc9693769bb724fc700246 /chart2/source/controller
parentdb95c38b3cd3efb924a3be2f7fe1027dbf75401f (diff)
Remove some more dead code
Diffstat (limited to 'chart2/source/controller')
-rw-r--r--chart2/source/controller/accessibility/AccStatisticsObject.hxx9
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx33
2 files changed, 2 insertions, 40 deletions
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
index eb101831f900..a11951aaa42b 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
@@ -38,15 +38,6 @@ namespace chart
class AccStatisticsObject : public AccessibleChartElement
{
public:
- /*
- enum StatisticsObjectType
- {
- MEAN_VAL_LINE = OBJECTTYPE_AVERAGEVALUE,
- ERROR_BARS = OBJECTTYPE_ERROR,
- REGRESSION = OBJECTTYPE_REGRESSION
- };
- */
-
AccStatisticsObject( const AccessibleElementInfo& rAccInfo );
virtual ~AccStatisticsObject();
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 368cc60d5d2c..9e214900ab06 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -767,8 +767,6 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
pDrawViewWrapper->MovAction( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
}
- //?? pDrawViewWrapper->GetPageView()->DragPoly();
-
impl_SetMousePointer( rMEvt );
}
void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ )
@@ -1087,7 +1085,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
}
}
- //const sal_Int32 nIdBeforeFormat = nUniqueId;
if( bIsPoint )
{
if( bHasDataLabelAtPoint )
@@ -1139,10 +1136,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatYErrorBars") );
- //if( nIdBeforeFormat != nUniqueId )
- xPopupMenu->insertSeparator( -1 );
-
- //const sal_Int32 nIdBeforeInsert = nUniqueId;
+ xPopupMenu->insertSeparator( -1 );
if( !bHasDataLabelsAtSeries )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabels") );
@@ -1155,10 +1149,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( !bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertYErrorBars") );
- //if( nIdBeforeInsert != nUniqueId )
- // xPopupMenu->insertSeparator( -1 );
-
- //const sal_Int32 nIdBeforeDelete = nUniqueId;
if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabels") );
@@ -1174,8 +1164,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasFormattedDataPointsOtherThanSelected )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetAllDataPoints"));
- //if( nIdBeforeDelete != nUniqueId )
- xPopupMenu->insertSeparator( -1 );
+ xPopupMenu->insertSeparator( -1 );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow"));
uno::Reference< awt::XPopupMenu > xArrangePopupMenu(
@@ -1328,7 +1317,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
KeyCode aKeyCode( rKEvt.GetKeyCode());
sal_uInt16 nCode = aKeyCode.GetCode();
-// bool bShift = aKeyCode.IsShift();
bool bAlternate = aKeyCode.IsMod2();
if( m_apAccelExecute.get() )
@@ -1348,8 +1336,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
}
}
- //if( m_pDrawViewWrapper->IsAction() );
-
// keyboard accessibility
ObjectType eObjectType = ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() );
if( ! bReturn )
@@ -1562,21 +1548,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
}
}
- /* old chart:
- // Ctrl-Shift-R: Repaint
- if (!bReturn && GetWindow())
- {
- KeyCode aKeyCode = rKEvt.GetKeyCode();
-
- if (aKeyCode.IsMod1() && aKeyCode.IsShift()
- && aKeyCode.GetCode() == KEY_R)
- {
- // 3D-Kontext wieder zerstoeren
- GetWindow()->Invalidate();
- bReturn = TRUE;
- }
- }
- */
return bReturn;
}