[Libreoffice-commits] core.git: editeng/source include/editeng include/svx svx/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Thu May 4 18:33:05 UTC 2017
editeng/source/editeng/editview.cxx | 4 -
editeng/source/editeng/impedit.cxx | 76 ++++++++++++++++++------------------
editeng/source/editeng/impedit.hxx | 6 +-
editeng/source/outliner/outlvw.cxx | 4 -
include/editeng/editdata.hxx | 8 +--
include/editeng/editview.hxx | 4 -
include/editeng/outliner.hxx | 4 -
include/svx/svdomeas.hxx | 2
include/svx/svdotable.hxx | 2
include/svx/svdotext.hxx | 4 -
svx/source/svdraw/svdedxv.cxx | 8 +--
svx/source/svdraw/svdomeas.cxx | 24 +++++------
svx/source/svdraw/svdotxed.cxx | 26 ++++++------
svx/source/table/svdotable.cxx | 12 ++---
14 files changed, 92 insertions(+), 92 deletions(-)
New commits:
commit fadf6427a9cbf351727e1412d8079757a994085b
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Wed May 3 09:45:25 2017 +0200
convert EVAnchorMode enum to scoped enum
change values to match position in definition to their meaning
Change-Id: Ia96e0c7e0c70c847dea518ef871608516542d3cb
Reviewed-on: https://gerrit.libreoffice.org/37186
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index c89573dc6e80..c1ebe72c3212 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -725,12 +725,12 @@ void EditView::SetInsertMode( bool bInsert )
pImpEditView->SetInsertMode( bInsert );
}
-void EditView::SetAnchorMode( EVAnchorMode eMode )
+void EditView::SetAnchorMode( EEAnchorMode eMode )
{
pImpEditView->SetAnchorMode( eMode );
}
-EVAnchorMode EditView::GetAnchorMode() const
+EEAnchorMode EditView::GetAnchorMode() const
{
return pImpEditView->GetAnchorMode();
}
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 382daf5c1a22..71c1471a8961 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -89,7 +89,7 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindo
bReadOnly = false;
bClickedInSelection = false;
eSelectionMode = EE_SELMODE_TXTONLY;
- eAnchorMode = ANCHOR_TOP_LEFT;
+ eAnchorMode = EEAnchorMode::TopLeft;
nInvMore = 1;
nTravelXPos = TRAVEL_X_DONTKNOW;
nControl = EVControlBits::AUTOSCROLL | EVControlBits::ENABLEPASTE;
@@ -691,23 +691,23 @@ void ImpEditView::RecalcOutputArea()
aNewSz.Width() = pEditEngine->pImpEditEngine->GetPaperSize().Width();
switch ( eAnchorMode )
{
- case ANCHOR_TOP_LEFT:
- case ANCHOR_VCENTER_LEFT:
- case ANCHOR_BOTTOM_LEFT:
+ case EEAnchorMode::TopLeft:
+ case EEAnchorMode::VCenterLeft:
+ case EEAnchorMode::BottomLeft:
{
aNewTopLeft.X() = aAnchorPoint.X();
}
break;
- case ANCHOR_TOP_HCENTER:
- case ANCHOR_VCENTER_HCENTER:
- case ANCHOR_BOTTOM_HCENTER:
+ case EEAnchorMode::TopHCenter:
+ case EEAnchorMode::VCenterHCenter:
+ case EEAnchorMode::BottomHCenter:
{
aNewTopLeft.X() = aAnchorPoint.X() - aNewSz.Width() / 2;
}
break;
- case ANCHOR_TOP_RIGHT:
- case ANCHOR_VCENTER_RIGHT:
- case ANCHOR_BOTTOM_RIGHT:
+ case EEAnchorMode::TopRight:
+ case EEAnchorMode::VCenterRight:
+ case EEAnchorMode::BottomRight:
{
aNewTopLeft.X() = aAnchorPoint.X() - aNewSz.Width() - 1;
}
@@ -722,23 +722,23 @@ void ImpEditView::RecalcOutputArea()
aNewSz.Height() = pEditEngine->pImpEditEngine->GetPaperSize().Height();
switch ( eAnchorMode )
{
- case ANCHOR_TOP_LEFT:
- case ANCHOR_TOP_HCENTER:
- case ANCHOR_TOP_RIGHT:
+ case EEAnchorMode::TopLeft:
+ case EEAnchorMode::TopHCenter:
+ case EEAnchorMode::TopRight:
{
aNewTopLeft.Y() = aAnchorPoint.Y();
}
break;
- case ANCHOR_VCENTER_LEFT:
- case ANCHOR_VCENTER_HCENTER:
- case ANCHOR_VCENTER_RIGHT:
+ case EEAnchorMode::VCenterLeft:
+ case EEAnchorMode::VCenterHCenter:
+ case EEAnchorMode::VCenterRight:
{
aNewTopLeft.Y() = aAnchorPoint.Y() - aNewSz.Height() / 2;
}
break;
- case ANCHOR_BOTTOM_LEFT:
- case ANCHOR_BOTTOM_HCENTER:
- case ANCHOR_BOTTOM_RIGHT:
+ case EEAnchorMode::BottomLeft:
+ case EEAnchorMode::BottomHCenter:
+ case EEAnchorMode::BottomRight:
{
aNewTopLeft.Y() = aAnchorPoint.Y() - aNewSz.Height() - 1;
}
@@ -748,7 +748,7 @@ void ImpEditView::RecalcOutputArea()
ResetOutputArea( tools::Rectangle( aNewTopLeft, aNewSz ) );
}
-void ImpEditView::SetAnchorMode( EVAnchorMode eMode )
+void ImpEditView::SetAnchorMode( EEAnchorMode eMode )
{
eAnchorMode = eMode;
CalcAnchorPoint();
@@ -761,23 +761,23 @@ void ImpEditView::CalcAnchorPoint()
// X:
switch ( eAnchorMode )
{
- case ANCHOR_TOP_LEFT:
- case ANCHOR_VCENTER_LEFT:
- case ANCHOR_BOTTOM_LEFT:
+ case EEAnchorMode::TopLeft:
+ case EEAnchorMode::VCenterLeft:
+ case EEAnchorMode::BottomLeft:
{
aAnchorPoint.X() = aOutArea.Left();
}
break;
- case ANCHOR_TOP_HCENTER:
- case ANCHOR_VCENTER_HCENTER:
- case ANCHOR_BOTTOM_HCENTER:
+ case EEAnchorMode::TopHCenter:
+ case EEAnchorMode::VCenterHCenter:
+ case EEAnchorMode::BottomHCenter:
{
aAnchorPoint.X() = aOutArea.Left() + (aOutArea.GetWidth()-1) / 2;
}
break;
- case ANCHOR_TOP_RIGHT:
- case ANCHOR_VCENTER_RIGHT:
- case ANCHOR_BOTTOM_RIGHT:
+ case EEAnchorMode::TopRight:
+ case EEAnchorMode::VCenterRight:
+ case EEAnchorMode::BottomRight:
{
aAnchorPoint.X() = aOutArea.Right();
}
@@ -787,23 +787,23 @@ void ImpEditView::CalcAnchorPoint()
// Y:
switch ( eAnchorMode )
{
- case ANCHOR_TOP_LEFT:
- case ANCHOR_TOP_HCENTER:
- case ANCHOR_TOP_RIGHT:
+ case EEAnchorMode::TopLeft:
+ case EEAnchorMode::TopHCenter:
+ case EEAnchorMode::TopRight:
{
aAnchorPoint.Y() = aOutArea.Top();
}
break;
- case ANCHOR_VCENTER_LEFT:
- case ANCHOR_VCENTER_HCENTER:
- case ANCHOR_VCENTER_RIGHT:
+ case EEAnchorMode::VCenterLeft:
+ case EEAnchorMode::VCenterHCenter:
+ case EEAnchorMode::VCenterRight:
{
aAnchorPoint.Y() = aOutArea.Top() + (aOutArea.GetHeight()-1) / 2;
}
break;
- case ANCHOR_BOTTOM_LEFT:
- case ANCHOR_BOTTOM_HCENTER:
- case ANCHOR_BOTTOM_RIGHT:
+ case EEAnchorMode::BottomLeft:
+ case EEAnchorMode::BottomHCenter:
+ case EEAnchorMode::BottomRight:
{
aAnchorPoint.Y() = aOutArea.Bottom() - 1;
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index c755ebb348b4..19333a665575 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -257,7 +257,7 @@ private:
Point aVisDocStartPos;
EESelectionMode eSelectionMode;
EditSelection aEditSelection;
- EVAnchorMode eAnchorMode;
+ EEAnchorMode eAnchorMode;
protected:
@@ -345,8 +345,8 @@ public:
bool IsInSelection( const EditPaM& rPaM );
- void SetAnchorMode( EVAnchorMode eMode );
- EVAnchorMode GetAnchorMode() const { return eAnchorMode; }
+ void SetAnchorMode( EEAnchorMode eMode );
+ EEAnchorMode GetAnchorMode() const { return eAnchorMode; }
void CalcAnchorPoint();
void RecalcOutputArea();
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 4f0775d72aca..455b04aa85b7 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1320,12 +1320,12 @@ EVControlBits OutlinerView::GetControlWord() const
return pEditView->GetControlWord();
}
-void OutlinerView::SetAnchorMode( EVAnchorMode eMode )
+void OutlinerView::SetAnchorMode( EEAnchorMode eMode )
{
pEditView->SetAnchorMode( eMode );
}
-EVAnchorMode OutlinerView::GetAnchorMode() const
+EEAnchorMode OutlinerView::GetAnchorMode() const
{
return pEditView->GetAnchorMode();
}
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index b50cff44c4e3..00e8a2d65ac0 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -37,10 +37,10 @@ enum EESelectionMode { EE_SELMODE_STD, EE_SELMODE_TXTONLY, EE_SELMODE_HIDDEN
// EE_SELMODE_HIDDEN can be used to completely hide the selection. This is useful e.g. when you want show the selection
// only as long as your window (which the edit view works on) has the focus
enum class EESpellState { Ok, LanguageNotInstalled, NoSpeller, ErrorFound };
-enum EVAnchorMode {
- ANCHOR_TOP_LEFT, ANCHOR_VCENTER_LEFT, ANCHOR_BOTTOM_LEFT,
- ANCHOR_TOP_HCENTER, ANCHOR_VCENTER_HCENTER, ANCHOR_BOTTOM_HCENTER,
- ANCHOR_TOP_RIGHT, ANCHOR_VCENTER_RIGHT, ANCHOR_BOTTOM_RIGHT };
+enum class EEAnchorMode {
+ TopLeft, TopHCenter, TopRight,
+ VCenterLeft, VCenterHCenter, VCenterRight,
+ BottomLeft, BottomHCenter, BottomRight };
#define EE_PARA_NOT_FOUND SAL_MAX_INT32
#define EE_PARA_APPEND SAL_MAX_INT32
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 55b2620c9e87..3ff03cc7097b 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -214,8 +214,8 @@ public:
const SfxStyleSheet* GetStyleSheet() const;
SfxStyleSheet* GetStyleSheet();
- void SetAnchorMode( EVAnchorMode eMode );
- EVAnchorMode GetAnchorMode() const;
+ void SetAnchorMode( EEAnchorMode eMode );
+ EEAnchorMode GetAnchorMode() const;
void CompleteAutoCorrect( vcl::Window* pFrameWin = nullptr );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index ed4eebbdc26a..06b21e38ec21 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -287,8 +287,8 @@ public:
void SetControlWord( EVControlBits nWord );
EVControlBits GetControlWord() const;
- void SetAnchorMode( EVAnchorMode eMode );
- EVAnchorMode GetAnchorMode() const;
+ void SetAnchorMode( EEAnchorMode eMode );
+ EEAnchorMode GetAnchorMode() const;
Pointer GetPointer( const Point& rPosPixel );
void Command( const CommandEvent& rCEvt );
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index c9c9091c3d93..be2ce849890b 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -139,7 +139,7 @@ public:
tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override;
virtual void TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const override;
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override;
- virtual sal_uInt16 GetOutlinerViewAnchorMode() const override;
+ virtual EEAnchorMode GetOutlinerViewAnchorMode() const override;
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override;
virtual OutlinerParaObject* GetOutlinerParaObject() const override;
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 1a0d57bcda7f..905b4aa2ea98 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -229,7 +229,7 @@ public:
virtual void EndTextEdit(SdrOutliner& rOutl) override;
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override;
void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const;
- virtual sal_uInt16 GetOutlinerViewAnchorMode() const override;
+ virtual EEAnchorMode GetOutlinerViewAnchorMode() const override;
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 98d83b1e4651..9f6f383b5344 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -48,7 +48,7 @@ class ImpSdrObjTextLink;
class EditStatus;
class TextChain;
class TextChainFlow;
-
+enum class EEAnchorMode;
namespace sdr { namespace properties {
class TextProperties;
@@ -487,7 +487,7 @@ public:
virtual bool BegTextEdit(SdrOutliner& rOutl) override;
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const;
virtual void EndTextEdit(SdrOutliner& rOutl) override;
- virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
+ virtual EEAnchorMode GetOutlinerViewAnchorMode() const;
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override;
void NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObject, SdrText* pText );
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 1552591e1b38..4748b1eb018c 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -245,7 +245,7 @@ void SdrObjEditView::ModelHasChanged()
bool bAnchorChg=false;
bool bColorChg=false;
bool bContourFrame=pTextObj->IsContourTextFrame();
- EVAnchorMode eNewAnchor(ANCHOR_VCENTER_HCENTER);
+ EEAnchorMode eNewAnchor(EEAnchorMode::VCenterHCenter);
tools::Rectangle aOldArea(aMinTextEditArea);
aOldArea.Union(aTextEditArea);
Color aNewColor;
@@ -302,8 +302,8 @@ void SdrObjEditView::ModelHasChanged()
}
}
if (pTextEditOutlinerView!=nullptr) { // check fill and anchor
- EVAnchorMode eOldAnchor=pTextEditOutlinerView->GetAnchorMode();
- eNewAnchor=(EVAnchorMode)pTextObj->GetOutlinerViewAnchorMode();
+ EEAnchorMode eOldAnchor=pTextEditOutlinerView->GetAnchorMode();
+ eNewAnchor=pTextObj->GetOutlinerViewAnchorMode();
bAnchorChg=eOldAnchor!=eNewAnchor;
Color aOldColor(pTextEditOutlinerView->GetBackgroundColor());
aNewColor = GetTextEditBackgroundColor(*this);
@@ -539,7 +539,7 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP
if (pText!=nullptr)
{
- pOutlView->SetAnchorMode((EVAnchorMode)(pText->GetOutlinerViewAnchorMode()));
+ pOutlView->SetAnchorMode(pText->GetOutlinerViewAnchorMode());
pTextEditOutliner->SetFixedCellHeight(static_cast<const SdrTextFixedCellHeightItem&>(pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
}
// do update before setting output area so that aTextEditArea can be recalculated
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 7f4654b211dd..5cf7a420f137 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -1313,7 +1313,7 @@ void SdrMeasureObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Re
SdrTextObj::TakeTextEditArea(pPaperMin,pPaperMax,pViewInit,pViewMin);
}
-sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
+EEAnchorMode SdrMeasureObj::GetOutlinerViewAnchorMode() const
{
if (bTextDirty) UndirtyText();
ImpMeasureRec aRec;
@@ -1350,21 +1350,21 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
if (eMV==css::drawing::MeasureTextVertPos_CENTERED) eTH=SDRTEXTHORZADJUST_CENTER;
}
- EVAnchorMode eRet=ANCHOR_BOTTOM_HCENTER;
+ EEAnchorMode eRet=EEAnchorMode::BottomHCenter;
if (eTH==SDRTEXTHORZADJUST_LEFT) {
- if (eTV==SDRTEXTVERTADJUST_TOP) eRet=ANCHOR_TOP_LEFT;
- else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=ANCHOR_BOTTOM_LEFT;
- else eRet=ANCHOR_VCENTER_LEFT;
+ if (eTV==SDRTEXTVERTADJUST_TOP) eRet=EEAnchorMode::TopLeft;
+ else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=EEAnchorMode::BottomLeft;
+ else eRet=EEAnchorMode::VCenterLeft;
} else if (eTH==SDRTEXTHORZADJUST_RIGHT) {
- if (eTV==SDRTEXTVERTADJUST_TOP) eRet=ANCHOR_TOP_RIGHT;
- else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=ANCHOR_BOTTOM_RIGHT;
- else eRet=ANCHOR_VCENTER_RIGHT;
+ if (eTV==SDRTEXTVERTADJUST_TOP) eRet=EEAnchorMode::TopRight;
+ else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=EEAnchorMode::BottomRight;
+ else eRet=EEAnchorMode::VCenterRight;
} else {
- if (eTV==SDRTEXTVERTADJUST_TOP) eRet=ANCHOR_TOP_HCENTER;
- else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=ANCHOR_BOTTOM_HCENTER;
- else eRet=ANCHOR_VCENTER_HCENTER;
+ if (eTV==SDRTEXTVERTADJUST_TOP) eRet=EEAnchorMode::TopHCenter;
+ else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=EEAnchorMode::BottomHCenter;
+ else eRet=EEAnchorMode::VCenterHCenter;
}
- return (sal_uInt16)eRet;
+ return eRet;
}
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index d6ba21c3c69b..3d4b392bab22 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -309,38 +309,38 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
mbInEditMode = false;
}
-sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const
+EEAnchorMode SdrTextObj::GetOutlinerViewAnchorMode() const
{
SdrTextHorzAdjust eH=GetTextHorizontalAdjust();
SdrTextVertAdjust eV=GetTextVerticalAdjust();
- EVAnchorMode eRet=ANCHOR_TOP_LEFT;
- if (IsContourTextFrame()) return (sal_uInt16)eRet;
+ EEAnchorMode eRet=EEAnchorMode::TopLeft;
+ if (IsContourTextFrame()) return eRet;
if (eH==SDRTEXTHORZADJUST_LEFT) {
if (eV==SDRTEXTVERTADJUST_TOP) {
- eRet=ANCHOR_TOP_LEFT;
+ eRet=EEAnchorMode::TopLeft;
} else if (eV==SDRTEXTVERTADJUST_BOTTOM) {
- eRet=ANCHOR_BOTTOM_LEFT;
+ eRet=EEAnchorMode::BottomLeft;
} else {
- eRet=ANCHOR_VCENTER_LEFT;
+ eRet=EEAnchorMode::VCenterLeft;
}
} else if (eH==SDRTEXTHORZADJUST_RIGHT) {
if (eV==SDRTEXTVERTADJUST_TOP) {
- eRet=ANCHOR_TOP_RIGHT;
+ eRet=EEAnchorMode::TopRight;
} else if (eV==SDRTEXTVERTADJUST_BOTTOM) {
- eRet=ANCHOR_BOTTOM_RIGHT;
+ eRet=EEAnchorMode::BottomRight;
} else {
- eRet=ANCHOR_VCENTER_RIGHT;
+ eRet=EEAnchorMode::VCenterRight;
}
} else {
if (eV==SDRTEXTVERTADJUST_TOP) {
- eRet=ANCHOR_TOP_HCENTER;
+ eRet=EEAnchorMode::TopHCenter;
} else if (eV==SDRTEXTVERTADJUST_BOTTOM) {
- eRet=ANCHOR_BOTTOM_HCENTER;
+ eRet=EEAnchorMode::BottomHCenter;
} else {
- eRet=ANCHOR_VCENTER_HCENTER;
+ eRet=EEAnchorMode::VCenterHCenter;
}
}
- return (sal_uInt16)eRet;
+ return eRet;
}
void SdrTextObj::ImpSetTextEditParams() const
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index d3ab40c875ee..1e44e1f23e09 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1622,9 +1622,9 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size*
}
-sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
+EEAnchorMode SdrTableObj::GetOutlinerViewAnchorMode() const
{
- EVAnchorMode eRet=ANCHOR_TOP_LEFT;
+ EEAnchorMode eRet=EEAnchorMode::TopLeft;
CellRef xCell( getActiveCell() );
if( xCell.is() )
{
@@ -1633,19 +1633,19 @@ sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
{
if (eV==SDRTEXTVERTADJUST_TOP)
{
- eRet=ANCHOR_TOP_LEFT;
+ eRet=EEAnchorMode::TopLeft;
}
else if (eV==SDRTEXTVERTADJUST_BOTTOM)
{
- eRet=ANCHOR_BOTTOM_LEFT;
+ eRet=EEAnchorMode::BottomLeft;
}
else
{
- eRet=ANCHOR_VCENTER_LEFT;
+ eRet=EEAnchorMode::VCenterLeft;
}
}
}
- return (sal_uInt16)eRet;
+ return eRet;
}
More information about the Libreoffice-commits
mailing list