diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-11 12:33:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-13 08:54:36 +0200 |
| commit | 670b7ade84ec972d831055349e2bdbc2b1218955 (patch) | |
| tree | 90e18c89c0e8d789c97eec18eb8c4285b9a37097 /cui | |
| parent | d61f0a8c8634827ad427ebb4609d389164c0cc79 (diff) | |
convert BUTTON_DRAW constants to scoped enum
Change-Id: I6ad6558c855736a4a5268593ced9c8300235d4bd
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 8 | ||||
| -rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 3 | ||||
| -rw-r--r-- | cui/source/options/optdict.cxx | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 435bc82555d1..1b454fcc9366 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -4587,13 +4587,13 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat pVDev->SetOutputSizePixel( aSize ); Image aImage = GetSizedImage( *pVDev.get(), aSize, - CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT )); + CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default )); // Fill button data struct with new images pData->SetImage(SvBmp::UNCHECKED, aImage); - pData->SetImage(SvBmp::CHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED )) ); - pData->SetImage(SvBmp::HICHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED )) ); - pData->SetImage(SvBmp::HIUNCHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED)) ); + pData->SetImage(SvBmp::CHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked )) ); + pData->SetImage(SvBmp::HICHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked | DrawButtonFlags::Pressed )) ); + pData->SetImage(SvBmp::HIUNCHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default | DrawButtonFlags::Pressed)) ); pData->SetImage(SvBmp::TRISTATE, GetSizedImage( *pVDev.get(), aSize, Image() ) ); // Use tristate bitmaps to have no checkbox for separator entries pData->SetImage(SvBmp::HITRISTATE, GetSizedImage( *pVDev.get(), aSize, Image() ) ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 0ded6c545164..56d6d5db53aa 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -27,6 +27,7 @@ #include <vcl/controllayout.hxx> #include <vcl/msgbox.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/decoview.hxx> #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp> @@ -241,7 +242,7 @@ namespace svx // calculate the size of the radio image - we're to paint our text _after_ this image DBG_ASSERT( !GetModeRadioImage(), "RubyRadioButton::Paint: images not supported!" ); - Size aImageSize = GetRadioImage( GetSettings(), 0 ).GetSizePixel(); + Size aImageSize = GetRadioImage( GetSettings(), DrawButtonFlags::NONE ).GetSizePixel(); aImageSize.Width() = CalcZoom( aImageSize.Width() ) + 2; // + 2 because otherwise the radiobuttons aImageSize.Height() = CalcZoom( aImageSize.Height() ) + 2; // appear a bit cut from right and top. diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index b1c9973c83e2..a59093124c82 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -362,7 +362,7 @@ void SvxEditDictionaryDialog::Paint( const Rectangle& rRect ) //Rectangle aRect(aEditDictsBox.GetPosPixel(),aEditDictsBox.GetSizePixel()); - sal_uInt16 nStyle=BUTTON_DRAW_NOFILL; + sal_uInt16 nStyle=DrawButtonFlags::NoFill; // aDecoView.DrawButton( aRect, nStyle); } */ |