Remove dead code: "//static" and "//virtual"

13 files changed, 1 insertions, 38 deletions

diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index f06ef9efe501..9e382d4427c4 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -725,20 +725,16 @@ bool DialogModel::setData(
     return true;
 }
 
-// static
 OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString )
 {
     return lcl_ConvertRole( rRoleString, true );
 }
 
-// static
 OUString DialogModel::GetRoleDataLabel()
 {
     return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS )));
 }
 
-// static
-
 sal_Int32 DialogModel::GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString )
 {
     static lcl_tRoleIndexMap aRoleIndexMap;
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index a5d56b81e4f6..4bfbd04a54e4 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -332,7 +332,7 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural
     }
     return aRet;
 }
-//static
+
 rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID
                         , const uno::Reference< frame::XModel >& xChartModel  )
 {
@@ -373,7 +373,6 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID
     return aRet;
 }
 
-//static
 OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
 {
     OUString aRet;
@@ -412,7 +411,6 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
     return aRet;
 }
 
-//static
 OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
                         , const Reference< frame::XModel >& xChartModel )
 {
@@ -432,7 +430,6 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
     return aRet;
 }
 
-//static
 rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID
                         , const uno::Reference< frame::XModel >& xChartModel )
 {
@@ -704,7 +701,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
     return aRet;
 }
 
-// static
 rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument )
 {
     rtl::OUString aRet;
@@ -758,7 +754,6 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r
 }
 
 
-// static
 rtl::OUString ObjectNameProvider::getNameForCID(
     const rtl::OUString& rObjectCID,
     const uno::Reference< chart2::XChartDocument >& xChartDocument )
@@ -814,7 +809,6 @@ rtl::OUString ObjectNameProvider::getNameForCID(
     return getName( eType );
 }
 
-//static
 rtl::OUString ObjectNameProvider::getName_ObjectForSeries(
         ObjectType eObjectType,
         const rtl::OUString& rSeriesCID,
@@ -833,7 +827,6 @@ rtl::OUString ObjectNameProvider::getName_ObjectForSeries(
         return ObjectNameProvider::getName_ObjectForAllSeries( eObjectType );
 }
 
-//static
 rtl::OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType )
 {
     OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES));
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 8fd7133b3f4f..ec72cd6c0381 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -147,7 +147,6 @@ void DataSourceTabControl::EnableTabToggling()
 
 // ----------------------------------------
 
-// static
 USHORT DataSourceDialog::m_nLastPageId = 0;
 
 DataSourceDialog::DataSourceDialog(
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index e6e691e00bee..78218e2e4ae1 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -96,7 +96,6 @@ void InsertErrorBarsDialog::SetAxisMinorStepWidthForErrorBarDecimals( double fMi
     m_apErrorBarResources->SetAxisMinorStepWidthForErrorBarDecimals( fMinorStepWidth );
 }
 
-//static
 double InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals(
     const Reference< frame::XModel >& xChartModel,
     const Reference< uno::XInterface >& xChartView,
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index b9086018503e..87533fc9069c 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -68,7 +68,6 @@ NumberFormatDialog::~NumberFormatDialog()
 {
 }
 
-//static
 SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool )
 {
     static const USHORT nWhichPairs[] =
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 352fb95a29fa..11170fa5a466 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -57,8 +57,6 @@ using namespace ::com::sun::star::chart2;
 //-----------------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
-
-// static
 USHORT View3DDialog::m_nLastPageId = 0;
 
 View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorTable* pColorTable )
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index b377a4df6ea0..3394568fb373 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -185,7 +185,6 @@ SdrPageView* DrawViewWrapper::GetPageView() const
     return pSdrPageView;
 };
 
-//virtual
 void DrawViewWrapper::SetMarkHandles()
 {
     if( m_pMarkHandleProvider && m_pMarkHandleProvider->getMarkHandles( aHdl ) )
@@ -385,7 +384,6 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
     }
 }
 
-//static
 SdrObject* DrawViewWrapper::getSdrObject( const uno::Reference<
                     drawing::XShape >& xShape )
 {
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 6fe6df1b3096..4f4cd36a7d66 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -239,8 +239,6 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
 }
 
 // --------------------------------------------------------------------------------
-
-//static
 void ItemConverter::InvalidateUnequalItems( SfxItemSet  &rDestSet, const SfxItemSet &rSourceSet )
 {
     SfxWhichIter      aIter (rSourceSet);
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 2f2920f1538b..261561125bd3 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -582,7 +582,6 @@ void ChartController::executeDispatch_Cut()
     executeDispatch_Delete();
 }
 
