diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-05-18 12:58:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-05-18 12:58:12 +0000 |
| commit | eb2c332f6f7b00915e7bc517c8ef84f205ea1ea8 (patch) | |
| tree | 7dffa5219713d5fb24973d45f62b55f3a7f86a59 /sw/inc/pagedesc.hxx | |
| parent | 52714f166a529688ba5eedb904f5234fd0962be7 (diff) | |
INTEGRATION: CWS swundo01 (1.5.160); FILE MERGED
2004/01/06 14:53:19 hbrinkm 1.5.160.2: #i7983#
2003/11/11 13:44:49 hbrinkm 1.5.160.1: #i7983#
Diffstat (limited to 'sw/inc/pagedesc.hxx')
| -rw-r--r-- | sw/inc/pagedesc.hxx | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 2b0091547e97..3c98f15cad76 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pagedesc.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-04-01 12:57:12 $ + * last change: $Author: kz $ $Date: 2004-05-18 13:58:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -176,9 +176,7 @@ enum UseOnPage class SwPageDesc : public SwModify { friend class SwDoc; - - //nicht (mehr) implementiert. - SwPageDesc& operator=( const SwPageDesc& ); + friend class SwUndoPageDescExt; String aDescName; SvxNumberType aNumType; @@ -278,6 +276,8 @@ public: //Given a SwNode return the pagedesc in use at that location. static const SwPageDesc* GetPageDescOfNode(const SwNode& rNd); + SwPageDesc& operator=( const SwPageDesc& ); + SwPageDesc( const SwPageDesc& ); ~SwPageDesc(); }; @@ -362,4 +362,25 @@ inline const SwFrmFmt *SwPageDesc::GetLeftFmt() const return PD_LEFT & eUse ? &aLeft : 0; } +class SwPageDescExt +{ + SwPageDesc aPageDesc; + SwDoc * pDoc; + String sFollow; + + void SetPageDesc(const SwPageDesc & aPageDesc); + +public: + SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc * pDoc); + SwPageDescExt(const SwPageDescExt & rSrc); + ~SwPageDescExt(); + + SwPageDescExt & operator = (const SwPageDescExt & rSrc); + SwPageDescExt & operator = (const SwPageDesc & rSrc); + + const String & GetName() const; + + operator SwPageDesc() const; // #i7983# +}; + #endif //_PAGEDESC_HXX |