diff options
| author | Daniel Rentz <dr@openoffice.org> | 2002-10-15 12:27:20 +0000 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2002-10-15 12:27:20 +0000 |
| commit | fce1a633a9a79b9910ce50b16f253cc52cf11333 (patch) | |
| tree | 78e6cc26865bd3fdd436e33822ab132427e6d73a /sc | |
| parent | b23dcebf76824531f3ccdf3d63fb67a584445f15 (diff) | |
#79058# reset listboxes on 'Reset' action
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/dbgui/tpsubt.cxx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 936c2f037cd8..9a433f0ff9d8 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tpsubt.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dr $ $Date: 2001-05-21 12:52:47 $ + * last change: $Author: dr $ $Date: 2002-10-15 13:27:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -193,6 +193,14 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, //---------------------------------------------------------- + // #79058# first we have to clear the listboxes... + for ( USHORT nLbEntry = 0; nLbEntry < aLbColumns.GetEntryCount(); ++nLbEntry ) + { + aLbColumns.CheckEntryPos( nLbEntry, FALSE ); + *((USHORT*)aLbColumns.GetEntryData( nLbEntry )) = 0; + } + aLbFunctions.SelectEntryPos( 0 ); + ScSubTotalParam theSubTotalData( ((const ScSubTotalItem&) rArgSet.Get( nWhichSubTotals )). GetSubTotalData() ); @@ -213,8 +221,8 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo, aLbColumns.CheckEntryPos( nCheckPos ); *pFunction = FuncToLbPos( pFunctions[i] ); - aLbFunctions.SelectEntryPos( *pFunction ); } + aLbColumns.SelectEntryPos( 0 ); } else { @@ -336,15 +344,9 @@ void ScTpSubTotalGroup::FillListBoxes() pDoc->GetString( col, nFirstRow, nTab, aFieldName ); if ( aFieldName.Len() == 0 ) { - aFieldName = aStrColumn; + aFieldName = aStrColumn; aFieldName += ' '; - if ( col < 26 ) - aFieldName += (sal_Unicode)( 'A' + col ); - else - { - aFieldName += (sal_Unicode)( 'A' + ( col / 26 ) - 1 ); - aFieldName += (sal_Unicode)( 'A' + ( col % 26 ) ); - } + aFieldName += ::ColToAlpha( col ); // from global.hxx } nFieldArr[i] = col; aLbGroup.InsertEntry( aFieldName, i+1 ); |