diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-21 20:19:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-21 20:20:12 +0000 |
| commit | 20bd8d0426380b5ae52c83923f2eb747a5abf8b0 (patch) | |
| tree | b5a3f46dceef41622f24ccc56fe473a431669187 | |
| parent | 2250d7d4a1643672168387837ba2f9530fdb7dc2 (diff) | |
-Werror,-Wmacro-redefined
Change-Id: Ifd246b642979df0d8b1aa20a59f8c73dc9ddc1b2
| -rw-r--r-- | extensions/source/propctrlr/formresid.hrc | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/pcrmiscres.src | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/taborder.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index 6019632a28c2..52cc1f634ce8 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/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 ) diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src index a856d0288a0e..58a393ca1cde 100644 --- a/extensions/source/propctrlr/pcrmiscres.src +++ b/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"; }; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 617a34ef4cb7..4724a40d290a 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/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; |