automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

4 files changed, 115 insertions, 115 deletions

diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 071ff8aabf2a..94f12a5820c4 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -38,35 +38,35 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 
-#define RECOVERY_CMDPART_PROTOCOL                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:"))
-
-#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEmergencySave"         ))
-#define RECOVERY_CMDPART_DO_RECOVERY                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doAutoRecovery"          ))
-#define RECOVERY_CMDPART_DO_CRASHREPORT             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doCrashReport"           ))
-
-#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doPrepareEmergencySave"))
-#define RECOVERY_CMD_DO_EMERGENCY_SAVE              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEmergencySave"       ))
-#define RECOVERY_CMD_DO_RECOVERY                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doAutoRecovery"        ))
-#define RECOVERY_CMD_DO_ENTRY_BACKUP                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryBackup"         ))
-#define RECOVERY_CMD_DO_ENTRY_CLEANUP               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryCleanUp"        ))
-
-#define PROP_STATUSINDICATOR                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator"  ))
-#define PROP_DISPATCHASYNCHRON                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DispatchAsynchron"))
-#define PROP_SAVEPATH                               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SavePath"         ))
-#define PROP_ENTRYID                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EntryID"          ))
-
-#define STATEPROP_ID                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID"           ))
-#define STATEPROP_STATE                             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentState"))
-#define STATEPROP_ORGURL                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OriginalURL"  ))
-#define STATEPROP_TEMPURL                           rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TempURL"      ))
-#define STATEPROP_FACTORYURL                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FactoryURL"   ))
-#define STATEPROP_TEMPLATEURL                       rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TemplateURL"  ))
-#define STATEPROP_TITLE                             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title"        ))
-#define STATEPROP_MODULE                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Module"       ))
-
-#define RECOVERY_OPERATIONSTATE_START               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "start" ))
-#define RECOVERY_OPERATIONSTATE_STOP                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stop"  ))
-#define RECOVERY_OPERATIONSTATE_UPDATE              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "update"))
+#define RECOVERY_CMDPART_PROTOCOL                   rtl::OUString( "vnd.sun.star.autorecovery:")
+
+#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE          rtl::OUString( "/doEmergencySave"         )
+#define RECOVERY_CMDPART_DO_RECOVERY                rtl::OUString( "/doAutoRecovery"          )
+#define RECOVERY_CMDPART_DO_CRASHREPORT             rtl::OUString( "/doCrashReport"           )
+
+#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE      rtl::OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave")
+#define RECOVERY_CMD_DO_EMERGENCY_SAVE              rtl::OUString( "vnd.sun.star.autorecovery:/doEmergencySave"       )
+#define RECOVERY_CMD_DO_RECOVERY                    rtl::OUString( "vnd.sun.star.autorecovery:/doAutoRecovery"        )
+#define RECOVERY_CMD_DO_ENTRY_BACKUP                rtl::OUString( "vnd.sun.star.autorecovery:/doEntryBackup"         )
+#define RECOVERY_CMD_DO_ENTRY_CLEANUP               rtl::OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp"        )
+
+#define PROP_STATUSINDICATOR                        rtl::OUString( "StatusIndicator"  )
+#define PROP_DISPATCHASYNCHRON                      rtl::OUString( "DispatchAsynchron")
+#define PROP_SAVEPATH                               rtl::OUString( "SavePath"         )
+#define PROP_ENTRYID                                rtl::OUString( "EntryID"          )
+
+#define STATEPROP_ID                                rtl::OUString( "ID"           )
+#define STATEPROP_STATE                             rtl::OUString( "DocumentState")
+#define STATEPROP_ORGURL                            rtl::OUString( "OriginalURL"  )
+#define STATEPROP_TEMPURL                           rtl::OUString( "TempURL"      )
+#define STATEPROP_FACTORYURL                        rtl::OUString( "FactoryURL"   )
+#define STATEPROP_TEMPLATEURL                       rtl::OUString( "TemplateURL"  )
+#define STATEPROP_TITLE                             rtl::OUString( "Title"        )
+#define STATEPROP_MODULE                            rtl::OUString( "Module"       )
+
+#define RECOVERY_OPERATIONSTATE_START               rtl::OUString( "start" )
+#define RECOVERY_OPERATIONSTATE_STOP                rtl::OUString( "stop"  )
+#define RECOVERY_OPERATIONSTATE_UPDATE              rtl::OUString( "update")
 
 #define DLG_RET_UNKNOWN                                  -1
 #define DLG_RET_OK                                        1
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 62705b641393..9c498f250263 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -21,55 +21,55 @@
 
 #include <svx/svxdllapi.h>
 
