diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-03-18 14:33:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-19 15:34:18 +0000 |
| commit | 04187aaf09969341a7ae9ae7ff5a13925381a96b (patch) | |
| tree | eb73ab0eb6c1b14cb8c0c621c32d85c266863b73 /sw/source/ui/misc | |
| parent | 35e190ba5bac01b47fbed1ea568dfb3456029d82 (diff) | |
Resolves: #i124371# When changing the numbering or bullet styling...
of a set of paragraph which have more than one different List Style applied
create a new List Style and put the paragraphs into a new list.
(cherry picked from commit 0087ca89e3905009ed947c651f3dc70f3d61ea93)
Conflicts:
sw/inc/doc.hxx
sw/inc/docsh.hxx
sw/inc/editsh.hxx
sw/source/core/doc/docnum.cxx
sw/source/core/docnode/ndcopy.cxx
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/uibase/app/docst.cxx
sw/source/core/uibase/docvw/edtwin.cxx
sw/source/core/uibase/inc/textsh.hxx
sw/source/core/uibase/shells/listsh.cxx
sw/source/core/uibase/shells/textsh1.cxx
sw/source/core/uibase/shells/txtnum.cxx
sw/source/core/uibase/uiview/formatclipboard.cxx
sw/source/core/uibase/uiview/view2.cxx
sw/source/core/uibase/wrtsh/wrtsh1.cxx
sw/source/core/undo/unnum.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/ui/misc/num.cxx
Change-Id: Iadb5b386cada296d90d96aa75574024baac7ae3e
Diffstat (limited to 'sw/source/ui/misc')
| -rw-r--r-- | sw/source/ui/misc/num.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 376c600fdee9..c37c9b187003 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -921,7 +921,7 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, , rWrtSh(rSh) { GetUserButton()->SetClickHdl(LINK(this, SwSvxNumBulletTabDialog, RemoveNumberingHdl)); - GetUserButton()->Enable(rWrtSh.GetCurNumRule() != NULL); + GetUserButton()->Enable(rWrtSh.GetNumRuleAtCurrCrsrPos() != NULL); m_nSingleNumPageId = AddTabPage("singlenum", RID_SVXPAGE_PICK_SINGLE_NUM ); m_nBulletPageId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET ); AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM ); |