-Werror,-Wmacro-redefined

Change-Id: Ifd246b642979df0d8b1aa20a59f8c73dc9ddc1b2

extensions/source/propctrlr/formresid.hrc

@@ -315,7 +315,7 @@
 #define RID_SVXBMP_CHECKBOX                 ( RID_PROPCONTROLLER_START + 36 )
 #define RID_SVXBMP_FIXEDTEXT                ( RID_PROPCONTROLLER_START + 37 )
 #define RID_SVXBMP_GROUPBOX                 ( RID_PROPCONTROLLER_START + 38 )
-#define RID_SVXBMP_EDIT                     ( RID_PROPCONTROLLER_START + 39 )
+#define RID_SVXBMP_EDITBOX                  ( RID_PROPCONTROLLER_START + 39 )
 #define RID_SVXBMP_LISTBOX                  ( RID_PROPCONTROLLER_START + 40 )
 #define RID_SVXBMP_COMBOBOX                 ( RID_PROPCONTROLLER_START + 41 )
 #define RID_SVXBMP_GRID                     ( RID_PROPCONTROLLER_START + 42 )

extensions/source/propctrlr/pcrmiscres.src

@@ -55,7 +55,7 @@ Bitmap RID_SVXBMP_GROUPBOX
     File = "sx10598.png";
 };
 
-Bitmap RID_SVXBMP_EDIT
+Bitmap RID_SVXBMP_EDITBOX
 {
     File = "sx10599.png";
 };

extensions/source/propctrlr/taborder.cxx

@@ -136,7 +136,7 @@ namespace pcr
             {
             case FormComponentType::COMMANDBUTTON:  nImageId = RID_SVXBMP_BUTTON; break;
             case FormComponentType::FIXEDTEXT:      nImageId = RID_SVXBMP_FIXEDTEXT; break;
-            case FormComponentType::TEXTFIELD:      nImageId = RID_SVXBMP_EDIT; break;
+            case FormComponentType::TEXTFIELD:      nImageId = RID_SVXBMP_EDITBOX; break;
             case FormComponentType::RADIOBUTTON:    nImageId = RID_SVXBMP_RADIOBUTTON; break;
             case FormComponentType::CHECKBOX:       nImageId = RID_SVXBMP_CHECKBOX; break;
             case FormComponentType::LISTBOX:        nImageId = RID_SVXBMP_LISTBOX; break;