diff options
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 44 | ||||
| -rw-r--r-- | svx/source/inc/fmurl.hxx | 18 |
2 files changed, 31 insertions, 31 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index e679d186ad59..12ad0bbd765b 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -447,28 +447,28 @@ namespace { switch (nType) { - case OBJ_FM_EDIT : return FM_COMPONENT_TEXTFIELD; - case OBJ_FM_BUTTON : return FM_COMPONENT_COMMANDBUTTON; - case OBJ_FM_FIXEDTEXT : return FM_COMPONENT_FIXEDTEXT; - case OBJ_FM_LISTBOX : return FM_COMPONENT_LISTBOX; - case OBJ_FM_CHECKBOX : return FM_COMPONENT_CHECKBOX; - case OBJ_FM_RADIOBUTTON : return FM_COMPONENT_RADIOBUTTON; - case OBJ_FM_GROUPBOX : return FM_COMPONENT_GROUPBOX; - case OBJ_FM_COMBOBOX : return FM_COMPONENT_COMBOBOX; - case OBJ_FM_GRID : return FM_COMPONENT_GRIDCONTROL; - case OBJ_FM_IMAGEBUTTON : return FM_COMPONENT_IMAGEBUTTON; - case OBJ_FM_FILECONTROL : return FM_COMPONENT_FILECONTROL; - case OBJ_FM_DATEFIELD : return FM_COMPONENT_DATEFIELD; - case OBJ_FM_TIMEFIELD : return FM_COMPONENT_TIMEFIELD; - case OBJ_FM_NUMERICFIELD : return FM_COMPONENT_NUMERICFIELD; - case OBJ_FM_CURRENCYFIELD : return FM_COMPONENT_CURRENCYFIELD; - case OBJ_FM_PATTERNFIELD : return FM_COMPONENT_PATTERNFIELD; - case OBJ_FM_HIDDEN : return FM_COMPONENT_HIDDENCONTROL; - case OBJ_FM_IMAGECONTROL : return FM_COMPONENT_IMAGECONTROL; - case OBJ_FM_FORMATTEDFIELD : return FM_COMPONENT_FORMATTEDFIELD; - case OBJ_FM_SCROLLBAR : return FM_SUN_COMPONENT_SCROLLBAR; - case OBJ_FM_SPINBUTTON : return FM_SUN_COMPONENT_SPINBUTTON; - case OBJ_FM_NAVIGATIONBAR : return FM_SUN_COMPONENT_NAVIGATIONBAR; + case OBJ_FM_EDIT : return OUString(FM_COMPONENT_TEXTFIELD); + case OBJ_FM_BUTTON : return OUString(FM_COMPONENT_COMMANDBUTTON); + case OBJ_FM_FIXEDTEXT : return OUString(FM_COMPONENT_FIXEDTEXT); + case OBJ_FM_LISTBOX : return OUString(FM_COMPONENT_LISTBOX); + case OBJ_FM_CHECKBOX : return OUString(FM_COMPONENT_CHECKBOX); + case OBJ_FM_RADIOBUTTON : return OUString(FM_COMPONENT_RADIOBUTTON); + case OBJ_FM_GROUPBOX : return OUString(FM_COMPONENT_GROUPBOX); + case OBJ_FM_COMBOBOX : return OUString(FM_COMPONENT_COMBOBOX); + case OBJ_FM_GRID : return OUString(FM_COMPONENT_GRIDCONTROL); + case OBJ_FM_IMAGEBUTTON : return OUString(FM_COMPONENT_IMAGEBUTTON); + case OBJ_FM_FILECONTROL : return OUString(FM_COMPONENT_FILECONTROL); + case OBJ_FM_DATEFIELD : return OUString(FM_COMPONENT_DATEFIELD); + case OBJ_FM_TIMEFIELD : return OUString(FM_COMPONENT_TIMEFIELD); + case OBJ_FM_NUMERICFIELD : return OUString(FM_COMPONENT_NUMERICFIELD); + case OBJ_FM_CURRENCYFIELD : return OUString(FM_COMPONENT_CURRENCYFIELD); + case OBJ_FM_PATTERNFIELD : return OUString(FM_COMPONENT_PATTERNFIELD); + case OBJ_FM_HIDDEN : return OUString(FM_COMPONENT_HIDDENCONTROL); + case OBJ_FM_IMAGECONTROL : return OUString(FM_COMPONENT_IMAGECONTROL); + case OBJ_FM_FORMATTEDFIELD : return OUString(FM_COMPONENT_FORMATTEDFIELD); + case OBJ_FM_SCROLLBAR : return OUString(FM_SUN_COMPONENT_SCROLLBAR); + case OBJ_FM_SPINBUTTON : return OUString(FM_SUN_COMPONENT_SPINBUTTON); + case OBJ_FM_NAVIGATIONBAR : return OUString(FM_SUN_COMPONENT_NAVIGATIONBAR); } return OUString(); } diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index 878eea656ff0..3182e4be0a46 100644 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx @@ -27,7 +27,7 @@ #define FMURL_RECORD_MOVENEXT OUString( ".uno:FormController/moveToNext" ) #define FMURL_RECORD_MOVELAST OUString( ".uno:FormController/moveToLast" ) #define FMURL_RECORD_MOVETONEW OUString( ".uno:FormController/moveToNew" ) -#define FMURL_RECORD_UNDO ".uno:FormController/undoRecord" +#define FMURL_RECORD_UNDO OUString( ".uno:FormController/undoRecord" ) #define FMURL_RECORD_SAVE OUString( ".uno:FormController/saveRecord" ) #define FMURL_RECORD_DELETE OUString( ".uno:FormController/deleteRecord" ) #define FMURL_FORM_REFRESH OUString( ".uno:FormController/refreshForm" ) @@ -39,14 +39,14 @@ #define FMURL_FORM_FILTER OUString( ".uno:FormController/filter" ) #define FMURL_FORM_APPLY_FILTER OUString( ".uno:FormController/applyFilter" ) #define FMURL_FORM_REMOVE_FILTER OUString( ".uno:FormController/removeFilterOrder" ) -#define FMURL_CONFIRM_DELETION ".uno:FormSlots/ConfirmDeletion" -#define FMURL_COMPONENT_FORMGRIDVIEW ".component:DB/FormGridView" -#define FMURL_GRIDVIEW_CLEARVIEW ".uno:FormSlots/ClearView" -#define FMURL_GRIDVIEW_ADDCOLUMN ".uno:FormSlots/AddGridColumn" -#define FMURL_GRIDVIEW_ATTACHTOFORM ".uno:FormSlots/AttachToForm" -#define FMARG_ATTACHTO_MASTERFORM "MasterForm" -#define FMARG_ADDCOL_COLUMNTYPE "ColumnType" -#define FMARG_ADDCOL_COLUMNPOS "ColumnPosition" +#define FMURL_CONFIRM_DELETION OUString( ".uno:FormSlots/ConfirmDeletion" ) +#define FMURL_COMPONENT_FORMGRIDVIEW OUString( ".component:DB/FormGridView" ) +#define FMURL_GRIDVIEW_CLEARVIEW OUString( ".uno:FormSlots/ClearView" ) +#define FMURL_GRIDVIEW_ADDCOLUMN OUString( ".uno:FormSlots/AddGridColumn" ) +#define FMURL_GRIDVIEW_ATTACHTOFORM OUString( ".uno:FormSlots/AttachToForm" ) +#define FMARG_ATTACHTO_MASTERFORM OUString( "MasterForm" ) +#define FMARG_ADDCOL_COLUMNTYPE OUString( "ColumnType" ) +#define FMARG_ADDCOL_COLUMNPOS OUString( "ColumnPosition" ) #endif // INCLUDED_SVX_SOURCE_INC_FMURL_HXX |