summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/dbmgr.hxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 7802771bc9c5..ac3deb1d9a9b 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -223,7 +223,6 @@ friend class SwConnectionDisposedListener_Impl;
/// merge to file _and_ merge to e-Mail
SAL_DLLPRIVATE bool MergeMailFiles(SwWrtShell* pSh,
const SwMergeDescriptor& rMergeDescriptor, vcl::Window* pParent );
- SAL_DLLPRIVATE bool ToNextRecord(SwDSParam* pParam);
SwDBManager(SwDBManager const&) = delete;
SwDBManager& operator=(SwDBManager const&) = delete;
@@ -251,7 +250,6 @@ public:
/// Merging of data records into fields.
bool MergeNew( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent = nullptr );
- static bool Merge(SwWrtShell* pSh);
void MergeCancel();
/// Initialize data fields that lack name of database.
@@ -270,7 +268,7 @@ public:
const OUString& rDBName, const OUString& rTableName);
static void GetColumnNames(ListBox* pListBox,
css::uno::Reference< css::sdbc::XConnection> xConnection,
- const OUString& rTableName, bool bAppend = false);
+ const OUString& rTableName);
static sal_uLong GetColumnFormat( css::uno::Reference< css::sdbc::XDataSource> xSource,
css::uno::Reference< css::sdbc::XConnection> xConnection,