svidl: Unwind SFX_ARGUMENT macro, and kill it.

Change-Id: I61334b687c251ccc90f125e8bf95f8689028b8c3

4 files changed, 29 insertions, 33 deletions

diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index dbf5a81996ec..635bf62d0c6f 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -597,7 +597,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
     {
         // at leaast one dummy
         WriteTab( rOutStm, 1 );
-        rOutStm.WriteCharPtr( "SFX_ARGUMENT( 0, 0, SfxVoidItem )" ) << endl;
+        rOutStm.WriteCharPtr("{ (const SfxType*) &aSfxVoidItem_Impl, 0, 0 }" ) << endl;
     }
     rOutStm << endl;
     rOutStm.WriteCharPtr( "};" ) << endl << endl;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 7867f1812f0f..21ae92287924 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1445,12 +1445,13 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
             SvMetaAttribute * pPar  = rList[n];
             SvMetaType * pPType     = pPar->GetType();
             WriteTab( rOutStm, 1 );
-            rOutStm.WriteCharPtr( "SFX_ARGUMENT(" )
-               .WriteCharPtr( pPar->GetSlotId().getString().getStr() ).WriteChar( ',' ) // SlodId
+            rOutStm.WriteCharPtr("{ (const SfxType*) &a")
+                // item type
+               .WriteCharPtr(pPType->GetName().getString().getStr()).WriteCharPtr("_Impl, ")
                 // parameter name
-               .WriteCharPtr( "\"" ).WriteCharPtr( pPar->GetName().getString().getStr() ).WriteCharPtr( "\"," )
-                // item name
-               .WriteCharPtr( pPType->GetName().getString().getStr() ).WriteCharPtr( ")," ) << endl;
+               .WriteCharPtr("\"").WriteCharPtr(pPar->GetName().getString().getStr()).WriteCharPtr("\", ")
+                // slot id
+               .WriteCharPtr(pPar->GetSlotId().getString().getStr()).WriteCharPtr(" },") << endl;
             if( !rBase.FindType( pPType, rBase.aUsedTypes ) )
                 rBase.aUsedTypes.push_back( pPType );
         }
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 4c85ab3b276c..60cfdd0dabec 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -210,11 +210,6 @@ SFX_DECL_TYPE(18); // for SvxSearchItem
                  0, 0, DisableFlags, UnoName \
                }
 
