diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-17 14:15:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-20 06:52:34 +0000 |
| commit | d99d143900081dd14e070c7373ba204739d80496 (patch) | |
| tree | 72fb5e8523e29399d0aff96d3a6fb37dafeaabd6 /sw/source/core/layout/pagechg.cxx | |
| parent | impower test case - repair (diff) | |
| download | core-d99d143900081dd14e070c7373ba204739d80496.tar.gz core-d99d143900081dd14e070c7373ba204739d80496.zip | |
convert RndStdIds to scoped enum
Change-Id: I029ad67dfcbc40f3953adf485957efcbd97f23d0
Reviewed-on: https://gerrit.libreoffice.org/35328
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/layout/pagechg.cxx')
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 44ca0dd07756..356d5df770f2 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -373,7 +373,7 @@ static void lcl_MakeObjs( const SwFrameFormats &rTable, SwPageFrame *pPage ) { if( rAnch.GetContentAnchor() ) { - if (FLY_AT_PAGE == rAnch.GetAnchorId()) + if (RndStdIds::FLY_AT_PAGE == rAnch.GetAnchorId()) { SwFormatAnchor aAnch( rAnch ); aAnch.SetAnchor( nullptr ); @@ -1518,7 +1518,7 @@ void SwRootFrame::AssertPageFlys( SwPageFrame *pPage ) SwFrameFormat& rFormat = (*pPage->GetSortedObjs())[i]->GetFrameFormat(); const SwFormatAnchor &rAnch = rFormat.GetAnchor(); const sal_uInt16 nPg = rAnch.GetPageNum(); - if ((rAnch.GetAnchorId() == FLY_AT_PAGE) && + if ((rAnch.GetAnchorId() == RndStdIds::FLY_AT_PAGE) && nPg != pPage->GetPhyPageNum() ) { SAL_INFO( "sw.pageframe", nPg << " " << pPage->GetPhyPageNum() ); @@ -1661,11 +1661,11 @@ void SwRootFrame::ImplCalcBrowseWidth() long nWidth = 0; switch ( rFormat.GetAnchor().GetAnchorId() ) { - case FLY_AS_CHAR: + case RndStdIds::FLY_AS_CHAR: nWidth = bFly ? rFormat.GetFrameSize().GetWidth() : pAnchoredObj->GetObjRect().Width(); break; - case FLY_AT_PARA: + case RndStdIds::FLY_AT_PARA: { // #i33170# // Reactivated old code because @@ -1812,7 +1812,7 @@ static void lcl_MoveAllLowerObjs( SwFrame* pFrame, const Point& rOffset ) // all except from the as character anchored objects are moved // when processing the page frame: - if ( !bPage && (rAnchor.GetAnchorId() != FLY_AS_CHAR) ) + if ( !bPage && (rAnchor.GetAnchorId() != RndStdIds::FLY_AS_CHAR) ) continue; SwObjPositioningInProgress aPosInProgress( *pAnchoredObj ); |