diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-25 12:03:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-02 08:02:54 +0000 |
commit | 4978328534c0f759eea7d0c196046f1d53b06925 (patch) | |
tree | cf9dcd62c4f09dcd08115bbda2a8950678a38562 /sfx2/source/appl/lnkbase2.cxx | |
parent | 1461ebbbb5d47d90e31f0945a4878a68fbee5213 (diff) |
convert method names in tools::SvRef to be more like our other..
reference classes, uno::Reference and rtl::Reference.
Specifically rename Is()->is() and Clear()->clear().
Change-Id: Icb7e05e2d09cb9977121508b837ba0961dabb4ae
Reviewed-on: https://gerrit.libreoffice.org/33576
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/appl/lnkbase2.cxx')
-rw-r--r-- | sfx2/source/appl/lnkbase2.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index ffb5b1d61b5b..3b80c7bfc9d3 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -246,7 +246,7 @@ IMPL_LINK( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void ) void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP ) { DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" ); - DBG_ASSERT( !xObj.Is(), "object exist" ); + DBG_ASSERT( !xObj.is(), "object exist" ); nObjType = nObjTypeP; } @@ -303,7 +303,7 @@ void SvBaseLink::SetUpdateMode( SfxLinkUpdateMode nMode ) void SvBaseLink::clearStreamToLoadFrom() { m_xInputStreamToLoadFrom.clear(); - if( xObj.Is() ) + if( xObj.is() ) { xObj->clearStreamToLoadFrom(); } @@ -318,7 +318,7 @@ bool SvBaseLink::Update() GetRealObject_(); ReleaseRef(); - if( xObj.Is() ) + if( xObj.is() ) { xObj->setStreamToLoadFrom(m_xInputStreamToLoadFrom,m_bIsReadOnly); OUString sMimeType( SotExchange::GetFormatMimeType( @@ -331,11 +331,11 @@ bool SvBaseLink::Update() bool bSuccess = eRes == SUCCESS; //for manual Updates there is no need to hold the ServerObject if( OBJECT_CLIENT_DDE == nObjType && - SfxLinkUpdateMode::ONCALL == GetUpdateMode() && xObj.Is() ) + SfxLinkUpdateMode::ONCALL == GetUpdateMode() && xObj.is() ) xObj->RemoveAllDataAdvise( this ); return bSuccess; } - if( xObj.Is() ) + if( xObj.is() ) { // should be asynchronous? if( xObj->IsPending() ) @@ -365,7 +365,7 @@ void SvBaseLink::GetRealObject_( bool bConnect) if( !pImpl->m_pLinkMgr ) return; - DBG_ASSERT( !xObj.Is(), "object already exist" ); + DBG_ASSERT( !xObj.is(), "object already exist" ); if( OBJECT_CLIENT_DDE == nObjType ) { @@ -389,7 +389,7 @@ void SvBaseLink::GetRealObject_( bool bConnect) else if( (OBJECT_CLIENT_SO & nObjType) ) xObj = sfx2::LinkManager::CreateObj( this ); - if( bConnect && ( !xObj.Is() || !xObj->Connect( this ) ) ) + if( bConnect && ( !xObj.is() || !xObj->Connect( this ) ) ) Disconnect(); } @@ -427,11 +427,11 @@ void SvBaseLink::SetLinkManager( LinkManager* _pMgr ) void SvBaseLink::Disconnect() { - if( xObj.Is() ) + if( xObj.is() ) { xObj->RemoveAllDataAdvise( this ); xObj->RemoveConnectAdvise( this ); - xObj.Clear(); + xObj.clear(); } } @@ -451,9 +451,9 @@ void SvBaseLink::Edit( vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndE { pImpl->m_pParentWin = pParent; pImpl->m_aEndEditLink = rEndEditHdl; - pImpl->m_bIsConnect = xObj.Is(); + pImpl->m_bIsConnect = xObj.is(); if( !pImpl->m_bIsConnect ) - GetRealObject_( xObj.Is() ); + GetRealObject_( xObj.is() ); bool bAsync = false; Link<const OUString&, void> aLink = LINK( this, SvBaseLink, EndEditHdl ); @@ -463,7 +463,7 @@ void SvBaseLink::Edit( vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndE if( pImpl->m_pLinkMgr ) { SvLinkSourceRef ref = sfx2::LinkManager::CreateObj( this ); - if( ref.Is() ) + if( ref.is() ) { ref->Edit( pParent, this, aLink ); bAsync = true; @@ -527,7 +527,7 @@ bool SvBaseLink::ExecuteEdit( const OUString& _rNewName ) void SvBaseLink::Closed() { - if( xObj.Is() ) + if( xObj.is() ) xObj->RemoveAllDataAdvise( this ); } |