diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 11:26:35 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 11:26:35 +0000 |
commit | 5bc54ed581f0639604382ae1a1a29d8d08312cce (patch) | |
tree | 4bb85572348a6210ccd3e90aab94e2cfd0b25bde /svx | |
parent | 564fb538d846dd184b66d13d5136206e87a69029 (diff) |
INTEGRATION: CWS impressodf12 (1.29.46); FILE MERGED
2008/04/25 09:00:56 cl 1.29.46.4: RESYNC: (1.29-1.30); FILE MERGED
2008/04/24 15:26:10 cl 1.29.46.3: #i35937# converted EE_PARA_BULLETSTATE to bool item
2008/04/23 13:15:01 tl 1.29.46.2: #i35937# EditEngine/outliner changes regarding number format and bullets
2008/04/10 16:50:53 cl 1.29.46.1: #i35937# allow paragraph depth of -1 to switch of numbering
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/editeng/eerdll.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx index 641529f0d526..fc3f2b4e24de 100644 --- a/svx/source/editeng/eerdll.cxx +++ b/svx/source/editeng/eerdll.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: eerdll.cxx,v $ - * $Revision: 1.30 $ + * $Revision: 1.31 $ * * This file is part of OpenOffice.org. * @@ -113,19 +113,15 @@ SfxPoolItem** GlobalEditData::GetDefItems() SvxNumRule aTmpNumRule( 0, 0, FALSE ); ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ); -#ifndef SVX_LIGHT ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS ); -#else - ppDefItems[1] = new SfxVoidItem( EE_PARA_XMLATTRIBS ); -#endif // #ifndef SVX_LIGHT ppDefItems[2] = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, FALSE ); ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, TRUE ); ppDefItems[4] = new SvxScriptSpaceItem( TRUE, EE_PARA_ASIANCJKSPACING ); ppDefItems[5] = new SvxNumBulletItem( aTmpNumRule, EE_PARA_NUMBULLET ); ppDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, FALSE ); - ppDefItems[7] = new SfxUInt16Item( EE_PARA_BULLETSTATE, 0 ); + ppDefItems[7] = new SfxBoolItem( EE_PARA_BULLETSTATE, TRUE ); ppDefItems[8] = new SvxLRSpaceItem( EE_PARA_OUTLLRSPACE ); - ppDefItems[9] = new SfxUInt16Item( EE_PARA_OUTLLEVEL ); + ppDefItems[9] = new SfxInt16Item( EE_PARA_OUTLLEVEL, -1 ); ppDefItems[10] = new SvxBulletItem( EE_PARA_BULLET ); ppDefItems[11] = new SvxLRSpaceItem( EE_PARA_LRSPACE ); ppDefItems[12] = new SvxULSpaceItem( EE_PARA_ULSPACE ); |