INTEGRATION: CWS geordi2q10 (1.7.2); FILE MERGED

2003/11/27 08:56:37 rt 1.7.2.1: #111934#: join CWS sw7pp1b
This commit is contained in:
Rüdiger Timm 2003-12-01 08:37:16 +00:00
parent 81544f1c84
commit 6739f17281

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: dcontact.hxx,v $ * $RCSfile: dcontact.hxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: rt $ $Date: 2003-11-24 15:59:59 $ * last change: $Author: rt $ $Date: 2003-12-01 09:37:16 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -292,6 +292,10 @@ class SwDrawContact : public SwContact
SwFrm *pAnchor; SwFrm *pAnchor;
SwPageFrm *pPage; SwPageFrm *pPage;
// OD 10.10.2003 #112299# - internal flag to indicate that disconnect
// from layout is in progress
bool mbDisconnectInProgress;
// OD 16.05.2003 #108784# - data structure for collecting 'virtual' // OD 16.05.2003 #108784# - data structure for collecting 'virtual'
// drawing object supporting drawing objects in headers/footers. // drawing object supporting drawing objects in headers/footers.
std::list<SwDrawVirtObj*> maDrawVirtObjs; std::list<SwDrawVirtObj*> maDrawVirtObjs;