-#define SFX_ARGUMENT( ArgSlotId, ArgName, ArgTypeId ) \
-            { (const SfxType*) &a##ArgTypeId##_Impl, ArgName, ArgSlotId }
-
-
-
 class SfxPoolItem;
 
 struct SfxFormalArgument
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index d6278bfb85a9..21d5c6219368 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -82,28 +82,28 @@ using namespace ::com::sun::star::io;
 
 // needs to be converted to a better data structure
 SfxFormalArgument aFormalArgs[] = {
-    SFX_ARGUMENT(SID_DEFAULTFILENAME,"SuggestedSaveAsName",SfxStringItem),
-    SFX_ARGUMENT(SID_DEFAULTFILEPATH,"SuggestedSaveAsDir",SfxStringItem),
-    SFX_ARGUMENT(SID_DOCINFO_AUTHOR,"VersionAuthor",SfxStringItem),
-    SFX_ARGUMENT(SID_DOCINFO_COMMENTS,"VersionComment",SfxStringItem),
-    SFX_ARGUMENT(SID_DOCINFO_MAJOR,"VersionMajor",SfxBoolItem),
-    SFX_ARGUMENT(SID_FILE_FILTEROPTIONS,"FilterOptions",SfxStringItem),
-    SFX_ARGUMENT(SID_FILTER_NAME,"FilterName",SfxStringItem),
-//    SFX_ARGUMENT(SID_FILE_NAME,"FileName",SfxStringItem),
-    SFX_ARGUMENT(SID_FILE_NAME,"URL",SfxStringItem),
-    SFX_ARGUMENT(SID_OPTIONS,"OpenFlags",SfxStringItem),
-    SFX_ARGUMENT(SID_OVERWRITE,"Overwrite",SfxBoolItem),
-    SFX_ARGUMENT(SID_PASSWORD,"Password",SfxStringItem),
-    SFX_ARGUMENT(SID_PASSWORDINTERACTION,"PasswordInteraction",SfxBoolItem),
-    SFX_ARGUMENT(SID_REFERER,"Referer",SfxStringItem),
-    SFX_ARGUMENT(SID_SAVETO,"SaveTo",SfxBoolItem),
-    SFX_ARGUMENT(SID_TEMPLATE_NAME,"TemplateName",SfxStringItem),
-    SFX_ARGUMENT(SID_TEMPLATE_REGIONNAME,"TemplateRegion",SfxStringItem),
-//    SFX_ARGUMENT(SID_TEMPLATE_REGIONNAME,"Region",SfxStringItem),
-//    SFX_ARGUMENT(SID_TEMPLATE_NAME,"Name",SfxStringItem),
-    SFX_ARGUMENT(SID_UNPACK,"Unpacked",SfxBoolItem),
-    SFX_ARGUMENT(SID_VERSION,"Version",SfxInt16Item),
-    SFX_ARGUMENT(SID_SAVEACOPYITEM,"SaveACopy",SfxBoolItem),
+    { (const SfxType*) &aSfxStringItem_Impl, "SuggestedSaveAsName", SID_DEFAULTFILENAME },
+    { (const SfxType*) &aSfxStringItem_Impl, "SuggestedSaveAsDir", SID_DEFAULTFILEPATH },
+    { (const SfxType*) &aSfxStringItem_Impl, "VersionAuthor", SID_DOCINFO_AUTHOR },
+    { (const SfxType*) &aSfxStringItem_Impl, "VersionComment", SID_DOCINFO_COMMENTS },
+    { (const SfxType*) &aSfxBoolItem_Impl, "VersionMajor", SID_DOCINFO_MAJOR },
+    { (const SfxType*) &aSfxStringItem_Impl, "FilterOptions", SID_FILE_FILTEROPTIONS },
+    { (const SfxType*) &aSfxStringItem_Impl, "FilterName", SID_FILTER_NAME },
+//    { (const SfxType*) &aSfxStringItem_Impl, "FileName", SID_FILE_NAME },
+    { (const SfxType*) &aSfxStringItem_Impl, "URL", SID_FILE_NAME },
+    { (const SfxType*) &aSfxStringItem_Impl, "OpenFlags", SID_OPTIONS },
+    { (const SfxType*) &aSfxBoolItem_Impl, "Overwrite", SID_OVERWRITE },
+    { (const SfxType*) &aSfxStringItem_Impl, "Password", SID_PASSWORD },
+    { (const SfxType*) &aSfxBoolItem_Impl, "PasswordInteraction", SID_PASSWORDINTERACTION },
+    { (const SfxType*) &aSfxStringItem_Impl, "Referer", SID_REFERER },
+    { (const SfxType*) &aSfxBoolItem_Impl, "SaveTo", SID_SAVETO },
+    { (const SfxType*) &aSfxStringItem_Impl, "TemplateName", SID_TEMPLATE_NAME },
+    { (const SfxType*) &aSfxStringItem_Impl, "TemplateRegion", SID_TEMPLATE_REGIONNAME },
+//    { (const SfxType*) &aSfxStringItem_Impl, "Region", SID_TEMPLATE_REGIONNAME },
+//    { (const SfxType*) &aSfxStringItem_Impl, "Name", SID_TEMPLATE_NAME },
+    { (const SfxType*) &aSfxBoolItem_Impl, "Unpacked", SID_UNPACK },
+    { (const SfxType*) &aSfxInt16Item_Impl, "Version", SID_VERSION },
+    { (const SfxType*) &aSfxBoolItem_Impl, "SaveACopy", SID_SAVEACOPYITEM },
 };
 
 static sal_uInt16 nMediaArgsCount = sizeof(aFormalArgs) / sizeof (SfxFormalArgument);