INTEGRATION: CWS pchfix04 (1.29.6); FILE MERGED

2007/02/06 07:24:48 os 1.29.6.2: #i73604#  eeitemid.hxx removed
2007/02/05 08:38:58 os 1.29.6.1: #i73604# usage of ITEMID_* removed
This commit is contained in:
Kurt Zenker 2007-05-10 14:29:32 +00:00
parent 57beac3123
commit a5b1b8b05d

View file

@ -4,9 +4,9 @@
*
* $RCSfile: fuconrec.cxx,v $
*
* $Revision: 1.29 $
* $Revision: 1.30 $
*
* last change: $Author: kz $ $Date: 2006-12-12 17:15:58 $
* last change: $Author: kz $ $Date: 2007-05-10 15:29:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -94,9 +94,6 @@
#ifndef _SFXREQUEST_HXX //autogen
#include <sfx2/request.hxx>
#endif
#ifndef _EEITEMID_HXX
#include <svx/eeitemid.hxx>
#endif
#ifndef _SVX_ADJITEM_HXX
#include <svx/adjitem.hxx>
#endif
@ -363,7 +360,7 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
// calling SetVerticalWriting() again since this item may not yet
// be set at the object and thus may differ from verical state of
// the object.
aSet.Put(SvxWritingModeItem(com::sun::star::text::WritingMode_TB_RL));
aSet.Put(SvxWritingModeItem(com::sun::star::text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION));
pObj->SetMergedItemSet(aSet);
}
@ -625,7 +622,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
else
rAttr.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_BLOCK ) );
rAttr.Put( SvxAdjustItem( SVX_ADJUST_CENTER ) );
rAttr.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
rAttr.Put( SdrTextLeftDistItem( 100 ) );
rAttr.Put( SdrTextRightDistItem( 100 ) );
rAttr.Put( SdrTextUpperDistItem( 100 ) );