remove unnecessary empty dtor, etc.

Change-Id: Ia2a1d1fe81a07d1e37437539d6d651a7c6ce1111

9 files changed, 9 insertions, 66 deletions

diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index f09bfb66cf2a..d74298196297 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
     chart2/source/controller/dialogs/dlg_CreationWizard.src \
     chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
     chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
-    chart2/source/controller/dialogs/tp_ErrorBars.src \
     chart2/source/controller/dialogs/tp_PointGeometry.src \
     chart2/source/controller/menus/ShapeContextMenu.src \
     chart2/source/controller/menus/ShapeEditContextMenu.src \
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 5d1f0f46a71f..836223934ac1 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -29,22 +29,18 @@ SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference< uno::XComponen
     : ModalDialog(pWindow
     ,"dlg_InsertLegend"
     ,"modules/schart/ui/dlg_InsertLegend.ui")
-    , m_apLegendPositionResources( new LegendPositionResources(*this,xCC) )
-{
-}
-
-SchLegendDlg::~SchLegendDlg()
+    , m_xLegendPositionResources( new LegendPositionResources(*this,xCC) )
 {
 }
 
 void SchLegendDlg::init( const uno::Reference< frame::XModel >& xChartModel )
 {
-    m_apLegendPositionResources->writeToResources( xChartModel );
+    m_xLegendPositionResources->writeToResources( xChartModel );
 }
 
 bool SchLegendDlg::writeToModel( const uno::Reference< frame::XModel >& xChartModel ) const
 {
-    m_apLegendPositionResources->writeToModel( xChartModel );
+    m_xLegendPositionResources->writeToModel( xChartModel );
     return true;
 }
 
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 995babd2887f..7b6743d8b09c 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -38,11 +38,6 @@ ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs
             pParent->GetParentDialog(),
             rInAttrs, /* bNoneAvailable = */ false )
 {
-//     FreeResource();
-}
-
-ErrorBarsTabPage::~ErrorBarsTabPage()
-{
 }
 
 SfxTabPage* ErrorBarsTabPage::Create(
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index 81a0417d7eb1..a1bb2ae0085d 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -30,7 +30,6 @@ class ErrorBarsTabPage : public SfxTabPage
 {
 public:
     ErrorBarsTabPage ( Window* pParent, const SfxItemSet& rInAttrs );
-    virtual ~ErrorBarsTabPage ();
 
     void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
     void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType );
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src
deleted file mode 100644
index 78e6a1234145..000000000000
--- a/chart2/source/controller/dialogs/tp_ErrorBars.src
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "HelpIds.hrc"
-#include "TabPages.hrc"
-#include "res_ErrorBar.hrc"
-
-TabPage TP_YERRORBAR
-{
-    HelpID = "chart2:TabPage:TP_YERRORBAR";
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    RESOURCE_ERRORBARS( 260 - 12, 0 )
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 53e14639db31..0cd35d694f4b 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -30,13 +30,12 @@
 
 #include <boost/scoped_ptr.hpp>
 
+#include "res_LegendPosition.hxx"
+#include "res_Titles.hxx"
+
 namespace chart
 {
 
-/**
-*/
-class TitleResources;
-class LegendPositionResources;
 class TitlesAndObjectsTabPage : public svt::OWizardPage
 {
 public:
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index d518b2cbbf0d..a8d90cb6f1ce 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -22,8 +22,6 @@
 #define HID_SCH_WIN_DOCUMENT                                "CHART2_HID_SCH_WIN_DOCUMENT"
 #define HID_SCH_CTL_DATA                                    "CHART2_HID_SCH_CTL_DATA"
 
-#define HID_SCH_CT_INDICATE                                 "CHART2_HID_SCH_CT_INDICATE"
-
 //for chart type dialog:
 #define HID_SCH_CTL_TYPE                                    "CHART2_HID_SCH_CTL_TYPE"
 #define HID_SCH_CTL_VARIANT                                 "CHART2_HID_SCH_CTL_VARIANT"
@@ -56,15 +54,8 @@
 
 #define HID_SCH_STATISTIK_MEANVALUE                         "CHART2_HID_SCH_STATISTIK_MEANVALUE"
 #define HID_SCH_STATISTIK_NO_ERROR                          "CHART2_HID_SCH_STATISTIK_NO_ERROR"
-#define HID_SCH_STATISTIK_VARIANT                           "CHART2_HID_SCH_STATISTIK_VARIANT"
-#define HID_SCH_STATISTIK_SIGMA                             "CHART2_HID_SCH_STATISTIK_SIGMA"
 #define HID_SCH_STATISTIK_PERCENT                           "CHART2_HID_SCH_STATISTIK_PERCENT"
-#define HID_SCH_STATISTIK_BIGERROR                          "CHART2_HID_SCH_STATISTIK_BIGERROR"
 #define HID_SCH_STATISTIK_CONSTERROR                        "CHART2_HID_SCH_STATISTIK_CONSTERROR"
-#define HID_SCH_STATISTIK_PERCENT_VALUE                     "CHART2_HID_SCH_STATISTIK_PERCENT_VALUE"
-#define HID_SCH_STATISTIK_BIGERROR_VALUE                    "CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE"
-#define HID_SCH_STATISTIK_PLUS_VALUE                        "CHART2_HID_SCH_STATISTIK_PLUS_VALUE"
-#define HID_SCH_STATISTIK_MINUS_VALUE                       "CHART2_HID_SCH_STATISTIK_MINUS_VALUE"
 
 #define HID_SCH_DATALABEL_VALUE                             "CHART2_HID_SCH_DATALABEL_VALUE"
 #define HID_SCH_DATALABEL_PERCENT                           "CHART2_HID_SCH_DATALABEL_PERCENT"
@@ -101,7 +92,6 @@
 #define HID_INSERT_STATISTICS                               "CHART2_HID_INSERT_STATISTICS"
 #define HID_INSERT_DESCRIPTION                              "CHART2_HID_INSERT_DESCRIPTION"
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx
index 6c07cbf2ff14..eee9c243e249 100644
--- a/chart2/source/controller/inc/dlg_InsertLegend.hxx
+++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx
@@ -19,29 +19,26 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTLEGEND_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTLEGEND_HXX
 
-// header for class ModalDialog
 #include <vcl/dialog.hxx>
-// header for class CheckBox
 #include <sfx2/basedlgs.hxx>
 
 #include <boost/scoped_ptr.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
+#include "res_LegendPosition.hxx"
+
 namespace chart
 {
 
-class LegendPositionResources;
-
 class SchLegendDlg : public ModalDialog
 {
 private:
-    boost::scoped_ptr < LegendPositionResources >    m_apLegendPositionResources;
+    boost::scoped_ptr < LegendPositionResources >    m_xLegendPositionResources;
 
 public:
     SchLegendDlg( Window* pParent, const ::com::sun::star::uno::Reference<
                        ::com::sun::star::uno::XComponentContext>& xCC );
-    virtual ~SchLegendDlg();
 
     void init( const ::com::sun::star::uno::Reference<
                        ::com::sun::star::frame::XModel >& xChartModel );
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index f1989c676ab0..f1989c676ab0 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx