diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 14:37:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 14:37:18 +0000 |
| commit | 9ae73a76861ed708014273ee605c6897fd84d0fa (patch) | |
| tree | b7a0788bd1ad61acab61074e85b723d715057154 /sw/source/core/crsr/findattr.cxx | |
| parent | d3fde290efea8593a87fff81a7ca6dd56aa2b94c (diff) | |
INTEGRATION: CWS swautomatic01 (1.11.38); FILE MERGED
2006/10/10 17:10:06 fme 1.11.38.4: RESYNC: (1.12-1.13); FILE MERGED
2006/09/01 12:11:33 fme 1.11.38.3: RESYNC: (1.11-1.12); FILE MERGED
2006/08/09 08:56:28 fme 1.11.38.2: #i64576# Automatic styles
2006/07/18 13:12:23 fme 1.11.38.1: #i65476# AutoStyles
Diffstat (limited to 'sw/source/core/crsr/findattr.cxx')
| -rw-r--r-- | sw/source/core/crsr/findattr.cxx | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index a8f01d437080..e3416fa74910 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.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-09-16 20:45:50 $ + * last change: $Author: rt $ $Date: 2006-12-01 15:37:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -320,7 +320,7 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam ) : 0; } - if( bNoColls && !rTxtNd.GetpSwAttrSet() ) + if( bNoColls && !rTxtNd.HasSwAttrSet() ) return ; const SfxItemSet& rSet = rTxtNd.GetSwAttrSet(); @@ -388,16 +388,16 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr ) // -------------------------------------------------------------- USHORT nWhch = rAttr.Which(); SfxWhichIter* pIter = NULL; - const SfxPoolItem* pTmpItem; - const SwAttrSet* pSet; - if( RES_TXTATR_CHARFMT == nWhch ) + const SfxPoolItem* pTmpItem = NULL; + const SfxItemSet* pSet = NULL; + if( RES_TXTATR_CHARFMT == nWhch || RES_TXTATR_AUTOFMT == nWhch ) { - if( bNoColls ) + if( bNoColls && RES_TXTATR_CHARFMT == nWhch ) return Found(); - SwCharFmt* pFmt = rAttr.GetCharFmt().GetCharFmt(); - if( pFmt ) + pTmpItem = NULL; + pSet = CharFmt::GetItemSet( rAttr.GetAttr() ); + if ( pSet ) { - pSet = &pFmt->GetAttrSet(); pIter = new SfxWhichIter( *pSet ); nWhch = pIter->FirstWhich(); while( nWhch && @@ -406,8 +406,6 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr ) if( !nWhch ) pTmpItem = NULL; } - else - pTmpItem = NULL; } else pTmpItem = &rAttr.GetAttr(); @@ -548,16 +546,16 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) // -------------------------------------------------------------- USHORT nWhch = rAttr.Which(); SfxWhichIter* pIter = NULL; - const SfxPoolItem* pTmpItem; - const SwAttrSet* pSet; - if( RES_TXTATR_CHARFMT == nWhch ) + const SfxPoolItem* pTmpItem = NULL; + const SfxItemSet* pSet = NULL; + if( RES_TXTATR_CHARFMT == nWhch || RES_TXTATR_AUTOFMT == nWhch ) { - if( bNoColls ) + if( bNoColls && RES_TXTATR_CHARFMT == nWhch ) return Found(); - SwCharFmt* pFmt = rAttr.GetCharFmt().GetCharFmt(); - if( pFmt ) + + pSet = CharFmt::GetItemSet( rAttr.GetAttr() ); + if ( pSet ) { - pSet = &pFmt->GetAttrSet(); pIter = new SfxWhichIter( *pSet ); nWhch = pIter->FirstWhich(); while( nWhch && @@ -566,8 +564,6 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) if( !nWhch ) pTmpItem = NULL; } - else - pTmpItem = NULL; } else pTmpItem = &rAttr.GetAttr(); @@ -911,7 +907,7 @@ int lcl_Search( const SwCntntNode& rCNd, SwPaM& rPam, const SfxItemSet& rCmpSet, BOOL bNoColls ) { // nur die harte Attributierung suchen ? - if( bNoColls && !rCNd.GetpSwAttrSet() ) + if( bNoColls && !rCNd.HasSwAttrSet() ) return FALSE; const SfxItemSet& rNdSet = rCNd.GetSwAttrSet(); @@ -1003,7 +999,7 @@ FASTBOOL SwPaM::Find( const SfxPoolItem& rAttr, FASTBOOL bValue, SwMoveFn fnMove // keine harte Attributierung, dann pruefe, ob die Vorlage schon // mal nach dem Attribut befragt wurde - if( !pNode->GetpSwAttrSet() ) + if( !pNode->HasSwAttrSet() ) { const SwFmt* pTmpFmt = pNode->GetFmtColl(); if( aFmtArr.Count() && aFmtArr.Seek_Entry( pTmpFmt )) @@ -1101,7 +1097,7 @@ FASTBOOL SwPaM::Find( const SfxItemSet& rSet, FASTBOOL bNoColls, SwMoveFn fnMove // keine harte Attributierung, dann pruefe, ob die Vorlage schon // mal nach dem Attribut befragt wurde - if( !pNode->GetpSwAttrSet() ) + if( !pNode->HasSwAttrSet() ) { const SwFmt* pTmpFmt = pNode->GetFmtColl(); if( aFmtArr.Count() && aFmtArr.Seek_Entry( pTmpFmt )) |