diff options
| author | Noel Grandin <noel@peralex.com> | 2020-03-30 15:11:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-31 09:34:38 +0200 |
| commit | 7d6c67d323a87f1006d84c2a95b45dfbfb03c0c8 (patch) | |
| tree | a706adf3e58f81b3838a95ccef4669d6d6f769ab /cui | |
| parent | 1ec7b4ae86a9fe666fc1510636c483d8980d04f6 (diff) | |
convert enum to scoped in SvBaseLink
Change-Id: Ief399381ac27764fce95ee053c322571a07b671c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91366
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/linkdlg.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index c70fa676a315..6a830e5580c1 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -41,8 +41,6 @@ #include <dialmgr.hxx> -#define FILEOBJECT ( OBJECT_CLIENT_FILE & ~OBJECT_CLIENT_SO ) - using namespace sfx2; using namespace ::com::sun::star; @@ -149,8 +147,8 @@ void SvBaseLinksDlg::LinksSelectHdl(weld::TreeView* pSvTabListBox) // possibly deselect old entries in case of multi-selection int nSelEntry = pSvTabListBox->get_selected_index(); SvBaseLink* pLink = reinterpret_cast<SvBaseLink*>(pSvTabListBox->get_id(nSelEntry).toInt64()); - sal_uInt16 nObjectType = pLink->GetObjType(); - if((OBJECT_CLIENT_FILE & nObjectType) != OBJECT_CLIENT_FILE) + SvBaseLinkObjectType nObjectType = pLink->GetObjType(); + if(!isClientFileType(nObjectType)) { pSvTabListBox->unselect_all(); pSvTabListBox->select(nSelEntry); @@ -164,7 +162,7 @@ void SvBaseLinksDlg::LinksSelectHdl(weld::TreeView* pSvTabListBox) DBG_ASSERT(pLink, "Where is the Link?"); if (!pLink) continue; - if( (OBJECT_CLIENT_FILE & pLink->GetObjType()) != OBJECT_CLIENT_FILE ) + if( !isClientFileType(pLink->GetObjType()) ) pSvTabListBox->unselect(nEntry); } } @@ -186,12 +184,12 @@ void SvBaseLinksDlg::LinksSelectHdl(weld::TreeView* pSvTabListBox) OUString sType, sLink; OUString *pLinkNm = &sLink, *pFilter = nullptr; - if( FILEOBJECT & pLink->GetObjType() ) + if( isClientType(pLink->GetObjType()) ) { m_xRbAutomatic->set_sensitive(false); m_xRbManual->set_active(true); m_xRbManual->set_sensitive(false); - if( OBJECT_CLIENT_GRF == pLink->GetObjType() ) + if( SvBaseLinkObjectType::ClientGraphic == pLink->GetObjType() ) { pLinkNm = nullptr; pFilter = &sLink; @@ -228,7 +226,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, AutomaticClickHdl, weld::Button&, void ) { int nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); - if( pLink && !( FILEOBJECT & pLink->GetObjType() ) && + if( pLink && !isClientType( pLink->GetObjType() ) && SfxLinkUpdateMode::ALWAYS != pLink->GetUpdateMode() ) SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS ); } @@ -237,7 +235,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, ManualClickHdl, weld::Button&, void ) { int nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); - if( pLink && !( FILEOBJECT & pLink->GetObjType() ) && + if( pLink && !isClientType( pLink->GetObjType() ) && SfxLinkUpdateMode::ONCALL != pLink->GetUpdateMode()) SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL ); } @@ -371,7 +369,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, weld::Button&, void ) m_xTbLinks->remove(nPos); // close object, if it's still existing - bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType(); + bool bNewLnkMgr = SvBaseLinkObjectType::ClientFile == xLink->GetObjType(); // tell the link that it will be resolved! xLink->Closed(); @@ -578,7 +576,7 @@ void SvBaseLinksDlg::InsertEntry(const SvBaseLink& rLink, int nPos, bool bSelect m_xTbLinks->insert(nPos); m_xTbLinks->set_text(nPos, aTxt, 0); m_xTbLinks->set_id(nPos, OUString::number(reinterpret_cast<sal_Int64>(&rLink))); - if( OBJECT_CLIENT_GRF == rLink.GetObjType() ) + if( SvBaseLinkObjectType::ClientGraphic == rLink.GetObjType() ) m_xTbLinks->set_text(nPos, sFilter, 1); else m_xTbLinks->set_text(nPos, sLinkNm, 1); |