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/core/docnode/ndcopy.cxx | |
| 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/core/docnode/ndcopy.cxx')
| -rw-r--r-- | sw/source/core/docnode/ndcopy.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 4ec8d2ce63a0..01dc51279c33 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -1304,7 +1304,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, *pCpyRange->GetMark() = *pCopyPam->GetMark(); } - if ( pNumRuleToPropagate ) + if ( pNumRuleToPropagate != NULL ) { // #i86492# - use <SwDoc::SetNumRule(..)>, because it also handles the <ListId> pDoc->SetNumRule( *pCopyPam, *pNumRuleToPropagate, false, |