diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-11-16 09:03:35 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-11-16 09:03:35 +0000 |
| commit | ab73e742cdb5ebc2f5d58e6fea83888586580a30 (patch) | |
| tree | 86f66d9e7bf3c7454d9b24315d2feec33e537647 /svx/source/dialog/svxbmpnumvalueset.cxx | |
| parent | 0abdc620143de573de397d8e25d6b2f4783b2ef7 (diff) | |
INTEGRATION: CWS thaiissues (1.2.894); FILE MERGED
2005/09/29 18:30:39 os 1.2.894.2: RESYNC: (1.2-1.3); FILE MERGED
2005/08/25 13:39:21 os 1.2.894.1: #i42965# enable more than 8 numbering/outline types
Diffstat (limited to 'svx/source/dialog/svxbmpnumvalueset.cxx')
| -rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 8acb54bfb133..6f427c2dbfba 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svxbmpnumvalueset.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:07:39 $ + * last change: $Author: obo $ $Date: 2005-11-16 10:03:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -508,6 +508,7 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nTy aLineColor ( COL_LIGHTGRAY ) { SetColCount( 4 ); + SetLineCount( 2 ); SetStyle( GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER ); if(NUM_PAGETYPE_BULLET == nType) { @@ -535,7 +536,9 @@ void SvxNumValueSet::SetNumberingSettings( aNumSettings = aNum; xFormatter = xFormat; aLocale = rLocale; - for ( USHORT i = 0; i < aNum.getLength() && i < 8; i++ ) + if(aNum.getLength() > 8) + SetStyle( GetStyle()|WB_VSCROLL); + for ( USHORT i = 0; i < aNum.getLength(); i++ ) InsertItem( i + 1, i ); } /* -----------------------------31.01.01 09:50-------------------------------- @@ -549,7 +552,9 @@ void SvxNumValueSet::SetOutlineNumberingSettings( aOutlineSettings = rOutline; xFormatter = xFormat; aLocale = rLocale; - for ( sal_uInt16 i = 0; i < aOutlineSettings.getLength() && i < 8; i++ ) + if(aOutlineSettings.getLength() > 8) + SetStyle( GetStyle() | WB_VSCROLL ); + for ( sal_uInt16 i = 0; i < aOutlineSettings.getLength(); i++ ) InsertItem( i + 1, i ); } |