summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/Library_chartcontroller.mk1
-rw-r--r--chart2/UIConfig_chart2.mk1
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx8
-rw-r--r--chart2/uiconfig/ui/tp_DataSource.ui28
4 files changed, 33 insertions, 5 deletions
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index d4f309f0070e..bf59cab99831 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/dialogs/dlg_InsertTitle \
chart2/source/controller/dialogs/dlg_NumberFormat \
chart2/source/controller/dialogs/dlg_ObjectProperties \
+ chart2/source/controller/dialogs/dlg_PropertyMapping \
chart2/source/controller/dialogs/dlg_ShapeFont \
chart2/source/controller/dialogs/dlg_ShapeParagraph \
chart2/source/controller/dialogs/dlg_View3D \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index d9ef7d7cb3e6..515ddf048a3d 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/datarangedialog \
chart2/uiconfig/ui/dlg_DataLabel \
chart2/uiconfig/ui/dlg_InsertErrorBars \
+ chart2/uiconfig/ui/dlg_PropertyMapping \
chart2/uiconfig/ui/insertaxisdlg \
chart2/uiconfig/ui/insertgriddlg \
chart2/uiconfig/ui/inserttitledlg \
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index de931a5200c6..2f1844963036 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -28,6 +28,7 @@
#include "tp_DataSourceControls.hxx"
#include "ControllerLockGuard.hxx"
#include "DataSourceHelper.hxx"
+#include "dlg_PropertyMapping.hxx"
#include <com/sun/star/sheet/XRangeSelection.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/chart2/XChartType.hpp>
@@ -217,8 +218,7 @@ DataSourceTabPage::DataSourceTabPage(
get(m_pFT_DATALABELS ,"FT_DATALABELS");
get(m_pEDT_CATEGORIES ,"EDT_CATEGORIES");
get(m_pIMB_RANGE_CAT ,"IMB_RANGE_CAT");
-
- m_pBtn_AddMapping = NULL;
+ get(m_pBtn_AddMapping ,"BTN_ADD_MAPPING");
m_pFT_CAPTION->Show(!bHideDescription);
@@ -249,9 +249,7 @@ DataSourceTabPage::DataSourceTabPage(
m_pEDT_CATEGORIES->SetStyle( m_pEDT_CATEGORIES->GetStyle() | WB_FORCECTRLBACKGROUND );
// mapped properties
-#if 0
m_pBtn_AddMapping->SetClickHdl( LINK( this, DataSourceTabPage, AddMappingHdl ));
-#endif
// set symbol font for arrows
// note: StarSymbol is substituted to OpenSymbol for OOo
@@ -763,6 +761,8 @@ IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*, pEdit )
IMPL_LINK_NOARG( DataSourceTabPage, AddMappingHdl )
{
+ PropertyMappingDlg aDlg(this);
+ aDlg.Execute();
OUString aNewMappingName = "FillColor";
m_pLB_ROLE->InsertEntry( lcl_GetRoleLBEntry( aNewMappingName, OUString()));
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui b/chart2/uiconfig/ui/tp_DataSource.ui
index d36559f3b4b5..a067a6f46295 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Fri Jan 17 16:28:14 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
@@ -93,9 +92,11 @@
<child>
<object class="GtkButton" id="BTN_ADD">
<property name="label" translatable="yes">_Add</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -107,9 +108,11 @@
</child>
<child>
<object class="GtkButton" id="BTN_UP">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="always_show_image">True</property>
</object>
<packing>
@@ -122,10 +125,12 @@
<child>
<object class="GtkButton" id="BTN_REMOVE">
<property name="label" translatable="yes">_Remove</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -137,9 +142,11 @@
</child>
<child>
<object class="GtkButton" id="BTN_DOWN">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -237,9 +244,11 @@
</child>
<child>
<object class="GtkButton" id="IMB_RANGE_MAIN">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="image">imageIMB_RANGE_MAIN</property>
</object>
<packing>
@@ -317,9 +326,11 @@
</child>
<child>
<object class="GtkButton" id="IMB_RANGE_CAT">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="image">imageIMB_RANGE_CAT</property>
</object>
<packing>
@@ -335,6 +346,21 @@
<property name="position">5</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="BTN_ADD_MAPPING">
+ <property name="label" translatable="yes">Add property mapping</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
generated by cgit (git 2.34.1) at 2024-06-05 17:55:55 +0000