diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 15:21:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 15:21:38 +0000 |
| commit | c3c2a9120713cf075cfa095d7fe928b9121c02c9 (patch) | |
| tree | e0df03fb682189f7f491078f391e3814901183de /sw/source/ui/ribbar | |
| parent | d19235b1a15417591c27b6ed9002172defe9dab7 (diff) | |
INTEGRATION: CWS pchfix04 (1.13.22); FILE MERGED
2007/02/06 07:06:19 os 1.13.22.2: #i73604# eeitemid.hxx removed
2007/02/05 08:27:50 os 1.13.22.1: #i73604# usage of ITEMID_* removed
Diffstat (limited to 'sw/source/ui/ribbar')
| -rw-r--r-- | sw/source/ui/ribbar/concustomshape.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index 5e50a471611f..39c2565506be 100644 --- a/sw/source/ui/ribbar/concustomshape.cxx +++ b/sw/source/ui/ribbar/concustomshape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: concustomshape.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 15:18:00 $ + * last change: $Author: kz $ $Date: 2007-05-10 16:21:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -110,9 +110,6 @@ #ifndef _SVDOASHP_HXX #include <svx/svdoashp.hxx> #endif -#ifndef _EEITEMID_HXX -#include <svx/eeitemid.hxx> -#endif #ifndef _SVX_ADJITEM_HXX #include <svx/adjitem.hxx> #endif @@ -273,7 +270,7 @@ void ConstCustomShape::SetAttributes( SdrObject* pObj ) } if ( !bAttributesAppliedFromGallery ) { - pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER ) ); + pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) ); pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); pObj->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) ); |