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/filter/basflt/shellio.cxx | |
| parent | 8e5437ea859e78f7de2730bfa60ab6d27534f286 (diff) | |
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/filter/basflt/shellio.cxx')
| -rw-r--r-- | sw/source/filter/basflt/shellio.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index e1e8694a2586..642c84dca8de 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -230,9 +230,9 @@ sal_uLong SwReader::Read( const Reader& rOptions ) { SwPosition const*const pFrameAnchor( rAnchor.GetContentAnchor()); - if ( (FLY_AT_PAGE == rAnchor.GetAnchorId()) + if ( (RndStdIds::FLY_AT_PAGE == rAnchor.GetAnchorId()) || ( pFrameAnchor - && ( ( (FLY_AT_PARA == rAnchor.GetAnchorId()) + && ( ( (RndStdIds::FLY_AT_PARA == rAnchor.GetAnchorId()) && ( (pUndoPam->GetPoint()->nNode == pFrameAnchor->nNode) || (pUndoPam->GetMark()->nNode == @@ -240,7 +240,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) ) ) // #i97570# also check frames anchored AT char - || ( (FLY_AT_CHAR == rAnchor.GetAnchorId()) + || ( (RndStdIds::FLY_AT_CHAR == rAnchor.GetAnchorId()) && !IsDestroyFrameAnchoredAtChar( *pFrameAnchor, *pUndoPam->GetPoint(), @@ -252,7 +252,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) ) { if( bChkHeaderFooter && - (FLY_AT_PARA == rAnchor.GetAnchorId()) && + (RndStdIds::FLY_AT_PARA == rAnchor.GetAnchorId()) && RES_DRAWFRMFMT == pFrameFormat->Which() ) { // DrawObjects are not allowed in Headers/Footers! @@ -278,7 +278,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) pFrameFormat->DelFrames(); } - if (FLY_AT_PAGE == rAnchor.GetAnchorId()) + if (RndStdIds::FLY_AT_PAGE == rAnchor.GetAnchorId()) { if( !rAnchor.GetContentAnchor() ) { |