summaryrefslogtreecommitdiff
path: root/sw/inc/fesh.hxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-09-20 12:02:55 +0000
committerRüdiger Timm <rt@openoffice.org>2004-09-20 12:02:55 +0000
commit98370e02c87360e383fb51787dd6a00935634b24 (patch)
treec34de2f49c455da13ba868ac0908e14fe6964566 /sw/inc/fesh.hxx
parentf8d1de07097aafce82eee4baa681a5b8a3c76814 (diff)
INTEGRATION: CWS swmailmerge (1.37.34); FILE MERGED
2004/09/15 13:34:33 os 1.37.34.5: RESYNC: (1.39-1.41); FILE MERGED 2004/09/13 07:55:02 os 1.37.34.4: #i25107# PastePages(): SwEditShell parameter changed to SwFEShell 2004/08/13 14:20:40 os 1.37.34.3: RESYNC: (1.38-1.39); FILE MERGED 2004/07/07 14:59:25 os 1.37.34.2: RESYNC: (1.37-1.38); FILE MERGED 2004/06/17 07:02:20 os 1.37.34.1: #i25107# weekly check-in
Diffstat (limited to 'sw/inc/fesh.hxx')
-rw-r--r--sw/inc/fesh.hxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index e71b6a6110e0..91498e5d5c8d 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fesh.hxx,v $
*
- * $Revision: 1.43 $
+ * $Revision: 1.44 $
*
- * last change: $Author: rt $ $Date: 2004-09-20 12:34:52 $
+ * last change: $Author: rt $ $Date: 2004-09-20 13:02:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -276,7 +276,9 @@ public:
// Copy und Paste Methoden fuer das interne Clipboard
BOOL Copy( SwDoc* pClpDoc, const String* pNewClpTxt = 0 );
- BOOL Paste( SwDoc* pClpDoc );
+ BOOL Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames = sal_False);
+ //paste some pages into another doc - used in mailmerge
+ BOOL PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPage);
// Copy-Methode fuer Drag&Drop
BOOL Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt,
BOOL bIsMove = FALSE, BOOL bSelectInsert = TRUE );