Kaydet (Commit) 18caee07 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Tomaž Vajngerl

graphic: move access to cxx for PDFData and VectorGraphicData

We need strict control when PDFData and VectorGraphicData is
accessed and changed, so create access methods for PDFData and
move the access methods to cxx (for VectorGraphicData).

Change-Id: I39324a807a4db559bad5501b5913e62a0aeabf01
Reviewed-on: https://gerrit.libreoffice.org/52395Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst c5e4eec3
...@@ -191,7 +191,11 @@ private: ...@@ -191,7 +191,11 @@ private:
friend void WriteImpGraphic(SvStream& rOStm, const ImpGraphic& rImpGraphic); friend void WriteImpGraphic(SvStream& rOStm, const ImpGraphic& rImpGraphic);
friend void ReadImpGraphic(SvStream& rIStm, ImpGraphic& rImpGraphic); friend void ReadImpGraphic(SvStream& rIStm, ImpGraphic& rImpGraphic);
const VectorGraphicDataPtr& getVectorGraphicData() const { return maVectorGraphicData; } const VectorGraphicDataPtr& getVectorGraphicData() const;
const css::uno::Sequence<sal_Int8>& getPdfData() const;
void setPdfData(const css::uno::Sequence<sal_Int8>& rPdfData);
}; };
#endif // INCLUDED_VCL_INC_IMPGRAPH_HXX #endif // INCLUDED_VCL_INC_IMPGRAPH_HXX
......
...@@ -552,12 +552,12 @@ const VectorGraphicDataPtr& Graphic::getVectorGraphicData() const ...@@ -552,12 +552,12 @@ const VectorGraphicDataPtr& Graphic::getVectorGraphicData() const
void Graphic::setPdfData(const uno::Sequence<sal_Int8>& rPdfData) void Graphic::setPdfData(const uno::Sequence<sal_Int8>& rPdfData)
{ {
ImplTestRefCount(); ImplTestRefCount();
mxImpGraphic->maPdfData = rPdfData; mxImpGraphic->setPdfData(rPdfData);
} }
const uno::Sequence<sal_Int8>& Graphic::getPdfData() const const uno::Sequence<sal_Int8>& Graphic::getPdfData() const
{ {
return mxImpGraphic->maPdfData; return mxImpGraphic->getPdfData();
} }
OUString Graphic::getOriginURL() const OUString Graphic::getOriginURL() const
......
...@@ -396,6 +396,21 @@ bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const ...@@ -396,6 +396,21 @@ bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const
return bRet; return bRet;
} }
const VectorGraphicDataPtr& ImpGraphic::getVectorGraphicData() const
{
return maVectorGraphicData;
}
void ImpGraphic::setPdfData(const uno::Sequence<sal_Int8>& rPdfData)
{
maPdfData = rPdfData;
}
const uno::Sequence<sal_Int8>& ImpGraphic::getPdfData() const
{
return maPdfData;
}
void ImpGraphic::ImplCreateSwapInfo() void ImpGraphic::ImplCreateSwapInfo()
{ {
if (!ImplIsSwapOut()) if (!ImplIsSwapOut())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment