diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-26 07:17:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-26 07:17:43 +0000 |
| commit | 911ff6d3589bb85e2144fa65d91d145ee4fadb41 (patch) | |
| tree | 23c220d1cd819927fd83d0e79ed200473cc0d6d3 /sw | |
| parent | d71351e88b27abeb4936781d3711fee70a5ce39a (diff) | |
INTEGRATION: CWS swqbf101 (1.33.8); FILE MERGED
2007/07/12 10:41:07 od 1.33.8.1: #i56253# class <SwUndoFmtAttr>
- keep numbering attributes about depending text nodes and
restore these on undo.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/undobj.hxx | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index d9eaac87c911..3336fb8a30f9 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -4,9 +4,9 @@ * * $RCSfile: undobj.hxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: obo $ $Date: 2007-07-18 14:32:17 $ + * last change: $Author: rt $ $Date: 2007-07-26 08:17:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -607,6 +607,9 @@ public: OUT_UNDOBJ( ResetAttr ) }; +// --> OD 2007-07-11 #i56253# +struct TxtNodeNumberingAttrs; +// <-- class SwUndoFmtAttr : public SwUndo { @@ -614,8 +617,11 @@ class SwUndoFmtAttr : public SwUndo SwFmt* pFmt; SfxItemSet* pOldSet; // die alten Attribute ULONG nNode; - USHORT nFmtWhich; - BOOL bSaveDrawPt; + const USHORT nFmtWhich; + const BOOL bSaveDrawPt; + // --> OD 2007-07-11 #i56253# + ::std::vector<TxtNodeNumberingAttrs>* mpNumAttrsOfTxtNodes; + // <-- int IsFmtInDoc( SwDoc* ); // ist das Attribut-Format noch im Doc ? void SaveFlyAnchor( BOOL bSaveDrawPt = FALSE ); @@ -629,14 +635,27 @@ class SwUndoFmtAttr : public SwUndo // This situation occurs for undo of styles. bool RestoreFlyAnchor( SwUndoIter& rIter ); // <-- - void Init(); + // --> OD 2007-07-11 #i56253# + // add parameter <rAffectedItemSet> + void Init( const SfxItemSet& rAffectedItems ); + // <-- + + // --> OD 2007-07-11 #i56253# + ::std::vector<TxtNodeNumberingAttrs>* GetActualNumAttrsOfTxtNodes( const SfxItemSet* pAffectedItems = 0 ); + // <-- public: // meldet sich im Format an und sichert sich die alten Attribute - SwUndoFmtAttr( const SfxItemSet& rOldSet, SwFmt& rFmt, - BOOL bSaveDrawPt = TRUE ); - SwUndoFmtAttr( const SfxPoolItem& rItem, SwFmt& rFmt, - BOOL bSaveDrawPt = TRUE ); + // --> OD 2007-07-11 #i56253# + // add new 2nd parameter <rNewSet> + SwUndoFmtAttr( const SfxItemSet& rOldSet, + const SfxItemSet& rNewSet, + SwFmt& rFmt, + BOOL bSaveDrawPt = TRUE ); + // <-- + SwUndoFmtAttr( const SfxPoolItem& rItem, + SwFmt& rFmt, + BOOL bSaveDrawPt = TRUE ); virtual ~SwUndoFmtAttr(); virtual void Undo( SwUndoIter& ); // --> OD 2004-10-26 #i35443# - <Redo(..)> calls <Undo(..)> - nothing else |