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 /cui | |
| parent | f2d556ca02827d0d77d06388bfe1a40739f4d1f8 (diff) | |
fix macro and enum name collision using CamelCase
so that the enum names remain consistent
Change-Id: I656069b484038d3bf17ecbb4f3e26395ca5a1b6d
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 5771f5700907..26d0c3574cb1 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -5309,10 +5309,10 @@ MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_R SetImage( WarningBox::GetStandardImage() ); SetMessText( ReplaceIconName( aMessage ) ); RemoveButton( 1 ); - AddButton( StandardButtonType::SB_YES, 2, 0 ); + AddButton( StandardButtonType::Yes, 2, 0 ); AddButton( CUI_RES( RID_SVXSTR_YESTOALL ), 5, 0 ); - AddButton( StandardButtonType::NO, 3, 0 ); - AddButton( StandardButtonType::CANCEL, 4, 0 ); + AddButton( StandardButtonType::No, 3, 0 ); + AddButton( StandardButtonType::Cancel, 4, 0 ); } SvxIconReplacementDialog :: SvxIconReplacementDialog( diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 673b7de3906f..1dbd644dae90 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -77,7 +77,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier) :ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui") - ,m_sCancel( Button::GetStandardText( StandardButtonType::CANCEL ) ) + ,m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) ) ,m_pPreSearchFocus( NULL ) ,m_lnkContextSupplier(lnkContextSupplier) ,m_pConfig( NULL ) |