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 | |
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')
-rw-r--r-- | sfx2/source/appl/appcfg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/fileobj.cxx | 36 | ||||
-rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/appl/lnkbase2.cxx | 26 | ||||
-rw-r--r-- | sfx2/source/bastyp/progress.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/oleprops.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/printhelper.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 96 | ||||
-rw-r--r-- | sfx2/source/view/frame.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/frmload.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 28 |
13 files changed, 119 insertions, 119 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 1c88d46eba5d..e17dcac6fb3b 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -119,9 +119,9 @@ IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Timer*, pAsyncIdle, void) { SfxObjectShellRef xRef( aHint.GetObjShell() ); pAsyncIdle->Stop(); - SAL_INFO_IF(!xRef.Is(), "sfx.appl", "SfxEvent: " << aHint.GetEventName()); + SAL_INFO_IF(!xRef.is(), "sfx.appl", "SfxEvent: " << aHint.GetEventName()); SfxGetpApp()->Broadcast( aHint ); - if ( xRef.Is() ) + if ( xRef.is() ) xRef->Broadcast( aHint ); delete this; } diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index e7ced1bfa4f9..8cf53b51ea94 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -65,10 +65,10 @@ SvFileObject::SvFileObject() SvFileObject::~SvFileObject() { - if (xMed.Is()) + if (xMed.is()) { xMed->SetDoneLink( Link<void*,void>() ); - xMed.Clear(); + xMed.clear(); } if (nPostUserEventId) Application::RemoveUserEvent(nPostUserEventId); @@ -110,7 +110,7 @@ bool SvFileObject::GetData( css::uno::Any & rData, if( bGetSynchron ) { // call a LoadFile every second time to test the loading - if( !xMed.Is() ) + if( !xMed.is() ) LoadFile_Impl(); if( !bInCallDownload ) @@ -124,8 +124,8 @@ bool SvFileObject::GetData( css::uno::Any & rData, } } - if( !bWaitForData && ( xMed.Is() || // was loaded as URL - ( bSynchron && LoadFile_Impl() && xMed.Is() ) ) ) + if( !bWaitForData && ( xMed.is() || // was loaded as URL + ( bSynchron && LoadFile_Impl() && xMed.is() ) ) ) { // If it was loaded from the Internet, do not retry if( !bGetSynchron ) @@ -133,9 +133,9 @@ bool SvFileObject::GetData( css::uno::Any & rData, bLoadError = !GetGraphic_Impl( aGrf, xMed->GetInStream() ); } else if( !LoadFile_Impl() || - !GetGraphic_Impl( aGrf, xMed.Is() ? xMed->GetInStream() : nullptr )) + !GetGraphic_Impl( aGrf, xMed.is() ? xMed->GetInStream() : nullptr )) { - if( !xMed.Is() ) + if( !xMed.is() ) break; aGrf.SetDefaultType(); } @@ -181,9 +181,9 @@ bool SvFileObject::GetData( css::uno::Any & rData, bNativFormat = bOldNativFormat; // Everything ready? - if( xMed.Is() && !bSynchron && bClearMedium ) + if( xMed.is() && !bSynchron && bClearMedium ) { - xMed.Clear(); + xMed.clear(); bClearMedium = false; } } @@ -208,7 +208,7 @@ bool SvFileObject::Connect( sfx2::SvBaseLink* pLink ) if( OBJECT_CLIENT_GRF == pLink->GetObjType() ) { SfxObjectShellRef pShell = pLink->GetLinkManager()->GetPersist(); - if( pShell.Is() ) + if( pShell.is() ) { if( pShell->IsAbortingImport() ) return false; @@ -248,7 +248,7 @@ bool SvFileObject::Connect( sfx2::SvBaseLink* pLink ) bool SvFileObject::LoadFile_Impl() { // We are still at Loading!! - if( bWaitForData || !bLoadAgain || xMed.Is() ) + if( bWaitForData || !bLoadAgain || xMed.is() ) return false; // at the moment on the current DocShell @@ -269,7 +269,7 @@ bool SvFileObject::LoadFile_Impl() xMed->Download( LINK( this, SvFileObject, LoadGrfReady_Impl ) ); bInCallDownload = false; - bClearMedium = !xMed.Is(); + bClearMedium = !xMed.is(); if( bClearMedium ) xMed = xTmpMed; // If already finished in Download return bDataReady; @@ -304,7 +304,7 @@ bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) rGrf.SetLink( GfxLink() ); if( !pStream ) - nRes = xMed.Is() ? GRFILTER_OPENERROR + nRes = xMed.is() ? GRFILTER_OPENERROR : rGF.ImportGraphic( rGrf, INetURLObject(sFileNm), nFilter ); else @@ -320,7 +320,7 @@ bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) if( nRes ) { - if( xMed.Is() && !pStream ) + if( xMed.is() && !pStream ) SAL_WARN( "sfx.appl", "Graphic error [" << nRes << "] - [" << xMed->GetPhysicalName() << "] URL[" << sFileNm << "]" ); else SAL_WARN( "sfx.appl", "Graphic error [" << nRes << "] - [" << sFileNm << "]" ); @@ -475,13 +475,13 @@ IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, void ) if( bDataReady ) { bLoadAgain = true; - if( xMed.Is() ) + if( xMed.is() ) { xMed->SetDoneLink( Link<void*,void>() ); mxDelMed = xMed; nPostUserEventId = Application::PostUserEvent( LINK( this, SvFileObject, DelMedium_Impl )); - xMed.Clear(); + xMed.clear(); } } } @@ -489,7 +489,7 @@ IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, void ) IMPL_LINK_NOARG( SvFileObject, DelMedium_Impl, void*, void ) { nPostUserEventId = nullptr; - mxDelMed.Clear(); + mxDelMed.clear(); } IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) @@ -537,7 +537,7 @@ bool SvFileObject::IsDataComplete() const { SvFileObject* pThis = const_cast<SvFileObject*>(this); if( bDataReady || - ( bSynchron && pThis->LoadFile_Impl() && xMed.Is() ) ) + ( bSynchron && pThis->LoadFile_Impl() && xMed.is() ) ) bRet = true; else { diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 3da0210f1734..3f0f6e7cbdaa 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -72,7 +72,7 @@ LinkManager::~LinkManager() { for(tools::SvRef<SvBaseLink> & rTmp : aLinkTbl) { - if( rTmp.Is() ) + if( rTmp.is() ) { rTmp->Disconnect(); rTmp->SetLinkManager( nullptr ); @@ -110,12 +110,12 @@ void LinkManager::Remove( SvBaseLink *pLink ) { rTmp->Disconnect(); rTmp->SetLinkManager( nullptr ); - rTmp.Clear(); + rTmp.clear(); bFound = true; } // Remove empty ones if they exist - if( !rTmp.Is() ) + if( !rTmp.is() ) { aLinkTbl.erase( aLinkTbl.begin() + n ); if( bFound ) @@ -136,7 +136,7 @@ void LinkManager::Remove( size_t nPos, size_t nCnt ) for( size_t n = nPos; n < nPos + nCnt; ++n) { tools::SvRef<SvBaseLink>& rTmp = aLinkTbl[ n ]; - if( rTmp.Is() ) + if( rTmp.is() ) { rTmp->Disconnect(); rTmp->SetLinkManager( nullptr ); @@ -151,7 +151,7 @@ bool LinkManager::Insert( SvBaseLink* pLink ) for( size_t n = 0; n < aLinkTbl.size(); ++n ) { tools::SvRef<SvBaseLink>& rTmp = aLinkTbl[ n ]; - if( !rTmp.Is() ) + if( !rTmp.is() ) { aLinkTbl.erase( aLinkTbl.begin() + n-- ); } @@ -279,7 +279,7 @@ void LinkManager::UpdateAllLinks( for( size_t n = 0; n < aLinkTbl.size(); ++n ) { tools::SvRef<SvBaseLink>& rLink = aLinkTbl[ n ]; - if( !rLink.Is() ) + if( !rLink.is() ) { Remove( n-- ); continue; 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 ); } diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index be387aa711ec..146bff4f202a 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -188,7 +188,7 @@ void SfxProgress::Stop() { if( pImpl->pActiveProgress ) { - if ( pImpl->xObjSh.Is() && pImpl->xObjSh->GetProgress() == this ) + if ( pImpl->xObjSh.is() && pImpl->xObjSh->GetProgress() == this ) pImpl->xObjSh->SetProgress_Impl(nullptr); return; } @@ -200,7 +200,7 @@ void SfxProgress::Stop() "sfx.bastyp", "SfxProgress: destroyed at " << Get10ThSec() << "ds"); Suspend(); - if ( pImpl->xObjSh.Is() ) + if ( pImpl->xObjSh.is() ) pImpl->xObjSh->SetProgress_Impl(nullptr); else SfxGetpApp()->SetProgress_Impl(nullptr); @@ -319,7 +319,7 @@ void SfxProgress::Resume() if ( pImpl->bWaitMode ) { - if ( pImpl->xObjSh.Is() ) + if ( pImpl->xObjSh.is() ) { for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst(pImpl->xObjSh.get() ); pFrame; @@ -328,7 +328,7 @@ void SfxProgress::Resume() } } - if ( pImpl->xObjSh.Is() ) + if ( pImpl->xObjSh.is() ) { SfxViewFrame *pFrame = SfxViewFrame::GetFirst(pImpl->xObjSh.get()); if ( pFrame ) @@ -363,7 +363,7 @@ void SfxProgress::Suspend() pImpl->xStatusInd->reset(); } - if ( pImpl->xObjSh.Is() ) + if ( pImpl->xObjSh.is() ) { for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst(pImpl->xObjSh.get()); @@ -371,7 +371,7 @@ void SfxProgress::Suspend() pFrame = SfxViewFrame::GetNext( *pFrame, pImpl->xObjSh.get() ) ) pFrame->GetWindow().LeaveWait(); } - if ( pImpl->xObjSh.Is() ) + if ( pImpl->xObjSh.is() ) { SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pImpl->xObjSh.get() ); if ( pFrame ) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index f979407f10b2..01da9338ec34 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -3159,7 +3159,7 @@ SfxItemSet* SfxMedium::GetItemSet() const SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() { - if( !pImpl->xAttributes.Is() ) + if( !pImpl->xAttributes.is() ) { pImpl->xAttributes = SvKeyValueIteratorRef( new SvKeyValueIterator ); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 8a568240bdbf..da263b3c8fe6 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1527,7 +1527,7 @@ void SfxHeaderAttributes_Impl::Append( const SvKeyValue& rKV ) SvKeyValueIterator* SfxObjectShell::GetHeaderAttributes() { - if( !pImpl->xHeaderAttributes.Is() ) + if( !pImpl->xHeaderAttributes.is() ) { DBG_ASSERT( pMedium, "No Medium" ); pImpl->xHeaderAttributes = new SfxHeaderAttributes_Impl( this ); diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 809200f95987..8cf5f31a50e2 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -1099,7 +1099,7 @@ ErrCode SfxOlePropertySet::LoadPropertySet( SotStorage* pStrg, const OUString& r if( pStrg ) { tools::SvRef<SotStorageStream> xStrm = pStrg->OpenSotStream( rStrmName, StreamMode::STD_READ ); - if( xStrm.Is() && (xStrm->GetError() == SVSTREAM_OK) ) + if( xStrm.is() && (xStrm->GetError() == SVSTREAM_OK) ) { xStrm->SetBufferSize( STREAM_BUFFER_SIZE ); Load( *xStrm ); @@ -1117,7 +1117,7 @@ ErrCode SfxOlePropertySet::SavePropertySet( SotStorage* pStrg, const OUString& r if( pStrg ) { tools::SvRef<SotStorageStream> xStrm = pStrg->OpenSotStream( rStrmName, StreamMode::TRUNC | StreamMode::STD_WRITE ); - if( xStrm.Is() ) + if( xStrm.is() ) Save( *xStrm ); else SetError( ERRCODE_IO_ACCESSDENIED ); diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index b790e8ee1aad..4af6b2e09ff0 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -121,7 +121,7 @@ Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrintOptions Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() { - if( m_pData->m_pObjectShell.Is() ) + if( m_pData->m_pObjectShell.is() ) { Reference < view::XPrintable > xPrintable( m_pData->m_pObjectShell->GetModel(), UNO_QUERY ); if ( xPrintable.is() ) @@ -132,14 +132,14 @@ Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() Reference< css::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPrintable() { - Reference < view::XPrintable > xPrintable( m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->GetModel() : nullptr, UNO_QUERY ); + Reference < view::XPrintable > xPrintable( m_pData->m_pObjectShell.is() ? m_pData->m_pObjectShell->GetModel() : nullptr, UNO_QUERY ); return xPrintable; } void SAL_CALL SfxPrintJob_Impl::cancelJob() { // FIXME: how to cancel PrintJob via API?! - if( m_pData->m_pObjectShell.Is() ) + if( m_pData->m_pObjectShell.is() ) m_pData->m_pObjectShell->Broadcast( SfxPrintingHint( SFX_PRINTABLESTATE_CANCELJOB ) ); } @@ -259,7 +259,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() // search for any view of this document that is currently printing const Printer *pPrinter = nullptr; - SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? SfxViewFrame::GetFirst( m_pData->m_pObjectShell.get(), false ) : nullptr; + SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.is() ? SfxViewFrame::GetFirst( m_pData->m_pObjectShell.get(), false ) : nullptr; SfxViewFrame* pFirst = pViewFrm; while ( pViewFrm && !pPrinter ) { @@ -318,7 +318,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > { // Get old Printer - SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? + SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.is() ? SfxViewFrame::GetFirst( m_pData->m_pObjectShell.get(), false ) : nullptr; if ( !pViewFrm ) return; @@ -591,7 +591,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& SolarMutexGuard aGuard; // get view for sfx printing capabilities - SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? + SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.is() ? SfxViewFrame::GetFirst( m_pData->m_pObjectShell.get(), false ) : nullptr; if ( !pViewFrm ) return; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index a46a563acfbd..01ee8395caf3 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -237,7 +237,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument // ::sfx2::IModifiableDocument virtual void storageIsModified() override { - if ( m_pObjectShell.Is() && !m_pObjectShell->IsModified() ) + if ( m_pObjectShell.is() && !m_pObjectShell->IsModified() ) m_pObjectShell->SetModified(); } @@ -248,8 +248,8 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument { if (!m_xDocumentMetadata.is()) { - OSL_ENSURE(m_pObjectShell.Is(), "GetDMA: no object shell?"); - if (!m_pObjectShell.Is()) + OSL_ENSURE(m_pObjectShell.is(), "GetDMA: no object shell?"); + if (!m_pObjectShell.is()) { return nullptr; } @@ -289,7 +289,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument Reference<rdf::XDocumentMetadataAccess> CreateDMAUninitialized() { - return (m_pObjectShell.Is()) + return (m_pObjectShell.is()) ? new ::sfx2::DocumentMetadataAccess( ::comphelper::getProcessComponentContext(), *m_pObjectShell) : nullptr; @@ -609,7 +609,7 @@ Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContaine SfxModelGuard aGuard( *this ); Reference< script::XStarBasicAccess >& rxAccess = m_pData->m_xStarBasicAccess; - if( !rxAccess.is() && m_pData->m_pObjectShell.Is() ) + if( !rxAccess.is() && m_pData->m_pObjectShell.is() ) rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell.get() ); Reference< container::XNameContainer > xRet; @@ -634,7 +634,7 @@ void SAL_CALL SfxBaseModel::createLibrary( const OUString& LibName, const OUStri SfxModelGuard aGuard( *this ); Reference< script::XStarBasicAccess >& rxAccess = m_pData->m_xStarBasicAccess; - if( !rxAccess.is() && m_pData->m_pObjectShell.Is() ) + if( !rxAccess.is() && m_pData->m_pObjectShell.is() ) rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell.get() ); if( rxAccess.is() ) @@ -657,7 +657,7 @@ void SAL_CALL SfxBaseModel::addModule( const OUString& LibraryName, const OUStri SfxModelGuard aGuard( *this ); Reference< script::XStarBasicAccess >& rxAccess = m_pData->m_xStarBasicAccess; - if( !rxAccess.is() && m_pData->m_pObjectShell.Is() ) + if( !rxAccess.is() && m_pData->m_pObjectShell.is() ) rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell.get() ); if( rxAccess.is() ) @@ -679,7 +679,7 @@ void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUStri SfxModelGuard aGuard( *this ); Reference< script::XStarBasicAccess >& rxAccess = m_pData->m_xStarBasicAccess; - if( !rxAccess.is() && m_pData->m_pObjectShell.Is() ) + if( !rxAccess.is() && m_pData->m_pObjectShell.is() ) rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell.get() ); if( rxAccess.is() ) @@ -750,7 +750,7 @@ void SAL_CALL SfxBaseModel::dispose() m_pData->m_xDocumentMetadata.clear(); - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { EndListening( *m_pData->m_pObjectShell ); } @@ -791,7 +791,7 @@ IMPL_SfxBaseModel_DataContainer::impl_setDocumentProperties( const Reference< document::XDocumentProperties >& rxNewDocProps) { m_xDocumentProperties.set(rxNewDocProps, UNO_QUERY_THROW); - if (m_pObjectShell.Is()) + if (m_pObjectShell.is()) { Reference<util::XModifyBroadcaster> const xMB( m_xDocumentProperties, UNO_QUERY_THROW); @@ -848,7 +848,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& { // allows to set a windowless document to EMBEDDED state // but _only_ before load() or initNew() methods - if ( m_pData->m_pObjectShell.Is() && !m_pData->m_pObjectShell->GetMedium() ) + if ( m_pData->m_pObjectShell.is() && !m_pData->m_pObjectShell->GetMedium() ) { bool bEmb(false); if ( ( rArgs[0].Value >>= bEmb ) && bEmb ) @@ -858,7 +858,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& return true; } - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { m_pData->m_sURL = rURL; @@ -939,7 +939,7 @@ OUString SAL_CALL SfxBaseModel::getURL() Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() { SfxModelGuard aGuard( *this ); - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { Sequence< beans::PropertyValue > seqArgsNew; Sequence< beans::PropertyValue > seqArgsOld; @@ -1225,7 +1225,7 @@ sal_Bool SAL_CALL SfxBaseModel::disableSetModified() { SfxModelGuard aGuard( *this ); - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw RuntimeException(); bool bResult = m_pData->m_pObjectShell->IsEnableSetModified(); @@ -1238,7 +1238,7 @@ sal_Bool SAL_CALL SfxBaseModel::enableSetModified() { SfxModelGuard aGuard( *this ); - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw RuntimeException(); bool bResult = m_pData->m_pObjectShell->IsEnableSetModified(); @@ -1251,7 +1251,7 @@ sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled() { SfxModelGuard aGuard( *this ); - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw RuntimeException(); return m_pData->m_pObjectShell->IsEnableSetModified(); @@ -1265,7 +1265,7 @@ sal_Bool SAL_CALL SfxBaseModel::isModified() { SfxModelGuard aGuard( *this ); - return m_pData->m_pObjectShell.Is() && m_pData->m_pObjectShell->IsModified(); + return m_pData->m_pObjectShell.is() && m_pData->m_pObjectShell->IsModified(); } @@ -1276,7 +1276,7 @@ void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified ) { SfxModelGuard aGuard( *this ); - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) m_pData->m_pObjectShell->SetModified(bModified); } @@ -1425,7 +1425,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() { SfxModelGuard aGuard( *this ); - return m_pData->m_pObjectShell.Is() && m_pData->m_pObjectShell->HasName(); + return m_pData->m_pObjectShell.is() && m_pData->m_pObjectShell->HasName(); } @@ -1436,7 +1436,7 @@ OUString SAL_CALL SfxBaseModel::getLocation() { SfxModelGuard aGuard( *this ); - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { // TODO/LATER: is it correct that the shared document returns shared file location? if ( m_pData->m_pObjectShell->IsDocShared() ) @@ -1456,7 +1456,7 @@ sal_Bool SAL_CALL SfxBaseModel::isReadonly() { SfxModelGuard aGuard( *this ); - return !m_pData->m_pObjectShell.Is() || m_pData->m_pObjectShell->IsReadOnly(); + return !m_pData->m_pObjectShell.is() || m_pData->m_pObjectShell->IsReadOnly(); } @@ -1467,7 +1467,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > { SfxModelGuard aGuard( *this ); - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { m_pData->m_pObjectShell->AddLog( OSL_LOG_PREFIX "storeSelf" ); SfxSaveGuard aSaveGuard(this, m_pData); @@ -1596,7 +1596,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL { SfxModelGuard aGuard( *this ); - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { m_pData->m_pObjectShell->AddLog( OSL_LOG_PREFIX "storeAsURL" ); SfxSaveGuard aSaveGuard(this, m_pData); @@ -1636,7 +1636,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL { SfxModelGuard aGuard( *this ); - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { m_pData->m_pObjectShell->AddLog( OSL_LOG_PREFIX "storeToURL" ); SfxSaveGuard aSaveGuard(this, m_pData); @@ -1709,8 +1709,8 @@ void SAL_CALL SfxBaseModel::initNew() throw frame::DoubleInitializationException( OUString(), *this ); // the object shell should exist always - DBG_ASSERT( m_pData->m_pObjectShell.Is(), "Model is useless without an ObjectShell" ); - if ( m_pData->m_pObjectShell.Is() ) + DBG_ASSERT( m_pData->m_pObjectShell.is(), "Model is useless without an ObjectShell" ); + if ( m_pData->m_pObjectShell.is() ) { if( m_pData->m_pObjectShell->GetMedium() ) throw frame::DoubleInitializationException(); @@ -1760,9 +1760,9 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA throw frame::DoubleInitializationException( OUString(), *this ); // the object shell should exist always - DBG_ASSERT( m_pData->m_pObjectShell.Is(), "Model is useless without an ObjectShell" ); + DBG_ASSERT( m_pData->m_pObjectShell.is(), "Model is useless without an ObjectShell" ); - if (!m_pData->m_pObjectShell.Is()) + if (!m_pData->m_pObjectShell.is()) return; if( m_pData->m_pObjectShell->GetMedium() ) @@ -1888,7 +1888,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla Any aAny; - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { if ( aFlavor.MimeType == "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ) { @@ -2263,7 +2263,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBas SfxModelGuard aGuard( *this ); Reference< script::XStorageBasedLibraryContainer > xBasicLibraries; - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) xBasicLibraries.set( m_pData->m_pObjectShell->GetBasicContainer(), UNO_QUERY_THROW ); return xBasicLibraries; } @@ -2273,7 +2273,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDia SfxModelGuard aGuard( *this ); Reference< script::XStorageBasedLibraryContainer > xDialogLibraries; - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) xDialogLibraries.set( m_pData->m_pObjectShell->GetDialogContainer(), UNO_QUERY_THROW ); return xDialogLibraries; } @@ -2282,7 +2282,7 @@ sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution() { SfxModelGuard aGuard( *this ); - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) return m_pData->m_pObjectShell->AdjustMacroMode(); return false; } @@ -2523,7 +2523,7 @@ uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( ) bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) { bool bValue = false; - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); if ( pMedium ) @@ -2787,7 +2787,7 @@ void SfxBaseModel::changing() SfxModelGuard aGuard( *this ); // the notification should not be sent if the document can not be modified - if ( !m_pData->m_pObjectShell.Is() || !m_pData->m_pObjectShell->IsEnableSetModified() ) + if ( !m_pData->m_pObjectShell.is() || !m_pData->m_pObjectShell->IsEnableSetModified() ) return; NotifyModifyListeners_Impl(); @@ -2808,7 +2808,7 @@ SfxObjectShell* SfxBaseModel::GetObjectShell() const bool SfxBaseModel::IsInitialized() const { - if ( !m_pData || !m_pData->m_pObjectShell.Is() ) + if ( !m_pData || !m_pData->m_pObjectShell.is() ) { OSL_FAIL( "SfxBaseModel::IsInitialized: this should have been caught earlier!" ); return false; @@ -2855,7 +2855,7 @@ void SfxBaseModel::impl_store( const OUString& sURL throw frame::IllegalArgumentIOException(); bool bSaved = false; - if ( !bSaveTo && m_pData->m_pObjectShell.Is() && !sURL.isEmpty() + if ( !bSaveTo && m_pData->m_pObjectShell.is() && !sURL.isEmpty() && !sURL.startsWith( "private:stream" ) && ::utl::UCBContentHelper::EqualURLs( getLocation(), sURL ) ) { @@ -2929,7 +2929,7 @@ void SfxBaseModel::impl_store( const OUString& sURL } } - if ( !bSaved && m_pData->m_pObjectShell.Is() ) + if ( !bSaved && m_pData->m_pObjectShell.is() ) { SfxGetpApp()->NotifyEvent( SfxEventHint( bSaveTo ? SfxEventHintId::SaveToDoc : SfxEventHintId::SaveAsDoc, GlobalEventConfig::GetEventName( bSaveTo ? GlobalEventId::SAVETODOC : GlobalEventId::SAVEASDOC ), m_pData->m_pObjectShell.get() ) ); @@ -3131,7 +3131,7 @@ Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() { SfxModelGuard aGuard( *this ); - if ( m_pData->m_pObjectShell.Is() && !m_pData->m_contViewData.is() ) + if ( m_pData->m_pObjectShell.is() && !m_pData->m_contViewData.is() ) { SfxViewFrame *pActFrame = SfxViewFrame::Current(); if ( !pActFrame || pActFrame->GetObjectShell() != m_pData->m_pObjectShell.get() ) @@ -3270,7 +3270,7 @@ Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const SfxModelGuard aGuard( *this ); Reference< embed::XStorage > xResult; - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { Reference< embed::XStorage > xStorage = m_pData->m_pObjectShell->GetStorage(); if ( xStorage.is() ) @@ -3294,7 +3294,7 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() Sequence< OUString > aResult; bool bSuccess = false; - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) { Reference < embed::XStorage > xStorage = m_pData->m_pObjectShell->GetStorage(); Reference < container::XNameAccess > xAccess( xStorage, UNO_QUERY ); @@ -3361,7 +3361,7 @@ OUString const & SfxBaseModel::getRuntimeUID() const bool SfxBaseModel::hasValidSignatures() const { SolarMutexGuard aGuard; - if ( m_pData->m_pObjectShell.Is() ) + if ( m_pData->m_pObjectShell.is() ) return ( m_pData->m_pObjectShell->ImplGetSignatureState() == SignatureState::OK ); return false; } @@ -3543,7 +3543,7 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz { SfxModelGuard aGuard( *this ); - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw Exception(); // TODO: error handling SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell.get(), false ); @@ -3570,7 +3570,7 @@ awt::Size SAL_CALL SfxBaseModel::getVisualAreaSize( sal_Int64 /*nAspect*/ ) { SfxModelGuard aGuard( *this ); - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw Exception(); // TODO: error handling Rectangle aTmpRect = m_pData->m_pObjectShell->GetVisArea( ASPECT_CONTENT ); @@ -3583,7 +3583,7 @@ sal_Int32 SAL_CALL SfxBaseModel::getMapUnit( sal_Int64 /*nAspect*/ ) { SfxModelGuard aGuard( *this ); - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw Exception(); // TODO: error handling return VCLUnoHelper::VCL2UnoEmbedMapUnit( m_pData->m_pObjectShell->GetMapUnit() ); @@ -3651,7 +3651,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& SfxModelGuard aGuard( *this ); Reference< embed::XStorage > xResult; - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw io::IOException(); // TODO: SfxAllItemSet aSet( m_pData->m_pObjectShell->GetPool() ); @@ -3709,7 +3709,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >& SfxModelGuard aGuard( *this ); Reference< embed::XStorage > xResult; - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw io::IOException(); // TODO: // the persistence should be switched only if the storage is different @@ -3738,7 +3738,7 @@ Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentStorage() SfxModelGuard aGuard( *this ); Reference< embed::XStorage > xResult; - if ( !m_pData->m_pObjectShell.Is() ) + if ( !m_pData->m_pObjectShell.is() ) throw io::IOException(); // TODO return m_pData->m_pObjectShell->GetStorage(); @@ -3791,7 +3791,7 @@ bool SfxBaseModel::impl_getPrintHelper() SfxModelGuard aGuard( *this ); if (!m_pData->m_sModuleIdentifier.isEmpty()) return m_pData->m_sModuleIdentifier; - if (m_pData->m_pObjectShell.Is()) + if (m_pData->m_pObjectShell.is()) return m_pData->m_pObjectShell->GetFactory().GetDocumentServiceName(); return OUString(); } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 117cc7ac6dcd..b66cebd154dd 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -281,7 +281,7 @@ void SfxFrame::CancelTransfers() // Check if StarOne-Loader should be canceled SfxFrameWeakRef wFrame( this ); - if (wFrame.Is()) + if (wFrame.is()) pImpl->bInCancelTransfers = false; } } diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 16d1d04a351e..5efadcfd2b35 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -705,7 +705,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA // SfxObjectShellRef is used here ( instead of ...Lock ) since the model is closed below if necessary // SfxObjectShellLock would be even dangerous here, since the lifetime control should be done outside in case of success const SfxObjectShellRef xDoc = impl_findObjectShell( xModel ); - ENSURE_OR_THROW( xDoc.Is(), "no SfxObjectShell for the given model" ); + ENSURE_OR_THROW( xDoc.is(), "no SfxObjectShell for the given model" ); // ensure the ID of the to-be-created view is in the descriptor, if possible const sal_Int16 nViewId = impl_determineEffectiveViewId_nothrow( *xDoc, aDescriptor ); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 27b90a67a513..f61d6e9728a5 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -189,7 +189,7 @@ void SfxEditDocumentDialog::dispose() /// Is this read-only object shell opened via .uno:SignPDF? static bool IsSignPDF(SfxObjectShellRef xObjSh) { - if (!xObjSh.Is()) + if (!xObjSh.is()) return false; SfxMedium* pMedium = xObjSh->GetMedium(); @@ -1000,7 +1000,7 @@ void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell ) */ void SfxViewFrame::ReleaseObjectShell_Impl() { - DBG_ASSERT( m_xObjSh.Is(), "no SfxObjectShell to release!" ); + DBG_ASSERT( m_xObjSh.is(), "no SfxObjectShell to release!" ); GetFrame().ReleasingComponent_Impl(); if ( GetWindow().HasChildPathFocus( true ) ) @@ -1022,7 +1022,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() OSL_FAIL("No Shell"); #endif - if ( m_xObjSh.Is() ) + if ( m_xObjSh.is() ) { m_pDispatcher->Pop( *m_xObjSh ); SfxModule* pModule = m_xObjSh->GetModule(); @@ -1037,7 +1037,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() if ( 1 == m_xObjSh->GetOwnerLockCount() && m_pImpl->bObjLocked && m_xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED ) m_xObjSh->DoClose(); SfxObjectShellRef xDyingObjSh = m_xObjSh; - m_xObjSh.Clear(); + m_xObjSh.clear(); if( ( GetFrameType() & SFXFRAME_HASTITLE ) && m_pImpl->nDocViewNo ) xDyingObjSh->GetNoSet_Impl().ReleaseIndex(m_pImpl->nDocViewNo-1); if ( m_pImpl->bObjLocked ) @@ -1172,7 +1172,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) case SfxEventHintId::OpenDoc: case SfxEventHintId::CreateDoc: { - if ( !m_xObjSh.Is() ) + if ( !m_xObjSh.is() ) break; SfxBindings& rBind = GetBindings(); @@ -1276,7 +1276,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { UpdateTitle(); - if ( !m_xObjSh.Is() ) + if ( !m_xObjSh.is() ) break; // Switch r/o? @@ -1326,7 +1326,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) break; case SfxHintId::Dying: // when the Object is being deleted, destroy the view too - if ( m_xObjSh.Is() ) + if ( m_xObjSh.is() ) ReleaseObjectShell_Impl(); else GetFrame().DoClose(); @@ -1338,7 +1338,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) IMPL_LINK_NOARG(SfxViewFrame, SwitchReadOnlyHandler, Button*, void) { - if (m_xObjSh.Is() && IsSignPDF(m_xObjSh)) + if (m_xObjSh.is() && IsSignPDF(m_xObjSh)) { ScopedVclPtrInstance<SfxEditDocumentDialog> pDialog(nullptr); if (pDialog->Execute() != RET_OK) @@ -1374,7 +1374,7 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) GetBindings().SetDispatcher( m_pDispatcher ); m_xObjSh = pObjSh; - if ( m_xObjSh.Is() && m_xObjSh->IsPreview() ) + if ( m_xObjSh.is() && m_xObjSh->IsPreview() ) GetDispatcher()->SetQuietMode_Impl( true ); if ( pObjSh ) @@ -1462,8 +1462,8 @@ SfxViewFrame::~SfxViewFrame() void SfxViewFrame::KillDispatcher_Impl() { - SfxModule* pModule = m_xObjSh.Is() ? m_xObjSh->GetModule() : nullptr; - if ( m_xObjSh.Is() ) + SfxModule* pModule = m_xObjSh.is() ? m_xObjSh->GetModule() : nullptr; + if ( m_xObjSh.is() ) ReleaseObjectShell_Impl(); if ( m_pDispatcher ) { @@ -1633,7 +1633,7 @@ void SfxViewFrame::Show() { // First lock the objectShell so that UpdateTitle() is valid: // IsVisible() == true (:#) - if ( m_xObjSh.Is() ) + if ( m_xObjSh.is() ) { m_xObjSh->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN ); if ( !m_pImpl->bObjLocked ) @@ -2310,7 +2310,7 @@ bool SfxViewFrame::DoClose() OUString SfxViewFrame::GetActualPresentationURL_Impl() const { - if ( m_xObjSh.Is() ) + if ( m_xObjSh.is() ) return m_xObjSh->GetMedium()->GetName(); return OUString(); } @@ -2318,7 +2318,7 @@ OUString SfxViewFrame::GetActualPresentationURL_Impl() const void SfxViewFrame::SetModalMode( bool bModal ) { m_pImpl->bModal = bModal; - if ( m_xObjSh.Is() ) + if ( m_xObjSh.is() ) { for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( m_xObjSh.get() ); !bModal && pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, m_xObjSh.get() ) ) |