diff options
Diffstat (limited to 'vcl/source/gdi/pdfextoutdevdata.cxx')
| -rw-r--r-- | vcl/source/gdi/pdfextoutdevdata.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index f62fff043620..488278a81739 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -294,7 +294,7 @@ struct PageSyncData std::deque< PDFWriter::StructAttribute > mParaStructAttributes; std::deque< PDFWriter::StructAttributeValue > mParaStructAttributeValues; std::deque< Graphic > mGraphics; - Graphic* mpCurrentGraphic; + Graphic mCurrentGraphic; std::deque< std::shared_ptr< PDFWriter::AnyWidget > > mControls; GlobalSyncData* mpGlobalData; @@ -303,8 +303,7 @@ struct PageSyncData explicit PageSyncData( GlobalSyncData* pGlobal ) - : mpCurrentGraphic ( nullptr ) - , mbGroupIgnoreGDIMtfActions ( false ) + : mbGroupIgnoreGDIMtfActions ( false ) { mpGlobalData = pGlobal; } void PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDataSync::Action eAct ); @@ -417,7 +416,8 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc mbGroupIgnoreGDIMtfActions = rOutDevData.HasAdequateCompression( rGraphic, mParaRects[0], mParaRects[1]); - mpCurrentGraphic = mbGroupIgnoreGDIMtfActions ? nullptr : &rGraphic; + if ( !mbGroupIgnoreGDIMtfActions ) + mCurrentGraphic = rGraphic; } break; } @@ -474,7 +474,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc } else { - mpCurrentGraphic = nullptr; + mCurrentGraphic.Clear(); } } break; @@ -530,9 +530,9 @@ PDFExtOutDevData::~PDFExtOutDevData() delete mpGlobalSyncData; } -const Graphic* PDFExtOutDevData::GetCurrentGraphic() const +Graphic PDFExtOutDevData::GetCurrentGraphic() const { - return mpPageSyncData->mpCurrentGraphic; + return mpPageSyncData->mCurrentGraphic; } void PDFExtOutDevData::SetDocumentLocale( const css::lang::Locale& rLoc ) |