diff options
| author | Carsten Driesner <cd@openoffice.org> | 2004-02-03 06:40:51 +0000 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2004-02-03 06:40:51 +0000 |
| commit | 4cce0e539b67b61df350fadd7741b4fabce55258 (patch) | |
| tree | 43e06ee80e1e74b24f26d79f9c93280f136a2dad /framework/collector | |
| parent | 241b58ae5b2ba4fa4acd1fd1d29f4a44357bc844 (diff) | |
#111899# Fixed problem with slots that are state and function at the same time
Diffstat (limited to 'framework/collector')
| -rw-r--r-- | framework/collector/cmduicollector.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/framework/collector/cmduicollector.cxx b/framework/collector/cmduicollector.cxx index a99406d934..c94b5afddb 100644 --- a/framework/collector/cmduicollector.cxx +++ b/framework/collector/cmduicollector.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cmduicollector.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: cd $ $Date: 2004-01-30 15:52:54 $ + * last change: $Author: cd $ $Date: 2004-02-03 07:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -306,6 +306,7 @@ bool ReadCSVFile( const OUString& aCVSFileURL, MODULES eModule, const OUString& OString aStatusState; OString aToolbarState; OString aCmdName; + OString aSlotName; sal_Int32 nIndex = 0; aID = aLine.getToken( 2, ',', nIndex ); @@ -313,7 +314,11 @@ bool ReadCSVFile( const OUString& aCVSFileURL, MODULES eModule, const OUString& aMenuState = aLine.getToken( 0, ',', nIndex ); aStatusState = aLine.getToken( 0, ',', nIndex ); aToolbarState = aLine.getToken( 0, ',', nIndex ); - aCmdName = aLine.getToken( 20, ',', nIndex ); + aCmdName = aLine.getToken( 18, ',', nIndex ); + aSlotName = aLine.getToken( 1, ',', nIndex ); + + if ( aCmdName.getLength() == 0 ) + aCmdName = aSlotName; int nID = aID.toInt32(); |