diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-27 09:04:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-27 09:04:44 +0200 |
| commit | f2d556ca02827d0d77d06388bfe1a40739f4d1f8 (patch) | |
| tree | 4c0ab405b27e11c65c9856651a1de048492cda45 /dbaccess | |
| parent | fix tb56 build (diff) | |
| download | core-f2d556ca02827d0d77d06388bfe1a40739f4d1f8.tar.gz core-f2d556ca02827d0d77d06388bfe1a40739f4d1f8.zip | |
work around Windows and OSX macro collisions with enum values
Change-Id: I3d14b96b6b51e497bde33f0177b377e7fe3dbad9
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/sqlmessage.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 2fcc3bb2f5ea..b47fd5f74962 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -425,7 +425,7 @@ namespace sal_uInt16 nButtonID = 0; switch ( _eType ) { - case StandardButtonType::YES: nButtonID = RET_YES; break; + case StandardButtonType::SB_YES: nButtonID = RET_YES; break; case StandardButtonType::NO: nButtonID = RET_NO; break; case StandardButtonType::OK: nButtonID = RET_OK; break; case StandardButtonType::CANCEL: nButtonID = RET_CANCEL; break; @@ -564,7 +564,7 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) { if ( _nStyle & WB_YES_NO_CANCEL ) { - lcl_addButton( *this, StandardButtonType::YES, ( _nStyle & WB_DEF_YES ) != 0 ); + lcl_addButton( *this, StandardButtonType::SB_YES, ( _nStyle & WB_DEF_YES ) != 0 ); lcl_addButton( *this, StandardButtonType::NO, ( _nStyle & WB_DEF_NO ) != 0 ); lcl_addButton( *this, StandardButtonType::CANCEL, ( _nStyle & WB_DEF_CANCEL ) != 0 ); } @@ -575,7 +575,7 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) } else if ( _nStyle & WB_YES_NO ) { - lcl_addButton( *this, StandardButtonType::YES, ( _nStyle & WB_DEF_YES ) != 0 ); + lcl_addButton( *this, StandardButtonType::SB_YES, ( _nStyle & WB_DEF_YES ) != 0 ); lcl_addButton( *this, StandardButtonType::NO, ( _nStyle & WB_DEF_NO ) != 0 ); } else if ( _nStyle & WB_RETRY_CANCEL ) |