-//static
 bool ChartController::isObjectDeleteable( const uno::Any& rSelection )
 {
     ObjectIdentifier aSelOID( rSelection );
diff --git a/chart2/source/controller/main/ImplUndoManager.cxx b/chart2/source/controller/main/ImplUndoManager.cxx
index ef7d3cd5fa34..90bc3394ba2f 100644
--- a/chart2/source/controller/main/ImplUndoManager.cxx
+++ b/chart2/source/controller/main/ImplUndoManager.cxx
@@ -144,7 +144,6 @@ OUString UndoElement::getActionString() const
     return m_aActionString;
 }
 
-// static
 Reference< frame::XModel > UndoElement::cloneModel( const Reference< frame::XModel > & xModel )
 {
     Reference< frame::XModel > xResult;
@@ -156,7 +155,6 @@ Reference< frame::XModel > UndoElement::cloneModel( const Reference< frame::XMod
     return xResult;
 }
 
-// static
 void UndoElement::applyModelContentToModel(
     Reference< frame::XModel > & xInOutModelToChange,
     const Reference< frame::XModel > & xModelToCopyFrom,
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 507b74baeecd..76c81e62ef57 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -631,13 +631,11 @@ ObjectHierarchy::ObjectHierarchy(
 ObjectHierarchy::~ObjectHierarchy()
 {}
 
-// static
 ObjectHierarchy::tOID ObjectHierarchy::getRootNodeOID()
 {
     return ObjectIdentifier( C2U( "ROOT" ) );
 }
 
-// static
 bool ObjectHierarchy::isRootNode( const ObjectHierarchy::tOID& rOID )
 {
     return ( rOID == ObjectHierarchy::getRootNodeOID() );
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 7c91d18229ed..c5fcb7e53e1a 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -335,8 +335,6 @@ bool Selection::isAdditionalShapeSelected() const
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-
-//static
 bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
                                       , rtl::OUString& rOutName
                                       , bool bGivenObjectMayBeResult )
@@ -370,7 +368,6 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
     return true;
 }
 
-//static
 bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
                                       , ObjectIdentifier& rOutObject
                                       , bool bGivenObjectMayBeResult )
@@ -384,7 +381,6 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
     return false;
 }
 
-//static
 bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
                     , const rtl::OUString& rNameOfSelectedObject
                     , const DrawViewWrapper& rDrawViewWrapper )
@@ -400,7 +396,6 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     return true;
 }
 
-// static
 ::rtl::OUString SelectionHelper::getHitObjectCID(
     const Point& rMPos,
     DrawViewWrapper& rDrawViewWrapper,
@@ -466,7 +461,6 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     // \\- solar mutex
 }
 
-//static
 bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID
                     , const uno::Reference< frame::XModel >& xChartModel )
 {
@@ -489,7 +483,6 @@ SelectionHelper::~SelectionHelper()
 {
 }
 
-//virtual
 bool SelectionHelper::getFrameDragSingles()
 {
     bool bFrameDragSingles = true;//true == green == surrounding handles
@@ -498,7 +491,6 @@ bool SelectionHelper::getFrameDragSingles()
     return bFrameDragSingles;
 }
 
-//static
 SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj )
 {
     if(!pObj)
@@ -554,7 +546,6 @@ SdrObject* SelectionHelper::getObjectToMark()
     return m_pMarkObj;
 }
 
-//static
 E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj )
 {
     //search wether the object or one of its children is a 3D object
@@ -591,7 +582,6 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj )
 
 }
 
-//virtual
 bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
 {
     SolarMutexGuard aSolarGuard;
diff --git a/chart2/source/controller/main/UndoManager.cxx b/chart2/source/controller/main/UndoManager.cxx
index 63c7bcebcd29..2f9efb674eaf 100644
--- a/chart2/source/controller/main/UndoManager.cxx
+++ b/chart2/source/controller/main/UndoManager.cxx
@@ -409,7 +409,6 @@ sal_Int64 UndoManager::getSomething( const Sequence< sal_Int8 >& rId )
     return 0;
 }
 
-// static
 const Sequence< sal_Int8 >& UndoManager::getUnoTunnelId()
 {
     static Sequence< sal_Int8 >* pSeq = 0;
@@ -426,7 +425,6 @@ const Sequence< sal_Int8 >& UndoManager::getUnoTunnelId()
     return *pSeq;
 }
 
-// static
 UndoManager* UndoManager::getImplementation( const Reference< uno::XInterface > xObj )
 {
     UndoManager* pRet = NULL;