diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 15:56:57 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 15:56:57 +0000 |
commit | 71b45e713f2426a70538e2620ee21fa18d82cc89 (patch) | |
tree | 30f96fc2a334133e2fedd378df907c61d12d50ec /sc | |
parent | 41971dd733764a047beb159893a81623aaa7fc30 (diff) |
INTEGRATION: CWS pchfix04 (1.10.22); FILE MERGED
2007/04/26 04:39:18 hjs 1.10.22.3: RESYNC: (1.10-1.11); FILE MERGED
2007/02/06 07:03:28 os 1.10.22.2: #i73604# eeitemid.hxx removed
2007/02/05 08:35:31 os 1.10.22.1: #i73604# usage of ITEMID_* removed
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/drawfunc/fuconcustomshape.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 92308c031455..6a0ec63ad8d5 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fuconcustomshape.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2007-02-27 13:11:17 $ + * last change: $Author: kz $ $Date: 2007-05-10 16:56:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,9 +73,6 @@ #include "tabvwsh.hxx" #include "sc.hrc" -#ifndef _EEITEMID_HXX -#include <svx/eeitemid.hxx> -#endif #ifndef _SVX_ADJITEM_HXX #include <svx/adjitem.hxx> #endif @@ -307,7 +304,7 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj ) } if ( !bAttributesAppliedFromGallery ) { - pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER ) ); + pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, 0 ) ); pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); pObj->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) ); |