mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerfilter: remove empty RTFPicture constructor

Browse Source 
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>
This commit is contained in:
Miklos Vajna
2019-03-05 21:38:37 +01:00
parent 936308d3ef
commit 7e2a4f53a2
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@@ -3475,8 +3475,6 @@ void RTFDocumentImpl::bufferProperties(RTFBuffer_t& rBuffer, const RTFValue::Poi
rBuffer.emplace_back(Buf_t(BUFFER_PROPS, pValue, pTableProperties)); rBuffer.emplace_back(Buf_t(BUFFER_PROPS, pValue, pTableProperties));
} }
RTFPicture::RTFPicture() = default;
RTFShape::RTFShape() = default; RTFShape::RTFShape() = default;
RTFDrawingObject::RTFDrawingObject() = default; RTFDrawingObject::RTFDrawingObject() = default;

1
writerfilter/source/rtftok/rtfdocumentimpl.hxx
View File

@@ -357,7 +357,6 @@ private:
class RTFPicture : public virtual SvRefBase class RTFPicture : public virtual SvRefBase
{ {
public: public:
RTFPicture();
sal_Int32 nWidth = 0; sal_Int32 nWidth = 0;
sal_Int32 nHeight = 0; sal_Int32 nHeight = 0;
sal_Int32 nGoalWidth = 0; sal_Int32 nGoalWidth = 0;

18
writerfilter/source/rtftok/rtfvalue.cxx
View File

@@ -38,7 +38,7 @@ RTFValue::RTFValue()
: m_pAttributes(new RTFSprms()) : m_pAttributes(new RTFSprms())
, m_pSprms(new RTFSprms()) , m_pSprms(new RTFSprms())
, m_pShape(new RTFShape()) , 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_pAttributes(new RTFSprms())
, m_pSprms(new RTFSprms()) , m_pSprms(new RTFSprms())
, m_pShape(new RTFShape()) , 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_pSprms(new RTFSprms())
, m_bForceString(bForce) , m_bForceString(bForce)
, m_pShape(new RTFShape()) , 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_pAttributes(new RTFSprms(rAttributes))
, m_pSprms(new RTFSprms()) , m_pSprms(new RTFSprms())
, m_pShape(new RTFShape()) , 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_pAttributes(new RTFSprms(rAttributes))
, m_pSprms(new RTFSprms(rSprms)) , m_pSprms(new RTFSprms(rSprms))
, m_pShape(new RTFShape()) , 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_pSprms(new RTFSprms())
, m_xShape(std::move(xShape)) , m_xShape(std::move(xShape))
, m_pShape(new RTFShape()) , 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_pSprms(new RTFSprms())
, m_xStream(std::move(xStream)) , m_xStream(std::move(xStream))
, m_pShape(new RTFShape()) , 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_pSprms(new RTFSprms())
, m_xObject(std::move(xObject)) , m_xObject(std::move(xObject))
, m_pShape(new RTFShape()) , 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_pAttributes(new RTFSprms())
, m_pSprms(new RTFSprms()) , m_pSprms(new RTFSprms())
, m_pShape(new RTFShape(aShape)) , m_pShape(new RTFShape(aShape))
, m_pPicture(new RTFPicture()) , m_pPicture(new RTFPicture)
{ {
} }