diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-09 19:08:51 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-09 19:27:49 +0100 |
| commit | 6d7514357bf50ab0555228db59bb1baa3f31ca03 (patch) | |
| tree | bd5e119825a1ed31954ee9dc50b24ed38554935d /chart2 | |
| parent | 1e9993be107905fdbcbf095b55bb2ae6a493600b (diff) | |
use localized names instead of the internal ones
Change-Id: Idd5d5def2550f8ba98f4e8a8a17330a4b663862e
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_PropertyMapping.cxx | 8 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_PropertyMapping.hxx | 4 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/tp_DataSource.cxx | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx index a10c84f31e97..45ae7982d4be 100644 --- a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx +++ b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx @@ -9,6 +9,8 @@ #include "dlg_PropertyMapping.hxx" +#include "DialogModel.hxx" + using namespace com::sun::star; namespace chart { @@ -40,7 +42,8 @@ std::vector<OUString> getEntries() } -PropertyMappingDlg::PropertyMappingDlg(Window* pParent, uno::Reference< chart2::XChartType > xChartType ) +PropertyMappingDlg::PropertyMappingDlg(Window* pParent, uno::Reference< chart2::XChartType > xChartType, + DialogModel& rDialogModel) : ModalDialog(pParent, "PropertyMappingDialog", "modules/schart/ui/dlg_PropertyMapping.ui") { @@ -52,7 +55,8 @@ PropertyMappingDlg::PropertyMappingDlg(Window* pParent, uno::Reference< chart2:: uno::Sequence< OUString > aPropRoles = xChartType->getSupportedPropertyRoles(); for(sal_Int32 i = 0, n = aPropRoles.getLength(); i < n; ++i) { - mpMappingTable->InsertEntry(aPropRoles[i]); + OUString aUIString = rDialogModel.ConvertRoleFromInternalToUI(aPropRoles[i]); + mpMappingTable->InsertEntry(aUIString); } mpBtnOk->SetClickHdl( LINK( this, PropertyMappingDlg, OkBtnHdl ) ); mpBtnCancel->SetClickHdl( LINK( this, PropertyMappingDlg, CancelBtnHdl ) ); diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx index 0c20de5f5dca..96d1e167a229 100644 --- a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx +++ b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx @@ -18,12 +18,14 @@ namespace chart { +class DialogModel; + class PropertyMappingDlg : public ModalDialog { public: PropertyMappingDlg(Window* pParent, com::sun::star::uno::Reference< - com::sun::star::chart2::XChartType > xChartType); + com::sun::star::chart2::XChartType > xChartType, DialogModel& rDialogModel); OUString getSelectedEntry(); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index f15f2e1e8bbd..76b1e85d6abe 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -765,7 +765,7 @@ IMPL_LINK_NOARG( DataSourceTabPage, AddMappingHdl ) if(!pSeriesEntry) return 0; - PropertyMappingDlg aDlg(this, pSeriesEntry->m_xChartType); + PropertyMappingDlg aDlg(this, pSeriesEntry->m_xChartType, m_rDialogModel); short aRet = aDlg.Execute(); if(aRet == RET_OK) { |