Remove useless comments and some dead code.

8 files changed, 6 insertions, 25 deletions

diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index c612fa53904f..d04835a4049c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -113,10 +113,9 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r
         {
             try
             {
-                // /-- locked controllers
+                // locked controllers
                 ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
                 xTemplate->changeDiagram( xDiagram );
-                // \-- locked controllers
             }
             catch( uno::Exception & ex )
             {
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index e38416317ca7..e8984a0e0b4f 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -338,7 +338,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
     {
         uno::Reference< frame::XModel > xModel( xChartModel, uno::UNO_QUERY);
 
-        // /-- locked controllers
+        // locked controllers
         ControllerLockGuard aCtrlLockGuard( xModel );
         uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel );
         DiagramHelper::tTemplateWithServiceName aTemplateWithService(
@@ -357,7 +357,6 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
             if( xDiaProp.is() )
                 xDiaProp->setPropertyValue( C2U( "SortByXValues" ), uno::makeAny( rParameter.bSortByXValues ) );
         }
-        // \-- locked controllers
     }
     return false;
 }
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index cb17d564752d..b7461c404363 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -144,7 +144,6 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
 {
     static uno::Sequence< uno::Type > aTypeList;
 
-    // /--
     ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
     if( !aTypeList.getLength() )
     {
@@ -162,7 +161,6 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
     }
 
     return aTypeList;
-    // \--
 }
 uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException )
 {
@@ -294,7 +292,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
     m_xChartModel.clear();
     m_xParentWindow.clear();
 
-    // /--
     SolarMutexGuard aSolarGuard;
     if( m_pDialog )
     {
@@ -317,7 +314,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
     {
         ASSERT_EXCEPTION( ex );
     }
-    // \--
 }
 
 //XPropertySet
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index b13e93a573b2..ff26d19ea7f0 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -182,11 +182,10 @@ void ThreeD_SceneAppearance_TabPage::applyRoundedEdgeAndObjectLinesToModel()
             break;
     }
 
-    // /-- locked controllers
+    // locked controllers
     ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
     ThreeDHelper::setRoundedEdgesAndObjectLines(
         ::chart::ChartModelHelper::findDiagram( m_xChartModel ), nCurrentRoundedEdges, nObjectLines );
-    // \-- locked controllers
 }
 
 void ThreeD_SceneAppearance_TabPage::applyShadeModeToModel()
@@ -307,7 +306,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
         return 0;
 
     {
-        // /-- locked controllers
+        // locked controllers
         ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
 
         uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( m_xChartModel ) );
@@ -320,7 +319,6 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
         {
             OSL_ENSURE( false, "Invalid Entry selected" );
         }
-        // \-- locked controllers
     }
 
     // update other controls
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index cb04fae0769e..e112c8b424be 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -784,7 +784,7 @@ void ChartController::impl_deleteDrawViewController()
             uno::Reference< util::XModeChangeBroadcaster > xViewBroadcaster( m_xChartView, uno::UNO_QUERY );
             if( xViewBroadcaster.is() )
                 xViewBroadcaster->removeModeChangeListener(this);
-            // /--
+
             impl_invalidateAccessible();
             SolarMutexGuard aSolarGuard;
             impl_deleteDrawViewController();
@@ -797,7 +797,6 @@ void ChartController::impl_deleteDrawViewController()
             m_pChartWindow = NULL;//m_pChartWindow is deleted via UNO due to dispose of m_xViewWindow (trigerred by Framework (Controller pretends to be XWindow also))
             m_xViewWindow->dispose();
             m_xChartView.clear();
-            // \--
         }
 
         // remove as listener to layout manager events
@@ -1312,7 +1311,6 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
     UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
         ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_CHARTTYPE ))), m_xUndoManager, getModel() );
 
-    // /--
     SolarMutexGuard aSolarGuard;
     //prepare and open dialog
     ChartTypeDialog aDlg( m_pChartWindow, getModel(), m_xCC );
@@ -1321,7 +1319,6 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
         impl_adaptDataSeriesAutoResize();
         aUndoGuard.commitAction();
     }
-    // \--
 }
 
 void SAL_CALL ChartController::executeDispatch_SourceData()
@@ -1338,7 +1335,6 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
         ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_DATA_RANGES ))), m_xUndoManager, getModel() );
     if( xChartDoc.is())
     {
-        // /--
         SolarMutexGuard aSolarGuard;
         ::chart::DataSourceDialog aDlg( m_pChartWindow, xChartDoc, m_xCC );
         if( aDlg.Execute() == RET_OK )
@@ -1346,7 +1342,6 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
             impl_adaptDataSeriesAutoResize();
             aUndoGuard.commitAction();
         }
-        // \--
     }
 }
 
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index 1ddb8ede5b93..4f1cc58bb06b 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -63,7 +63,6 @@ void ChartController::executeDispatch_EditData()
         Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider());
 
         {
-            // /--
             SolarMutexGuard aSolarGuard;
             // using assignment for broken gcc 3.3
             UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData(
@@ -73,7 +72,6 @@ void ChartController::executeDispatch_EditData()
             // the dialog has no OK/Cancel
             aDataEditorDialog.Execute();
             aUndoGuard.commitAction();
-            // \--
         }
     }
 }
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index baaa3b1c3959..d352e92a3c65 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -106,7 +106,7 @@ namespace
         DBG_ERROR("unknown ObjectType");
         return NULL;
     }
-    //--
+
     rtl::OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID );
     bool bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS"));
     //-------------------------------------------------------------
@@ -842,13 +842,11 @@ void SAL_CALL ChartController::executeDispatch_View3D()
             ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_3D_VIEW ))),
             m_xUndoManager, getModel());
 
-        // /--
         //open dialog
         SolarMutexGuard aSolarGuard;
         View3DDialog aDlg( m_pChartWindow, getModel(), m_pDrawModelWrapper->GetColorTable() );
         if( aDlg.Execute() == RET_OK )
             aUndoGuard.commitAction();
-        // \--
     }
     catch( uno::RuntimeException& e)
     {
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 91557b6b1b35..d1245b57f27d 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -113,13 +113,11 @@ void SAL_CALL UndoCommandDispatch::dispatch(
     if( m_xUndoManager.is() )
     {
         // why is it necessary to lock the solar mutex here?
-        // /--
         SolarMutexGuard aSolarGuard;
         if( URL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" )))
             m_xUndoManager->undo( m_xModel );
         else
             m_xUndoManager->redo( m_xModel );
-        // \--
     }
 }