summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-03-05 21:38:37 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-03-06 09:06:03 +0100
commit7e2a4f53a243e90cca4b17c63f5318af1a4687f2 (patch)
tree22b210ebd0636a37cce6cc0ee5c25fcf7599c591 /writerfilter
parent936308d3ef4f43d9c525401cb1cfca197df13b0f (diff)
writerfilter: remove empty RTFPicture constructor
This is really just a reference-counted struct, not a real class. Change-Id: Ifccd513e56632fd4df7711f7070188671b45e82d Reviewed-on: https://gerrit.libreoffice.org/68777 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx1
-rw-r--r--writerfilter/source/rtftok/rtfvalue.cxx18
3 files changed, 9 insertions, 12 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index afc7e7f4c579..e29eedafee4e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3475,8 +3475,6 @@ void RTFDocumentImpl::bufferProperties(RTFBuffer_t& rBuffer, const RTFValue::Poi
rBuffer.emplace_back(Buf_t(BUFFER_PROPS, pValue, pTableProperties));
}
-RTFPicture::RTFPicture() = default;
-
RTFShape::RTFShape() = default;
RTFDrawingObject::RTFDrawingObject() = default;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 7f31dfac82ed..5ee0dcf6a397 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -357,7 +357,6 @@ private:
class RTFPicture : public virtual SvRefBase
{
public:
- RTFPicture();
sal_Int32 nWidth = 0;
sal_Int32 nHeight = 0;
sal_Int32 nGoalWidth = 0;
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index 8685c9d238a3..0164307ffad2 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -38,7 +38,7 @@ RTFValue::RTFValue()
: m_pAttributes(new RTFSprms())
, m_pSprms(new RTFSprms())
, m_pShape(new RTFShape())
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}
@@ -47,7 +47,7 @@ RTFValue::RTFValue(int nValue)
, m_pAttributes(new RTFSprms())
, m_pSprms(new RTFSprms())
, m_pShape(new RTFShape())
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}
@@ -57,7 +57,7 @@ RTFValue::RTFValue(OUString sValue, bool bForce)
, m_pSprms(new RTFSprms())
, m_bForceString(bForce)
, m_pShape(new RTFShape())
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}
@@ -65,7 +65,7 @@ RTFValue::RTFValue(const RTFSprms& rAttributes)
: m_pAttributes(new RTFSprms(rAttributes))
, m_pSprms(new RTFSprms())
, m_pShape(new RTFShape())
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}
@@ -73,7 +73,7 @@ RTFValue::RTFValue(const RTFSprms& rAttributes, const RTFSprms& rSprms)
: m_pAttributes(new RTFSprms(rAttributes))
, m_pSprms(new RTFSprms(rSprms))
, m_pShape(new RTFShape())
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}
@@ -82,7 +82,7 @@ RTFValue::RTFValue(uno::Reference<drawing::XShape> xShape)
, m_pSprms(new RTFSprms())
, m_xShape(std::move(xShape))
, m_pShape(new RTFShape())
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}
@@ -91,7 +91,7 @@ RTFValue::RTFValue(uno::Reference<io::XInputStream> xStream)
, m_pSprms(new RTFSprms())
, m_xStream(std::move(xStream))
, m_pShape(new RTFShape())
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}
@@ -100,7 +100,7 @@ RTFValue::RTFValue(uno::Reference<embed::XEmbeddedObject> xObject)
, m_pSprms(new RTFSprms())
, m_xObject(std::move(xObject))
, m_pShape(new RTFShape())
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}
@@ -108,7 +108,7 @@ RTFValue::RTFValue(const RTFShape& aShape)
: m_pAttributes(new RTFSprms())
, m_pSprms(new RTFSprms())
, m_pShape(new RTFShape(aShape))
- , m_pPicture(new RTFPicture())
+ , m_pPicture(new RTFPicture)
{
}