diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 13:16:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 13:16:42 +0000 |
| commit | e0b8d9b382507242fd2669d6a23898d83eac11de (patch) | |
| tree | 1d3474d315522d9f5f2c2b4d5a234b76edbd7a91 /svx/source/outliner | |
| parent | 16da2684bbffb65fd789082d2f99df9103a4fbc9 (diff) | |
INTEGRATION: CWS impress150 (1.17.108); FILE MERGED
2008/07/21 14:47:56 cl 1.17.108.1: #i91807# create correct undo actions when combining paragraphs
Diffstat (limited to 'svx/source/outliner')
| -rw-r--r-- | svx/source/outliner/outleeng.cxx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/svx/source/outliner/outleeng.cxx b/svx/source/outliner/outleeng.cxx index fcd09ae7da..87ab99b97e 100644 --- a/svx/source/outliner/outleeng.cxx +++ b/svx/source/outliner/outleeng.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: outleeng.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.18 $ * * This file is part of OpenOffice.org. * @@ -40,6 +40,7 @@ #include <svtools/itemset.hxx> #include <svx/eeitem.hxx> #include "editstat.hxx" +#include "outlundo.hxx" OutlinerEditEng::OutlinerEditEng( Outliner* pEngOwner, SfxItemPool* pPool ) : EditEngine( pPool ) @@ -95,6 +96,19 @@ void OutlinerEditEng::ParagraphDeleted( USHORT nDeletedParagraph ) EditEngine::ParagraphDeleted( nDeletedParagraph ); } +void OutlinerEditEng::ParagraphConnected( USHORT /*nLeftParagraph*/, USHORT nRightParagraph ) +{ + if( pOwner && pOwner->IsUndoEnabled() && !const_cast<EditEngine&>(pOwner->GetEditEngine()).IsInUndo() ) + { + Paragraph* pPara = pOwner->GetParagraph( nRightParagraph ); + if( pPara && pOwner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) + { + pOwner->InsertUndo( new OutlinerUndoChangeParaFlags( pOwner, nRightParagraph, PARAFLAG_ISPAGE, 0 ) ); + } + } +} + + void OutlinerEditEng::StyleSheetChanged( SfxStyleSheet* pStyle ) { pOwner->StyleSheetChanged( pStyle ); |