summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorEilidh McAdam <eilidh.mcadam@gmail.com>2014-07-25 20:38:08 +0100
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2014-09-16 08:39:06 +0000
commit126b4407bade85298f983f545d6f507534fab61d (patch)
tree6cf74fac89624451047a57df3b266474f6770ed8 /sw/inc
parent636718c960a36bc28d37a69ac102dd6cb696bfba (diff)
Remove superfluous merge function.
The only caller of MergeDocuments now uses MergeMailFiles instead, so MergeDocuments can be removed. Change-Id: I03903a7f85c8328ab3f28cb1d23130557a1be7b4 Reviewed-on: https://gerrit.libreoffice.org/10982 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/dbmgr.hxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 18105cff4411..61eb74027c6e 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -367,8 +367,6 @@ public:
sal_Int32 _nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
);
- //merge into one document - returns the number of merged docs
- sal_Int32 MergeDocuments( SwMailMergeConfigItem& rMMConfig, SwView& rSourceView );
};
#endif