diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-27 09:43:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-27 12:59:23 +0000 |
| commit | 850a8d27ca696f18ce0c529346f8bb8505499545 (patch) | |
| tree | 5641e81912760029683e1c544e01af25eee23523 /sw/source/core/edit | |
| parent | 6c974272423ca19c94d8d5e182fec46836309d60 (diff) | |
Convert GRAPHIC to scoped enum
Change-Id: I1fd09a729cbda00f99841532e0dd3fa66bce7bea
Reviewed-on: https://gerrit.libreoffice.org/25534
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/core/edit')
| -rw-r--r-- | sw/source/core/edit/editsh.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 894614ea5fe7..43aa82fab6e2 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -237,7 +237,7 @@ const Graphic* SwEditShell::GetGraphic( bool bWait ) const const Graphic* pGrf( nullptr ); if ( pGrfNode ) { - pGrf = &(pGrfNode->GetGrf(bWait && GRAPHIC_DEFAULT == pGrfNode->GetGrf().GetType())); + pGrf = &(pGrfNode->GetGrf(bWait && GraphicType::Default == pGrfNode->GetGrf().GetType())); } return pGrf; } @@ -247,7 +247,7 @@ bool SwEditShell::IsLinkedGrfSwapOut() const SwGrfNode *pGrfNode = GetGrfNode_(); return pGrfNode && ( pGrfNode->IsLinkedFile() && - ( GRAPHIC_DEFAULT == pGrfNode->GetGrfObj().GetType() || + ( GraphicType::Default == pGrfNode->GetGrfObj().GetType() || pGrfNode->GetGrfObj().IsSwappedOut())); } @@ -257,10 +257,10 @@ const GraphicObject* SwEditShell::GetGraphicObj() const return pGrfNode ? &(pGrfNode->GetGrfObj()) : nullptr; } -sal_uInt16 SwEditShell::GetGraphicType() const +GraphicType SwEditShell::GetGraphicType() const { SwGrfNode *pGrfNode = GetGrfNode_(); - return static_cast<sal_uInt16>(pGrfNode ? pGrfNode->GetGrfObj().GetType() : GRAPHIC_NONE); + return pGrfNode ? pGrfNode->GetGrfObj().GetType() : GraphicType::NONE; } // returns the size of a graphic in <rSz> if CurrentCursor->GetPoint() points to a SwGrfNode and @@ -585,7 +585,7 @@ Graphic SwEditShell::GetIMapGraphic() const if( rNd.IsGrfNode() ) { SwGrfNode & rGrfNode(static_cast<SwGrfNode&>(rNd)); - aRet = rGrfNode.GetGrf(GRAPHIC_DEFAULT == rGrfNode.GetGrf().GetType()); + aRet = rGrfNode.GetGrf(GraphicType::Default == rGrfNode.GetGrf().GetType()); } else if ( rNd.IsOLENode() ) { |