svidl: Unwind SFX_ARGUMENT macro, and kill it.

Change-Id: I61334b687c251ccc90f125e8bf95f8689028b8c3

1 files changed, 22 insertions, 22 deletions

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);