chart2/source/controller/dialogs/DialogModel.cxx | 4 ++
chart2/source/controller/dialogs/tp_DataSource.cxx | 29 ---------------------
chart2/source/controller/dialogs/tp_DataSource.hxx | 2 -
chart2/uiconfig/ui/tp_DataSource.ui | 24 +----------------
4 files changed, 6 insertions(+), 53 deletions(-)
New commits:
commit 2bd5cb9f62450916267ad4c6d50ebff2d824e7c0
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Sun Jun 22 04:12:04 2014 +0200
show the property mapping sequences by default
Change-Id: I32417ed53e491a66f700e77ae0fff2154fa5441c
Reviewed-on: https://gerrit.libreoffice.org/10073
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index 4cab7d9..e18c7d3 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -502,6 +502,10 @@ DialogModel::tRolesWithRanges
DialogModel::getRolesWithRanges(
// add missing optional roles
aRoles = xChartType->getSupportedOptionalRoles();
addMissingRoles(aResult, aRoles);
+
+ // add missing property roles
+ aRoles = xChartType->getSupportedPropertyRoles();
+ addMissingRoles(aResult, aRoles);
}
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 8a83c5b..99903a2 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -28,7 +28,6 @@
#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,7 +216,6 @@ DataSourceTabPage::DataSourceTabPage(
get(m_pFT_DATALABELS ,"FT_DATALABELS");
get(m_pEDT_CATEGORIES ,"EDT_CATEGORIES");
get(m_pIMB_RANGE_CAT ,"IMB_RANGE_CAT");
- get(m_pBtn_AddMapping ,"BTN_ADD_MAPPING");
m_pFT_CAPTION->Show(!bHideDescription);
@@ -247,9 +245,6 @@ DataSourceTabPage::DataSourceTabPage(
m_pEDT_RANGE->SetStyle( m_pEDT_RANGE->GetStyle() | WB_FORCECTRLBACKGROUND
);
m_pEDT_CATEGORIES->SetStyle( m_pEDT_CATEGORIES->GetStyle() |
WB_FORCECTRLBACKGROUND );
- // mapped properties
- m_pBtn_AddMapping->SetClickHdl( LINK( this, DataSourceTabPage,
AddMappingHdl ));
-
// set symbol font for arrows
// note: StarSymbol is substituted to OpenSymbol for OOo
Font aSymbolFont( m_pBTN_UP->GetFont());
@@ -469,12 +464,6 @@ void DataSourceTabPage::fillRoleListBox()
}
m_pLB_ROLE->SetUpdateMode( true );
-
- if(pSeriesEntry->m_xChartType
- ->getSupportedPropertyRoles().getLength() == 0)
- m_pBtn_AddMapping->Disable();
- else
- m_pBtn_AddMapping->Enable();
}
}
@@ -764,24 +753,6 @@ IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*,
pEdit )
return 0;
}
-IMPL_LINK_NOARG( DataSourceTabPage, AddMappingHdl )
-{
- SeriesEntry * pSeriesEntry = dynamic_cast< SeriesEntry * >(
m_pLB_SERIES->FirstSelected());
- if(!pSeriesEntry)
- return 0;
-
- PropertyMappingDlg aDlg(this, pSeriesEntry->m_xChartType);
- short aRet = aDlg.Execute();
- if(aRet == RET_OK)
- {
- OUString aNewMappingName =
DialogModel::ConvertRoleFromUIToInternal(aDlg.getSelectedEntry());
- if(!aNewMappingName.isEmpty())
- m_pLB_ROLE->InsertEntry( lcl_GetRoleLBEntry( aNewMappingName,
OUString()));
- }
-
- return 0;
-}
-
void DataSourceTabPage::listeningFinished(
const OUString & rNewRange )
{
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx
b/chart2/source/controller/dialogs/tp_DataSource.hxx
index b89d4d4..496333e 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -82,7 +82,6 @@ protected:
DECL_LINK( RangeUpdateDataHdl, Edit* );
DECL_LINK( UpButtonClickedHdl, void* );
DECL_LINK( DownButtonClickedHdl, void* );
- DECL_LINK( AddMappingHdl, void* );
// ____ RangeSelectionListenerParent ____
virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE;
@@ -137,7 +136,6 @@ private:
FixedText* m_pFT_DATALABELS;//used for xy charts
Edit* m_pEDT_CATEGORIES;
PushButton* m_pIMB_RANGE_CAT;
- PushButton* m_pBtn_AddMapping;
OUString m_aFixedTextRange;
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui
b/chart2/uiconfig/ui/tp_DataSource.ui
index a067a6f..f7bed1d 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkImage" id="imageIMB_RANGE_CAT">
<property name="visible">True</property>
@@ -96,7 +97,6 @@
<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>
@@ -112,7 +112,6 @@
<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>
@@ -130,7 +129,6 @@
<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>
@@ -146,7 +144,6 @@
<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>
@@ -248,7 +245,6 @@
<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>
@@ -330,7 +326,6 @@
<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>
@@ -346,21 +341,6 @@
<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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
