diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-27 10:55:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-27 18:41:57 +0200 |
| commit | bbd500e14fce92b27cfc09e7cffd346e36eb5fb0 (patch) | |
| tree | 40f3766253cb9ef505d4113ee3c5f4d9d3823052 /sc | |
| parent | 97710225f015c8716c80e55ecdb78832f2edc731 (diff) | |
use SdrCircKind enum more widely
and make it a scoped enum
Change-Id: I6325ff86ff8566135f6d01a576c659539dcb3ed9
Reviewed-on: https://gerrit.libreoffice.org/78176
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/extras/anchor.cxx | 2 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 2 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc_sort.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/detfunc.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx index 8d61466b5a29..8ec960489d65 100644 --- a/sc/qa/extras/anchor.cxx +++ b/sc/qa/extras/anchor.cxx @@ -171,7 +171,7 @@ void ScAnchorTest::testTdf76183() // Add a circle somewhere below first row. const tools::Rectangle aOrigRect(1000, 1000, 1200, 1200); - SdrCircObj* pObj = new SdrCircObj(*pDrawLayer, OBJ_CIRC, aOrigRect); + SdrCircObj* pObj = new SdrCircObj(*pDrawLayer, SdrCircKind::Full, aOrigRect); pPage->InsertObject(pObj); // Anchor to cell ScDrawLayer::SetCellAnchoredFromPosition(*pObj, rDoc, 0, false); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index c4a6f84cd3e6..7b48202cedca 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2766,7 +2766,7 @@ void Test::testGraphicsInGroup() { // Add a circle. tools::Rectangle aOrigRect(10,10,210,210); // 200 x 200 - SdrCircObj* pObj = new SdrCircObj(*pDrawLayer, OBJ_CIRC, aOrigRect); + SdrCircObj* pObj = new SdrCircObj(*pDrawLayer, SdrCircKind::Full, aOrigRect); pPage->InsertObject(pObj); const tools::Rectangle& rNewRect = pObj->GetLogicRect(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Position and size of the circle shouldn't change when inserted into the page.", diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx index 8fd4627d86ce..fe31e2a803a7 100644 --- a/sc/qa/unit/ucalc_sort.cxx +++ b/sc/qa/unit/ucalc_sort.cxx @@ -1914,7 +1914,7 @@ void Test::testSortImages() // Insert graphic in cell B2. const tools::Rectangle aOrigRect(1000, 1000, 1200, 1200); - SdrCircObj* pObj = new SdrCircObj(*pDrawLayer, OBJ_CIRC, aOrigRect); + SdrCircObj* pObj = new SdrCircObj(*pDrawLayer, SdrCircKind::Full, aOrigRect); SdrPage* pPage = pDrawLayer->GetPage(0); CPPUNIT_ASSERT(pPage); pPage->InsertObject(pObj); diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 48a6c432db1e..76a42f661005 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -638,7 +638,7 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData SdrCircObj* pCircle = new SdrCircObj( *pModel, - OBJ_CIRC, + SdrCircKind::Full, aRect); SfxItemSet& rAttrSet = rData.GetCircleSet(); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 610c6983cc4a..0866ca17a20d 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1247,7 +1247,7 @@ SdrObjectUniquePtr XclImpOvalObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, SdrObjectUniquePtr xSdrObj( new SdrCircObj( *GetDoc().GetDrawLayer(), - OBJ_CIRC, + SdrCircKind::Full, rAnchorRect)); ConvertRectStyle( *xSdrObj ); rDffConv.Progress(); @@ -1319,7 +1319,7 @@ SdrObjectUniquePtr XclImpArcObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, c aNewRect.AdjustTop( -(rAnchorRect.GetHeight()) ); break; } - SdrObjKind eObjKind = maFillData.IsFilled() ? OBJ_SECT : OBJ_CARC; + SdrCircKind eObjKind = maFillData.IsFilled() ? SdrCircKind::Section : SdrCircKind::Arc; SdrObjectUniquePtr xSdrObj( new SdrCircObj( *GetDoc().GetDrawLayer(), |