diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-01 12:39:54 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-03-06 16:07:59 +0100 |
| commit | fa28cb86dfc33b6b8bd17472bf5177ffb0f23014 (patch) | |
| tree | 0ac76487839ee28189975e638ac83365ff2bce59 /cui/uiconfig | |
| parent | 10b61e9aa6e65bc75f9180b4629ff1952bfd8789 (diff) | |
tdf#77111 cui,sw: fix page number offset on paragraph dialog "Text Flow"
Commit c2ccd20c0fd92bddfff76447754541705e3eb8f3 introduced 0 as a valid
value for page number offset in sw core.
Unfortunately the paragraph dialog was not changed then; previously
page number 0 would do automatic numbering, but since then 0 was set as
the offset, and once you have a 0 offset there's no easy way to remove
it, you have to remove the whole page break.
* change the label before the text number edit widget to a checkbox
that disables the edit widget
* keep the id "labelPageNum" so that translations still work
* adapt SfxToSwPageDescAttr so it can not just set but also clear the
page number
* set initial value to 1; 0 is a really bad default since we can't
export it to ODF (see tdf#91306)
Change-Id: Ic4ca9e2562bb65ac359b305a2202f782e8598307
(cherry picked from commit d36fa0589ab822dc617c65b4d0d3bf68c092ad37)
Reviewed-on: https://gerrit.libreoffice.org/34745
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a5104f575a5acf8aea957cb79aa0fd67bc74f141)
Diffstat (limited to 'cui/uiconfig')
| -rw-r--r-- | cui/uiconfig/ui/textflowpage.ui | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui index 6a0d14d78584..8ce7a43b9100 100644 --- a/cui/uiconfig/ui/textflowpage.ui +++ b/cui/uiconfig/ui/textflowpage.ui @@ -18,6 +18,7 @@ <property name="upper">9999</property> <property name="step_increment">1</property> <property name="page_increment">10</property> + <property name="value">1</property> </object> <object class="GtkGrid" id="TextFlowPage"> <property name="visible">True</property> @@ -243,6 +244,9 @@ <property name="can_focus">True</property> <property name="invisible_char">•</property> <property name="adjustment">adjustment3</property> + <accessibility> + <relation type="labelled-by" target="labelPageNum"/> + </accessibility> </object> <packing> <property name="left_attach">4</property> @@ -250,13 +254,13 @@ </packing> </child> <child> - <object class="GtkLabel" id="labelPageNum"> + <object class="GtkCheckButton" id="labelPageNum"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes">Page _number:</property> <property name="use_underline">True</property> + <property name="inconsistent">True</property> <property name="justify">right</property> - <property name="mnemonic_widget">spinPageNumber</property> <property name="xalign">1</property> </object> <packing> |