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 | 5271b8d3a41b4bcab1f75b3829fb73b7df83246b (patch) | |
| tree | dc295a2ec550098cc02a87477d2ef387fb38f33d /framework | |
| parent | f4cb522c06c5518c9a5f8ffa2a48d7ca25e27b9e (diff) | |
#111899# Fixed problem with slots that are state and function at the same time
Diffstat (limited to 'framework')
| -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 0c40445580a9..81d0daccdeab 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(); |