diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-27 09:33:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-27 09:33:39 +0200 |
| commit | 28a1e1dded72badd8ad16417d29b56f9476035d6 (patch) | |
| tree | 10d6755de986a389add869568a327224210abbfe /basctl | |
| parent | f2d556ca02827d0d77d06388bfe1a40739f4d1f8 (diff) | |
fix macro and enum name collision using CamelCase
so that the enum names remain consistent
Change-Id: I656069b484038d3bf17ecbb4f3e26395ca5a1b6d
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/baside3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index d4f6441a1f5f..12af69212e83 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -913,7 +913,7 @@ NameClashQueryBox::NameClashQueryBox( vcl::Window* pParent, AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_RENAME), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_REPLACE), RET_NO, 0 ); - AddButton( StandardButtonType::CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); + AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); SetImage( QueryBox::GetStandardImage() ); } @@ -937,8 +937,8 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( vcl::Window* pParent, AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_ADD), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_OMIT), RET_NO, 0 ); - AddButton( StandardButtonType::CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); - AddButton( StandardButtonType::HELP, RET_HELP, BUTTONDIALOG_HELPBUTTON, 4 ); + AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); + AddButton( StandardButtonType::Help, RET_HELP, BUTTONDIALOG_HELPBUTTON, 4 ); SetImage( QueryBox::GetStandardImage() ); } |