summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdglev.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-24 11:33:00 +0200
committerNoel Grandin <noel@peralex.com>2015-04-29 10:41:39 +0200
commitd66f266cf24d09c2ceb9320f1355ba27114187c2 (patch)
tree45e90b8e144057dd38ca6ea46c1cb30104174149 /svx/source/svdraw/svdglev.cxx
parentda9361374c45da7c3bda803aaed52485fb3b12d7 (diff)
convert SDR*ALIGN constants to scoped enum
Change-Id: I29b7b4fe1181133cbbb0bb43a1835941cf12210d
Diffstat (limited to 'svx/source/svdraw/svdglev.cxx')
-rw-r--r--svx/source/svdraw/svdglev.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 3492f47e076c..7f2faba3fa0e 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -169,11 +169,11 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn)
static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*)
{
- sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet));
+ SdrAlign& nRet=*const_cast<SdrAlign *>(static_cast<SdrAlign const *>(pnRet));
bool& bDontCare=*const_cast<bool *>(static_cast<bool const *>(pbDontCare));
bool bVert=*static_cast<bool const *>(pbVert);
if (!bDontCare) {
- sal_uInt16 nAlg=0;
+ SdrAlign nAlg=SdrAlign::NONE;
if (bVert) {
nAlg=rGP.GetVertAlign();
} else {
@@ -183,21 +183,21 @@ static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void
if (bFirst) { nRet=nAlg; bFirst=false; }
else if (nRet!=nAlg) {
if (bVert) {
- nRet=SDRVERTALIGN_DONTCARE;
+ nRet=SdrAlign::VERT_DONTCARE;
} else {
- nRet=SDRHORZALIGN_DONTCARE;
+ nRet=SdrAlign::HORZ_DONTCARE;
}
bDontCare=true;
}
}
}
-sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(bool bVert) const
+SdrAlign SdrGlueEditView::GetMarkedGluePointsAlign(bool bVert) const
{
ForceUndirtyMrkPnt();
bool bFirst=true;
bool bDontCare=false;
- sal_uInt16 nRet=0;
+ SdrAlign nRet=SdrAlign::NONE;
const_cast<SdrGlueEditView*>(this)->ImpDoMarkedGluePoints(ImpGetAlign,true,&bFirst,&bDontCare,&bVert,&nRet);
return nRet;
}
@@ -206,14 +206,14 @@ static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pb
{
Point aPos(rGP.GetAbsolutePos(*pObj));
if (*static_cast<bool const *>(pbVert)) { // bVert?
- rGP.SetVertAlign(*static_cast<sal_uInt16 const *>(pnAlign));
+ rGP.SetVertAlign(*static_cast<SdrAlign const *>(pnAlign));
} else {
- rGP.SetHorzAlign(*static_cast<sal_uInt16 const *>(pnAlign));
+ rGP.SetHorzAlign(*static_cast<SdrAlign const *>(pnAlign));
}
rGP.SetAbsolutePos(aPos,*pObj);
}
-void SdrGlueEditView::SetMarkedGluePointsAlign(bool bVert, sal_uInt16 nAlign)
+void SdrGlueEditView::SetMarkedGluePointsAlign(bool bVert, SdrAlign nAlign)
{
ForceUndirtyMrkPnt();
BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints());