diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-21 11:45:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-21 12:09:09 +0000 |
| commit | beb8cfcf32f855a0fb638caef4782d9d867e3102 (patch) | |
| tree | 23b5a2376ecacc2977c3ce5f3a2be182abb05b3b /cui | |
| parent | 2b14fb3a4f92b928f0a5fc536c6a5f4a6e51a9b8 (diff) | |
convert inventorId to scoped enum
SW_DRAWLAYER had the same value as SC_DRAWLAYER, so I merged it into the
ScOrSwDraw enum constant
Change-Id: I5c45d378c00364d11cc960c9e48a6e3f10928724
Reviewed-on: https://gerrit.libreoffice.org/31037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tabline.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/transfrm.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index c11767a955a7..43d95f5b129d 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1927,7 +1927,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); - if( ( pObj->GetObjInventor() == SdrInventor ) && + if( ( pObj->GetObjInventor() == SdrInventor::Default ) && ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && pObj->HasText() ) { diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index e8d080e3a812..85b4f311de3c 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -69,7 +69,7 @@ SvxLineTabDialog::SvxLineTabDialog mbAreaTP( false ) { bool bLineOnly = false; - if( pObj && pObj->GetObjInventor() == SdrInventor ) + if( pObj && pObj->GetObjInventor() == SdrInventor::Default ) { switch( pObj->GetObjIdentifier() ) { diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 98d1f9b765f4..3e791e23b18c 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -876,7 +876,7 @@ void SvxPositionSizeTabPage::Construct() const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier()); - if((pObj->GetObjInventor() == SdrInventor) && + if((pObj->GetObjInventor() == SdrInventor::Default) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && pObj->HasText()) { |