[Libreoffice-commits] core.git: svx/source

[Stephan Bergmann]

 svx/source/inc/fmurl.hxx |   54 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 27e76ead71e86811f9720162df3eed504e2c29ad
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 19 08:35:17 2014 +0100

    Consistently define plain string literals here, no OUStrings
    
    cf. ef3fb927977681c3e5b5160e961e240063a8cb70 "svx: Use appropriate OUString
    functions on string constants," 897f35006ea48b7b60b087a8f0b955c7f099af3a "fix
    build," 3f66df98050175dfbab2026661c0cba734885e05 "Work around GCC bug"
    
    Change-Id: Ifdfaad30cb59d54ac71bfe9347d29fb853551fd4

diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 3182e4b..a354eae 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -20,33 +20,33 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 
-#define FMURL_FORM_POSITION                OUString( ".uno:FormController/positionForm" )
-#define FMURL_FORM_RECORDCOUNT             OUString( ".uno:FormController/RecordCount" )
-#define FMURL_RECORD_MOVEFIRST             OUString( ".uno:FormController/moveToFirst" )
-#define FMURL_RECORD_MOVEPREV              OUString( ".uno:FormController/moveToPrev" )
-#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                  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" )
-#define FMURL_FORM_REFRESH_CURRENT_CONTROL OUString( ".uno:FormController/refreshCurrentControl" )
-#define FMURL_FORM_SORT_UP                 OUString( ".uno:FormController/sortUp" )
-#define FMURL_FORM_SORT_DOWN               OUString( ".uno:FormController/sortDown" )
-#define FMURL_FORM_SORT                    OUString( ".uno:FormController/sort" )
-#define FMURL_FORM_AUTO_FILTER             OUString( ".uno:FormController/autoFilter" )
-#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             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" )
+#define FMURL_FORM_POSITION                ".uno:FormController/positionForm"
+#define FMURL_FORM_RECORDCOUNT             ".uno:FormController/RecordCount"
+#define FMURL_RECORD_MOVEFIRST             ".uno:FormController/moveToFirst"
+#define FMURL_RECORD_MOVEPREV              ".uno:FormController/moveToPrev"
+#define FMURL_RECORD_MOVENEXT              ".uno:FormController/moveToNext"
+#define FMURL_RECORD_MOVELAST              ".uno:FormController/moveToLast"
+#define FMURL_RECORD_MOVETONEW             ".uno:FormController/moveToNew"
+#define FMURL_RECORD_UNDO                  ".uno:FormController/undoRecord"
+#define FMURL_RECORD_SAVE                  ".uno:FormController/saveRecord"
+#define FMURL_RECORD_DELETE                ".uno:FormController/deleteRecord"
+#define FMURL_FORM_REFRESH                 ".uno:FormController/refreshForm"
+#define FMURL_FORM_REFRESH_CURRENT_CONTROL ".uno:FormController/refreshCurrentControl"
+#define FMURL_FORM_SORT_UP                 ".uno:FormController/sortUp"
+#define FMURL_FORM_SORT_DOWN               ".uno:FormController/sortDown"
+#define FMURL_FORM_SORT                    ".uno:FormController/sort"
+#define FMURL_FORM_AUTO_FILTER             ".uno:FormController/autoFilter"
+#define FMURL_FORM_FILTER                  ".uno:FormController/filter"
+#define FMURL_FORM_APPLY_FILTER            ".uno:FormController/applyFilter"
+#define FMURL_FORM_REMOVE_FILTER           ".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"
 
 #endif // INCLUDED_SVX_SOURCE_INC_FMURL_HXX