sw/source/filter/ww8/rtfattributeoutput.cxx | 4 ++-- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit b85810637d2475496a3055ae8c3f36a5a104a9a1 Author: Miklos Vajna <[email protected]> AuthorDate: Tue Dec 17 21:42:24 2019 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Dec 18 09:05:01 2019 +0100 sw RTF export: don't mark these members as const As the destructor wants to std::move() these members, and that only has an effect if the member is not const. Simiarly in writerfilter/, there the const prevents the implicit std::move() on return. Change-Id: I42ce393da9033abbd028bd5b83f15f69d34e254d Reviewed-on: https://gerrit.libreoffice.org/85336 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 570f018788b8..8a7fbb01bf2b 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1879,8 +1879,8 @@ class SaveRunState { private: RtfAttributeOutput& m_rRtf; - RtfStringBuffer const m_Run; - RtfStringBuffer const m_RunText; + RtfStringBuffer m_Run; + RtfStringBuffer m_RunText; bool const m_bSingleEmptyRun; bool const m_bInRun; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index af97169166ed..8bd50d702c98 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2081,7 +2081,7 @@ writerfilter::Reference<Properties>::Pointer_t RTFDocumentImpl::createStylePrope m_aStates.top().getTableSprms().set(NS_ooxml::LN_CT_Style_pPr, pParaProps); m_aStates.top().getTableSprms().set(NS_ooxml::LN_CT_Style_rPr, pCharProps); - writerfilter::Reference<Properties>::Pointer_t const pProps(new RTFReferenceProperties( + writerfilter::Reference<Properties>::Pointer_t pProps(new RTFReferenceProperties( m_aStates.top().getTableAttributes(), m_aStates.top().getTableSprms())); return pProps; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
