[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/Library_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Mon Jul 14 04:32:00 PDT 2014
chart2/Library_chartcontroller.mk | 1
chart2/UIConfig_chart2.mk | 1
chart2/source/controller/dialogs/dlg_PropertyMapping.cxx | 73 --------
chart2/source/controller/dialogs/dlg_PropertyMapping.hxx | 46 -----
chart2/uiconfig/ui/dlg_PropertyMapping.ui | 136 ---------------
5 files changed, 257 deletions(-)
New commits:
commit 8cdf36a8e98e8dbbc9cad1a72c61e91d025171c9
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Sun Jun 22 04:19:45 2014 +0200
remove now unused dialog
Change-Id: I42c340a6aee016e37ee558d46a8eab101837e9c5
Reviewed-on: https://gerrit.libreoffice.org/10074
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index abc9e58..b7e86bf 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -105,7 +105,6 @@ $(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 44f8674..d59c29e 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -38,7 +38,6 @@ $(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/dlg_PropertyMapping.cxx b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
deleted file mode 100644
index e9a933c..0000000
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- */
-
-#include "dlg_PropertyMapping.hxx"
-
-#include "DialogModel.hxx"
-
-using namespace com::sun::star;
-
-namespace chart {
-
-namespace {
-
-long pListBoxTabs[] =
-{
- 3,
- 0, 75, 150
-};
-
-}
-
-PropertyMappingDlg::PropertyMappingDlg(Window* pParent, uno::Reference< chart2::XChartType > xChartType )
- : ModalDialog(pParent, "PropertyMappingDialog",
- "modules/schart/ui/dlg_PropertyMapping.ui")
-{
- get(mpMappingTable, "LST_PROPERTY_MAPPING");
- get(mpBtnOk, "ok");
- get(mpBtnCancel, "cancel");
-
- mpMappingTable->SetTabs( pListBoxTabs, MAP_APPFONT );
- uno::Sequence< OUString > aPropRoles = xChartType->getSupportedPropertyRoles();
- for(sal_Int32 i = 0, n = aPropRoles.getLength(); i < n; ++i)
- {
- OUString aUIString = DialogModel::ConvertRoleFromInternalToUI(aPropRoles[i]);
- mpMappingTable->InsertEntry(aUIString);
- }
- mpBtnOk->SetClickHdl( LINK( this, PropertyMappingDlg, OkBtnHdl ) );
- mpBtnCancel->SetClickHdl( LINK( this, PropertyMappingDlg, CancelBtnHdl ) );
-}
-
-OUString PropertyMappingDlg::getSelectedEntry()
-{
- if(mpMappingTable->GetSelectionCount())
- {
- SvTreeListEntry* pEntry = mpMappingTable->FirstSelected();
- OUString aText = mpMappingTable->GetEntryText(pEntry, 0);
- return aText;
- }
-
- return OUString();
-}
-
-IMPL_LINK_NOARG(PropertyMappingDlg, OkBtnHdl)
-{
- EndDialog(RET_OK);
- return 0;
-}
-
-IMPL_LINK_NOARG(PropertyMappingDlg, CancelBtnHdl)
-{
- EndDialog(RET_CANCEL);
- return 0;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
deleted file mode 100644
index 0358a84..0000000
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- */
-
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
-
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <svtools/svtabbx.hxx>
-
-#include <com/sun/star/chart2/XChartType.hpp>
-
-namespace chart {
-
-class DialogModel;
-
-class PropertyMappingDlg : public ModalDialog
-{
-public:
-
- PropertyMappingDlg(Window* pParent, com::sun::star::uno::Reference<
- com::sun::star::chart2::XChartType > xChartType);
-
- OUString getSelectedEntry();
-
-private:
-
- DECL_LINK( OkBtnHdl, void* );
- DECL_LINK( CancelBtnHdl, void* );
-
- SvTabListBox* mpMappingTable;
- Button* mpBtnOk;
- Button* mpBtnCancel;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/uiconfig/ui/dlg_PropertyMapping.ui b/chart2/uiconfig/ui/dlg_PropertyMapping.ui
deleted file mode 100644
index cbdd35b..0000000
--- a/chart2/uiconfig/ui/dlg_PropertyMapping.ui
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
-<interface>
- <requires lib="gtk+" version="3.10"/>
- <!-- interface-requires LibreOffice 1.0 -->
- <object class="GtkDialog" id="PropertyMappingDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Add Property Mapping</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label" translatable="yes">Ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label" translatable="yes">Cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="LB_TITLE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Select property mapping:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LST_PROPERTY_MAPPING:border</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="svtlo-SvTabListBox" id="LST_PROPERTY_MAPPING:border">
- <property name="width_request">110</property>
- <property name="height_request">110</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Tab List-selection"/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="LB_COLOR">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Color</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="LB_FILLCOLOR">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">FillColor</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="LB_BORDERCOLOR">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">BorderColor</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
More information about the Libreoffice-commits
mailing list