diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-12-21 19:33:34 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-12-21 19:33:34 +0100 |
| commit | 09d6c9a395b8849e3e09c694282a1446b786bf80 (patch) | |
| tree | 2679219635044f2ce5fba49309555db74432b002 /sw/source/core/txtnode/ndtxt.cxx | |
| parent | 3144cdca91c66439f241ba972904632900f86022 (diff) | |
CWS swlayoutrefactoring: #i115510#: use boost::noncopyable for SwClient; move some code from client iterations into SwClientNotify calls
Diffstat (limited to 'sw/source/core/txtnode/ndtxt.cxx')
| -rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 6109aaa7364e..8dc7febc9314 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -92,6 +92,7 @@ #include <svl/intitem.hxx> #include <list.hxx> #include <switerator.hxx> +#include <attrhint.hxx> SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0, 4 ) @@ -123,21 +124,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere, // --> OD 2005-11-03 #125329# // call method <UpdateOutlineNode(..)> only for the document nodes array if ( IsDocNodes() ) - { - //if ( pColl && NO_NUMBERING != pColl->GetOutlineLevel() ) //#outline level,removed by zhaojianwei - //{ - // UpdateOutlineNode( *pNode, NO_NUMBERING, pColl->GetOutlineLevel() ); - //} -// if ( pColl && 0 != pColl->GetAttrOutlineLevel() )//#outline level,added by zhaojianwei -// { -// UpdateOutlineNode( *pNode, 0, pColl->GetAttrOutlineLevel() ); -// }//<--end -// else - { - UpdateOutlineNode(*pNode); - } - } - // <-- + UpdateOutlineNode(*pNode); //Wenn es noch kein Layout gibt oder in einer versteckten Section // stehen, brauchen wir uns um das MakeFrms nicht bemuehen. @@ -5062,9 +5049,10 @@ bool SwTxtNode::IsInContent() const return !GetDoc()->IsInHeaderFooter( SwNodeIndex(*this) ); } -void SwTxtNode::SwClientNotify( SwModify* pModify, USHORT nWhich ) +void SwTxtNode::SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) { - if ( nWhich == RES_CONDTXTFMTCOLL && pModify == GetRegisteredIn() ) + const SwAttrHint* pHint = dynamic_cast<const SwAttrHint*>(&rHint); + if ( pHint && pHint->GetId() == RES_CONDTXTFMTCOLL && &rModify == GetRegisteredIn() ) ChkCondColl(); } |