diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 13:11:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 13:11:43 +0000 |
| commit | 6778575864367e42b894dc054dc750611ce552c4 (patch) | |
| tree | ba86281e36dbcaa2d6051352660647f775201ca6 /sd/source/ui/func | |
| parent | f9574978660a1f81f22fd4588b6ba7a18415826d (diff) | |
INTEGRATION: CWS impress150 (1.42.62); FILE MERGED
2008/07/21 16:03:49 cl 1.42.62.1: #i91807# create correct undo actions when combining paragraphs
Diffstat (limited to 'sd/source/ui/func')
| -rw-r--r-- | sd/source/ui/func/fuinsfil.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 2ad780fb8bdb..38d0f90372cb 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fuinsfil.cxx,v $ - * $Revision: 1.42 $ + * $Revision: 1.43 $ * * This file is part of OpenOffice.org. * @@ -638,7 +638,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) Paragraph* pPara = (Paragraph*)pList->First(); // wo soll eingefuegt werden? - while( !pPara->HasFlag( PARAFLAG_ISPAGE ) ) + while( !pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) { pPara = pDocliner->GetParent(pPara); } @@ -650,7 +650,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) while (pPara) { ULONG nPos = pDocliner->GetAbsPos( pPara ); - if ( pPara->HasFlag( PARAFLAG_ISPAGE ) ) + if ( pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) nPage++; pPara = pDocliner->GetParagraph( nPos - 1 ); } @@ -694,7 +694,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) while (pPara) { ULONG nPos = pOutliner->GetAbsPos( pPara ); - if( pPara->HasFlag( PARAFLAG_ISPAGE ) ) + if( pOutliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) nNewPages++; pPara = pOutliner->GetParagraph( ++nPos ); } @@ -731,7 +731,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) pDocliner->SetStyleSheet( nTargetPos, pOutlStyle ); } - if( pSourcePara->HasFlag( PARAFLAG_ISPAGE ) ) + if( pDocliner->HasParaFlag( pSourcePara, PARAFLAG_ISPAGE ) ) { nNewPages++; if( pProgress ) |