summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-03-28 10:08:31 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-03-28 10:11:02 +0100
commitbc2f2ab20a44630097250a90393b7298b82fb9ea (patch)
tree3eb0b773f09152e1d453baf127e624cafa54923e
parenta2c8ae13a1ea76c9c7bcc06c8f40943978e8ac13 (diff)
move the dialog to chart2
Change-Id: I9f6e967d52dd10072c57b4f55faedd4ed7f98094
-rw-r--r--chart2/Module_chart2.mk1
-rw-r--r--chart2/UI_chart2.mk16
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx2
-rw-r--r--chart2/uiconfig/ui/smoothlinesdlg.ui (renamed from sc/uiconfig/scalc/ui/smoothlinesdlg.ui)0
-rw-r--r--sc/UI_scalc.mk1
5 files changed, 18 insertions, 2 deletions
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index db763a4d1801..03fa54b3cc39 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
Library_chartcontroller \
Library_chartcore \
Package_uiconfig \
+ UI_chart2 \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
diff --git a/chart2/UI_chart2.mk b/chart2/UI_chart2.mk
new file mode 100644
index 000000000000..05348111845f
--- /dev/null
+++ b/chart2/UI_chart2.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_UI_UI,modules/chart2))
+
+$(eval $(call gb_UI_add_uifiles,modules/chart2,\
+ chart2/uiconfig/ui/smoothlinesdlg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index bf24f38d074f..3907494c5385 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -453,7 +453,7 @@ private:
};
SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent )
- : ModalDialog( pParent, "SmoothLinesDialog", "modules/scalc/ui/smoothlinesdlg.ui")
+ : ModalDialog( pParent, "SmoothLinesDialog", "modules/chart2/ui/smoothlinesdlg.ui")
{
get(m_pRB_Splines_Cubic, "CubicSplineRadioButton");
get(m_pRB_Splines_B, "BSplineRadioButton");
diff --git a/sc/uiconfig/scalc/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui
index 26fe81d44746..26fe81d44746 100644
--- a/sc/uiconfig/scalc/ui/smoothlinesdlg.ui
+++ b/chart2/uiconfig/ui/smoothlinesdlg.ui
diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk
index 34cdee453988..46afc890e99c 100644
--- a/sc/UI_scalc.mk
+++ b/sc/UI_scalc.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_UI_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortoptionspage \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
- sc/uiconfig/scalc/ui/smoothlinesdlg \
))
# vim: set noet sw=4 ts=4: