diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-24 11:41:07 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-25 08:40:00 +0200 |
commit | b8d03c61dbf8a680a7073d6416a219368fb054b8 (patch) | |
tree | c1f14a78f5e6146339feb0199d5064b3e6630ebb /cui | |
parent | 9296ec4403b642939ae49322c5d84066ac5854c8 (diff) |
convert SvxDistributeVertical to scoped enum
Change-Id: I1797b9cd0164f8fcee2fb768a1db08ae17457534
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
-rw-r--r-- | cui/source/inc/dstribut.hxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/dstribut.cxx | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 0bc3a96505f9..109e7c136e6c 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -929,7 +929,7 @@ AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(const SfxItemSet& rAttr) { - VclPtrInstance<SvxDistributeDialog> pDlg( nullptr, rAttr, SvxDistributeHorizontalNone, SvxDistributeVerticalNone); + VclPtrInstance<SvxDistributeDialog> pDlg( nullptr, rAttr, SvxDistributeHorizontalNone, SvxDistributeVertical::NONE); return new AbstractSvxDistributeDialog_Impl( pDlg ); } diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index 27e000641e2e..0e87c903710a 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -43,7 +43,7 @@ class SvxDistributePage : public SvxTabPage public: SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, - SvxDistributeVertical eVer = SvxDistributeVerticalNone); + SvxDistributeVertical eVer = SvxDistributeVertical::NONE); virtual ~SvxDistributePage(); virtual void dispose() override; @@ -62,7 +62,7 @@ class SvxDistributeDialog : public SfxSingleTabDialog public: SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, - SvxDistributeVertical eVer = SvxDistributeVerticalNone); + SvxDistributeVertical eVer = SvxDistributeVertical::NONE); virtual ~SvxDistributeDialog(); virtual void dispose() override; diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 280ac7ba17e2..de3f64b92570 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -135,11 +135,11 @@ void SvxDistributePage::Reset(const SfxItemSet* ) switch(m_eDistributeVer) { - case SvxDistributeVerticalNone : m_pBtnVerNone->SetState(true); break; - case SvxDistributeVerticalTop : m_pBtnVerTop->SetState(true); break; - case SvxDistributeVerticalCenter : m_pBtnVerCenter->SetState(true); break; - case SvxDistributeVerticalDistance : m_pBtnVerDistance->SetState(true); break; - case SvxDistributeVerticalBottom : m_pBtnVerBottom->SetState(true); break; + case SvxDistributeVertical::NONE : m_pBtnVerNone->SetState(true); break; + case SvxDistributeVertical::Top : m_pBtnVerTop->SetState(true); break; + case SvxDistributeVertical::Center : m_pBtnVerCenter->SetState(true); break; + case SvxDistributeVertical::Distance : m_pBtnVerDistance->SetState(true); break; + case SvxDistributeVertical::Bottom : m_pBtnVerBottom->SetState(true); break; } } @@ -152,7 +152,7 @@ void SvxDistributePage::Reset(const SfxItemSet* ) bool SvxDistributePage::FillItemSet( SfxItemSet* ) { SvxDistributeHorizontal eDistributeHor(SvxDistributeHorizontalNone); - SvxDistributeVertical eDistributeVer(SvxDistributeVerticalNone); + SvxDistributeVertical eDistributeVer(SvxDistributeVertical::NONE); if(m_pBtnHorLeft->IsChecked()) eDistributeHor = SvxDistributeHorizontalLeft; @@ -164,13 +164,13 @@ bool SvxDistributePage::FillItemSet( SfxItemSet* ) eDistributeHor = SvxDistributeHorizontalRight; if(m_pBtnVerTop->IsChecked()) - eDistributeVer = SvxDistributeVerticalTop; + eDistributeVer = SvxDistributeVertical::Top; else if(m_pBtnVerCenter->IsChecked()) - eDistributeVer = SvxDistributeVerticalCenter; + eDistributeVer = SvxDistributeVertical::Center; else if(m_pBtnVerDistance->IsChecked()) - eDistributeVer = SvxDistributeVerticalDistance; + eDistributeVer = SvxDistributeVertical::Distance; else if(m_pBtnVerBottom->IsChecked()) - eDistributeVer = SvxDistributeVerticalBottom; + eDistributeVer = SvxDistributeVertical::Bottom; if(eDistributeHor != m_eDistributeHor || eDistributeVer != m_eDistributeVer) { |