diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-01 17:20:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-01 20:27:58 +0000 |
| commit | 362ff67556cca0890ca01f2de44596491c0e9bc8 (patch) | |
| tree | 0ce24496ad8ba015a1116e85e015a52339076ab1 /sw/source/uibase/table/tablepg.hxx | |
| parent | e2eb25a52d86eec868ace658dd3a27eaf536b311 (diff) | |
tdf#77111 sw: fix page number offset on table dialog "Text Flow"
Commit c2ccd20c0fd92bddfff76447754541705e3eb8f3 introduced 0 as a valid
value for page number offset in sw core.
Unfortunately the table 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 "pagenoft" so that translations still work
* set initial value to 1; 0 is a really bad default since we can't
export it to ODF
* add a little bit of left margin so the line is indented below the
upper line
Change-Id: I70cf5a66d4191acd2c19b3d0a83609e2b348a886
(cherry picked from commit c1e7fc6f497d7570cb0832c43647d295f8592567)
Reviewed-on: https://gerrit.libreoffice.org/34763
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/table/tablepg.hxx')
| -rw-r--r-- | sw/source/uibase/table/tablepg.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 63a270762516..1a9ebb679724 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -155,7 +155,7 @@ class SwTextFlowPage : public SfxTabPage VclPtr<CheckBox> m_pPageCollCB; VclPtr<ListBox> m_pPageCollLB; - VclPtr<FixedText> m_pPageNoFT; + VclPtr<CheckBox> m_pPageNoCB; VclPtr<NumericField> m_pPageNoNF; VclPtr<CheckBox> m_pSplitCB; VclPtr<TriStateBox> m_pSplitRowCB; @@ -176,6 +176,7 @@ class SwTextFlowPage : public SfxTabPage DECL_LINK(ApplyCollClickHdl_Impl, Button*, void); DECL_LINK( PageBreakPosHdl_Impl, Button*, void ); DECL_LINK( PageBreakTypeHdl_Impl, Button*, void ); + DECL_LINK(PageNoClickHdl_Impl, Button*, void); DECL_LINK( SplitHdl_Impl, Button*, void ); DECL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, Button*, void ); DECL_LINK( HeadLineCBClickHdl, Button* = nullptr, void ); |