diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 14:51:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 14:51:44 +0000 |
| commit | 42de38e636926a167a66322568d16a272d8670b0 (patch) | |
| tree | 44d6b527626e97e928600d28d5d2f0f10cf0f7f5 /sw/source/core/crsr/findattr.cxx | |
| parent | c0b88fe9923353e70fdc0bb9e23729c9be341ce5 (diff) | |
INTEGRATION: CWS writercorehandoff (1.10.4); FILE MERGED
2006/04/28 13:28:35 fme 1.10.4.3: RESYNC: (1.10-1.11); FILE MERGED
2005/10/24 16:01:12 tra 1.10.4.2: #50348#
2005/09/28 13:59:48 tra 1.10.4.1: #i50348#
Diffstat (limited to 'sw/source/core/crsr/findattr.cxx')
| -rw-r--r-- | sw/source/core/crsr/findattr.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 3be43ddafd3b..28763cab9e80 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: findattr.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2006-04-07 15:08:09 $ + * last change: $Author: hr $ $Date: 2006-08-14 15:51:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1278,13 +1278,13 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, // und noch die Attribute setzen #ifdef OLD - pCrsr->GetDoc()->Insert( *pCrsr, *pReplSet ); + pCrsr->GetDoc()->Insert( *pCrsr, *pReplSet, 0 ); #else //JP 13.07.95: alle gesuchten Attribute werden, wenn nicht im // ReplaceSet angegeben, auf Default zurueck gesetzt if( !pSet->Count() ) - pCrsr->GetDoc()->Insert( *pCrsr, *pReplSet ); + pCrsr->GetDoc()->Insert( *pCrsr, *pReplSet, 0 ); else { SfxItemPool* pPool = pReplSet->GetPool(); @@ -1304,7 +1304,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, pItem = aIter.NextItem(); } aSet.Put( *pReplSet ); - pCrsr->GetDoc()->Insert( *pCrsr, aSet ); + pCrsr->GetDoc()->Insert( *pCrsr, aSet, 0 ); } #endif return FIND_NO_RING; @@ -1339,7 +1339,7 @@ ULONG SwCursor::Find( const SfxItemSet& rSet, FASTBOOL bNoCollections, (pReplSet && pReplSet->Count()); BOOL bSttUndo = pDoc->DoesUndo() && bReplace; if( bSttUndo ) - pDoc->StartUndo( UNDO_REPLACE ); + pDoc->StartUndo( UNDO_REPLACE, NULL ); SwFindParaAttr aSwFindParaAttr( rSet, bNoCollections, pSearchOpt, pReplSet, *this ); @@ -1350,7 +1350,7 @@ ULONG SwCursor::Find( const SfxItemSet& rSet, FASTBOOL bNoCollections, pDoc->SetModified(); if( bSttUndo ) - pDoc->EndUndo( UNDO_REPLACE ); + pDoc->EndUndo( UNDO_REPLACE, NULL ); return nRet; } |