dbaccess/uiconfig/ui/querypropertiesdialog.ui | 17 ++------------
hwpfilter/source/hwpread.cxx | 8 +++---
sw/uiconfig/swriter/ui/captionoptions.ui | 31 +++++++++++---------------
3 files changed, 21 insertions(+), 35 deletions(-)
New commits:
commit 5575d7f3f3b2fcfdc2f9bbae7c8fb0805cb0f267
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Mar 6 14:18:05 2013 +0000
various efforts to consistently apply HIG rules
Change-Id: I1a3ef21959d2bf50c57ffeaf5be3e49f75cd8cca
diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui
b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
index 5119ff0..d745c16 100644
--- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui
+++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
@@ -12,22 +12,19 @@
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</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>
- <property name="margin_top">24</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -39,12 +36,10 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -56,11 +51,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</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>
<property name="use_stock">True</property>
</object>
<packing>
@@ -126,13 +119,12 @@
<child>
<object class="GtkRadioButton" id="distinct">
<property name="label">Yes</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <property name="group">nondistinct</property>
</object>
<packing>
<property name="expand">False</property>
@@ -143,11 +135,9 @@
<child>
<object class="GtkRadioButton" id="nondistinct">
<property name="label">No</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">distinct</property>
@@ -178,7 +168,7 @@
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">24</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="limit-label">
<property name="visible">True</property>
@@ -198,7 +188,6 @@
<object class="dbulo-LimitBox" id="limitbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="expand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui
b/sw/uiconfig/swriter/ui/captionoptions.ui
index 4cea9a2..194148e 100644
--- a/sw/uiconfig/swriter/ui/captionoptions.ui
+++ b/sw/uiconfig/swriter/ui/captionoptions.ui
@@ -17,13 +17,13 @@
</object>
<object class="GtkDialog" id="CaptionOptionsDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Caption options</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="spacing">2</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
@@ -31,6 +31,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -43,7 +44,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid2">
@@ -51,8 +51,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <property name="column_homogeneous">True</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkComboBox" id="level">
<property name="visible">True</property>
@@ -84,7 +83,6 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">_Level</property>
<property name="use_underline">True</property>
@@ -101,7 +99,6 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">_Separator</property>
<property name="use_underline">True</property>
@@ -147,7 +144,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
@@ -155,14 +151,11 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <property name="column_homogeneous">True</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_right">12</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Character style</property>
<property name="use_underline">True</property>
@@ -239,7 +232,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid3">
@@ -247,14 +239,11 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <property name="column_homogeneous">True</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_right">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Caption
order</property>
<property name="use_underline">True</property>
@@ -374,4 +363,12 @@
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="label5"/>
+ <widget name="label6"/>
+ <widget name="label4"/>
+ <widget name="label7"/>
+ </widgets>
+ </object>
</interface>
commit 17f68a9ea17f42757a124651a86bb04ee57f34f9
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Mon Mar 4 21:16:21 2013 +0100
coverity#983009: Resource leak
Just moving pArr block should be ok
Change-Id: I9c5c4c35b90d8f06933521c77c966a426a801cec
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 325f74c..becdb76 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -310,6 +310,10 @@ int TxtBox::Read(HWPFile & hwpf)
hwpf.ReadParaList(caption);
if( type == 0 ){ // if table?
+ TCell* *pArr = ::comphelper::newArray_null<TCell *>(ncell);
+ if (!pArr) {
+ return hwpf.SetState(HWP_InvalidFileFormat);
+ }
Table *tbl = new Table;
for( ii = 0 ; ii < ncell; ii++)
{
@@ -318,10 +322,6 @@ int TxtBox::Read(HWPFile & hwpf)
tbl->rows.insert(cell[ii].y);
tbl->rows.insert(cell[ii].y + cell[ii].h);
}
- TCell* *pArr = ::comphelper::newArray_null<TCell *>(ncell);
- if (!pArr) {
- return hwpf.SetState(HWP_InvalidFileFormat);
- }
for( ii = 0 ; ii < ncell; ii++)
{
TCell *tcell = new TCell;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
