sw/uiconfig/sw/ui/20872.ui | 43 ++++++++++++++++++++----------------------- vcl/inc/vcl/layout.hxx | 4 ++-- vcl/source/window/layout.cxx | 8 ++++++++ 3 files changed, 30 insertions(+), 25 deletions(-)
New commits: commit 12a971118f732858bd288e6fd5b38b17b7c560e8 Author: Caolán McNamara <[email protected]> Date: Fri Oct 12 12:50:56 2012 +0100 don't process empty grid cells Change-Id: Ibd8ea6a40ced219c5f64d1c04df28b85c99a00bb diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx index 5e22537..43fc7a9 100644 --- a/vcl/inc/vcl/layout.hxx +++ b/vcl/inc/vcl/layout.hxx @@ -315,8 +315,8 @@ private: int x; int y; ExtendedGridEntry() - : x(0) - , y(0) + : x(-1) + , y(-1) { } }; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 836b6a8..8336a08 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -427,6 +427,14 @@ VclGrid::array_type VclGrid::assembleGrid() const for (sal_Int32 y = 0; y < nMaxY; ++y) { ExtendedGridEntry &rSpan = A[x][y]; + //cell x/y is spanned by the widget at cell rSpan.x/rSpan.y, + //just points back to itself if there's no cell spanning + if ((rSpan.x == -1) || (rSpan.y == -1)) + { + //there is no entry for this cell, i.e. this is a cell + //with no widget in it, or spanned by any other widget + continue; + } ExtendedGridEntry &rEntry = A[rSpan.x][rSpan.y]; if (aNonEmptyCols[x] == false) --rEntry.nSpanWidth; commit 6b459bf06c10ee05ff1b6d5db8c3e30fa2774a9e Author: Caolán McNamara <[email protected]> Date: Fri Oct 12 11:49:54 2012 +0100 tweak dialog to show label again Change-Id: I8b2e61a2754190eb3bd218242485a6bbce41aa7d diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui index a06270d..879e210 100644 --- a/sw/uiconfig/sw/ui/20872.ui +++ b/sw/uiconfig/sw/ui/20872.ui @@ -29,6 +29,23 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Tap stop</col> + </row> + <row> + <col id="0" translatable="yes">Space</col> + </row> + <row> + <col id="0" translatable="yes">Nothing</col> + </row> + </data> + </object> <object class="GtkBox" id="20872"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -100,7 +117,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="hexpand">True</property> <property name="label" translatable="yes">Numbering followed by</property> </object> <packing> @@ -300,14 +316,15 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="halign">end</property> <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">6</property> - <property name="width">1</property> + <property name="width">2</property> <property name="height">1</property> </packing> </child> @@ -396,9 +413,6 @@ <property name="height">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> @@ -426,21 +440,4 @@ </packing> </child> </object> - <object class="GtkListStore" id="liststore2"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Tap stop</col> - </row> - <row> - <col id="0" translatable="yes">Space</col> - </row> - <row> - <col id="0" translatable="yes">Nothing</col> - </row> - </data> - </object> </interface>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
