diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-31 22:06:29 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-01 09:03:45 +0100 |
| commit | bf79168dba6100624bc105a66ce3f4d1bff9353b (patch) | |
| tree | 32546b2a2fe44f9a23f559c4a309f763f9757fbb /writerperfect | |
| parent | 3171066a959b52cd483bb22a0d1046e633f092f6 (diff) | |
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/49060
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/source/writer/EPUBExportDialog.cxx | 4 | ||||
| -rw-r--r-- | writerperfect/source/writer/EPUBExportDialog.hxx | 2 | ||||
| -rw-r--r-- | writerperfect/source/writer/EPUBExportFilter.hxx | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx b/writerperfect/source/writer/EPUBExportDialog.cxx index 59e5cb4bf469..bbd241bb7b63 100644 --- a/writerperfect/source/writer/EPUBExportDialog.cxx +++ b/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()); diff --git a/writerperfect/source/writer/EPUBExportDialog.hxx b/writerperfect/source/writer/EPUBExportDialog.hxx index 7d7f016b1a18..ab90c48ee04c 100644 --- a/writerperfect/source/writer/EPUBExportDialog.hxx +++ b/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; diff --git a/writerperfect/source/writer/EPUBExportFilter.hxx b/writerperfect/source/writer/EPUBExportFilter.hxx index ee676d3e1701..fb5d7d6616a9 100644 --- a/writerperfect/source/writer/EPUBExportFilter.hxx +++ b/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 |