-#define FM_COMPONENT_EDIT               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Edit" ) )
-#define FM_COMPONENT_TEXTFIELD          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TextField" ) )
-#define FM_COMPONENT_LISTBOX            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ListBox" ) )
-#define FM_COMPONENT_COMBOBOX           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ComboBox" ) )
-#define FM_COMPONENT_RADIOBUTTON        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.RadioButton" ) )
-#define FM_COMPONENT_GROUPBOX           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.GroupBox" ) )
-#define FM_COMPONENT_FIXEDTEXT          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FixedText" ) )
-#define FM_COMPONENT_COMMANDBUTTON      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CommandButton" ) )
-#define FM_COMPONENT_CHECKBOX           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CheckBox" ) )
-#define FM_COMPONENT_GRID               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Grid" ) )
-#define FM_COMPONENT_GRIDCONTROL        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.GridControl" ) )
-#define FM_COMPONENT_IMAGEBUTTON        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageButton" ) )
-#define FM_COMPONENT_FILECONTROL        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FileControl" ) )
-#define FM_COMPONENT_TIMEFIELD          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TimeField" ) )
-#define FM_COMPONENT_DATEFIELD          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.DateField" ) )
-#define FM_COMPONENT_NUMERICFIELD       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.NumericField" ) )
-#define FM_COMPONENT_CURRENCYFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CurrencyField" ) )
-#define FM_COMPONENT_PATTERNFIELD       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.PatternField" ) )
-#define FM_COMPONENT_FORMATTEDFIELD     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FormattedField" ) )
-#define FM_COMPONENT_HIDDEN             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Hidden" ) )
-#define FM_COMPONENT_HIDDENCONTROL      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.HiddenControl" ) )
-#define FM_COMPONENT_IMAGECONTROL       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageControl" ) )
-#define FM_CONTROL_GRID                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.Grid" ) )
-#define FM_CONTROL_GRIDCONTROL          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.GridControl" ) )
-#define SRV_SDB_CONNECTION              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.Connection" ) )
-#define FM_SUN_COMPONENT_FORM           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.Form" ) )
-#define FM_SUN_COMPONENT_TEXTFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ) )
-#define FM_SUN_COMPONENT_LISTBOX        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ) )
-#define FM_SUN_COMPONENT_COMBOBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ) )
-#define FM_SUN_COMPONENT_RADIOBUTTON    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ) )
-#define FM_SUN_COMPONENT_GROUPBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.GroupBox" ) )
-#define FM_SUN_COMPONENT_FIXEDTEXT      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FixedText" ) )
-#define FM_SUN_COMPONENT_COMMANDBUTTON  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ) )
-#define FM_SUN_COMPONENT_CHECKBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CheckBox" ) )
-#define FM_SUN_COMPONENT_GRIDCONTROL    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.GridControl" ) )
-#define FM_SUN_COMPONENT_IMAGEBUTTON    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ImageButton" ) )
-#define FM_SUN_COMPONENT_FILECONTROL    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FileControl" ) )
-#define FM_SUN_COMPONENT_TIMEFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TimeField" ) )
-#define FM_SUN_COMPONENT_DATEFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DateField" ) )
-#define FM_SUN_COMPONENT_NUMERICFIELD   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.NumericField" ) )
-#define FM_SUN_COMPONENT_CURRENCYFIELD  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CurrencyField" ) )
-#define FM_SUN_COMPONENT_PATTERNFIELD   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.PatternField" ) )
-#define FM_SUN_COMPONENT_HIDDENCONTROL  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.HiddenControl" ) )
-#define FM_SUN_COMPONENT_IMAGECONTROL   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseImageControl" ) )
-#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ) )
-#define FM_SUN_COMPONENT_SCROLLBAR      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ScrollBar" ) )
-#define FM_SUN_COMPONENT_SPINBUTTON     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.SpinButton" ) )
-#define FM_SUN_COMPONENT_NAVIGATIONBAR  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.NavigationToolBar" ) )
-#define FM_SUN_CONTROL_GRIDCONTROL      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.GridControl" ) )
+#define FM_COMPONENT_EDIT               rtl::OUString( "stardiv.one.form.component.Edit" )
+#define FM_COMPONENT_TEXTFIELD          rtl::OUString( "stardiv.one.form.component.TextField" )
+#define FM_COMPONENT_LISTBOX            rtl::OUString( "stardiv.one.form.component.ListBox" )
+#define FM_COMPONENT_COMBOBOX           rtl::OUString( "stardiv.one.form.component.ComboBox" )
+#define FM_COMPONENT_RADIOBUTTON        rtl::OUString( "stardiv.one.form.component.RadioButton" )
+#define FM_COMPONENT_GROUPBOX           rtl::OUString( "stardiv.one.form.component.GroupBox" )
+#define FM_COMPONENT_FIXEDTEXT          rtl::OUString( "stardiv.one.form.component.FixedText" )
+#define FM_COMPONENT_COMMANDBUTTON      rtl::OUString( "stardiv.one.form.component.CommandButton" )
+#define FM_COMPONENT_CHECKBOX           rtl::OUString( "stardiv.one.form.component.CheckBox" )
+#define FM_COMPONENT_GRID               rtl::OUString( "stardiv.one.form.component.Grid" )
+#define FM_COMPONENT_GRIDCONTROL        rtl::OUString( "stardiv.one.form.component.GridControl" )
+#define FM_COMPONENT_IMAGEBUTTON        rtl::OUString( "stardiv.one.form.component.ImageButton" )
+#define FM_COMPONENT_FILECONTROL        rtl::OUString( "stardiv.one.form.component.FileControl" )
+#define FM_COMPONENT_TIMEFIELD          rtl::OUString( "stardiv.one.form.component.TimeField" )
+#define FM_COMPONENT_DATEFIELD          rtl::OUString( "stardiv.one.form.component.DateField" )
+#define FM_COMPONENT_NUMERICFIELD       rtl::OUString( "stardiv.one.form.component.NumericField" )
+#define FM_COMPONENT_CURRENCYFIELD      rtl::OUString( "stardiv.one.form.component.CurrencyField" )
+#define FM_COMPONENT_PATTERNFIELD       rtl::OUString( "stardiv.one.form.component.PatternField" )
+#define FM_COMPONENT_FORMATTEDFIELD     rtl::OUString( "stardiv.one.form.component.FormattedField" )
+#define FM_COMPONENT_HIDDEN             rtl::OUString( "stardiv.one.form.component.Hidden" )
+#define FM_COMPONENT_HIDDENCONTROL      rtl::OUString( "stardiv.one.form.component.HiddenControl" )
+#define FM_COMPONENT_IMAGECONTROL       rtl::OUString( "stardiv.one.form.component.ImageControl" )
+#define FM_CONTROL_GRID                 rtl::OUString( "stardiv.one.form.control.Grid" )
+#define FM_CONTROL_GRIDCONTROL          rtl::OUString( "stardiv.one.form.control.GridControl" )
+#define SRV_SDB_CONNECTION              rtl::OUString( "com.sun.star.sdb.Connection" )
+#define FM_SUN_COMPONENT_FORM           rtl::OUString( "com.sun.star.form.component.Form" )
+#define FM_SUN_COMPONENT_TEXTFIELD      rtl::OUString( "com.sun.star.form.component.TextField" )
+#define FM_SUN_COMPONENT_LISTBOX        rtl::OUString( "com.sun.star.form.component.ListBox" )
+#define FM_SUN_COMPONENT_COMBOBOX       rtl::OUString( "com.sun.star.form.component.ComboBox" )
+#define FM_SUN_COMPONENT_RADIOBUTTON    rtl::OUString( "com.sun.star.form.component.RadioButton" )
+#define FM_SUN_COMPONENT_GROUPBOX       rtl::OUString( "com.sun.star.form.component.GroupBox" )
+#define FM_SUN_COMPONENT_FIXEDTEXT      rtl::OUString( "com.sun.star.form.component.FixedText" )
+#define FM_SUN_COMPONENT_COMMANDBUTTON  rtl::OUString( "com.sun.star.form.component.CommandButton" )
+#define FM_SUN_COMPONENT_CHECKBOX       rtl::OUString( "com.sun.star.form.component.CheckBox" )
+#define FM_SUN_COMPONENT_GRIDCONTROL    rtl::OUString( "com.sun.star.form.component.GridControl" )
+#define FM_SUN_COMPONENT_IMAGEBUTTON    rtl::OUString( "com.sun.star.form.component.ImageButton" )
+#define FM_SUN_COMPONENT_FILECONTROL    rtl::OUString( "com.sun.star.form.component.FileControl" )
+#define FM_SUN_COMPONENT_TIMEFIELD      rtl::OUString( "com.sun.star.form.component.TimeField" )
+#define FM_SUN_COMPONENT_DATEFIELD      rtl::OUString( "com.sun.star.form.component.DateField" )
+#define FM_SUN_COMPONENT_NUMERICFIELD   rtl::OUString( "com.sun.star.form.component.NumericField" )
+#define FM_SUN_COMPONENT_CURRENCYFIELD  rtl::OUString( "com.sun.star.form.component.CurrencyField" )
+#define FM_SUN_COMPONENT_PATTERNFIELD   rtl::OUString( "com.sun.star.form.component.PatternField" )
+#define FM_SUN_COMPONENT_HIDDENCONTROL  rtl::OUString( "com.sun.star.form.component.HiddenControl" )
+#define FM_SUN_COMPONENT_IMAGECONTROL   rtl::OUString( "com.sun.star.form.component.DatabaseImageControl" )
+#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( "com.sun.star.form.component.FormattedField" )
+#define FM_SUN_COMPONENT_SCROLLBAR      rtl::OUString( "com.sun.star.form.component.ScrollBar" )
+#define FM_SUN_COMPONENT_SPINBUTTON     rtl::OUString( "com.sun.star.form.component.SpinButton" )
+#define FM_SUN_COMPONENT_NAVIGATIONBAR  rtl::OUString( "com.sun.star.form.component.NavigationToolBar" )
+#define FM_SUN_CONTROL_GRIDCONTROL      rtl::OUString( "com.sun.star.form.control.GridControl" )
 
 namespace svxform
 {
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 154a090ccf8f..6c0b6a2795d5 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -20,33 +20,33 @@
 #ifndef _SVX_FMURL_HXX
 #define _SVX_FMURL_HXX
 
-#define FMURL_FORM_POSITION                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/positionForm" ) )
-#define FMURL_FORM_RECORDCOUNT             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/RecordCount" ) )
-#define FMURL_RECORD_MOVEFIRST             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToFirst" ) )
-#define FMURL_RECORD_MOVEPREV              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToPrev" ) )
-#define FMURL_RECORD_MOVENEXT              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToNext" ) )
-#define FMURL_RECORD_MOVELAST              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToLast" ) )
-#define FMURL_RECORD_MOVETONEW             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToNew" ) )
-#define FMURL_RECORD_UNDO                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/undoRecord" ) )
-#define FMURL_RECORD_SAVE                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/saveRecord" ) )
-#define FMURL_RECORD_DELETE                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/deleteRecord" ) )
-#define FMURL_FORM_REFRESH                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/refreshForm" ) )
-#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/refreshCurrentControl" ) )
-#define FMURL_FORM_SORT_UP                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sortUp" ) )
-#define FMURL_FORM_SORT_DOWN               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sortDown" ) )
-#define FMURL_FORM_SORT                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sort" ) )
-#define FMURL_FORM_AUTO_FILTER             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/autoFilter" ) )
-#define FMURL_FORM_FILTER                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/filter" ) )
-#define FMURL_FORM_APPLY_FILTER            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/applyFilter" ) )
-#define FMURL_FORM_REMOVE_FILTER           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/removeFilterOrder" ) )
-#define FMURL_CONFIRM_DELETION             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/ConfirmDeletion" ) )
-#define FMURL_COMPONENT_FORMGRIDVIEW       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".component:DB/FormGridView" ) )
-#define FMURL_GRIDVIEW_CLEARVIEW           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/ClearView" ) )
-#define FMURL_GRIDVIEW_ADDCOLUMN           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/AddGridColumn" ) )
-#define FMURL_GRIDVIEW_ATTACHTOFORM        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/AttachToForm" ) )
-#define FMARG_ATTACHTO_MASTERFORM          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MasterForm" ) )
-#define FMARG_ADDCOL_COLUMNTYPE            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnType" ) )
-#define FMARG_ADDCOL_COLUMNPOS             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnPosition" ) )
+#define FMURL_FORM_POSITION                rtl::OUString( ".uno:FormController/positionForm" )
+#define FMURL_FORM_RECORDCOUNT             rtl::OUString( ".uno:FormController/RecordCount" )
+#define FMURL_RECORD_MOVEFIRST             rtl::OUString( ".uno:FormController/moveToFirst" )
+#define FMURL_RECORD_MOVEPREV              rtl::OUString( ".uno:FormController/moveToPrev" )
+#define FMURL_RECORD_MOVENEXT              rtl::OUString( ".uno:FormController/moveToNext" )
+#define FMURL_RECORD_MOVELAST              rtl::OUString( ".uno:FormController/moveToLast" )
+#define FMURL_RECORD_MOVETONEW             rtl::OUString( ".uno:FormController/moveToNew" )
+#define FMURL_RECORD_UNDO                  rtl::OUString( ".uno:FormController/undoRecord" )
+#define FMURL_RECORD_SAVE                  rtl::OUString( ".uno:FormController/saveRecord" )
+#define FMURL_RECORD_DELETE                rtl::OUString( ".uno:FormController/deleteRecord" )
+#define FMURL_FORM_REFRESH                 rtl::OUString( ".uno:FormController/refreshForm" )
+#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( ".uno:FormController/refreshCurrentControl" )
+#define FMURL_FORM_SORT_UP                 rtl::OUString( ".uno:FormController/sortUp" )
+#define FMURL_FORM_SORT_DOWN               rtl::OUString( ".uno:FormController/sortDown" )
+#define FMURL_FORM_SORT                    rtl::OUString( ".uno:FormController/sort" )
+#define FMURL_FORM_AUTO_FILTER             rtl::OUString( ".uno:FormController/autoFilter" )
+#define FMURL_FORM_FILTER                  rtl::OUString( ".uno:FormController/filter" )
+#define FMURL_FORM_APPLY_FILTER            rtl::OUString( ".uno:FormController/applyFilter" )
+#define FMURL_FORM_REMOVE_FILTER           rtl::OUString( ".uno:FormController/removeFilterOrder" )
+#define FMURL_CONFIRM_DELETION             rtl::OUString( ".uno:FormSlots/ConfirmDeletion" )
+#define FMURL_COMPONENT_FORMGRIDVIEW       rtl::OUString( ".component:DB/FormGridView" )
+#define FMURL_GRIDVIEW_CLEARVIEW           rtl::OUString( ".uno:FormSlots/ClearView" )
+#define FMURL_GRIDVIEW_ADDCOLUMN           rtl::OUString( ".uno:FormSlots/AddGridColumn" )
+#define FMURL_GRIDVIEW_ATTACHTOFORM        rtl::OUString( ".uno:FormSlots/AttachToForm" )
+#define FMARG_ATTACHTO_MASTERFORM          rtl::OUString( "MasterForm" )
+#define FMARG_ADDCOL_COLUMNTYPE            rtl::OUString( "ColumnType" )
+#define FMARG_ADDCOL_COLUMNPOS             rtl::OUString( "ColumnPosition" )
 
 #endif // _SVX_FMURL_HXX
 
diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx
index fe63ea7c6913..90e039a51ef3 100644
--- a/svx/source/inc/gridcols.hxx
+++ b/svx/source/inc/gridcols.hxx
@@ -23,16 +23,16 @@
 
 namespace rtl { class OUString; }
 
-#define FM_COL_TEXTFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) )
-#define FM_COL_COMBOBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ) )
-#define FM_COL_CHECKBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ) )
-#define FM_COL_TIMEFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeField" ) )
-#define FM_COL_DATEFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateField" ) )
-#define FM_COL_NUMERICFIELD   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumericField" ) )
-#define FM_COL_CURRENCYFIELD  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrencyField" ) )
-#define FM_COL_PATTERNFIELD   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PatternField" ) )
-#define FM_COL_LISTBOX        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ) )
-#define FM_COL_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormattedField" ) )
+#define FM_COL_TEXTFIELD      rtl::OUString( "TextField" )
+#define FM_COL_COMBOBOX       rtl::OUString( "ComboBox" )
+#define FM_COL_CHECKBOX       rtl::OUString( "CheckBox" )
+#define FM_COL_TIMEFIELD      rtl::OUString( "TimeField" )
+#define FM_COL_DATEFIELD      rtl::OUString( "DateField" )
+#define FM_COL_NUMERICFIELD   rtl::OUString( "NumericField" )
+#define FM_COL_CURRENCYFIELD  rtl::OUString( "CurrencyField" )
+#define FM_COL_PATTERNFIELD   rtl::OUString( "PatternField" )
+#define FM_COL_LISTBOX        rtl::OUString( "ListBox" )
+#define FM_COL_FORMATTEDFIELD rtl::OUString( "FormattedField" )
 
 // column type ids
 #define TYPE_CHECKBOX       0