diff options
| author | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2010-06-02 17:35:20 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2010-06-02 17:35:20 +0200 |
| commit | 41058897dd1049f175ff8b832f8089d63df9ac9c (patch) | |
| tree | a697514ba25b8ef4055a1a91b5a507acd2fd428f /svx | |
| parent | 630d814ee5ac1133b5159dbdd88b7a328abe244a (diff) | |
#i111987# corrected handling of source polygon data creation for logical polygon operations
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedtv2.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index e31ea11be7d6..8cf83c0429cc 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1090,7 +1090,16 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) if(!bFirstObjectComplete) { - aMergePolyPolygonA = aTmpPoly; + // #i111987# Also need to collect ORed source shape when more than + // a single polygon is involved + if(aMergePolyPolygonA.count()) + { + aMergePolyPolygonA = basegfx::tools::solvePolygonOperationOr(aMergePolyPolygonA, aTmpPoly); + } + else + { + aMergePolyPolygonA = aTmpPoly; + } } else { |