summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-08-26 13:11:34 +0200
committerJochen Nitschke <j.nitschke+logerrit@ok.de>2016-08-26 13:14:41 +0000
commitc922161117dcaf33d6c61b0c5ffe860231e32e3c (patch)
treeab41168e1842c15661f52df53372798706e39c63
parentd54773ada2301d3a5c1ffc702715cd2d4006ad53 (diff)
tdf#95416 remove ../ style include
move (default) dtors to source files, where members are complete Change-Id: I9f3273d322b62cb01e546ff30d9fb4d37747bb3b Reviewed-on: https://gerrit.libreoffice.org/28400 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx2
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard.hxx3
-rw-r--r--chart2/source/controller/inc/dlg_InsertDataLabel.hxx3
4 files changed, 8 insertions, 2 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index cbf741bbc68e..7402c58e87ca 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -88,6 +88,8 @@ CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< fram
ActivatePage();
}
+CreationWizard::~CreationWizard() = default;
+
VclPtr<TabPage> CreationWizard::createPage(WizardState nState)
{
VclPtr<svt::OWizardPage> pRet;
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 17c15bcb7f2e..9846c20fc127 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -34,6 +34,8 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAt
Reset();
}
+DataLabelsDialog::~DataLabelsDialog() = default;
+
void DataLabelsDialog::Reset()
{
m_apDataLabelResources->Reset(m_rInAttrs);
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index bc250be6c8c5..fed019004716 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -22,7 +22,6 @@
#include "TimerTriggeredControllerLock.hxx"
#include "TabPageNotifiable.hxx"
-#include "../dialogs/DialogModel.hxx"
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <svtools/roadmapwizard.hxx>
@@ -35,6 +34,7 @@ namespace chart
class RangeChooserTabPage;
class DataSourceTabPage;
+class DialogModel;
class ChartTypeTemplateProvider;
class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable
@@ -45,6 +45,7 @@ public:
, const css::uno::Reference< css::uno::XComponentContext >& xContext );
CreationWizard() = delete;
+ virtual ~CreationWizard() override;
// TabPageNotifiable
virtual void setInvalidPage( TabPage * pTabPage ) override;
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index 4d0d4b173d37..2f62ad625655 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -23,12 +23,12 @@
#include <vcl/button.hxx>
#include <svl/itemset.hxx>
#include <memory>
-#include "../dialogs/res_DataLabel.hxx"
class SvNumberFormatter;
namespace chart
{
+class DataLabelResources;
class DataLabelsDialog : public ModalDialog
{
@@ -44,6 +44,7 @@ private:
public:
DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter);
+ virtual ~DataLabelsDialog() override;
void FillItemSet(SfxItemSet& rOutAttrs);
};