summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-19 21:47:56 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-19 21:47:56 +0000
commitefa0ff247278eea01716c68198732f3615e1dbd9 (patch)
tree54987c4ce119fcbeebdda055b1eb53de85737f63 /svx
parentfce9c1976712dee93e88fbf97a21e61e2abb2963 (diff)
INTEGRATION: CWS aw033 (1.15.12); FILE MERGED
2008/07/10 13:00:51 aw 1.15.12.9: #i39532# XOutputDevice removed, PrepareDelete removed 2008/05/14 14:02:45 aw 1.15.12.8: RESYNC: (1.29-1.31); FILE MERGED 2007/08/09 17:22:03 aw 1.15.12.7: RESYNC: (1.26-1.29); FILE MERGED 2007/05/23 20:17:21 aw 1.15.12.6: RESYNC: (1.25-1.26); FILE MERGED 2007/03/20 13:56:29 aw 1.15.12.5: RESYNC: (1.24-1.25); FILE MERGED 2006/11/28 18:27:42 aw 1.15.12.4: RESYNC: (1.21-1.24); FILE MERGED 2006/09/26 17:53:13 aw 1.15.12.3: RESYNC: (1.16-1.21); FILE MERGED 2006/05/12 15:05:30 aw 1.15.12.2: RESYNC: (1.15-1.16); FILE MERGED 2006/05/12 12:46:19 aw 1.15.12.1: code changes for primitive support
Diffstat (limited to 'svx')
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx18
1 files changed, 11 insertions, 7 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 206f6dd628..e0919cbbfc 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: EnhancedCustomShape2d.cxx,v $
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
*
* This file is part of OpenOffice.org.
*
@@ -46,7 +46,6 @@
#include <svx/xflclit.hxx>
#include <svx/sdasaitm.hxx>
#include <svx/svdmodel.hxx>
-#include <svx/xoutx.hxx>
#include <rtl/crc.h>
#include <rtl/math.hxx>
#include <svx/xfillit0.hxx>
@@ -690,6 +689,9 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
ClearItem( SDRATTR_TEXTDIRECTION ); //SJ: vertical writing is not required, by removing this item no outliner is created
+ // For primitive rendering, shadow handling is done completely based on the geometry, so i removed it here
+ ClearItem(SDRATTR_SHADOW);
+
Point aP( pCustomShapeObj->GetSnapRect().Center() );
Size aS( pCustomShapeObj->GetLogicRect().GetSize() );
aP.X() -= aS.Width() / 2;
@@ -1813,7 +1815,8 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
if ( vObjectList.size() )
{
const SfxItemSet& rCustomShapeSet = pCustomShapeObj->GetMergedItemSet();
- const sal_Bool bShadow(((SdrShadowItem&)rCustomShapeSet.Get( SDRATTR_SHADOW )).GetValue());
+ // For primitive rendering, shadow handling is done completely based on the geometry, so i removed it here
+ // const sal_Bool bShadow(((SdrShadowItem&)rCustomShapeSet.Get( SDRATTR_SHADOW )).GetValue());
Color aBasicColor( COL_WHITE );
Color aFillColor;
sal_uInt32 nColorCount = nColorData >> 28;
@@ -1850,10 +1853,11 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
// a single object, correct some values
SdrPathObj* pObj(vObjectList[0L]);
- if(bShadow)
- {
- pObj->SetMergedItem(SdrShadowItem(sal_True));
- }
+// For primitive rendering, shadow handling is done completely based on the geometry, so i removed it here
+// if(bShadow)
+// {
+// pObj->SetMergedItem(SdrShadowItem(sal_True));
+// }
if(!pObj->IsLine())
{