diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-06-27 12:27:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-27 17:22:09 +0100 |
| commit | b733d208b02facaaad8c4925277b34b9f7fd928f (patch) | |
| tree | fb9c0ea612d3d970632f8e2f1fdcbe3ae74afceb /sw/inc/doc.hxx | |
| parent | 852c8e53d7bdb978951ab2703085341ee529a211 (diff) | |
Related: #i78498# Do not keep OutlineLevel attribute at paragraph...
when a Paragraph Style is assigned.
(cherry picked from commit 6a1564284d90c7e175f7848520924f7f6a5884b7)
(cherry picked from commit 4a381b1124f60b76cabb558fa24827448a1caab0)
Conflicts:
sw/inc/doc.hxx
sw/inc/editsh.hxx
sw/inc/fmtcol.hxx
sw/inc/ndtxt.hxx
sw/source/core/attr/format.cxx
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/docglbl.cxx
sw/source/core/doc/doctxm.cxx
sw/source/core/doc/fmtcol.cxx
sw/source/core/edit/edfcol.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/undo/unfmco.cxx
sw/source/core/unocore/unosett.cxx
sw/source/core/unocore/unostyle.cxx
Change-Id: Ifa1214876df296f2e1210cc4a35f2df67f9f6bc4
Diffstat (limited to 'sw/inc/doc.hxx')
| -rw-r--r-- | sw/inc/doc.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 75eac111ab24..37a6fda6bc59 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1086,9 +1086,9 @@ public: The new parameter <bResetListAttrs> indicates, if the list attributes (list style, restart at and restart with) are cleared as well in case that <bReset = true> and the paragraph style has a list style attribute set. */ - bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt, - bool bReset = true, - bool bResetListAttrs = false ); + bool SetTxtFmtColl(const SwPaM &rRg, SwTxtFmtColl *pFmt, + const bool bReset = true, + const bool bResetListAttrs = false); SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const { return (SwTxtFmtColl*)FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName ); } |