extensions/source/bibliography/datman.cxx | 3 + extensions/uiconfig/sbibliography/ui/mappingdialog.ui | 24 ++++++++++- officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 8 +++ 3 files changed, 33 insertions(+), 2 deletions(-)
New commits: commit d422512a5c9afc3b309442ba1cbd4405afab96c8 Author: Miklos Vajna <[email protected]> AuthorDate: Tue Jul 27 14:55:15 2021 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Jul 27 16:18:15 2021 +0200 sw bibliography, local copy: handle the column mapping dialog This allows mapping the LocalURL database column to the LocalURL property of a bibliography reference field. Change-Id: Ic8793561e0242964c8a8313b230f6e13dda31dcb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119558 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 875938b7924f..e53d2b0392b9 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -219,6 +219,7 @@ class MappingDialog_Impl : public weld::GenericDialogController std::unique_ptr<weld::ComboBox> m_xCustom3LB; std::unique_ptr<weld::ComboBox> m_xCustom4LB; std::unique_ptr<weld::ComboBox> m_xCustom5LB; + std::unique_ptr<weld::ComboBox> m_xLocalURLLB; weld::ComboBox* aListBoxes[COLUMN_COUNT]; DECL_LINK(OkHdl, weld::Button&, void); @@ -278,6 +279,7 @@ MappingDialog_Impl::MappingDialog_Impl(weld::Window* pParent, BibDataManager* pM , m_xCustom3LB(m_xBuilder->weld_combo_box("custom3Combobox")) , m_xCustom4LB(m_xBuilder->weld_combo_box("custom4Combobox")) , m_xCustom5LB(m_xBuilder->weld_combo_box("custom5Combobox")) + , m_xLocalURLLB(m_xBuilder->weld_combo_box("LocalURLCombobox")) { m_xOKBT->connect_clicked(LINK(this, MappingDialog_Impl, OkHdl)); OUString sTitle = m_xDialog->get_title(); @@ -315,6 +317,7 @@ MappingDialog_Impl::MappingDialog_Impl(weld::Window* pParent, BibDataManager* pM aListBoxes[28] = m_xCustom3LB.get(); aListBoxes[29] = m_xCustom4LB.get(); aListBoxes[30] = m_xCustom5LB.get(); + aListBoxes[31] = m_xLocalURLLB.get(); aListBoxes[0]->append_text(sNone); Reference< XNameAccess > xFields = getColumns( pDatMan->getForm() ); diff --git a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui index 2dca5ddf11e0..b4053eeb7741 100644 --- a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui +++ b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui @@ -948,10 +948,30 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkLabel" id="label33"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label33">Local copy</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">LocalURLCombobox</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">14</property> + </packing> </child> <child> - <placeholder/> + <object class="GtkComboBoxText" id="LocalURLCombobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">14</property> + </packing> </child> <child> <placeholder/> diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu index edba2a2020be..22aabb743d21 100644 --- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu +++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu @@ -437,6 +437,14 @@ <value>Custom5</value> </prop> </node> + <node oor:name="LocalURL" oor:op="replace"> + <prop oor:name="ProgrammaticFieldName"> + <value>LocalURL</value> + </prop> + <prop oor:name="AssignedFieldName"> + <value>LocalURL</value> + </prop> + </node> </node> </node> </node> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
