EPUB export: can use std::move() here

And get rid of an easy to avoid include if we are at it.

Change-Id: I63cb4628a3a7038aab91c66f592920923a31d7a6
Reviewed-on: https://gerrit.libreoffice.org/49060Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

writerperfect/source/writer/EPUBExportDialog.cxx

@@ -70,11 +70,11 @@ sal_Int32 PositionToVersion(sal_Int32 nPosition)
 namespace writerperfect
 {
 
-EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent, comphelper::SequenceAsHashMap &rFilterData, uno::Reference<uno::XComponentContext> xContext, const css::uno::Reference<css::lang::XComponent> &xDocument)
+EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent, comphelper::SequenceAsHashMap &rFilterData, uno::Reference<uno::XComponentContext> xContext, css::uno::Reference<css::lang::XComponent> xDocument)
     : ModalDialog(pParent, "EpubDialog", "writerperfect/ui/exportepub.ui"),
       mxContext(std::move(xContext)),
       mrFilterData(rFilterData),
-      mxSourceDocument(xDocument)
+      mxSourceDocument(std::move(xDocument))
 {
     get(m_pVersion, "versionlb");
     assert(PositionToVersion(m_pVersion->GetSelectedEntryPos()) == EPUBExportFilter::GetDefaultVersion());

writerperfect/source/writer/EPUBExportDialog.hxx

@@ -27,7 +27,7 @@ namespace writerperfect
 class EPUBExportDialog : public ModalDialog
 {
 public:
-    EPUBExportDialog(vcl::Window *pParent, comphelper::SequenceAsHashMap &rFilterData, css::uno::Reference<css::uno::XComponentContext> xContext, const css::uno::Reference<css::lang::XComponent> &xDocument);
+    EPUBExportDialog(vcl::Window *pParent, comphelper::SequenceAsHashMap &rFilterData, css::uno::Reference<css::uno::XComponentContext> xContext, css::uno::Reference<css::lang::XComponent> xDocument);
     ~EPUBExportDialog() override;
     void dispose() override;
 

writerperfect/source/writer/EPUBExportFilter.hxx

@@ -19,10 +19,12 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include "exp/xmlimp.hxx"
-
 namespace writerperfect
 {
+namespace exp
+{
+struct FixedLayoutPage;
+}
 
 /// EPUB export XFilter implementation.
 class EPUBExportFilter : public cppu::WeakImplHelper