diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:29:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:29:38 +0000 |
| commit | c7e163f7067c4f705c46e37b9917514fd096e9e3 (patch) | |
| tree | 31442b5028079398f3e3cf7f39b4c946061c8d10 /sw/inc/dbmgr.hxx | |
| parent | dfef125d3ed8a8bdbdc46feaa10250b8cbf48504 (diff) | |
INTEGRATION: CWS tune03 (1.22.26); FILE MERGED
2004/08/09 21:18:08 mhu 1.22.26.2: RESYNC: (1.22-1.23); FILE MERGED
2004/07/19 19:10:29 mhu 1.22.26.1: #i29979# Added SW_DLLPUBLIC/PRIVATE (see swdllapi.h) to exported symbols/classes.
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index ff98c3d7abfe..7221a1d9b1b8 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dbmgr.hxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: hr $ $Date: 2004-08-02 14:17:51 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:29:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,11 @@ #include <com/sun/star/util/Date.hpp> #endif -#include "swtypes.hxx" // fuer aEmptyStr +#ifndef INCLUDED_SWDLLAPI_H +#include "swdllapi.h" +#endif +// @@@ #include "swtypes.hxx" // fuer aEmptyStr + #ifndef _SWDBDATA_HXX #include <swdbdata.hxx> #endif @@ -197,7 +201,8 @@ SV_DECL_PTRARR_DEL(SwDSParamArr, SwDSParamPtr, 0, 5) struct SwNewDBMgr_Impl; class SwConnectionDisposedListener_Impl; class AbstractMailMergeDlg; -class SwNewDBMgr + +class SW_DLLPUBLIC SwNewDBMgr { friend class SwConnectionDisposedListener_Impl; @@ -222,23 +227,25 @@ friend class SwConnectionDisposedListener_Impl; SwDSParam* pMergeData; AbstractMailMergeDlg* pMergeDialog; //CHINA001 SwMailMergeDlg* pMergeDialog; - SwDSParam* FindDSData(const SwDBData& rData, BOOL bCreate); - SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, BOOL bCreate); + SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, BOOL bCreate); + SW_DLLPRIVATE SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, BOOL bCreate); - DECL_LINK( PrtCancelHdl, Button * ); + + SW_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * ); // Datensaetze als Text ins Dokument einfuegen - void ImportFromConnection( SwWrtShell* pSh); + SW_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh); // Einzelnen Datensatz als Text ins Dokument einfuegen - void ImportDBEntry(SwWrtShell* pSh); + SW_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh); // Mischen von Datensaetzen in Felder, dann per email versenden - BOOL MergeMailing(SwWrtShell* pSh); + SW_DLLPRIVATE BOOL MergeMailing(SwWrtShell* pSh); + // Mischen von Datensaetzen in Felder, dann als Datei abspeichern - BOOL MergeMailFiles(SwWrtShell* pSh); - BOOL ToNextRecord(SwDSParam* pParam); + SW_DLLPRIVATE BOOL MergeMailFiles(SwWrtShell* pSh); + SW_DLLPRIVATE BOOL ToNextRecord(SwDSParam* pParam); public: SwNewDBMgr(); |