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 /vcl/generic | |
| parent | f2d556ca02827d0d77d06388bfe1a40739f4d1f8 (diff) | |
fix macro and enum name collision using CamelCase
so that the enum names remain consistent
Change-Id: I656069b484038d3bf17ecbb4f3e26395ca5a1b6d
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/app/gensys.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx index 5d1f395920cd..0bd02eec81cc 100644 --- a/vcl/generic/app/gensys.cxx +++ b/vcl/generic/app/gensys.cxx @@ -56,22 +56,22 @@ OUString GetNativeMessageBoxButtonText( StandardButtonType nButtonId, bool bUseR case StandardButtonType::OK: aText = "OK"; break; - case StandardButtonType::CANCEL: + case StandardButtonType::Cancel: aText = "Cancel"; break; - case StandardButtonType::ABORT: + case StandardButtonType::Abort: aText = "Abort"; break; - case StandardButtonType::RETRY: + case StandardButtonType::Retry: aText = "Retry"; break; - case StandardButtonType::SB_IGNORE: + case StandardButtonType::Ignore: aText = "Ignore"; break; - case StandardButtonType::SB_YES: + case StandardButtonType::Yes: aText = "Yes"; break; - case StandardButtonType::NO: + case StandardButtonType::No: aText = "No"; break; default: break; @@ -109,9 +109,9 @@ int SalGenericSystem::ShowNativeMessageBox( const OUString& rTitle, const OUStri if( nButtonCombination == SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO_CANCEL || nButtonCombination == SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO ) { - aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::SB_YES, bUseResources ) ); + aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::Yes, bUseResources ) ); nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES; - aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::NO, bUseResources ) ); + aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::No, bUseResources ) ); nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO; if( nDefaultButton == SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO ) nDefButton = 1; @@ -122,21 +122,21 @@ int SalGenericSystem::ShowNativeMessageBox( const OUString& rTitle, const OUStri { if( nButtonCombination == SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL ) { - aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::RETRY, bUseResources ) ); + aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::Retry, bUseResources ) ); nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_RETRY; } - aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::CANCEL, bUseResources ) ); + aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::Cancel, bUseResources ) ); nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL; if( nDefaultButton == SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL ) nDefButton = aButtons.size()-1; } if( nButtonCombination == SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_ABORT_RETRY_IGNORE ) { - aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::ABORT, bUseResources ) ); + aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::Abort, bUseResources ) ); nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_ABORT; - aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::RETRY, bUseResources ) ); + aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::Retry, bUseResources ) ); nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_RETRY; - aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::SB_IGNORE, bUseResources ) ); + aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::Ignore, bUseResources ) ); nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_IGNORE; switch( nDefaultButton ) { |