summaryrefslogtreecommitdiff
path: root/cui/source/inc/paragrph.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-03-01 12:39:54 +0100
committerMichael Stahl <mstahl@redhat.com>2017-03-01 12:42:10 +0100
commitd36fa0589ab822dc617c65b4d0d3bf68c092ad37 (patch)
tree7306d39b6f853c7440abb581a2c60d5d0769d138 /cui/source/inc/paragrph.hxx
parent86463ec54dcdc562121bdb57b1ac4e85b135b2df (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
Diffstat (limited to 'cui/source/inc/paragrph.hxx')
-rw-r--r--cui/source/inc/paragrph.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index c38f65a88b1f..abe414a4f24c 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -234,7 +234,7 @@ private:
VclPtr<ListBox> m_pBreakPositionLB;
VclPtr<TriStateBox> m_pApplyCollBtn;
VclPtr<ListBox> m_pApplyCollBox;
- VclPtr<FixedText> m_pPagenumText;
+ VclPtr<TriStateBox> m_pPageNumBox;
VclPtr<NumericField> m_pPagenumEdit;
// paragraph division
@@ -262,6 +262,7 @@ private:
DECL_LINK(ApplyCollClickHdl_Impl, Button*, void);
DECL_LINK( PageBreakPosHdl_Impl, ListBox&, void );
DECL_LINK( PageBreakTypeHdl_Impl, ListBox&, void );
+ DECL_LINK(PageNumBoxClickHdl_Impl, Button*, void);
virtual void PageCreated(const SfxAllItemSet& aSet) override;
};