undoapi: get rid of the usage of SfxMacroConfig::GetSlotId: the only thing done here is creating an SfxMacroInfo instance, whose only usage is the macro name (nowadays: script name) it carries. This can be done cheaper, by just carrying the string. The slot ID was never actually used.

1 files changed, 7 insertions, 4 deletions

diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index ea4271d18035..66238e7ac7f3 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -50,7 +50,6 @@ class SfxSlotPool;
 class SfxStringItem;
 class SfxFontItem;
 class SfxMacroInfoItem;
-class SfxMacroInfo;
 struct SfxStyleInfo_Impl;
 struct SfxStylesInfo_Impl;
 
@@ -104,14 +103,18 @@ struct SfxStylesInfo_Impl
 struct SfxGroupInfo_Impl
 {
     USHORT      nKind;
-    USHORT      nOrd;
+    USHORT      nUniqueID;
     void*       pObject;
     BOOL        bWasOpened;
     String      sCommand;
     String      sLabel;
 
                 SfxGroupInfo_Impl( USHORT n, USHORT nr, void* pObj = 0 ) :
-                    nKind( n ), nOrd( nr ), pObject( pObj ), bWasOpened(FALSE) {}
+                    nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(FALSE) {}
+};
+
+struct CuiMacroInfo
+{
 };
 
 typedef SfxGroupInfo_Impl* SfxGroupInfoPtr;
@@ -137,7 +140,7 @@ public:
     String        GetHelpText( SvLBoxEntry *pEntry );
     String        GetCurCommand();
     String        GetCurLabel();
-    SfxMacroInfo* GetMacroInfo();
+    String        GetSelectedScriptURI();
     void          FunctionSelected();
     void          SetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };