diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 17:09:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 17:09:45 +0000 |
| commit | a7ee59db90c36078df78101318f10eac8f09d8bd (patch) | |
| tree | 43478a265638366977995cbde604938f912b2993 /sw/inc/dbmgr.hxx | |
| parent | 962a69b0fc7cfdc65fc5c2acf0f176cc330be501 (diff) | |
INTEGRATION: CWS os7 (1.17.2.1.60); FILE MERGED
2003/03/18 08:26:32 os 1.17.2.1.60.1: #107698# lock DBMgr while actually printing to prevent re-merge of database fields
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 4e7feceb0d35..a28adfe9abba 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dbmgr.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2003-03-27 15:38:32 $ + * last change: $Author: hr $ $Date: 2003-04-04 18:09:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -209,6 +209,8 @@ friend class SwConnectionDisposedListener_Impl; BOOL bInMerge : 1; //merge process active BOOL bMergeSilent : 1; // suppress display of dialogs/boxes (used when called over API) + BOOL bMergeLock : 1; // prevent update of database fields while document is + // actually printed at the ViewShell SwDSParamArr aDataSourceParams; SwNewDBMgr_Impl* pImpl; const SwXMailMerge* pMergeEvtSrc; // != 0 if mail merge events are to be send |