summaryrefslogtreecommitdiff
path: root/sw/inc/dbmgr.hxx
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2001-07-10 12:51:01 +0000
committerOliver Specht <os@openoffice.org>2001-07-10 12:51:01 +0000
commiteb2aa8ef29e97d76a573d3c1e06c04e7772f0cc4 (patch)
tree34f789937b4dbccba48874682362ff37720c21fe /sw/inc/dbmgr.hxx
parent673acfcd3d65600582be7459e0478ad70c68a7e0 (diff)
#85318# reading from non-merge data bases corrected
Diffstat (limited to 'sw/inc/dbmgr.hxx')
-rw-r--r--sw/inc/dbmgr.hxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 9a0233013271..26e54a816ebf 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dbmgr.hxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: os $ $Date: 2001-06-25 13:42:08 $
+ * last change: $Author: os $ $Date: 2001-07-10 13:49:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -220,6 +220,8 @@ class SwNewDBMgr
BOOL MergeMailing(SwWrtShell* pSh);
// Mischen von Datensaetzen in Felder, dann als Datei abspeichern
BOOL MergeMailFiles(SwWrtShell* pSh);
+ BOOL ToNextRecord(SwDSParam* pParam);
+
public:
SwNewDBMgr();
~SwNewDBMgr();
@@ -285,8 +287,9 @@ public:
void InsertText(SwWrtShell& rSh,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties);
- // check if a data source is open as merge source
- BOOL IsDataSourceOpen(const String& rDataSource, const String& rTableOrQuery)const;
+ // check if a data source is open
+ BOOL IsDataSourceOpen(const String& rDataSource,
+ const String& rTableOrQuery, sal_Bool bMergeOnly);
// add data source information to the data source array - was PreInitDBData
void AddDSData(const SwDBData& rData, long nSelStart, long nSelEnd);
@@ -310,6 +313,8 @@ public:
BOOL GetMergeColumnCnt(const String& rColumnName, USHORT nLanguage,
String &rResult, double *pNumber, sal_uInt32 *pFormat);
BOOL ToNextMergeRecord();
+ BOOL ToNextRecord(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
+
BOOL ExistsNextRecord()const;
sal_uInt32 GetSelectedRecordId();
sal_Bool ToRecordId(sal_Int32 nSet);