diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-24 14:39:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:39 +0200 |
| commit | 45ba5f2f24791ab659111527a8350df4898b0e0c (patch) | |
| tree | c8cf1a844659348a7dcce6d2d1e8a102503a6462 /svx/source/svdraw | |
| parent | 11bce3212788d03fd53b9f005eaf0e70e6277763 (diff) | |
convert IMPSDR_ constants to scoped enum
Change-Id: Id267196397e2aa743d75f03932b3301ad462d800
Diffstat (limited to 'svx/source/svdraw')
| -rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdview.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index a1ae7ca6f7b1..0d0c1a518349 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -563,11 +563,11 @@ void SdrDragMethod::createSdrDragEntries_GlueDrag() void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal) const { - sal_uInt16 nOpt=0; + ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE; if (IsDraggingPoints()) { - nOpt=IMPSDR_POINTSDESCRIPTION; + nOpt=ImpTakeDescriptionOptions::POINTS; } else if (IsDraggingGluePoints()) { - nOpt=IMPSDR_GLUEPOINTSDESCRIPTION; + nOpt=ImpTakeDescriptionOptions::GLUEPOINTS; } getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,nVal,nOpt); } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 45a09abb2861..a9baeb9a35aa 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -2023,18 +2023,18 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const -void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const +void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, ImpTakeDescriptionOptions nOpt) const { rStr = ImpGetResStr(nStrCacheID); sal_Int32 nPos = rStr.indexOf("%1"); if(nPos != -1) { - if(nOpt == IMPSDR_POINTSDESCRIPTION) + if(nOpt == ImpTakeDescriptionOptions::POINTS) { rStr = rStr.replaceAt(nPos, 2, GetDescriptionOfMarkedPoints()); } - else if(nOpt == IMPSDR_GLUEPOINTSDESCRIPTION) + else if(nOpt == ImpTakeDescriptionOptions::GLUEPOINTS) { rStr = rStr.replaceAt(nPos, 2, GetDescriptionOfMarkedGluePoints()); } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 15654fa7c0e4..0f8b42428bd3 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1282,11 +1282,11 @@ OUString SdrView::GetStatusText() ImpTakeDescriptionStr(STR_ViewMarked,aStr); if (IsGluePointEditMode()) { if (HasMarkedGluePoints()) { - ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,IMPSDR_GLUEPOINTSDESCRIPTION); + ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,ImpTakeDescriptionOptions::GLUEPOINTS); } } else { if (HasMarkedPoints()) { - ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,IMPSDR_POINTSDESCRIPTION); + ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,ImpTakeDescriptionOptions::POINTS); } } } else { |