diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-01-06 10:12:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-18 09:13:56 +0100 |
| commit | 56a51fb78e26e4e7de6cacf31a99dc3a97ce7349 (patch) | |
| tree | 339d2d873c8a55e481bb42d6b3e50918a7fbba87 /sw/inc/dbmgr.hxx | |
| parent | 72b292106d5d66b794f98a85e1fe0c970302c913 (diff) | |
mailmerge: bPageStylesWithHeaderFooter should not be a return value.
Change-Id: I8d39b6b031b543e4cc6a31cf57d207b04a19ba38
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index fff831adb8a6..7304b8d439b8 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -248,7 +248,7 @@ friend class SwConnectionDisposedListener_Impl; const SwMergeDescriptor& rMergeDescriptor, std::shared_ptr<const SfxFilter> pStoreToFilter); - SAL_DLLPRIVATE bool CreateTargetDocShell(sal_Int32 nMaxDumpDocs, bool bMergeShell, vcl::Window *pSourceWindow, + SAL_DLLPRIVATE void CreateTargetDocShell(sal_Int32 nMaxDumpDocs, bool bMergeShell, vcl::Window *pSourceWindow, SwWrtShell *pSourceShell, SwDocShell *pSourceDocSh, SfxObjectShellRef &xTargetDocShell, SwDoc *&pTargetDoc, SwWrtShell *&pTargetShell, SwView *&pTargetView, |