diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-08-03 15:48:57 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-08-03 15:48:57 +0200 |
| commit | 1966cbd63b20271afcdfc10a3742eb102974029e (patch) | |
| tree | 4cf2a907eec9715ff58fb5cd2ab727ca8a342c9f | |
| parent | f3f537bc352b44c2178e4ffc5a5cba4fbab01c8c (diff) | |
| parent | 75af2ba3c019abcbe1c8cefe393a7edbc02a5b4b (diff) | |
CWS-TOOLING: integrate CWS impress196ooo/OOO330_m3
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 7 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 546df9cc4..a0746f513 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2094,6 +2094,13 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, aEquation.nPara[ 0 ] = 1; // hoping that this will not break anything rEquations.push_back( aEquation ); } + catch ( ... ) + { + EnhancedCustomShapeEquation aEquation; // #i112309# EnhancedCustomShape::Parse error + aEquation.nOperation = 0; // not catched on linux platform + aEquation.nPara[ 0 ] = 1; + rEquations.push_back( aEquation ); + } rEquationOrder.push_back( rEquations.size() - 1 ); } // now updating our old equation indices, they are marked with a bit in the hiword of nOperation diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 7e76d8d68..6898ddfd2 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5373,8 +5373,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r aSet.Put( SdrEdgeNode2VertDistItem( n2VertDist ) ); ((SdrEdgeObj*)pRet)->SetEdgeTrackPath( aPoly ); + pRet->SetMergedItemSet( aSet ); } - pRet->SetMergedItemSet( aSet ); } } |