diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 21:45:31 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-05-04 12:48:27 +0200 |
commit | 71960d9ff686189cc7d20e19cc99ba93ea4d415c (patch) | |
tree | 3eba6982791255a6c1316d5b5934fc13b8991f98 /filter | |
parent | c30545977038aa9cbec1cec0892eb5ca806bed76 (diff) |
ofz#1284 InsertBundle may delete the bundle that pMarkerBundle is pointing to
Change-Id: Ic8bd538e80469b672ddd9c5fcceb2f5aac81d2a1
Reviewed-on: https://gerrit.libreoffice.org/37052
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 217e9a5b581d59bc70ea4cb71a7da31411812156)
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/icgm/class2.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx index 93b3679381b6..bedcd2e37de2 100644 --- a/filter/source/graphicfilter/icgm/class2.cxx +++ b/filter/source/graphicfilter/icgm/class2.cxx @@ -147,7 +147,10 @@ void CGM::ImplDoClass2() aTempLineBundle.eLineType = (LineType)ImplGetI( pElement->nIndexPrecision ); aTempLineBundle.nLineWidth = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ); aTempLineBundle.SetColor( ImplGetBitmapColor() ); + const bool bUpdateLineBundle = aTempLineBundle.GetIndex() == pElement->pLineBundle->GetIndex(); CGMElements::InsertBundle( pElement->aLineList, aTempLineBundle ); + if (bUpdateLineBundle) + pElement->pLineBundle = static_cast<LineBundle*>(CGMElements::GetBundleIndex(aTempLineBundle.GetIndex(), pElement->aLineList, pElement->aLineBundle)); } break; case 0x0c : /*Marker Representation*/ @@ -157,7 +160,10 @@ void CGM::ImplDoClass2() aTempMarkerBundle.eMarkerType = (MarkerType)ImplGetI( pElement->nIndexPrecision ); aTempMarkerBundle.nMarkerSize = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ); aTempMarkerBundle.SetColor( ImplGetBitmapColor() ); + const bool bUpdateMarkerBundle = aTempMarkerBundle.GetIndex() == pElement->pMarkerBundle->GetIndex(); CGMElements::InsertBundle( pElement->aMarkerList, aTempMarkerBundle ); + if (bUpdateMarkerBundle) + pElement->pMarkerBundle = static_cast<MarkerBundle*>(CGMElements::GetBundleIndex(aTempMarkerBundle.GetIndex(), pElement->aMarkerList, pElement->aMarkerBundle)); } break; case 0x0d : /*Text Representation*/ @@ -169,7 +175,10 @@ void CGM::ImplDoClass2() aTempTextBundle.nCharacterSpacing = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ); aTempTextBundle.nCharacterExpansion = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ); aTempTextBundle.SetColor( ImplGetBitmapColor() ); + const bool bUpdateTextBundle = aTempTextBundle.GetIndex() == pElement->pTextBundle->GetIndex(); CGMElements::InsertBundle( pElement->aTextList, aTempTextBundle ); + if (bUpdateTextBundle) + pElement->pTextBundle = static_cast<TextBundle*>(CGMElements::GetBundleIndex(aTempTextBundle.GetIndex(), pElement->aTextList, pElement->aTextBundle)); } break; case 0x0e : /*Fill Representation*/ @@ -180,7 +189,10 @@ void CGM::ImplDoClass2() aTempFillBundle.SetColor( ImplGetBitmapColor() ); aTempFillBundle.nFillPatternIndex = ImplGetI( pElement->nIndexPrecision ); aTempFillBundle.nFillHatchIndex = ImplGetI( pElement->nIndexPrecision ); + const bool bUpdateFillBundle = aTempFillBundle.GetIndex() == pElement->pFillBundle->GetIndex(); CGMElements::InsertBundle( pElement->aFillList, aTempFillBundle ); + if (bUpdateFillBundle) + pElement->pFillBundle = static_cast<FillBundle*>(CGMElements::GetBundleIndex(aTempFillBundle.GetIndex(), pElement->aFillList, pElement->aFillBundle)); } break; case 0x0f : /*Edge Representation*/ @@ -190,7 +202,10 @@ void CGM::ImplDoClass2() aTempEdgeBundle.eEdgeType = (EdgeType)ImplGetI( pElement->nIndexPrecision ); aTempEdgeBundle.nEdgeWidth = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ); aTempEdgeBundle.SetColor( ImplGetBitmapColor() ); + const bool bUpdateEdgeBundle = aTempEdgeBundle.GetIndex() == pElement->pEdgeBundle->GetIndex(); CGMElements::InsertBundle( pElement->aEdgeList, aTempEdgeBundle ); + if (bUpdateEdgeBundle) + pElement->pEdgeBundle = static_cast<EdgeBundle*>(CGMElements::GetBundleIndex(aTempEdgeBundle.GetIndex(), pElement->aEdgeList, pElement->aEdgeBundle)); } break; case 0x10 : /*Interior Style Specification Mode */break; // NS |