mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert SvxDistributeHorizontal to scoped enum

Browse Source 
Change-Id: I7f3592ac8ef90686954624f37394a6e8f047ca44
This commit is contained in:
Noel Grandin
2016-08-24 11:54:15 +02:00
parent b8d03c61db
commit fdaa46f065
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/factory/dlgfact.cxx
View File

@@ -929,7 +929,7 @@ AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog(
AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(const SfxItemSet& rAttr) AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(const SfxItemSet& rAttr)
{ {
VclPtrInstance<SvxDistributeDialog> pDlg( nullptr, rAttr, SvxDistributeHorizontalNone, SvxDistributeVertical::NONE); VclPtrInstance<SvxDistributeDialog> pDlg( nullptr, rAttr, SvxDistributeHorizontal::NONE, SvxDistributeVertical::NONE);
return new AbstractSvxDistributeDialog_Impl( pDlg ); return new AbstractSvxDistributeDialog_Impl( pDlg );
} }

4
cui/source/inc/dstribut.hxx
View File

@@ -42,7 +42,7 @@ class SvxDistributePage : public SvxTabPage
public: public:
SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeHorizontal eHor = SvxDistributeHorizontal::NONE,
SvxDistributeVertical eVer = SvxDistributeVertical::NONE); SvxDistributeVertical eVer = SvxDistributeVertical::NONE);
virtual ~SvxDistributePage(); virtual ~SvxDistributePage();
virtual void dispose() override; virtual void dispose() override;
@@ -61,7 +61,7 @@ class SvxDistributeDialog : public SfxSingleTabDialog
public: public:
SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeHorizontal eHor = SvxDistributeHorizontal::NONE,
SvxDistributeVertical eVer = SvxDistributeVertical::NONE); SvxDistributeVertical eVer = SvxDistributeVertical::NONE);
virtual ~SvxDistributeDialog(); virtual ~SvxDistributeDialog();
virtual void dispose() override; virtual void dispose() override;

20
cui/source/tabpages/dstribut.cxx
View File

