diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-04-27 08:44:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-04-27 08:44:08 +0000 |
| commit | e0ff5cc0fea283704776c23fb425117b5aae203b (patch) | |
| tree | 01c48ee5f240d10170cc2bc7a65db17e8274885e /sw/inc/dbmgr.hxx | |
| parent | bfcc1b2c153cea9f304c2b0dbf51f6066f7882e4 (diff) | |
INTEGRATION: CWS os80 (1.30.238); FILE MERGED
2006/04/11 10:57:38 os 1.30.238.1: #i56195# obsolete members removed
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 752fac2b248a..10c0860ba2ec 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dbmgr.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2005-10-19 08:22:15 $ + * last change: $Author: kz $ $Date: 2006-04-27 09:44:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -245,10 +245,6 @@ friend class SwConnectionDisposedListener_Impl; SwNewDBMgr_Impl* pImpl; const SwXMailMerge* pMergeEvtSrc; // != 0 if mail merge events are to be send - SwDSParam* pMergeData; - AbstractMailMergeDlg* pMergeDialog; - //CHINA001 SwMailMergeDlg* pMergeDialog; - SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, BOOL bCreate); SW_DLLPRIVATE SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, BOOL bCreate); |