diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 15:16:16 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 15:16:16 +0000 |
| commit | 186b5ed6d3a40ac108380b873a0e058f098e100d (patch) | |
| tree | 4687c007a78c867f7cabc2d1ad367ac3751445ba /svx/source/customshapes/EnhancedCustomShape2d.cxx | |
| parent | 0f2fde1a8a4ecbf1d989e1712fe84af73a58d8c9 (diff) | |
INTEGRATION: CWS sj14 (1.8.40); FILE MERGED
2005/01/13 17:33:19 sj 1.8.40.1: #i40600# fixed, fontwork is now drawn if Linestyle is invisible
Diffstat (limited to 'svx/source/customshapes/EnhancedCustomShape2d.cxx')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 6d0c131823c3..6ff73f5b24c1 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: EnhancedCustomShape2d.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: vg $ $Date: 2004-12-23 11:08:33 $ + * last change: $Author: rt $ $Date: 2005-01-27 16:16:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2162,14 +2162,11 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl const XLineStyle eLineStyle = ((const XLineStyleItem&)pObj->GetMergedItem(XATTR_LINESTYLE)).GetValue(); const XFillStyle eFillStyle = ((const XFillStyleItem&)pObj->GetMergedItem(XATTR_FILLSTYLE)).GetValue(); - if(XLINE_NONE == eLineStyle && XFILL_NONE == eFillStyle) - { + //SJ: #i40600# if bLineGeometryNeededOnly is set linystyle does not matter + if( !bLineGeometryNeededOnly && ( XLINE_NONE == eLineStyle ) && ( XFILL_NONE == eFillStyle ) ) delete pObj; - } else - { vTempList.push_back(pObj); - } } vObjectList = vTempList; |