writerfilter/source/rtftok/rtfreferenceproperties.cxx | 3 - writerfilter/source/rtftok/rtfvalue.cxx | 32 ------------------ 2 files changed, 1 insertion(+), 34 deletions(-)
New commits: commit a94105591251126b26cf46219e21082e6527fd20 Author: Miklos Vajna <[email protected]> Date: Wed Jan 18 09:16:18 2017 +0100 writerfilter: clean up remaining redundant initializers in RTF import Change-Id: Ic01f496b45a68ae35627bfbfb18f5aaf0b2b783d Reviewed-on: https://gerrit.libreoffice.org/33253 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins <[email protected]> diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx index 7e33484..7f43c5e 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx @@ -21,8 +21,7 @@ RTFReferenceProperties::RTFReferenceProperties(RTFSprms aAttributes, RTFSprms aS } RTFReferenceProperties::RTFReferenceProperties(RTFSprms aAttributes) - : m_aAttributes(aAttributes), - m_aSprms() + : m_aAttributes(aAttributes) { } diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx index dbfe14c..0e540cb 100644 --- a/writerfilter/source/rtftok/rtfvalue.cxx +++ b/writerfilter/source/rtftok/rtfvalue.cxx @@ -39,12 +39,8 @@ RTFValue::RTFValue(int nValue, const OUString& sValue, RTFValue::RTFValue() : m_nValue(0), - m_sValue(), m_pAttributes(std::make_shared<RTFSprms>()), m_pSprms(std::make_shared<RTFSprms>()), - m_xShape(), - m_xStream(), - m_xObject(), m_bForceString(false), m_pShape(std::make_shared<RTFShape>()) { @@ -52,12 +48,8 @@ RTFValue::RTFValue() RTFValue::RTFValue(int nValue) : m_nValue(nValue), - m_sValue(), m_pAttributes(std::make_shared<RTFSprms>()), m_pSprms(std::make_shared<RTFSprms>()), - m_xShape(), - m_xStream(), - m_xObject(), m_bForceString(false) { m_pShape.reset(new RTFShape()); @@ -68,9 +60,6 @@ RTFValue::RTFValue(const OUString& sValue, bool bForce) m_sValue(sValue), m_pAttributes(std::make_shared<RTFSprms>()), m_pSprms(std::make_shared<RTFSprms>()), - m_xShape(), - m_xStream(), - m_xObject(), m_bForceString(bForce), m_pShape(std::make_shared<RTFShape>()) { @@ -78,12 +67,8 @@ RTFValue::RTFValue(const OUString& sValue, bool bForce) RTFValue::RTFValue(RTFSprms rAttributes) : m_nValue(), - m_sValue(), m_pAttributes(std::make_shared<RTFSprms>(rAttributes)), m_pSprms(std::make_shared<RTFSprms>()), - m_xShape(), - m_xStream(), - m_xObject(), m_bForceString(false), m_pShape(std::make_shared<RTFShape>()) { @@ -91,12 +76,8 @@ RTFValue::RTFValue(RTFSprms rAttributes) RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms) : m_nValue(), - m_sValue(), m_pAttributes(std::make_shared<RTFSprms>(rAttributes)), m_pSprms(std::make_shared<RTFSprms>(rSprms)), - m_xShape(), - m_xStream(), - m_xObject(), m_bForceString(false), m_pShape(std::make_shared<RTFShape>()) { @@ -104,12 +85,9 @@ RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms) RTFValue::RTFValue(uno::Reference<drawing::XShape> const& xShape) : m_nValue(), - m_sValue(), m_pAttributes(std::make_shared<RTFSprms>()), m_pSprms(std::make_shared<RTFSprms>()), m_xShape(xShape), - m_xStream(), - m_xObject(), m_bForceString(false), m_pShape(std::make_shared<RTFShape>()) { @@ -117,12 +95,9 @@ RTFValue::RTFValue(uno::Reference<drawing::XShape> const& xShape) RTFValue::RTFValue(uno::Reference<io::XInputStream> const& xStream) : m_nValue(), - m_sValue(), m_pAttributes(std::make_shared<RTFSprms>()), m_pSprms(std::make_shared<RTFSprms>()), - m_xShape(), m_xStream(xStream), - m_xObject(), m_bForceString(false), m_pShape(std::make_shared<RTFShape>()) { @@ -130,11 +105,8 @@ RTFValue::RTFValue(uno::Reference<io::XInputStream> const& xStream) RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> const& xObject) : m_nValue(), - m_sValue(), m_pAttributes(std::make_shared<RTFSprms>()), m_pSprms(std::make_shared<RTFSprms>()), - m_xShape(), - m_xStream(), m_xObject(xObject), m_bForceString(false), m_pShape(std::make_shared<RTFShape>()) @@ -143,12 +115,8 @@ RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> const& xObject) RTFValue::RTFValue(const RTFShape& aShape) : m_nValue(), - m_sValue(), m_pAttributes(std::make_shared<RTFSprms>()), m_pSprms(std::make_shared<RTFSprms>()), - m_xShape(), - m_xStream(), - m_xObject(), m_bForceString(false), m_pShape(std::make_shared<RTFShape>(aShape)) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
