INTEGRATION: CWS impressodf12 (1.5.352); FILE MERGED

2008/05/29 13:33:20 cl 1.5.352.4: #i75927# bullet rework
2008/04/25 09:01:15 cl 1.5.352.3: RESYNC: (1.5-1.6); FILE MERGED
2008/04/22 19:59:41 cl 1.5.352.2: added undo for changing paragraph flags
2008/04/10 16:50:55 cl 1.5.352.1: #i35937# allow paragraph depth of -1 to switch of numbering

1 files changed, 44 insertions, 4 deletions

diff --git a/svx/source/outliner/outlundo.hxx b/svx/source/outliner/outlundo.hxx
index 0c0e7e86b4..7ed0e83a71 100644
--- a/svx/source/outliner/outlundo.hxx
+++ b/svx/source/outliner/outlundo.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: outlundo.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,16 +49,56 @@ public:
     Outliner*	GetOutliner() const { return mpOutliner; }
 };
 
+class OutlinerUndoChangeParaFlags : public OutlinerUndoBase
+{
+private:
+    sal_uInt16		mnPara;
+    sal_uInt16		mnOldFlags;
+    sal_uInt16		mnNewFlags;
+    
+    void ImplChangeFlags( sal_uInt16 nFlags );
+
+public:
+    OutlinerUndoChangeParaFlags( Outliner* pOutliner, sal_uInt16 nPara, sal_uInt16 nOldDepth, sal_uInt16 nNewDepth );
+
+    virtual void	Undo();
+    virtual void	Redo();
+};
+
+class OutlinerUndoChangeParaNumberingRestart : public OutlinerUndoBase
+{
+private:
+    sal_uInt16		mnPara;
+    
+    struct ParaRestartData
+    {
+        sal_Int16       mnNumberingStartValue;
+        sal_Bool        mbParaIsNumberingRestart;
+    };
+
+    ParaRestartData maUndoData;
+    ParaRestartData maRedoData;
+
+    void ImplApplyData( const ParaRestartData& rData );
+public:
+    OutlinerUndoChangeParaNumberingRestart( Outliner* pOutliner, sal_uInt16 nPara,
+        sal_Int16 nOldNumberingStartValue, sal_Int16 mnNewNumberingStartValue,
+        sal_Bool  nOldbParaIsNumberingRestart, sal_Bool nbNewParaIsNumberingRestart );
+
+    virtual void	Undo();
+    virtual void	Redo();
+};
+    
 class OutlinerUndoChangeDepth : public OutlinerUndoBase
 {
     using SfxUndoAction::Repeat;
 private:
     USHORT 			mnPara;
-    USHORT 			mnOldDepth;
-    USHORT 			mnNewDepth;
+    sal_Int16		mnOldDepth;
+    sal_Int16		mnNewDepth;
 
 public:
-                    OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, USHORT nOldDepth, USHORT nNewDepth );
+                    OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
 
     virtual void	Undo();
     virtual void	Redo();