@@ -120,11 +120,11 @@ void SvxDistributePage::Reset(const SfxItemSet* )
switch(m_eDistributeHor) switch(m_eDistributeHor)
{ {
case SvxDistributeHorizontalNone : m_pBtnHorNone->SetState(true); break; case SvxDistributeHorizontal::NONE : m_pBtnHorNone->SetState(true); break;
case SvxDistributeHorizontalLeft : m_pBtnHorLeft->SetState(true); break; case SvxDistributeHorizontal::Left : m_pBtnHorLeft->SetState(true); break;
case SvxDistributeHorizontalCenter : m_pBtnHorCenter->SetState(true); break; case SvxDistributeHorizontal::Center : m_pBtnHorCenter->SetState(true); break;
case SvxDistributeHorizontalDistance : m_pBtnHorDistance->SetState(true); break; case SvxDistributeHorizontal::Distance : m_pBtnHorDistance->SetState(true); break;
case SvxDistributeHorizontalRight : m_pBtnHorRight->SetState(true); break; case SvxDistributeHorizontal::Right : m_pBtnHorRight->SetState(true); break;
} }
m_pBtnVerNone->SetState(false); m_pBtnVerNone->SetState(false);
@@ -151,17 +151,17 @@ void SvxDistributePage::Reset(const SfxItemSet* )
bool SvxDistributePage::FillItemSet( SfxItemSet* ) bool SvxDistributePage::FillItemSet( SfxItemSet* )
{ {
SvxDistributeHorizontal eDistributeHor(SvxDistributeHorizontalNone); SvxDistributeHorizontal eDistributeHor(SvxDistributeHorizontal::NONE);
SvxDistributeVertical eDistributeVer(SvxDistributeVertical::NONE); SvxDistributeVertical eDistributeVer(SvxDistributeVertical::NONE);
if(m_pBtnHorLeft->IsChecked()) if(m_pBtnHorLeft->IsChecked())
eDistributeHor = SvxDistributeHorizontalLeft; eDistributeHor = SvxDistributeHorizontal::Left;
else if(m_pBtnHorCenter->IsChecked()) else if(m_pBtnHorCenter->IsChecked())
eDistributeHor = SvxDistributeHorizontalCenter; eDistributeHor = SvxDistributeHorizontal::Center;
else if(m_pBtnHorDistance->IsChecked()) else if(m_pBtnHorDistance->IsChecked())
eDistributeHor = SvxDistributeHorizontalDistance; eDistributeHor = SvxDistributeHorizontal::Distance;
else if(m_pBtnHorRight->IsChecked()) else if(m_pBtnHorRight->IsChecked())
eDistributeHor = SvxDistributeHorizontalRight; eDistributeHor = SvxDistributeHorizontal::Right;
if(m_pBtnVerTop->IsChecked()) if(m_pBtnVerTop->IsChecked())
eDistributeVer = SvxDistributeVertical::Top; eDistributeVer = SvxDistributeVertical::Top;

12
include/svx/dstribut_enum.hxx
View File

@@ -19,13 +19,13 @@
#ifndef INCLUDED_SVX_DSTRIBUT_ENUM_HXX #ifndef INCLUDED_SVX_DSTRIBUT_ENUM_HXX
#define INCLUDED_SVX_DSTRIBUT_ENUM_HXX #define INCLUDED_SVX_DSTRIBUT_ENUM_HXX
enum SvxDistributeHorizontal enum class SvxDistributeHorizontal
{ {
SvxDistributeHorizontalNone = 0, NONE = 0,
SvxDistributeHorizontalLeft, Left,
SvxDistributeHorizontalCenter, Center,
SvxDistributeHorizontalDistance, Distance,
SvxDistributeHorizontalRight Right
}; };
enum class SvxDistributeVertical enum class SvxDistributeVertical

12
svx/source/svdraw/svdedtv2.cxx
View File

@@ -788,7 +788,7 @@ void SdrEditView::DistributeMarkedObjects()
if( bUndo ) if( bUndo )
BegUndo(); BegUndo();
if(eHor != SvxDistributeHorizontalNone) if(eHor != SvxDistributeHorizontal::NONE)
{ {
// build sorted entry list // build sorted entry list
nFullLength = 0L; nFullLength = 0L;
@@ -802,24 +802,24 @@ void SdrEditView::DistributeMarkedObjects()
switch(eHor) switch(eHor)
{ {
case SvxDistributeHorizontalLeft: case SvxDistributeHorizontal::Left:
{ {
pNew->mnPos = pNew->mpObj->GetSnapRect().Left(); pNew->mnPos = pNew->mpObj->GetSnapRect().Left();
break; break;
} }
case SvxDistributeHorizontalCenter: case SvxDistributeHorizontal::Center:
{ {
pNew->mnPos = (pNew->mpObj->GetSnapRect().Right() + pNew->mpObj->GetSnapRect().Left()) / 2; pNew->mnPos = (pNew->mpObj->GetSnapRect().Right() + pNew->mpObj->GetSnapRect().Left()) / 2;
break; break;
} }
case SvxDistributeHorizontalDistance: case SvxDistributeHorizontal::Distance:
{ {
pNew->mnLength = pNew->mpObj->GetSnapRect().GetWidth() + 1; pNew->mnLength = pNew->mpObj->GetSnapRect().GetWidth() + 1;
nFullLength += pNew->mnLength; nFullLength += pNew->mnLength;
pNew->mnPos = (pNew->mpObj->GetSnapRect().Right() + pNew->mpObj->GetSnapRect().Left()) / 2; pNew->mnPos = (pNew->mpObj->GetSnapRect().Right() + pNew->mpObj->GetSnapRect().Left()) / 2;
break; break;
} }
case SvxDistributeHorizontalRight: case SvxDistributeHorizontal::Right:
{ {
pNew->mnPos = pNew->mpObj->GetSnapRect().Right(); pNew->mnPos = pNew->mpObj->GetSnapRect().Right();
break; break;
@@ -837,7 +837,7 @@ void SdrEditView::DistributeMarkedObjects()
aEntryList.push_back( pNew ); aEntryList.push_back( pNew );
} }
if(eHor == SvxDistributeHorizontalDistance) if(eHor == SvxDistributeHorizontal::Distance)
{ {
// calculate room in-between // calculate room in-between
sal_Int32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1; sal_Int32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1;