filter/source/graphicfilter/ios2met/ios2met.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit e81454861f4fa2d5d6bbdc2c0eb6af14347c8205 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jan 13 20:42:55 2017 +0000 acquire/release in ctor/dtor Change-Id: I4cf6ba1ece0491bc7a83c4adf1e5c086c0fa3553 diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 751217c..6d6067c 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -451,10 +451,14 @@ OS2METReader::OS2METReader() , aAttr() , pAttrStack(nullptr) { + pVirDev = VclPtr<VirtualDevice>::Create(); + pVirDev->EnableOutput(false); } OS2METReader::~OS2METReader() { + pVirDev.disposeAndClear(); + while (pAreaStack!=nullptr) { OSArea * p=pAreaStack; pAreaStack=p->pSucc; @@ -2702,8 +2706,6 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF xOrdFile.reset(); - pVirDev = VclPtr<VirtualDevice>::Create(); - pVirDev->EnableOutput(false); rGDIMetaFile.Record(pVirDev); pOS2MET->SetEndian(SvStreamEndian::LITTLE); @@ -2761,7 +2763,6 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF } rGDIMetaFile.Stop(); - pVirDev.disposeAndClear(); rGDIMetaFile.SetPrefMapMode( aGlobMapMode );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits