connectivity/source/drivers/dbase/DTable.cxx | 4 extensions/source/bibliography/datman.cxx | 2 svx/uiconfig/ui/addsubmissiondialog.ui | 268 +++++++++++++++------------ 3 files changed, 159 insertions(+), 115 deletions(-)
New commits: commit 4bb7e9a1b0dd2f72609affde0170c0a2d4fff44b Author: Caolán McNamara <[email protected]> Date: Sun Feb 2 00:49:44 2014 +0000 WaE: -Werror=missing-field-initializers Change-Id: I7d1c9c460d41dec416275e1ce8e6328020118682 diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index d38b151..2970cb5 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -447,7 +447,7 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne { SAL_INFO( "connectivity.drivers", "dbase [email protected] ODbaseTable::ODbaseTable" ); // initialize the header - m_aHeader = {}; + memset(&m_aHeader, 0, sizeof(m_aHeader)); m_aHeader.db_typ = dBaseIII; m_eEncoding = getConnection()->getTextEncoding(); } @@ -467,7 +467,7 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne , m_bWriteableMemo(sal_False) { SAL_INFO( "connectivity.drivers", "dbase [email protected] ODbaseTable::ODbaseTable" ); - m_aHeader = {}; + memset(&m_aHeader, 0, sizeof(m_aHeader)); m_eEncoding = getConnection()->getTextEncoding(); } commit 57a989babfa9d206d5a01b9bfc76bc864729b958 Author: Caolán McNamara <[email protected]> Date: Sun Feb 2 00:36:20 2014 +0000 drop unused aURLST Change-Id: Id009e6c372a5586be2eb84882d3feec8af78e30d diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 30315f80..0baaf88 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -536,7 +536,6 @@ class DBChangeDialog_Impl : public ModalDialog HeaderBar aSelectionHB; DBChangeDialogConfig_Impl aConfig; OUString aEntryST; - OUString aURLST; BibDataManager* pDatMan; @@ -557,7 +556,6 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) aSelectionLB(this, BibResId( LB_SELECTION )), aSelectionHB(this, BibResId( HB_SELECTION )), aEntryST(BIB_RESSTR(ST_ENTRY)), - aURLST(BIB_RESSTR(ST_URL)), pDatMan(pMan) { FreeResource(); commit ec7f47cb1bd8b29a1692023a27ec3a9a7f869751 Author: Caolán McNamara <[email protected]> Date: Sat Feb 1 23:35:54 2014 +0000 add submission got overwritten by accident i.e. regression since cc866c0297de076488b8778aa036a3ed3c673678 Change-Id: Ie22717cd1c975b7b6d013fb22f0990287ac664c2 diff --git a/svx/uiconfig/ui/addsubmissiondialog.ui b/svx/uiconfig/ui/addsubmissiondialog.ui index 719641a..6ec2caf 100644 --- a/svx/uiconfig/ui/addsubmissiondialog.ui +++ b/svx/uiconfig/ui/addsubmissiondialog.ui @@ -11,6 +11,62 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</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">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">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">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</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="GtkFrame" id="frame1"> <property name="visible">True</property> @@ -73,7 +129,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">3</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -89,13 +145,29 @@ </object> <packing> <property name="left_attach">2</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Action</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">action</property> + </object> + <packing> + <property name="left_attach">0</property> <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkEntry" id="expression"> + <object class="GtkEntry" id="action"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -106,98 +178,128 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Method</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">method</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Submission</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="row_homogeneous">True</property> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkComboBoxText" id="method"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="expression"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="invisible_char">â¢</property> + <property name="width_chars">46</property> + <property name="invisible_char_set">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Data Type</property> + <property name="label" translatable="yes">_Binding</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">name</property> + <property name="mnemonic_widget">binding</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">4</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkLabel" id="urlft1"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Binding e_xpression</property> + <property name="label" translatable="yes">_Replace</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">expression</property> + <property name="mnemonic_widget">replace</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">5</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <placeholder/> + <object class="GtkComboBoxText" id="binding"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> </child> <child> - <placeholder/> + <object class="GtkComboBoxText" id="replace"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> </child> </object> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Settings</property> + <property name="label" translatable="yes">Submission</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -210,62 +312,6 @@ <property name="position">1</property> </packing> </child> - <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">gtk-ok</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> - <property name="use_stock">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">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="help"> - <property name="label">gtk-help</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> </object> </child> <action-widgets>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
