remove unnecessary empty dtor, etc.

Change-Id: Ia2a1d1fe81a07d1e37437539d6d651a7c6ce1111

3 files changed, 82 insertions, 16 deletions

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/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
new file mode 100644
index 000000000000..f1989c676ab0
--- /dev/null
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -0,0 +1,79 @@
+/* -*- 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 .
+ */
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_LEGENDPOSITION_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_LEGENDPOSITION_HXX
+
+#include <vcl/builder.hxx>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <svl/itemset.hxx>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace chart
+{
+
+class LegendPositionResources
+{
+
+public:
+    //constructor without Display checkbox
+    LegendPositionResources(VclBuilderContainer& rParent);
+    //constructor inclusive Display checkbox
+    LegendPositionResources(VclBuilderContainer& rParent, const ::com::sun::star::uno::Reference<
+                       ::com::sun::star::uno::XComponentContext>& xCC );
+    virtual ~LegendPositionResources();
+
+    void writeToResources( const ::com::sun::star::uno::Reference<
+                       ::com::sun::star::frame::XModel >& xChartModel );
+    void writeToModel( const ::com::sun::star::uno::Reference<
+                       ::com::sun::star::frame::XModel >& xChartModel ) const;
+
+    void initFromItemSet( const SfxItemSet& rInAttrs );
+    void writeToItemSet( SfxItemSet& rOutAttrs ) const;
+
+    void SetChangeHdl( const Link& rLink );
+
+    DECL_LINK( PositionEnableHdl, void* );
+    DECL_LINK( PositionChangeHdl, RadioButton* );
+
+    void SetAccessibleRelationMemberOf(Window* pMemberOf);
+
+private:
+    void impl_setRadioButtonToggleHdl();
+
+private:
+    ::com::sun::star::uno::Reference<
+                       ::com::sun::star::uno::XComponentContext>    m_xCC;
+
+    CheckBox*       m_pCbxShow;
+
+    RadioButton*    m_pRbtLeft;
+    RadioButton*    m_pRbtRight;
+    RadioButton*    m_pRbtTop;
+    RadioButton*    m_pRbtBottom;
+
+    Link            m_aChangeLink;
+};
+
+} //namespace chart
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */