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 | |
| 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>
185 files changed, 914 insertions, 920 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index aa6b7b080527..7a5b1a5a0829 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -200,7 +200,7 @@ SbModuleRef const & ModulWindow::XModule() // for m_xModule it may not yet be available, here we keep trying to access // the module until such time as it exists - if ( !m_xModule.Is() ) + if ( !m_xModule.is() ) { BasicManager* pBasMgr = GetDocument().getBasicManager(); if ( pBasMgr ) @@ -258,7 +258,7 @@ void ModulWindow::Resize() void ModulWindow::CheckCompileBasic() { - if ( XModule().Is() ) + if ( XModule().is() ) { // never compile while running! bool const bRunning = StarBASIC::IsRunning(); @@ -311,14 +311,14 @@ void ModulWindow::BasicExecute() CheckCompileBasic(); - if ( XModule().Is() && m_xModule->IsCompiled() && !m_aStatus.bError ) + if ( XModule().is() && m_xModule->IsCompiled() && !m_aStatus.bError ) { if ( GetBreakPoints().size() ) m_aStatus.nBasicFlags = m_aStatus.nBasicFlags | BasicDebugFlags::Break; if ( !m_aStatus.bIsRunning ) { - DBG_ASSERT( m_xModule.Is(), "Kein Modul!" ); + DBG_ASSERT( m_xModule.is(), "Kein Modul!" ); AddStatus( BASWIN_RUNNINGBASIC ); sal_uInt16 nStart, nEnd; TextSelection aSel = GetEditView()->GetSelection(); @@ -364,7 +364,7 @@ void ModulWindow::CompileBasic() { CheckCompileBasic(); - XModule().Is() && m_xModule->IsCompiled(); + XModule().is() && m_xModule->IsCompiled(); } void ModulWindow::BasicRun() @@ -488,9 +488,9 @@ void ModulWindow::ImportDialog() void ModulWindow::ToggleBreakPoint( sal_uLong nLine ) { - DBG_ASSERT( XModule().Is(), "Kein Modul!" ); + DBG_ASSERT( XModule().is(), "Kein Modul!" ); - if ( XModule().Is() ) + if ( XModule().is() ) { CheckCompileBasic(); if ( m_aStatus.bError ) @@ -525,9 +525,9 @@ void ModulWindow::ToggleBreakPoint( sal_uLong nLine ) void ModulWindow::UpdateBreakPoint( const BreakPoint& rBrk ) { - DBG_ASSERT( XModule().Is(), "Kein Modul!" ); + DBG_ASSERT( XModule().is(), "Kein Modul!" ); - if ( XModule().Is() ) + if ( XModule().is() ) { CheckCompileBasic(); @@ -696,9 +696,9 @@ void ModulWindow::BasicAddWatch() void ModulWindow::EditMacro( const OUString& rMacroName ) { - DBG_ASSERT( XModule().Is(), "Kein Modul!" ); + DBG_ASSERT( XModule().is(), "Kein Modul!" ); - if ( XModule().Is() ) + if ( XModule().is() ) { CheckCompileBasic(); @@ -757,11 +757,11 @@ bool ModulWindow::AllowUndo() void ModulWindow::UpdateData() { - DBG_ASSERT( XModule().Is(), "Kein Modul!" ); + DBG_ASSERT( XModule().is(), "Kein Modul!" ); // UpdateData is called when the source has changed from outside // => interrupts undesired! - if ( XModule().Is() ) + if ( XModule().is() ) { SetModule( m_xModule->GetSource32() ); @@ -1155,7 +1155,7 @@ bool ModulWindow::IsModified() OUString ModulWindow::GetSbModuleName() { OUString aModuleName; - if ( XModule().Is() ) + if ( XModule().is() ) aModuleName = m_xModule->GetName(); return aModuleName; } @@ -1268,7 +1268,7 @@ SearchOptionFlags ModulWindow::GetSearchOptions() void ModulWindow::BasicStarted() { - if ( XModule().Is() ) + if ( XModule().is() ) { m_aStatus.bIsRunning = true; BreakPointList& rList = GetBreakPoints(); @@ -1299,7 +1299,7 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor() LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName ); OUString aModName( GetName() ); OUString aLibSubName; - if( m_xBasic.Is() && aDocument.isInVBAMode() && XModule().Is() ) + if( m_xBasic.is() && aDocument.isInVBAMode() && XModule().is() ) { switch( m_xModule->GetModuleType() ) { @@ -1395,7 +1395,7 @@ void ModulWindow::UpdateModule () OUString const aModule = getTextEngineText(*GetEditEngine()); // update module in basic - assert(m_xModule.Is()); + assert(m_xModule.is()); // update module in module window SetModule(aModule); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 72d656feec2b..d2d96b8f184a 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1701,7 +1701,7 @@ WatchItem* WatchItem::GetRootItem() WatchItem* pItem = mpArrayParentItem; while( pItem ) { - if( pItem->mpArray.Is() ) + if( pItem->mpArray.is() ) break; pItem = pItem->mpArrayParentItem; } @@ -2261,7 +2261,7 @@ bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) if (IsSbxVariable(pSbx) || bArrayElement) { // Accept no objects and only end nodes of arrays for editing - if( !pItem->mpObject.Is() && ( !pItem->mpArray.Is() || pItem->nDimLevel == pItem->nDimCount ) ) + if( !pItem->mpObject.is() && ( !pItem->mpArray.is() || pItem->nDimLevel == pItem->nDimCount ) ) { aEditingRes = SvHeaderTabListBox::GetEntryText( pEntry, ITEM_ID_VALUE-1 ); aEditingRes = comphelper::string::strip(aEditingRes, ' '); @@ -2483,7 +2483,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped ) { if (SbxObject* pObj = dynamic_cast<SbxObject*>(pVar->GetObject())) { - if ( pItem->mpObject.Is() && !pItem->maMemberList.empty() ) + if ( pItem->mpObject.is() && !pItem->maMemberList.empty() ) { bool bObjChanged = false; // Check if member list has changed SbxArray* pProps = pObj->GetProperties(); @@ -2511,7 +2511,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped ) else { aWatchStr = "Null"; - if( pItem->mpObject.Is() ) + if( pItem->mpObject.is() ) { bCollapse = true; pItem->clearWatchItem(); @@ -2522,7 +2522,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped ) } else { - if( pItem->mpObject.Is() ) + if( pItem->mpObject.is() ) { bCollapse = true; pItem->clearWatchItem(); @@ -2564,7 +2564,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped ) } else if( bBasicStopped ) { - if( pItem->mpObject.Is() || pItem->mpArray.Is() ) + if( pItem->mpObject.is() || pItem->mpArray.is() ) { implCollapseModifiedObjectEntry( pEntry, this ); pItem->mpObject = nullptr; diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 2f417b10e4fb..ff3e49c9a31e 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -845,7 +845,7 @@ OUString MacroChooser::GetInfo( SbxVariable* pVar ) { OUString aComment; SbxInfoRef xInfo = pVar->GetInfo(); - if ( xInfo.Is() ) + if ( xInfo.is() ) aComment = xInfo->GetComment(); return aComment; } diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index 17612c4f749c..1f336b482819 100644 --- a/basic/qa/cppunit/basic_coverage.cxx +++ b/basic/qa/cppunit/basic_coverage.cxx @@ -77,7 +77,7 @@ void Coverage::run_test(const OUString& sFileURL) if( !testMacro.HasError() ) { SbxVariableRef pResult = testMacro.Run(); - if( pResult.Is() && pResult->GetInteger() == 1 ) + if( pResult.is() && pResult->GetInteger() == 1 ) { bResult = true; } diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx index 2c4e86f0ea17..ebd97d8c7ef4 100644 --- a/basic/qa/cppunit/basictest.cxx +++ b/basic/qa/cppunit/basictest.cxx @@ -78,7 +78,7 @@ SbxVariableRef MacroSnippet::Run( const css::uno::Sequence< css::uno::Any >& rAr SbxVariableRef pReturn = nullptr; if ( !Compile() ) return pReturn; - SbMethod* pMeth = mpMod.Is() ? static_cast<SbMethod*>(mpMod->Find( "doUnitTest", SbxClassType::Method )) : nullptr; + SbMethod* pMeth = mpMod.is() ? static_cast<SbMethod*>(mpMod->Find( "doUnitTest", SbxClassType::Method )) : nullptr; if ( pMeth ) { if ( rArgs.getLength() ) diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 91b26d8f6eb7..a0f3f3208cd1 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -74,7 +74,7 @@ void VBATest::testMiscVBAFunctions() MacroSnippet myMacro; myMacro.LoadSourceFromFile( sMacroURL ); SbxVariableRef pReturn = myMacro.Run(); - if ( pReturn.Is() ) + if ( pReturn.is() ) { fprintf(stderr, "macro result for %s\n", macroSource[ i ] ); fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -152,7 +152,7 @@ void VBATest::testMiscOLEStuff() MacroSnippet myMacro; myMacro.LoadSourceFromFile( sMacroURL ); SbxVariableRef pReturn = myMacro.Run( aArgs ); - if ( pReturn.Is() ) + if ( pReturn.is() ) { fprintf(stderr, "macro result for %s\n", macroSource[ i ] ); fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 56cf96adebb6..de6381071a73 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -667,7 +667,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase OUString aStorName( rStorage.GetName() ); // #i13114 removed, DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); - if ( !xManagerStream.Is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) ) + if ( !xManagerStream.is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) ) { ImpMgrNotLoaded( aStorName ); return; @@ -749,7 +749,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase xManagerStream->Seek( nEndPos ); xManagerStream->SetBufferSize( 0 ); - xManagerStream.Clear(); + xManagerStream.clear(); } void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) @@ -759,7 +759,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) OUString aStorName( rStorage.GetName() ); DBG_ASSERT( aStorName.getLength(), "No Storage Name!" ); - if ( !xManagerStream.Is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) ) + if ( !xManagerStream.is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) ) { ImpMgrNotLoaded( aStorName ); return; @@ -783,7 +783,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator OUString aLibs = xManagerStream->ReadUniOrByteString(xManagerStream->GetStreamCharSet()); xManagerStream->SetBufferSize( 0 ); - xManagerStream.Clear(); // Close stream + xManagerStream.clear(); // Close stream if ( !aLibs.isEmpty() ) { @@ -818,7 +818,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) xStorageRef = new SotStorage( false, aLibRelStorage. GetMainURL( INetURLObject::DecodeMechanism::NONE ), eStorageReadMode ); } - if ( xStorageRef.Is() ) + if ( xStorageRef.is() ) { AddLib( *xStorageRef, aLibName, false ); } @@ -899,13 +899,13 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora } } - if ( !xStorage.Is() ) + if ( !xStorage.is() ) { xStorage = new SotStorage( false, aStorageName, eStorageReadMode ); } tools::SvRef<SotStorage> xBasicStorage = xStorage->OpenSotStorage( szBasicStorage, eStorageReadMode, false ); - if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) + if ( !xBasicStorage.is() || xBasicStorage->GetError() ) { StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, xStorage->GetName(), ERRCODE_BUTTON_OK ); aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTORAGE)); @@ -914,7 +914,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora { // In the Basic-Storage every lib is in a Stream... tools::SvRef<SotStorageStream> xBasicStream = xBasicStorage->OpenSotStream( pLibInfo->GetLibName(), eStreamReadMode ); - if ( !xBasicStream.Is() || xBasicStream->GetError() ) + if ( !xBasicStream.is() || xBasicStream->GetError() ) { StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD , pLibInfo->GetLibName(), ERRCODE_BUTTON_OK ); aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTREAM)); @@ -924,7 +924,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora bool bLoaded = false; if ( xBasicStream->Seek( STREAM_SEEK_TO_END ) != 0 ) { - if ( !pLibInfo->GetLib().Is() ) + if ( !pLibInfo->GetLib().is() ) { pLibInfo->SetLib( new StarBASIC( GetStdLib(), mbDocMgr ) ); } @@ -992,12 +992,12 @@ bool BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) con bool bProtected = ImplEncryptStream( rStrm ); SbxBaseRef xNew = SbxBase::Load( rStrm ); bool bLoaded = false; - if( xNew.Is() ) + if( xNew.is() ) { if( auto pNew = dynamic_cast<StarBASIC*>( xNew.get() ) ) { // Use the Parent of the old BASICs - if( rOldBasic.Is() ) + if( rOldBasic.is() ) { pNew->SetParent( rOldBasic->GetParent() ); if( pNew->GetParent() ) @@ -1152,12 +1152,12 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage ) SAL_WARN("basic", "BasicManager::RemoveLib: Caught exception: " << e.Message); } - if (xStorage.Is() && xStorage->IsStorage(szBasicStorage)) + if (xStorage.is() && xStorage->IsStorage(szBasicStorage)) { tools::SvRef<SotStorage> xBasicStorage = xStorage->OpenSotStorage ( szBasicStorage, StreamMode::STD_READWRITE, false ); - if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) + if ( !xBasicStorage.is() || xBasicStorage->GetError() ) { StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, OUString(), ERRCODE_BUTTON_OK ); aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTORAGE)); @@ -1173,7 +1173,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage ) xBasicStorage->FillInfoList( &aInfoList ); if ( aInfoList.empty() ) { - xBasicStorage.Clear(); + xBasicStorage.clear(); xStorage->Remove( szBasicStorage ); xStorage->Commit(); // If no further Streams or SubStorages available, @@ -1183,7 +1183,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage ) if ( aInfoList.empty() ) { //OUString aName_( xStorage->GetName() ); - xStorage.Clear(); + xStorage.clear(); //*** TODO: Replace if still necessary //SfxContentHelper::Kill( aName ); //*** TODO-End @@ -1192,7 +1192,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage ) } } } - if ((*itLibInfo)->GetLib().Is()) + if ((*itLibInfo)->GetLib().is()) { GetStdLib()->Remove( (*itLibInfo)->GetLib().get() ); } @@ -1390,7 +1390,7 @@ bool BasicManager::IsBasicModified() const { for (auto const& rpLib : mpImpl->aLibs) { - if (rpLib->GetLib().Is() && rpLib->GetLib()->IsModified()) + if (rpLib->GetLib().is() && rpLib->GetLib()->IsModified()) { return true; } diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index e900fa9bf527..49a0163d26bf 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -247,7 +247,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any } SbxVariable* pMethVar = nullptr; // Be still tolerant and make default search if no search basic exists - if( bSearchLib && xLibSearchBasic.Is() ) + if( bSearchLib && xLibSearchBasic.is() ) { sal_Int16 nCount = xLibSearchBasic->GetObjects()->Count(); for( sal_Int16 nObj = -1; nObj < nCount ; nObj++ ) @@ -279,7 +279,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any } // Default: Be tolerant and search everywhere - if( (!pMethVar || nullptr == dynamic_cast<const SbMethod*>( pMethVar)) && maBasicRef.Is() ) + if( (!pMethVar || nullptr == dynamic_cast<const SbMethod*>( pMethVar)) && maBasicRef.is() ) { pMethVar = maBasicRef->FindQualified( aMacro, SbxClassType::DontCare ); } @@ -305,7 +305,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any // Call method SbxVariableRef xValue = pRet ? new SbxVariable : nullptr; - if( xArray.Is() ) + if( xArray.is() ) { pMeth->SetParameters( xArray.get() ); } @@ -427,7 +427,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) // Get dialog SbxBaseRef pObj = rPar.Get( 1 )->GetObject(); - if( !(pObj.Is() && nullptr != dynamic_cast<const SbUnoObject*>( pObj.get() )) ) + if( !(pObj.is() && nullptr != dynamic_cast<const SbUnoObject*>( pObj.get() )) ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); return; diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 7c079a8b531c..9e9e4c6d6602 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -462,7 +462,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) SbiCloseRecord( r, nPos ); } // User defined types - if ( rTypes.Is() ) + if ( rTypes.is() ) { sal_uInt16 nTypes = rTypes->Count(); if (nTypes > 0 ) @@ -620,7 +620,7 @@ void SbiImage::AddCode( char* p, sal_uInt32 s ) // Add user type void SbiImage::AddType(SbxObject* pObject) { - if( !rTypes.Is() ) + if( !rTypes.is() ) { rTypes = new SbxArray; } @@ -630,7 +630,7 @@ void SbiImage::AddType(SbxObject* pObject) void SbiImage::AddEnum(SbxObject* pObject) // Register enum type { - if( !rEnums.Is() ) + if( !rEnums.is() ) { rEnums = new SbxArray; } @@ -674,7 +674,7 @@ OUString SbiImage::GetString( short nId ) const const SbxObject* SbiImage::FindType (const OUString& aTypeName) const { - return rTypes.Is() ? static_cast<SbxObject*>(rTypes->Find(aTypeName,SbxClassType::Object)) : nullptr; + return rTypes.is() ? static_cast<SbxObject*>(rTypes->Find(aTypeName,SbxClassType::Object)) : nullptr; } sal_uInt16 SbiImage::CalcLegacyOffset( sal_Int32 nOffset ) diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 168842bc74db..fa5019e05e0a 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -114,7 +114,7 @@ DocBasicItem::~DocBasicItem() try { stopListening(); - mxClassModules.Clear(); // release with SolarMutex locked + mxClassModules.clear(); // release with SolarMutex locked } catch (...) { @@ -232,7 +232,7 @@ StarBASIC* lclGetDocBasicForModule( SbModule* pModule ) SbxObject* StarBASIC::getVBAGlobals( ) { - if ( !pVBAGlobals.Is() ) + if ( !pVBAGlobals.is() ) { Any aThisDoc; if ( GetUNOConstant("ThisComponent", aThisDoc) ) @@ -996,7 +996,7 @@ StarBASIC::~StarBASIC() } // #100326 Set Parent NULL in registered listeners - if( xUnoListeners.Is() ) + if( xUnoListeners.is() ) { sal_uInt16 uCount = xUnoListeners->Count(); for( sal_uInt16 i = 0 ; i < uCount ; i++ ) @@ -1809,7 +1809,7 @@ void StarBASIC::SetGlobalBreakHdl( const Link<StarBASIC*,BasicDebugFlags>& rLink SbxArrayRef const & StarBASIC::getUnoListeners() { - if( !xUnoListeners.Is() ) + if( !xUnoListeners.is() ) { xUnoListeners = new SbxArray(); } @@ -2036,7 +2036,7 @@ void BasicCollection::Initialize() p->SetFlag( SbxFlagBits::DontStore ); p = Make( pRemoveStr, SbxClassType::Method, SbxEMPTY ); p->SetFlag( SbxFlagBits::DontStore ); - if ( !xAddInfo.Is() ) + if ( !xAddInfo.is() ) { xAddInfo = new SbxInfo; xAddInfo->AddParam( "Item", SbxVARIANT ); @@ -2044,7 +2044,7 @@ void BasicCollection::Initialize() xAddInfo->AddParam( "Before", SbxVARIANT, SbxFlagBits::Read | SbxFlagBits::Optional ); xAddInfo->AddParam( "After", SbxVARIANT, SbxFlagBits::Read | SbxFlagBits::Optional ); } - if ( !xItemInfo.Is() ) + if ( !xItemInfo.is() ) { xItemInfo = new SbxInfo; xItemInfo->AddParam( "Index", SbxVARIANT, SbxFlagBits::Read | SbxFlagBits::Optional); diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index dd3ea516a0f8..028bc74c75ea 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -860,7 +860,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal ) if( eBaseType == SbxOBJECT ) { SbxBaseRef xObj = pVal->GetObject(); - if( !xObj.Is() ) + if( !xObj.is() ) { aRetType = cppu::UnoType<XInterface>::get(); return aRetType; @@ -983,7 +983,7 @@ Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType if( eBaseType == SbxOBJECT ) { SbxBaseRef xObj = pVar->GetObject(); - if( xObj.Is() ) + if( xObj.is() ) { if( auto obj = dynamic_cast<SbUnoAnyObject*>( xObj.get() ) ) return obj->getValue(); @@ -2522,7 +2522,7 @@ SbUnoMethod::~SbUnoMethod() SbxInfo* SbUnoMethod::GetInfo() { - if( !pInfo.Is() && m_xUnoMethod.is() ) + if( !pInfo.is() && m_xUnoMethod.is() ) { SbiInstance* pInst = GetSbData()->pInst; if( pInst && pInst->IsCompatibility() ) @@ -2931,7 +2931,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) // try to create Struct with the same name SbUnoObjectRef xUnoObj = Impl_CreateUnoStruct( aClassName ); - if( !xUnoObj.Is() ) + if( !xUnoObj.is() ) { return; } @@ -3843,7 +3843,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet { SolarMutexGuard guard; - if( xSbxObj.Is() ) + if( xSbxObj.is() ) { OUString aMethodName = aPrefixName; aMethodName = aMethodName + Event.MethodName; @@ -3908,7 +3908,7 @@ void BasicAllListener_Impl ::disposing(const EventObject& ) { SolarMutexGuard guard; - xSbxObj.Clear(); + xSbxObj.clear(); } @@ -4255,7 +4255,7 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject , m_xScopeObj( xScopeObj ) , m_aListeners( m_aMutex ) { - m_bProxyIsClassModuleObject = xScopeObj.Is() && nullptr != dynamic_cast<const SbClassModuleObject*>( xScopeObj.get() ); + m_bProxyIsClassModuleObject = xScopeObj.is() && nullptr != dynamic_cast<const SbClassModuleObject*>( xScopeObj.get() ); } Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() @@ -4347,7 +4347,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, Any aRet; SbxObjectRef xScopeObj = m_xScopeObj; - if( !xScopeObj.Is() ) + if( !xScopeObj.is() ) { return aRet; } @@ -4393,7 +4393,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, // Call method SbxVariableRef xValue = new SbxVariable; - if( xArray.Is() ) + if( xArray.is() ) pMeth->SetParameters( xArray.get() ); pMeth->Call( xValue.get() ); aRet = sbxToUnoValue( xValue.get() ); @@ -4638,7 +4638,7 @@ bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal ) if( pUnoObj->isNativeCOMObject() ) { SbxVariableRef pMeth = pObj->Find( "toString", SbxClassType::Method ); - if ( pMeth.Is() ) + if ( pMeth.is() ) { SbxValues aRes; pMeth->Get( aRes ); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index dce7d98cdded..f964ef2dd32d 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -207,7 +207,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& if ( m_xAggInv.is() && m_xAggInv->hasMethod( aFunctionName ) ) return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam ); SbMethodRef pMethod = getMethod( aFunctionName ); - if ( !pMethod.Is() ) + if ( !pMethod.is() ) throw RuntimeException(); // check number of parameters sal_Int32 nParamsCount = aParams.getLength(); @@ -246,7 +246,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& xSbxVar->SetFlag( SbxFlagBits::Fixed ); } } - if ( xSbxParams.Is() ) + if ( xSbxParams.is() ) pMethod->SetParameters( xSbxParams.get() ); // call method @@ -255,7 +255,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& pMethod->Call( xReturn.get() ); Any aReturn; // get output parameters - if ( xSbxParams.Is() ) + if ( xSbxParams.is() ) { SbxInfo* pInfo_ = pMethod->GetInfo(); if ( pInfo_ ) @@ -302,7 +302,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) return m_xAggInv->setValue( aPropertyName, aValue ); SbPropertyRef pProperty = getProperty( aPropertyName ); - if ( !pProperty.Is() ) + if ( !pProperty.is() ) throw UnknownPropertyException(); unoToSbxValue( pProperty.get(), aValue ); } @@ -314,7 +314,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName ) return m_xAggInv->getValue( aPropertyName ); SbPropertyRef pProperty = getProperty( aPropertyName ); - if ( !pProperty.Is() ) + if ( !pProperty.is() ) throw UnknownPropertyException(); SbxVariable* pProp = pProperty.get(); @@ -330,7 +330,7 @@ DocObjectWrapper::hasMethod( const OUString& aName ) { if ( m_xAggInv.is() && m_xAggInv->hasMethod( aName ) ) return true; - return getMethod( aName ).Is(); + return getMethod( aName ).is(); } sal_Bool SAL_CALL @@ -339,7 +339,7 @@ DocObjectWrapper::hasProperty( const OUString& aName ) bool bRes = false; if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) ) bRes = true; - else bRes = getProperty( aName ).Is(); + else bRes = getProperty( aName ).is(); return bRes; } @@ -668,7 +668,7 @@ SbxVariable* SbModule::Find( const OUString& rName, SbxClassType t ) // Put enum types as objects into module, // allows MyEnum.First notation SbxArrayRef xArray = pImage->GetEnums(); - if( xArray.Is() ) + if( xArray.is() ) { SbxVariable* pEnumVar = xArray->Find( rName, SbxClassType::DontCare ); SbxObject* pEnumObject = dynamic_cast<SbxObject*>( pEnumVar ); @@ -1286,7 +1286,7 @@ void SbModule::RemoveVars() // SbUserform because it could trigger say an initialise event // which would cause basic to be re-run in the middle of the init ( and remember RemoveVars is called from compile and we don't want code to run as part of the compile ) SbxVariableRef p = SbModule::Find( rModuleVariableName, SbxClassType::Property ); - if( p.Is() ) + if( p.is() ) Remove( p.get() ); } } @@ -2122,7 +2122,7 @@ void SbMethod::Broadcast( SfxHintId nHintId ) pCst = nullptr; SbMethod* pThisCopy = new SbMethod( *this ); SbMethodRef xHolder = pThisCopy; - if( mpPar.Is() ) + if( mpPar.is() ) { // Enregister this as element 0, but don't reset the parent! if( GetType() != SbxVOID ) { @@ -2563,7 +2563,7 @@ void SbUserFormModule::Load() { SAL_INFO("basic", "** load() "); // forces a load - if ( !pDocObject.Is() ) + if ( !pDocObject.is() ) InitObject(); } @@ -2689,7 +2689,7 @@ void SbUserFormModule::InitObject() SbxVariable* SbUserFormModule::Find( const OUString& rName, SbxClassType t ) { - if ( !pDocObject.Is() && !GetSbData()->bRunInit && GetSbData()->pInst ) + if ( !pDocObject.is() && !GetSbData()->bRunInit && GetSbData()->pInst ) InitObject(); return SbObjModule::Find( rName, t ); } diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index ac4351cf62cd..1a4c12b4f1bb 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -185,7 +185,7 @@ RTLFUNC(CreateObject) OUString aClass( rPar.Get( 1 )->GetOUString() ); SbxObjectRef p = SbxBase::CreateObject( aClass ); - if( !p.Is() ) + if( !p.is() ) StarBASIC::Error( ERRCODE_BASIC_CANNOT_LOAD ); else { diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index bad68c593f84..eee8de4a90aa 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -214,7 +214,7 @@ RTLFUNC(CallByName) // Call method SbxVariableRef refVar = rPar.Get(0); - if( xArray.Is() ) + if( xArray.is() ) pMeth->SetParameters( xArray.get() ); pMeth->Call( refVar.get() ); pMeth->SetParameters( nullptr ); diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 139d154828f4..2f9284ef8254 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1069,7 +1069,7 @@ void SbiRuntime::PushArgv() { pArgvStk.emplace_back(refArgv, nArgc); nArgc = 1; - refArgv.Clear(); + refArgv.clear(); } void SbiRuntime::PopArgv() @@ -1116,7 +1116,7 @@ void SbiRuntime::PushForEach() pForStk = p; SbxVariableRef xObjVar = PopVar(); - SbxBase* pObj = xObjVar.Is() ? xObjVar->GetObject() : nullptr; + SbxBase* pObj = xObjVar.is() ? xObjVar->GetObject() : nullptr; if( pObj == nullptr ) { Error( ERRCODE_BASIC_NO_OBJECT ); @@ -1221,7 +1221,7 @@ SbiForStack* SbiRuntime::FindForStackItemForCollection( class BasicCollection* p { for (SbiForStack *p = pForStk; p; p = p->pNext) { - SbxVariable* pVar = p->refEnd.Is() ? p->refEnd.get() : nullptr; + SbxVariable* pVar = p->refEnd.is() ? p->refEnd.get() : nullptr; if( p->eForType == ForType::EachCollection && pVar != nullptr && dynamic_cast<BasicCollection*>( pVar) == pCollection ) @@ -1591,7 +1591,7 @@ inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef& refVal, SbxVariableRe return false; SbxObjectRef xValObj = static_cast<SbxObject*>(refVal->GetObject()); - if( !xValObj.Is() || nullptr != dynamic_cast<const SbUnoAnyObject*>( xValObj.get() ) ) + if( !xValObj.is() || nullptr != dynamic_cast<const SbUnoAnyObject*>( xValObj.get() ) ) return false; SbUnoObject* pUnoVal = dynamic_cast<SbUnoObject*>( xValObj.get() ); @@ -1779,7 +1779,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b { SbxVariableRef refObjVal = dynamic_cast<SbxObject*>( pObjVarObj ); - if( refObjVal.Is() ) + if( refObjVal.is() ) { refVal = refObjVal; } @@ -1793,7 +1793,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b // #52896 refVal can be invalid here, if uno-sequences - or more // general arrays - are assigned to variables that are declared // as an object! - if( !refVal.Is() ) + if( !refVal.is() ) { Error( ERRCODE_BASIC_INVALID_USAGE_OBJECT ); } @@ -1907,7 +1907,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b SbxBase* pValObjBase = refVal->GetObject(); if( pValObjBase == nullptr ) { - if( xPrevVarObj.Is() ) + if( xPrevVarObj.is() ) { // Object is overwritten with NULL, instantiate init object DimAsNewRecoverHash &rDimAsNewRecoverHash = GaDimAsNewRecoverHash::get(); @@ -1935,7 +1935,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b else { // Does old value exist? - bool bFirstInit = !xPrevVarObj.Is(); + bool bFirstInit = !xPrevVarObj.is(); if( bFirstInit ) { // Store information to instantiate object later @@ -2087,9 +2087,9 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar ) // If refDim then this DIM statement is terminating a ReDIM and // previous StepERASE_CLEAR for an array, the following actions have // been delayed from ( StepERASE_CLEAR ) 'till here - if ( refRedim.Is() ) + if ( refRedim.is() ) { - if ( !refRedimpArray.Is() ) // only erase the array not ReDim Preserve + if ( !refRedimpArray.is() ) // only erase the array not ReDim Preserve { lcl_eraseImpl( refVar, bVBAEnabled ); } @@ -2189,7 +2189,7 @@ void SbiRuntime::StepREDIMP() DimImpl( refVar ); // Now check, if we can copy from the old array - if( refRedimpArray.Is() ) + if( refRedimpArray.is() ) { SbxBase* pElemObj = refVar->GetObject(); SbxDimArray* pNewArray = dynamic_cast<SbxDimArray*>( pElemObj ); @@ -2341,7 +2341,7 @@ void SbiRuntime::StepERASE_CLEAR() void SbiRuntime::StepARRAYACCESS() { - if( !refArgv.Is() ) + if( !refArgv.is() ) { StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR ); } @@ -2378,7 +2378,7 @@ void SbiRuntime::StepARGC() void SbiRuntime::StepARGV() { - if( !refArgv.Is() ) + if( !refArgv.is() ) { StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR ); } @@ -2561,7 +2561,7 @@ void SbiRuntime::StepNEXT() void SbiRuntime::StepCASE() { - if( !refCaseStk.Is() ) + if( !refCaseStk.is() ) { refCaseStk = new SbxArray; } @@ -2573,7 +2573,7 @@ void SbiRuntime::StepCASE() void SbiRuntime::StepENDCASE() { - if( !refCaseStk.Is() || !refCaseStk->Count() ) + if( !refCaseStk.is() || !refCaseStk->Count() ) { StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR ); } @@ -2790,7 +2790,7 @@ void SbiRuntime::StepLOADI( sal_uInt32 nOp1 ) void SbiRuntime::StepARGN( sal_uInt32 nOp1 ) { - if( !refArgv.Is() ) + if( !refArgv.is() ) StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR ); else { @@ -2817,7 +2817,7 @@ void SbiRuntime::StepARGN( sal_uInt32 nOp1 ) void SbiRuntime::StepARGTYP( sal_uInt32 nOp1 ) { - if( !refArgv.Is() ) + if( !refArgv.is() ) StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR ); else { @@ -3061,7 +3061,7 @@ void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 ) void SbiRuntime::StepCASETO( sal_uInt32 nOp1 ) { - if( !refCaseStk.Is() || !refCaseStk->Count() ) + if( !refCaseStk.is() || !refCaseStk->Count() ) StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR ); else { @@ -3452,7 +3452,7 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt if( bFatalError ) { // #39108 use dummy variable instead of fatal error - if( !xDummyVar.Is() ) + if( !xDummyVar.is() ) { xDummyVar = new SbxVariable( SbxVARIANT ); } @@ -3555,7 +3555,7 @@ SbxBase* SbiRuntime::FindElementExtern( const OUString& rName ) { return nullptr; } - if( refLocals.Is() ) + if( refLocals.is() ) { pElem = refLocals->Find( rName, SbxClassType::DontCare ); } @@ -3570,7 +3570,7 @@ SbxBase* SbiRuntime::FindElementExtern( const OUString& rName ) if( !pElem && pMeth ) { SbxInfo* pInfo = pMeth->GetInfo(); - if( pInfo && refParams.Is() ) + if( pInfo && refParams.is() ) { sal_uInt16 nParamCount = refParams->Count(); sal_uInt16 j = 1; @@ -3612,7 +3612,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 ) { if( nOp1 & 0x8000 ) { - if( !refArgv.Is() ) + if( !refArgv.is() ) { StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR ); } @@ -3795,7 +3795,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem ) { // is it an uno-object? SbxBaseRef pObj = pElem->GetObject(); - if( pObj.Is() ) + if( pObj.is() ) { if (SbUnoObject* pUnoObj = dynamic_cast<SbUnoObject*>( pObj.get())) { @@ -3861,7 +3861,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem ) { pDflt->Broadcast( SfxHintId::BasicDataWanted ); SbxBaseRef pDfltObj = pDflt->GetObject(); - if( pDfltObj.Is() ) + if( pDfltObj.is() ) { if (SbUnoObject* pSbObj = dynamic_cast<SbUnoObject*>(pDfltObj.get())) { @@ -3890,7 +3890,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem ) { SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxClassType::Method ); SbxVariableRef refTemp = meth; - if ( refTemp.Is() ) + if ( refTemp.is() ) { meth->SetParameters( pPar ); SbxVariable* pNew = new SbxMethod( *static_cast<SbxMethod*>(meth) ); @@ -3934,7 +3934,7 @@ void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 ) void SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, bool bStatic ) { - if( !refLocals.Is() ) + if( !refLocals.is() ) { refLocals = new SbxArray; } @@ -4085,7 +4085,7 @@ void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32 nOp2 ) void SbiRuntime::StepCASEIS( sal_uInt32 nOp1, sal_uInt32 nOp2 ) { - if( !refCaseStk.Is() || !refCaseStk->Count() ) + if( !refCaseStk.is() || !refCaseStk->Count() ) { StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR ); } @@ -4154,7 +4154,7 @@ void SbiRuntime::StepSTMNT( sal_uInt32 nOp1, sal_uInt32 nOp2 ) { SbxVariable* p = refExprStk->Get( 0 ); if( p->GetRefCount() > 1 && - refLocals.Is() && refLocals->Find( p->GetName(), p->GetClass() ) ) + refLocals.is() && refLocals->Find( p->GetName(), p->GetClass() ) ) { sUnknownMethodName = p->GetName(); bFatalExpr = true; @@ -4314,7 +4314,7 @@ void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1, sal_uInt32 nOp2 ) // fill the array with instances of the requested class SbxBaseRef xObj = refVar->GetObject(); - if( !xObj.Is() ) + if( !xObj.is() ) { StarBASIC::Error( ERRCODE_BASIC_INVALID_OBJECT ); return; @@ -4462,7 +4462,7 @@ void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt3 void SbiRuntime::StepLOCAL( sal_uInt32 nOp1, sal_uInt32 nOp2 ) { - if( !refLocals.Is() ) + if( !refLocals.is() ) { refLocals = new SbxArray; } @@ -4486,7 +4486,7 @@ void SbiRuntime::StepPUBLIC_Impl( sal_uInt32 nOp1, sal_uInt32 nOp2, bool bUsedFo bool bFlag = pMod->IsSet( SbxFlagBits::NoModify ); pMod->SetFlag( SbxFlagBits::NoModify ); SbxVariableRef p = pMod->Find( aName, SbxClassType::Property ); - if( p.Is() ) + if( p.is() ) { pMod->Remove (p.get()); } @@ -4549,7 +4549,7 @@ void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 ) bool bFlag = pStorage->IsSet( SbxFlagBits::NoModify ); rBasic.SetFlag( SbxFlagBits::NoModify ); SbxVariableRef p = pStorage->Find( aName, SbxClassType::Property ); - if( p.Is() ) + if( p.is() ) { pStorage->Remove (p.get()); } @@ -4558,7 +4558,7 @@ void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 ) { pStorage->ResetFlag( SbxFlagBits::NoModify ); } - if( p.Is() ) + if( p.is() ) { p->SetFlag( SbxFlagBits::DontStore ); // from 2.7.1996: HACK because of 'reference can't be saved' diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index 8bf551adc4c1..5fc4775fd00a 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -61,7 +61,7 @@ SbxArray& SbxArray::operator=( const SbxArray& rArray ) for( const auto& rpSrcRef : rArray.mVarEntries ) { SbxVariableRef pSrc_ = rpSrcRef.mpVar; - if( !pSrc_.Is() ) + if( !pSrc_.is() ) continue; if( eType != SbxVARIANT ) @@ -150,7 +150,7 @@ SbxVariable* SbxArray::Get32( sal_uInt32 nIdx ) } SbxVariableRef& rRef = GetRef32( nIdx ); - if ( !rRef.Is() ) + if ( !rRef.is() ) rRef = new SbxVariable( eType ); return rRef.get(); @@ -165,7 +165,7 @@ SbxVariable* SbxArray::Get( sal_uInt16 nIdx ) } SbxVariableRef& rRef = GetRef( nIdx ); - if ( !rRef.Is() ) + if ( !rRef.is() ) rRef = new SbxVariable( eType ); return rRef.get(); @@ -311,7 +311,7 @@ void SbxArray::Merge( SbxArray* p ) for (auto& rEntry1: p->mVarEntries) { - if (!rEntry1.mpVar.Is()) + if (!rEntry1.mpVar.is()) continue; OUString aName = rEntry1.mpVar->GetName(); @@ -321,7 +321,7 @@ void SbxArray::Merge( SbxArray* p ) // Then overwrite! for (auto& rEntry2: mVarEntries) { - if (!rEntry2.mpVar.Is()) + if (!rEntry2.mpVar.is()) continue; if (rEntry2.mpVar->GetHashCode() == nHash && @@ -329,12 +329,12 @@ void SbxArray::Merge( SbxArray* p ) { // Take this element and clear the original. rEntry2.mpVar = rEntry1.mpVar; - rEntry1.mpVar.Clear(); + rEntry1.mpVar.clear(); break; } } - if (rEntry1.mpVar.Is()) + if (rEntry1.mpVar.is()) { // We don't have element with the same name. Add a new entry. SbxVarEntry aNewEntry; @@ -354,7 +354,7 @@ SbxVariable* SbxArray::FindUserData( sal_uInt32 nData ) SbxVariable* p = nullptr; for (auto& rEntry : mVarEntries) { - if (!rEntry.mpVar.Is()) + if (!rEntry.mpVar.is()) continue; if (rEntry.mpVar->IsVisible() && rEntry.mpVar->GetUserData() == nData) @@ -408,7 +408,7 @@ SbxVariable* SbxArray::Find( const OUString& rName, SbxClassType t ) sal_uInt16 nHash = SbxVariable::MakeHashCode( rName ); for (auto& rEntry : mVarEntries) { - if (!rEntry.mpVar.Is() || !rEntry.mpVar->IsVisible()) + if (!rEntry.mpVar.is() || !rEntry.mpVar->IsVisible()) continue; // The very secure search works as well, if there is no hashcode! @@ -489,14 +489,14 @@ bool SbxArray::StoreData( SvStream& rStrm ) const // Which elements are even defined? for( auto& rEntry: mVarEntries ) { - if (rEntry.mpVar.Is() && !(rEntry.mpVar->GetFlags() & SbxFlagBits::DontStore)) + if (rEntry.mpVar.is() && !(rEntry.mpVar->GetFlags() & SbxFlagBits::DontStore)) nElem++; } rStrm.WriteUInt16( nElem ); for( size_t n = 0; n < mVarEntries.size(); n++ ) { const SbxVarEntry& rEntry = mVarEntries[n]; - if (rEntry.mpVar.Is() && !(rEntry.mpVar->GetFlags() & SbxFlagBits::DontStore)) + if (rEntry.mpVar.is() && !(rEntry.mpVar->GetFlags() & SbxFlagBits::DontStore)) { rStrm.WriteUInt16( n ); if (!rEntry.mpVar->Store(rStrm)) diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx index 24afd3388d0b..1a671a654512 100644 --- a/basic/source/sbx/sbxexec.cxx +++ b/basic/source/sbx/sbxexec.cxx @@ -90,7 +90,7 @@ static SbxVariableRef QualifiedName { // Read in the element refVar = Element( pObj, pGbl, &p, t ); - while( refVar.Is() && (*p == '.' || *p == '!') ) + while( refVar.is() && (*p == '.' || *p == '!') ) { // It follows still an objectelement. The current element // had to be a SBX-Object or had to deliver such an object! @@ -98,7 +98,7 @@ static SbxVariableRef QualifiedName if( !pObj ) // Then it had to deliver an object pObj = dynamic_cast<SbxObject*>( refVar->GetObject() ); - refVar.Clear(); + refVar.clear(); if( !pObj ) break; p++; @@ -129,7 +129,7 @@ static SbxVariableRef Operand sal_uInt16 nLen; if( !refVar->Scan( OUString( p ), &nLen ) ) { - refVar.Clear(); + refVar.clear(); } else { @@ -176,11 +176,11 @@ static SbxVariableRef MulDiv( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod const sal_Unicode* p = *ppBuf; SbxVariableRef refVar( Operand( pObj, pGbl, &p, false ) ); p = SkipWhitespace( p ); - while( refVar.Is() && ( *p == '*' || *p == '/' ) ) + while( refVar.is() && ( *p == '*' || *p == '/' ) ) { sal_Unicode cOp = *p++; SbxVariableRef refVar2( Operand( pObj, pGbl, &p, false ) ); - if( refVar2.Is() ) + if( refVar2.is() ) { // temporary variable! SbxVariable* pVar = refVar.get(); @@ -193,7 +193,7 @@ static SbxVariableRef MulDiv( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod } else { - refVar.Clear(); + refVar.clear(); break; } } @@ -206,11 +206,11 @@ static SbxVariableRef PlusMinus( SbxObject* pObj, SbxObject* pGbl, const sal_Uni const sal_Unicode* p = *ppBuf; SbxVariableRef refVar( MulDiv( pObj, pGbl, &p ) ); p = SkipWhitespace( p ); - while( refVar.Is() && ( *p == '+' || *p == '-' ) ) + while( refVar.is() && ( *p == '+' || *p == '-' ) ) { sal_Unicode cOp = *p++; SbxVariableRef refVar2( MulDiv( pObj, pGbl, &p ) ); - if( refVar2.Is() ) + if( refVar2.is() ) { // temporaere Variable! SbxVariable* pVar = refVar.get(); @@ -223,7 +223,7 @@ static SbxVariableRef PlusMinus( SbxObject* pObj, SbxObject* pGbl, const sal_Uni } else { - refVar.Clear(); + refVar.clear(); break; } } @@ -236,7 +236,7 @@ static SbxVariableRef Assign( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod const sal_Unicode* p = *ppBuf; SbxVariableRef refVar( Operand( pObj, pGbl, &p, true ) ); p = SkipWhitespace( p ); - if( refVar.Is() ) + if( refVar.is() ) { if( *p == '=' ) { @@ -244,13 +244,13 @@ static SbxVariableRef Assign( SbxObject* pObj, SbxObject* pGbl, const sal_Unicod if( refVar->GetClass() != SbxClassType::Property ) { SbxBase::SetError( ERRCODE_SBX_BAD_ACTION ); - refVar.Clear(); + refVar.clear(); } else { p++; SbxVariableRef refVar2( PlusMinus( pObj, pGbl, &p ) ); - if( refVar2.Is() ) + if( refVar2.is() ) { SbxVariable* pVar = refVar.get(); SbxVariable* pVar2 = refVar2.get(); @@ -287,7 +287,7 @@ static SbxVariableRef Element } refVar = pObj->Find( aSym, t ); pObj->SetFlags( nOld ); - if( refVar.Is() ) + if( refVar.is() ) { refVar->SetParameters( nullptr ); // Follow still parameter? @@ -303,10 +303,10 @@ static SbxVariableRef Element while( *p && *p != ')' && *p != ']' ) { SbxVariableRef refArg = PlusMinus( pGbl, pGbl, &p ); - if( !refArg.Is() ) + if( !refArg.is() ) { // Error during the parsing - refVar.Clear(); break; + refVar.clear(); break; } else { @@ -321,7 +321,7 @@ static SbxVariableRef Element } if( *p == ')' ) p++; - if( refVar.Is() ) + if( refVar.is() ) refVar->SetParameters( refPar.get() ); } } @@ -350,7 +350,7 @@ SbxVariable* SbxObject::Execute( const OUString& rTxt ) SetError( ERRCODE_SBX_SYNTAX ); break; } pVar = Assign( this, this, &p ); - if( !pVar.Is() ) + if( !pVar.is() ) { break; } diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index e33e6b390a50..69533d97ccf4 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -564,7 +564,7 @@ void SbxObject::Remove( SbxVariable* pVar ) static bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray ) { SbxArrayRef p = static_cast<SbxArray*>( SbxBase::Load( rStrm ) ); - if( !p.Is() ) + if( !p.is() ) { return false; } diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index cf56cd738f8e..097b04c0b1a6 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -185,7 +185,7 @@ void SbxVariable::Broadcast( SfxHintId nHintId ) pCst = nullptr; SbxFlagBits nSaveFlags = GetFlags(); SetFlag( SbxFlagBits::ReadWrite ); - if( mpPar.Is() ) + if( mpPar.is() ) { // Register this as element 0, but don't change over the parent! mpPar->GetRef( 0 ) = this; @@ -199,10 +199,10 @@ void SbxVariable::Broadcast( SfxHintId nHintId ) SbxInfo* SbxVariable::GetInfo() { - if( !pInfo.Is() ) + if( !pInfo.is() ) { Broadcast( SfxHintId::BasicInfoWanted ); - if( pInfo.Is() ) + if( pInfo.is() ) { SetModified( true ); } @@ -239,7 +239,7 @@ const OUString& SbxVariable::GetName( SbxNameType t ) const // Request parameter-information (not for objects) const_cast<SbxVariable*>(this)->GetInfo(); // Append nothing, if it is a simple property (no empty brackets) - if (!pInfo.Is() || (pInfo->m_Params.empty() && GetClass() == SbxClassType::Property)) + if (!pInfo.is() || (pInfo->m_Params.empty() && GetClass() == SbxClassType::Property)) { return maName; } @@ -619,7 +619,7 @@ bool SbxVariable::StoreData( SvStream& rStrm ) const write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, maName, RTL_TEXTENCODING_ASCII_US); rStrm.WriteUInt32( nUserData ); - if( pInfo.Is() ) + if( pInfo.is() ) { rStrm.WriteUChar( 2 ); // Version 2: with UserData! pInfo->StoreData( rStrm ); @@ -656,7 +656,7 @@ SbxAlias& SbxAlias::operator=( const SbxAlias& r ) SbxAlias::~SbxAlias() { - if( xAlias.Is() ) + if( xAlias.is() ) { EndListening( xAlias->GetBroadcaster() ); } @@ -664,7 +664,7 @@ SbxAlias::~SbxAlias() void SbxAlias::Broadcast( SfxHintId nHt ) { - if( xAlias.Is() ) + if( xAlias.is() ) { xAlias->SetParameters( GetParameters() ); if( nHt == SfxHintId::BasicDataWanted ) @@ -688,7 +688,7 @@ void SbxAlias::Notify( SfxBroadcaster&, const SfxHint& rHint ) const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint); if( p && p->GetId() == SfxHintId::BasicDying ) { - xAlias.Clear(); + xAlias.clear(); // delete the alias? if( pParent ) { diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index f2161ec4947d..5b671ad0f3e5 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -421,7 +421,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) { sal_uLong nPos; tools::SvRef<SvBaseLink> xLink = GetSelEntry( &nPos ); - if( !xLink.Is() ) + if( !xLink.is() ) return; ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO | WB_DEF_YES, aStrCloselinkmsg ); @@ -437,7 +437,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) xLink->Closed(); // if somebody has forgotten to deregister himself - if( xLink.Is() ) + if( xLink.is() ) pLinkMgr->Remove( xLink.get() ); if( bNewLnkMgr ) @@ -508,7 +508,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, void ) { SvTreeListEntry* pBox = m_pTbLinks->GetEntry( --nPos ); tools::SvRef<SvBaseLink> xLink( static_cast<SvBaseLink*>(pBox->GetUserData()) ); - if( xLink.Is() ) + if( xLink.is() ) { OUString sCur( ImplGetStateStr( *xLink ) ), sOld( SvTabListBox::GetEntryText( pBox, 3 ) ); @@ -595,7 +595,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) for( size_t n = 0; n < rLnks.size(); ++n ) { tools::SvRef<SvBaseLink>& rLinkRef = rLnks[ n ]; - if( !rLinkRef.Is() ) + if( !rLinkRef.is() ) { rLnks.erase( rLnks.begin() + n ); --n; diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index ab51cbabe673..46d4429b4af9 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1462,7 +1462,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const case ID_BROWSER_CUT: { CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller(); - if (xCurrentController.Is() && nullptr != dynamic_cast< const EditCellController* >(xCurrentController.get())) + if (xCurrentController.is() && nullptr != dynamic_cast< const EditCellController* >(xCurrentController.get())) { Edit& rEdit = static_cast<Edit&>(xCurrentController->GetWindow()); bool bHasLen = (rEdit.GetSelection().Len() != 0); @@ -1941,7 +1941,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property case ID_BROWSER_PASTE: { CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller(); - if (!xCurrentController.Is()) + if (!xCurrentController.is()) // should be intercepted by GetState. Normally. // Unfortunately ID_BROWSER_PASTE is a 'fast call' slot, which means it may be executed without checking if it is // enabled. This would be really deadly herein if the current cell has no controller ... diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 2edd7fda2975..3b32859b7f7d 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -139,7 +139,7 @@ namespace dbaui if (nUserObjectId == SotClipboardFormatId::RTF || nUserObjectId == SotClipboardFormatId::HTML ) { ODatabaseImportExport* pExport = static_cast<ODatabaseImportExport*>(pUserObject); - if ( pExport && rxOStm.Is() ) + if ( pExport && rxOStm.is() ) { pExport->setStream(rxOStm.get()); return pExport->Write(); diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 51f998e82da9..a8e8ba27dbfe 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1248,7 +1248,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) if ( IsDropFormatSupported( SotClipboardFormatId::STRING ) ) do { // odd construction, but spares us a lot of (explicit ;) goto's - if (!GetEmptyRow().Is()) + if (!GetEmptyRow().is()) // without an empty row we're not in update mode break; @@ -1270,12 +1270,12 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) // not dropped within a cell (a cell isn't as wide as the column - the are small spaces) break; - if ((IsModified() || (GetCurrentRow().Is() && GetCurrentRow()->IsModified())) && (GetCurrentPos() != nRow)) + if ((IsModified() || (GetCurrentRow().is() && GetCurrentRow()->IsModified())) && (GetCurrentPos() != nRow)) // there is a current and modified row or cell and he text is to be dropped into another one break; CellControllerRef xCurrentController = Controller(); - if (xCurrentController.Is() && xCurrentController->IsModified() && ((nRow != GetCurRow()) || (nCol != GetCurColumnId()))) + if (xCurrentController.is() && xCurrentController->IsModified() && ((nRow != GetCurRow()) || (nCol != GetCurColumnId()))) // the current controller is modified and the user wants to drop in another cell -> no chance // (when leaving the modified cell a error may occur - this is deadly while dragging) break; @@ -1323,7 +1323,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) } while (false); - if(nAction != DND_ACTION_COPY && GetEmptyRow().Is()) + if(nAction != DND_ACTION_COPY && GetEmptyRow().is()) { const DataFlavorExVector& _rFlavors = GetDataFlavors(); if(::std::any_of(_rFlavors.begin(),_rFlavors.end(),SbaGridControlPrec())) @@ -1366,7 +1366,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) ActivateCell(); CellControllerRef xCurrentController = Controller(); - if (!xCurrentController.Is() || nullptr == dynamic_cast< const EditCellController* >(xCurrentController.get())) + if (!xCurrentController.is() || nullptr == dynamic_cast< const EditCellController* >(xCurrentController.get())) return DND_ACTION_NONE; Edit& rEdit = static_cast<Edit&>(xCurrentController->GetWindow()); @@ -1384,7 +1384,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) return DND_ACTION_COPY; } - if(GetEmptyRow().Is()) + if(GetEmptyRow().is()) { const DataFlavorExVector& _rFlavors = GetDataFlavors(); if( ::std::any_of(_rFlavors.begin(),_rFlavors.end(), SbaGridControlPrec()) ) diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index a077cda997d3..58de1f22855a 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -244,7 +244,7 @@ bool OTableGrantControl::SaveModified() bErg = false; ::dbaui::showError(::dbtools::SQLExceptionInfo(e),GetParent(),m_xContext); } - if(bErg && Controller().Is()) + if(bErg && Controller().is()) Controller()->ClearModified(); if(!bErg) UpdateTables(); diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 0b75d816e81d..d5b059654d6c 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -280,7 +280,7 @@ bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedData _rAsyncDrop.bHtml = bHtml; _rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,true,_xConnection); - bRet = ( !_rAsyncDrop.bError && bOk && _rAsyncDrop.aHtmlRtfStorage.Is() ); + bRet = ( !_rAsyncDrop.bError && bOk && _rAsyncDrop.aHtmlRtfStorage.is() ); if ( bRet ) { // now we need to copy the stream @@ -302,7 +302,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc ,const OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { - if ( _rDesc.aHtmlRtfStorage.Is() ) + if ( _rDesc.aHtmlRtfStorage.is() ) { copyTagTable(_rDesc,false,_xConnection); _rDesc.aHtmlRtfStorage = nullptr; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 40ac61745126..b9fb54822c11 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -895,7 +895,7 @@ bool OSelectionBrowseBox::SaveModified() bool bError = false; bool bListAction = false; - if (pEntry.is() && Controller().Is() && Controller()->IsModified()) + if (pEntry.is() && Controller().is() && Controller()->IsModified()) { // for the Undo-action OUString strOldCellContents,sNewValue; @@ -1162,7 +1162,7 @@ bool OSelectionBrowseBox::SaveModified() bAppendRow = true; } } - if( !bError && Controller().Is() ) + if( !bError && Controller().is() ) Controller()->ClearModified(); RowModified(GetCurRow(), GetCurColumnId()); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 80519ed295da..9d4c26304a37 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -681,7 +681,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) GetUndoManager().LeaveListAction(); RowModified(nRow); CellControllerRef xController(Controller()); - if(xController.Is()) + if(xController.is()) xController->SetModified(); // Set the Modify flag @@ -776,7 +776,7 @@ void OTableEditorCtrl::InsertRows( long nRow ) { ::tools::SvRef<SotStorageStream> aStreamRef; bool bOk = aTransferData.GetSotStorageStream(SotClipboardFormatId::SBA_TABED,aStreamRef); - if (bOk && aStreamRef.Is()) + if (bOk && aStreamRef.is()) { aStreamRef->Seek(STREAM_SEEK_TO_BEGIN); aStreamRef->ResetError(); @@ -876,7 +876,7 @@ void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const OUStr GoToRow( nRow ); GoToColumnId( nColId ); CellControllerRef xController = Controller(); - if(xController.Is()) + if(xController.is()) xController->GetWindow().SetText( rText ); else RowModified(nRow,nColId); diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index cec3d5349a6a..bd97f0618613 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -90,7 +90,7 @@ void OTableDesignCellUndoAct::Undo() if (m_pTabDgnCtrl->GetCurUndoActId() == 1) { CellControllerRef xController = m_pTabDgnCtrl->Controller(); - if ( xController.Is() ) + if ( xController.is() ) xController->ClearModified(); m_pTabDgnCtrl->GetView()->getController().setModified(false); diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 57186eb98f0a..998b0b3f4572 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1994,14 +1994,14 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp( { const OUString sStrmName( pStrmName, strlen(pStrmName), RTL_TEXTENCODING_MS_1252 ); - if( rStg.Is() && rStg->IsStream( sStrmName ) ) + if( rStg.is() && rStg->IsStream( sStrmName ) ) { tools::SvRef<SotStorageStream> xStrm = rStg->OpenSotStream( sStrmName, ( StreamMode::READ | StreamMode::SHARE_DENYWRITE | StreamMode::NOCREATE ) ); if( SVSTREAM_OK != xStrm->GetError()) { - xStrm.Clear(); - rStg.Clear(); + xStrm.clear(); + rStg.clear(); RemoveStream_Imp( sStrmName ); } else @@ -2060,7 +2060,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( tools::SvRef<SotStorage> &rStg, bool bConvert ) { - if( rStg.Is() ) + if( rStg.is() ) { OUString sStrmName( pStrmName, strlen(pStrmName), RTL_TEXTENCODING_MS_1252 ); if( rLst.empty() ) @@ -2072,7 +2072,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( { tools::SvRef<SotStorageStream> xStrm = rStg->OpenSotStream( sStrmName, ( StreamMode::READ | StreamMode::WRITE | StreamMode::SHARE_DENYWRITE ) ); - if( xStrm.Is() ) + if( xStrm.is() ) { xStrm->SetSize( 0 ); xStrm->SetBufferSize( 8192 ); @@ -2095,7 +2095,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( xStrm->Commit(); if( xStrm->GetError() == SVSTREAM_OK ) { - xStrm.Clear(); + xStrm.clear(); if (!bConvert) { rStg->Commit(); @@ -2229,7 +2229,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadCplSttExceptList() { tools::SvRef<SotStorage> xStg = new SotStorage( sShareAutoCorrFile, StreamMode::READ | StreamMode::SHARE_DENYNONE ); OUString sTemp ( pXMLImplCplStt_ExcptLstStr ); - if( xStg.Is() && xStg->IsContained( sTemp ) ) + if( xStg.is() && xStg->IsContained( sTemp ) ) LoadXMLExceptList_Imp( pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg ); } catch (const css::ucb::ContentCreationException&) @@ -2273,7 +2273,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList() { tools::SvRef<SotStorage> xStg = new SotStorage( sShareAutoCorrFile, StreamMode::READ | StreamMode::SHARE_DENYNONE ); OUString sTemp ( pXMLImplWrdStt_ExcptLstStr ); - if( xStg.Is() && xStg->IsContained( sTemp ) ) + if( xStg.is() && xStg->IsContained( sTemp ) ) LoadXMLExceptList_Imp( pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg ); } catch (const css::ucb::ContentCreationException &e) @@ -2322,7 +2322,7 @@ void SvxAutoCorrectLanguageLists::RemoveStream_Imp( const OUString& rName ) if( sShareAutoCorrFile != sUserAutoCorrFile ) { tools::SvRef<SotStorage> xStg = new SotStorage( sUserAutoCorrFile, StreamMode::READWRITE ); - if( xStg.Is() && SVSTREAM_OK == xStg->GetError() && + if( xStg.is() && SVSTREAM_OK == xStg->GetError() && xStg->IsStream( rName ) ) { xStg->Remove( rName ); @@ -2387,7 +2387,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() tools::SvRef<SotStorage> xSrcStg = new SotStorage( aDest.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ), StreamMode::READ ); tools::SvRef<SotStorage> xDstStg = new SotStorage( sUserAutoCorrFile, StreamMode::WRITE ); - if( xSrcStg.Is() && xDstStg.Is() ) + if( xSrcStg.is() && xDstStg.is() ) { OUString sXMLWord ( pXMLImplWrdStt_ExcptLstStr ); OUString sXMLSentence ( pXMLImplCplStt_ExcptLstStr ); @@ -2439,7 +2439,7 @@ bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SotStorage& rStg ) { tools::SvRef<SotStorageStream> refList = rStg.OpenSotStream( sStrmName, ( StreamMode::READ | StreamMode::WRITE | StreamMode::SHARE_DENYWRITE ) ); - if( refList.Is() ) + if( refList.is() ) { refList->SetSize( 0 ); refList->SetBufferSize( 8192 ); @@ -2463,7 +2463,7 @@ bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SotStorage& rStg ) bRet = SVSTREAM_OK == refList->GetError(); if( bRet ) { - refList.Clear(); + refList.clear(); rStg.Commit(); if( SVSTREAM_OK != rStg.GetError() ) { @@ -2493,7 +2493,7 @@ bool SvxAutoCorrectLanguageLists::MakeCombinedChanges( std::vector<SvxAutocorrWo MakeUserStorage_Impl(); tools::SvRef<SotStorage> xStorage = new SotStorage( sUserAutoCorrFile, StreamMode::READWRITE ); - bool bRet = xStorage.Is() && SVSTREAM_OK == xStorage->GetError(); + bool bRet = xStorage.is() && SVSTREAM_OK == xStorage->GetError(); if( bRet ) { @@ -2565,7 +2565,7 @@ bool SvxAutoCorrectLanguageLists::PutText( const OUString& rShort, const OUStrin MakeUserStorage_Impl(); tools::SvRef<SotStorage> xStg = new SotStorage( sUserAutoCorrFile, StreamMode::READWRITE ); - bool bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError(); + bool bRet = xStg.is() && SVSTREAM_OK == xStg->GetError(); // Update the word list if( bRet ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 5e45f5bdafe4..7bbc0e38fc8a 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6752,7 +6752,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, if( !rStm.IsEof() && nReadLen > nBytesRead && nDataLen ) { - if( xOle10Stm.Is() ) + if( xOle10Stm.is() ) { std::unique_ptr<sal_uInt8[]> pData(new sal_uInt8[ nDataLen ]); if( !pData ) @@ -6952,7 +6952,7 @@ css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForCo tools::SvRef<SotStorage> xStorage = new SotStorage( false, *xMemStream ); rSrcStg.CopyTo( xStorage.get() ); xStorage->Commit(); - xStorage.Clear(); + xStorage.clear(); OUString aType = SfxFilter::GetTypeFromStorage( rSrcStg ); if ( aType.getLength() ) pFilter = aMatch.GetFilter4EA( aType ); @@ -7073,7 +7073,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( { sal_Int64 nAspect = nRecommendedAspect; SdrOle2Obj* pRet = nullptr; - if( rSrcStorage.Is() && xDestStorage.is() && rStorageName.getLength() ) + if( rSrcStorage.is() && xDestStorage.is() && rStorageName.getLength() ) { comphelper::EmbeddedObjectContainer aCnt( xDestStorage ); // does the 01Ole-Stream exist at all? @@ -7086,18 +7086,18 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( { tools::SvRef<SotStorage> xObjStg = rSrcStorage->OpenSotStorage( rStorageName ); - if( xObjStg.Is() ) + if( xObjStg.is() ) { { sal_uInt8 aTestA[10]; // exist the \1CompObj-Stream ? tools::SvRef<SotStorageStream> xSrcTst = xObjStg->OpenSotStream( "\1CompObj" ); - bValidStorage = xSrcTst.Is() && sizeof( aTestA ) == + bValidStorage = xSrcTst.is() && sizeof( aTestA ) == xSrcTst->ReadBytes(aTestA, sizeof(aTestA)); if( !bValidStorage ) { // or the \1Ole-Stream ? xSrcTst = xObjStg->OpenSotStream( "\1Ole" ); - bValidStorage = xSrcTst.Is() && sizeof(aTestA) == + bValidStorage = xSrcTst.is() && sizeof(aTestA) == xSrcTst->ReadBytes(aTestA, sizeof(aTestA)); } } @@ -7113,7 +7113,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( tools::SvRef<SotStorageStream> xObjInfoSrc = xObjStg->OpenSotStream( "\3ObjInfo", StreamMode::STD_READ ); - if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() ) + if ( xObjInfoSrc.is() && !xObjInfoSrc->GetError() ) { sal_uInt8 nByte = 0; xObjInfoSrc->ReadUChar( nByte ); @@ -7146,7 +7146,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( // object is not an own object tools::SvRef<SotStorage> xObjStor = SotStorage::OpenOLEStorage( xDestStorage, aDstStgName, StreamMode::READWRITE ); - if ( xObjStor.Is() ) + if ( xObjStor.is() ) { tools::SvRef<SotStorage> xSrcStor = rSrcStorage->OpenSotStorage( rStorageName, StreamMode::READ ); xSrcStor->CopyTo( xObjStor.get() ); @@ -7159,7 +7159,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( rError = xObjStor->GetError(); bValidStorage = false; } - else if( !xObjStor.Is() ) + else if( !xObjStor.is() ) bValidStorage = false; } } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 0c06194c41af..9d32fc19cf36 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1848,21 +1848,21 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, if ( pObjStor ) { tools::SvRef<SotStorage> xObjStor( new SotStorage( pObjStor ) ); - if ( xObjStor.Is() && !xObjStor->GetError() ) + if ( xObjStor.is() && !xObjStor->GetError() ) { if ( xObjStor->GetClassName() == SvGlobalName() ) { xObjStor->SetClass( SvGlobalName( pObjStor->GetClassId() ), pObjStor->GetFormat(), pObjStor->GetUserName() ); } tools::SvRef<SotStorageStream> xSrcTst = xObjStor->OpenSotStream( "\1Ole" ); - if ( xSrcTst.Is() ) + if ( xSrcTst.is() ) { sal_uInt8 aTestA[ 10 ]; bool bGetItAsOle = (sizeof(aTestA) == xSrcTst->ReadBytes(aTestA, sizeof(aTestA))); if ( !bGetItAsOle ) { // maybe there is a contents stream in here xSrcTst = xObjStor->OpenSotStream( "Contents", StreamMode::READWRITE | StreamMode::NOCREATE ); - bGetItAsOle = (xSrcTst.Is() && + bGetItAsOle = (xSrcTst.is() && sizeof(aTestA) == xSrcTst->ReadBytes(aTestA, sizeof(aTestA))); } if ( bGetItAsOle ) @@ -1899,13 +1899,13 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, // object is not an own object tools::SvRef<SotStorage> xTarget = SotStorage::OpenOLEStorage( pOe->pShell->GetStorage(), aNm, StreamMode::READWRITE ); - if ( xObjStor.Is() && xTarget.Is() ) + if ( xObjStor.is() && xTarget.is() ) { xObjStor->CopyTo( xTarget.get() ); if( !xTarget->GetError() ) xTarget->Commit(); } - xTarget.Clear(); + xTarget.clear(); uno::Reference < embed::XEmbeddedObject > xObj = pOe->pShell->getEmbeddedObjectContainer().GetEmbeddedObject( aNm ); @@ -2016,15 +2016,15 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt { tools::SvRef<SotStorage> xSource( new SotStorage( pBas, true ) ); tools::SvRef<SotStorage> xDest( new SotStorage( new SvMemoryStream(), true ) ); - if ( xSource.Is() && xDest.Is() ) + if ( xSource.is() && xDest.is() ) { // is this a visual basic storage ? tools::SvRef<SotStorage> xSubStorage = xSource->OpenSotStorage( "VBA", StreamMode::READWRITE | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL ); - if( xSubStorage.Is() && ( SVSTREAM_OK == xSubStorage->GetError() ) ) + if( xSubStorage.is() && ( SVSTREAM_OK == xSubStorage->GetError() ) ) { tools::SvRef<SotStorage> xMacros = xDest->OpenSotStorage( "MACROS" ); - if ( xMacros.Is() ) + if ( xMacros.is() ) { SvStorageInfoList aList; xSource->FillInfoList( &aList ); @@ -2043,13 +2043,13 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt if ( xDoc.is() ) { tools::SvRef<SotStorage> xVBA = SotStorage::OpenOLEStorage( xDoc, SvxImportMSVBasic::GetMSBasicStorageName() ); - if ( xVBA.Is() && ( xVBA->GetError() == SVSTREAM_OK ) ) + if ( xVBA.is() && ( xVBA->GetError() == SVSTREAM_OK ) ) { tools::SvRef<SotStorage> xSubVBA = xVBA->OpenSotStorage( "_MS_VBA_Overhead" ); - if ( xSubVBA.Is() && ( xSubVBA->GetError() == SVSTREAM_OK ) ) + if ( xSubVBA.is() && ( xSubVBA->GetError() == SVSTREAM_OK ) ) { tools::SvRef<SotStorageStream> xOriginal = xSubVBA->OpenSotStream( "_MS_VBA_Overhead2" ); - if ( xOriginal.Is() && ( xOriginal->GetError() == SVSTREAM_OK ) ) + if ( xOriginal.is() && ( xOriginal->GetError() == SVSTREAM_OK ) ) { if ( nPersistPtr && ( nPersistPtr < nPersistPtrAnz ) ) { diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx index 1ea178aed5a7..6eb7b99ba216 100644 --- a/filter/source/msfilter/svxmsbas2.cxx +++ b/filter/source/msfilter/svxmsbas2.cxx @@ -35,7 +35,7 @@ ErrCode SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto, OUString aDstStgName( GetMSBasicStorageName() ); tools::SvRef<SotStorage> xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName, StreamMode::READWRITE | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL ) ); - if( xVBAStg.Is() && !xVBAStg->GetError() ) + if( xVBAStg.is() && !xVBAStg->GetError() ) { xVBAStg = nullptr; if( bSaveInto ) @@ -67,7 +67,7 @@ ErrCode SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocSh) uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() ); tools::SvRef<SotStorage> xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, GetMSBasicStorageName(), StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL )); - return ( xVBAStg.Is() && !xVBAStg->GetError() ) + return ( xVBAStg.is() && !xVBAStg->GetError() ) ? ERRCODE_SVX_VBASIC_STORAGE_EXIST : ERRCODE_NONE; } diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 44de0278c36b..cf205644ca17 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -115,7 +115,7 @@ public: const OString & GetName() const override { - return ( !aRef.Is() + return ( !aRef.is() || !SvMetaObject::GetName().isEmpty() ) ? SvMetaObject::GetName() : aRef->GetName(); diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 7b0e648e7a41..8e5e177fbd2e 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -201,7 +201,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& // written any more. // It is prohibited that Shell and SuperShell directly import the same //class. - if( GetMetaTypeType() == MetaTypeType::Shell && aSuperClass.Is() ) + if( GetMetaTypeType() == MetaTypeType::Shell && aSuperClass.is() ) aSuperClass->FillClasses( rClassList ); // Write all attributes of the imported classes, as long as they have @@ -221,7 +221,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& } // only write superclass if no shell and not in the list - if( GetMetaTypeType() != MetaTypeType::Shell && aSuperClass.Is() ) + if( GetMetaTypeType() != MetaTypeType::Shell && aSuperClass.is() ) { aSuperClass->InsertSlots( rList, rSuperList, rClassList, rPrefix, rBase ); } @@ -245,7 +245,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList ) } // my superclass - if( aSuperClass.Is() ) + if( aSuperClass.is() ) aSuperClass->FillClasses( rList ); } diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 9ae31d437cc9..f5ac534ac30d 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -105,12 +105,12 @@ OString SvMetaSlot::GetMangleName() const /** reference disbandment **/ SvMetaType * SvMetaSlot::GetSlotType() const { - if( aSlotType.Is() || !GetRef() ) return aSlotType.get(); + if( aSlotType.is() || !GetRef() ) return aSlotType.get(); return static_cast<SvMetaSlot *>(GetRef())->GetSlotType(); } SvMetaAttribute * SvMetaSlot::GetMethod() const { - if( aMethod.Is() || !GetRef() ) return aMethod.get(); + if( aMethod.is() || !GetRef() ) return aMethod.get(); return static_cast<SvMetaSlot *>(GetRef())->GetMethod(); } const OString& SvMetaSlot::GetGroupId() const @@ -272,7 +272,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, if( !bOk ) { - if( !aSlotType.Is() ) + if( !aSlotType.is() ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken& rTok = rInStm.GetToken_Next(); @@ -281,7 +281,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, if( rInStm.ReadIf( '=' ) ) { aSlotType = rBase.ReadKnownType( rInStm ); - if( !aSlotType.Is() ) + if( !aSlotType.is() ) throw SvParseException( rInStm, "SlotType with unknown item type" ); if( !aSlotType->IsItem() ) throw SvParseException( rInStm, "the SlotType is not a item" ); @@ -291,7 +291,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, rInStm.Seek( nTokPos ); } - if( !aMethod.Is() ) + if( !aMethod.is() ) { SvToken& rTok = rInStm.GetToken(); if( rTok.IsIdentifier() ) @@ -308,7 +308,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, } rInStm.Seek( nTokPos ); } - aMethod.Clear(); + aMethod.clear(); } } } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index a7b913d49d4f..6f3042b70d33 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -39,7 +39,7 @@ SvMetaAttribute::SvMetaAttribute( SvMetaType * pType ) SvMetaType * SvMetaAttribute::GetType() const { - if( aType.Is() || !GetRef() ) return aType.get(); + if( aType.is() || !GetRef() ) return aType.get(); return static_cast<SvMetaAttribute *>(GetRef())->GetType(); } diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx index d21e334a3c51..2172fb87b029 100644 --- a/idl/source/prj/parser.cxx +++ b/idl/source/prj/parser.cxx @@ -428,7 +428,7 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) if( bOk ) return; - if( !rSlot.aSlotType.Is() ) + if( !rSlot.aSlotType.is() ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken& rTok = rInStm.GetToken_Next(); @@ -437,7 +437,7 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) if( rInStm.ReadIf( '=' ) ) { rSlot.aSlotType = rBase.ReadKnownType( rInStm ); - if( !rSlot.aSlotType.Is() ) + if( !rSlot.aSlotType.is() ) throw SvParseException( rInStm, "SlotType with unknown item type" ); if( !rSlot.aSlotType->IsItem() ) throw SvParseException( rInStm, "the SlotType is not a item" ); @@ -447,7 +447,7 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) rInStm.Seek( nTokPos ); } - if( !rSlot.aMethod.Is() ) + if( !rSlot.aMethod.is() ) { SvToken& rTok = rInStm.GetToken(); if( rTok.IsIdentifier() ) @@ -464,7 +464,7 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) } rInStm.Seek( nTokPos ); } - rSlot.aMethod.Clear(); + rSlot.aMethod.clear(); } } } diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 5ad572947d1b..ceca0fd2aeab 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -103,7 +103,7 @@ protected: SvLinkSource* GetRealObject() { - if( !xObj.Is() ) + if( !xObj.is() ) GetRealObject_(); return xObj.get(); } diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index c3d54e600b98..d11dcafb07f5 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -555,7 +555,7 @@ namespace svt // return sal_False prevents leaving the cell virtual bool SaveRow(); // commit the current row - virtual bool IsModified() const {return aController.Is() && aController->IsModified();} + virtual bool IsModified() const {return aController.is() && aController->IsModified();} virtual CellController* GetController(long nRow, sal_uInt16 nCol); virtual void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol); @@ -588,7 +588,7 @@ namespace svt virtual ~EditBrowseBox() override; virtual void dispose() override; - bool IsEditing() const {return aController.Is();} + bool IsEditing() const {return aController.is();} void InvalidateStatusCell(long nRow) {RowModified(nRow, 0);} void InvalidateHandleColumn(); diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 51c35259be89..9a06bddb6d59 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -564,7 +564,7 @@ protected: OUString GetCurrentRowCellText(DbGridColumn* pCol,const DbGridRowRef& _rRow) const; virtual void DeleteSelectedRows(); - static bool IsValid(const DbGridRowRef& _xRow) { return _xRow.Is() && _xRow->IsValid(); } + static bool IsValid(const DbGridRowRef& _xRow) { return _xRow.is() && _xRow->IsValid(); } // row which is currently being appended bool IsCurrentAppending() const; diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx index 97a5b362254e..2ec345c40b56 100644 --- a/include/tools/ref.hxx +++ b/include/tools/ref.hxx @@ -56,7 +56,7 @@ public: if (pObj != nullptr) pObj->ReleaseRef(); } - void Clear() + void clear() { if (pObj != nullptr) { T * pRefObj = pObj; @@ -88,9 +88,9 @@ public: return *this; } - bool Is() const { return pObj != nullptr; } + bool is() const { return pObj != nullptr; } - explicit operator bool() const { return Is(); } + explicit operator bool() const { return is(); } T * get() const { return pObj; } @@ -219,12 +219,13 @@ public: { if( pObj ) _xHdl = pObj->GetHdl(); } inline SvCompatWeakRef& operator = ( T * pObj ) { _xHdl = pObj ? pObj->GetHdl() : nullptr; return *this; } - inline bool Is() const - { return _xHdl.Is() && _xHdl->GetObj(); } + inline bool is() const + { return _xHdl.is() && _xHdl->GetObj(); } + explicit operator bool() const { return is(); } inline T* operator -> () const - { return _xHdl.Is() ? _xHdl->GetObj() : nullptr; } + { return _xHdl.is() ? _xHdl->GetObj() : nullptr; } inline operator T* () const - { return _xHdl.Is() ? _xHdl->GetObj() : nullptr; } + { return _xHdl.is() ? _xHdl->GetObj() : nullptr; } }; #endif diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index bb1ed9ce4f67..b32e69620283 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -468,7 +468,7 @@ MSConvertOCXControls::ReadOCXCtlsStream( tools::SvRef<SotStorageStream>& rSrc1, sal_Int32 nPos, sal_Int32 nStreamSize) { - if ( rSrc1.Is() ) + if ( rSrc1.is() ) { BinaryXInputStream aCtlsStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *rSrc1 ) ), true ); aCtlsStrm.seek( nPos ); @@ -516,7 +516,7 @@ bool MSConvertOCXControls::importControlFromStream( ::oox::BinaryInputStream& rI bool MSConvertOCXControls::ReadOCXStorage( tools::SvRef<SotStorage>& xOleStg, Reference< XFormComponent > & rxFormComp ) { - if ( xOleStg.Is() ) + if ( xOleStg.is() ) { tools::SvRef<SotStorageStream> pNameStream = xOleStg->OpenSotStream( "\3OCXNAME"); BinaryXInputStream aNameStream( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pNameStream ) ), true ); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index d315e80cf14a..ff0ea2d7765b 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -443,7 +443,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) tools::SvRef<SfxMedium> pMedium = new SfxMedium( sFileName, ( StreamMode::READ | StreamMode::NOCREATE ) ); - if( pMedium.Is() ) + if( pMedium.is() ) { try { diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 695e2f2030f1..1922e67da645 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -486,7 +486,7 @@ bool OFieldExpressionControl::SaveModified() m_pParent->m_pController->getUndoManager().LeaveListAction(); } - if ( Controller().Is() ) + if ( Controller().is() ) Controller()->ClearModified(); if ( GetRowCount() == m_pParent->getGroups()->getCount() ) { diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx index 1be7cf6c8819..04e7c595be8a 100644 --- a/sc/qa/unit/bugfix-test.cxx +++ b/sc/qa/unit/bugfix-test.cxx @@ -61,7 +61,7 @@ void ScFiltersTest::testTdf64229() xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo64229b.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo64229b.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -79,7 +79,7 @@ void ScFiltersTest::testTdf36933() xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo36933test.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo36933test.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -97,7 +97,7 @@ void ScFiltersTest::testTdf43700() xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43700test.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43700test.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -115,7 +115,7 @@ void ScFiltersTest::testTdf43534() xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43534test.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43534test.*", xDocSh.is()); // ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 1a27357f4f35..942042194bf7 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -56,7 +56,7 @@ void ScCopyPasteTest::testCopyPasteXLS() // 1. Open the document ScDocShellRef xDocSh = loadDoc("chartx2.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load chartx2.xls.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load chartx2.xls.", xDocSh.is()); uno::Reference< frame::XModel2 > xModel2 ( xDocSh->GetModel(), UNO_QUERY ); CPPUNIT_ASSERT( xModel2.is() ); diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 13b323906b56..4354cc41d041 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -118,7 +118,7 @@ bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, { ScDocShellRef xDocShRef = ScBootstrapFixture::load(rURL, rFilter, rUserData, OUString(), nFilterFlags, nClipboardID, nFilterVersion ); - bool bLoaded = xDocShRef.Is(); + bool bLoaded = xDocShRef.is(); //reference counting of ScDocShellRef is very confused. if (bLoaded) xDocShRef->DoClose(); @@ -187,7 +187,7 @@ void ScFiltersTest::testRangeNameODS() { ScDocShellRef xDocSh = loadDoc("named-ranges-global.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-global.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-global.*", xDocSh.is()); xDocSh->DoHardRecalc(true); @@ -320,7 +320,7 @@ void ScFiltersTest::testContentXLSB() void ScFiltersTest::testContentXLS_XML() { ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS_XML); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testContentImpl(rDoc, FORMAT_XLS_XML); @@ -330,7 +330,7 @@ void ScFiltersTest::testContentXLS_XML() void ScFiltersTest::testSharedFormulaXLS() { ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); xDocSh->DoHardRecalc(true); // Check the results of formula cells in the shared formula range. @@ -354,7 +354,7 @@ void ScFiltersTest::testSharedFormulaXLS() // to handle these wrong ranges that Excel stores. xDocSh = loadDoc("shared-formula/gap.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc2 = xDocSh->GetDocument(); rDoc2.CalcAll(); @@ -556,7 +556,7 @@ void testEnhancedProtectionImpl( ScDocument& rDoc ) void ScFiltersTest::testEnhancedProtectionXLS() { ScDocShellRef xDocSh = loadDoc("enhanced-protection.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testEnhancedProtectionImpl( rDoc); @@ -567,7 +567,7 @@ void ScFiltersTest::testEnhancedProtectionXLS() void ScFiltersTest::testEnhancedProtectionXLSX() { ScDocShellRef xDocSh = loadDoc("enhanced-protection.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testEnhancedProtectionImpl( rDoc); @@ -578,7 +578,7 @@ void ScFiltersTest::testEnhancedProtectionXLSX() void ScFiltersTest::testSortWithSharedFormulasODS() { ScDocShellRef xDocSh = loadDoc("shared-formula/sort-crash.", FORMAT_ODS, true); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // E2:E10 should be shared. @@ -630,7 +630,7 @@ void ScFiltersTest::testSortWithSharedFormulasODS() void ScFiltersTest::testSortWithSheetExternalReferencesODS() { ScDocShellRef xDocSh = loadDoc("sort-with-sheet-external-references.", FORMAT_ODS, true); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn auto calc on. rDoc.CalcAll(); diff --git a/sc/qa/unit/functions_test.cxx b/sc/qa/unit/functions_test.cxx index 0cc94007364b..bed9aa096815 100644 --- a/sc/qa/unit/functions_test.cxx +++ b/sc/qa/unit/functions_test.cxx @@ -34,7 +34,7 @@ bool FunctionsTest::load(const OUString& rFilter, const OUString& rURL, { ScDocShellRef xDocShRef = ScBootstrapFixture::load(rURL, rFilter, rUserData, OUString(), nFilterFlags, nClipboardID, nFilterVersion ); - CPPUNIT_ASSERT(xDocShRef.Is()); + CPPUNIT_ASSERT(xDocShRef.is()); xDocShRef->DoHardRecalc(true); diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 439df8af4328..f8bdd1166d01 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -549,7 +549,7 @@ ScDocShellRef ScBootstrapFixture::load( bool bReadWrite, { xDocShRef->DoClose(); // load failed. - xDocShRef.Clear(); + xDocShRef.clear(); } return xDocShRef; @@ -649,7 +649,7 @@ ScDocShellRef ScBootstrapFixture::saveAndReload( ScDocShell* pShell, sal_Int32 n OUString aFilterType(aFileFormats[nFormat].pTypeName, strlen(aFileFormats[nFormat].pTypeName), RTL_TEXTENCODING_UTF8); ScDocShellRef xDocSh = saveAndReload(pShell, aFilterName, OUString(), aFilterType, aFileFormats[nFormat].nFormatType); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); return xDocSh; } @@ -691,12 +691,12 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam* aTestValues, unsigned in int nImportType = aTestValues[ index ].nImportType; int nExportType = aTestValues[ index ].nExportType; ScDocShellRef xShell = loadDoc( sFileName, nImportType ); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); if ( nExportType != -1 ) xShell = saveAndReload(&(*xShell), nExportType ); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocument& rDoc = xShell->GetDocument(); diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 64290cdcdae2..ec39852db255 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -538,11 +538,11 @@ bool ScOpenCLTest::initTestEnv(const OUString& fileName, sal_Int32 nFormat, return false; xDocSh = loadDoc(fileName, nFormat, bReadWrite); - CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocSh.is()); enableOpenCL(); xDocShRes = loadDoc(fileName, nFormat, bReadWrite); - CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocShRes.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocShRes.is()); return true; } @@ -4747,15 +4747,15 @@ void ScOpenCLTest::setUp() void ScOpenCLTest::tearDown() { //close test env - if(xDocSh.Is()) + if(xDocSh.is()) { xDocSh->DoClose(); - xDocSh.Clear(); + xDocSh.clear(); } - if(xDocShRes.Is()) + if(xDocShRes.is()) { xDocShRes->DoClose(); - xDocShRes.Clear(); + xDocShRes.clear(); } uno::Reference< lang::XComponent > diff --git a/sc/qa/unit/range.cxx b/sc/qa/unit/range.cxx index 968434467e20..802175823a10 100644 --- a/sc/qa/unit/range.cxx +++ b/sc/qa/unit/range.cxx @@ -53,7 +53,7 @@ void ScAddressTest::setUp() void ScAddressTest::tearDown() { - m_xDocShRef.Clear(); + m_xDocShRef.clear(); BootstrapFixture::tearDown(); } @@ -94,7 +94,7 @@ void ScRangeTest::setUp() void ScRangeTest::tearDown() { - m_xDocShRef.Clear(); + m_xDocShRef.clear(); BootstrapFixture::tearDown(); } diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx index 1931a856175e..dce700164ecd 100644 --- a/sc/qa/unit/rangelst_test.cxx +++ b/sc/qa/unit/rangelst_test.cxx @@ -100,7 +100,7 @@ void Test::setUp() void Test::tearDown() { - m_xDocShRef.Clear(); + m_xDocShRef.clear(); BootstrapFixture::tearDown(); } diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index b4cb9856eed7..6413db82c015 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -366,7 +366,7 @@ void ScExportTest::test() ScDocShellRef xDocSh = saveAndReload(pShell, FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rLoadedDoc = xDocSh->GetDocument(); double aVal = rLoadedDoc.GetValue(0,0,0); ASSERT_DOUBLES_EQUAL(aVal, 1.0); @@ -390,7 +390,7 @@ void ScExportTest::testPasswordExportODS() OUString aFilterType(getFileFormats()[nFormat].pTypeName, strlen(getFileFormats()[nFormat].pTypeName), RTL_TEXTENCODING_UTF8); ScDocShellRef xDocSh = saveAndReloadPassword(pShell, aFilterName, OUString(), aFilterType, getFileFormats()[nFormat].nFormatType); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rLoadedDoc = xDocSh->GetDocument(); double aVal = rLoadedDoc.GetValue(0,0,0); ASSERT_DOUBLES_EQUAL(aVal, 1.0); @@ -401,10 +401,10 @@ void ScExportTest::testPasswordExportODS() void ScExportTest::testConditionalFormatExportODS() { ScDocShellRef xShell = loadDoc("new_cond_format_test_export.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFile("new_cond_format_test_export."); OUString aCSVPath; @@ -417,10 +417,10 @@ void ScExportTest::testConditionalFormatExportODS() void ScExportTest::testConditionalFormatExportXLSX() { ScDocShellRef xShell = loadDoc("new_cond_format_test_export.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); { OUString aCSVFile("new_cond_format_test_export."); @@ -441,10 +441,10 @@ void ScExportTest::testConditionalFormatExportXLSX() void ScExportTest::testColorScaleExportODS() { ScDocShellRef xShell = loadDoc("colorscale.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -457,10 +457,10 @@ void ScExportTest::testColorScaleExportODS() void ScExportTest::testColorScaleExportXLSX() { ScDocShellRef xShell = loadDoc("colorscale.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -473,10 +473,10 @@ void ScExportTest::testColorScaleExportXLSX() void ScExportTest::testDataBarExportODS() { ScDocShellRef xShell = loadDoc("databar.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -488,10 +488,10 @@ void ScExportTest::testDataBarExportODS() void ScExportTest::testFormatExportODS() { ScDocShellRef xShell = loadDoc("formats.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -505,7 +505,7 @@ void ScExportTest::testCommentExportXLSX() { //tdf#104729 FILESAVE OpenOffice do not save author of the comment during export to .xlsx ScDocShellRef xShell = loadDoc("comment.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/comments1.xml"); @@ -522,7 +522,7 @@ void ScExportTest::testCustomColumnWidthExportXLSX() { //tdf#100946 FILESAVE Excel on OS X ignored column widths in XLSX last saved by LO ScDocShellRef xShell = loadDoc("custom_column_width.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -614,7 +614,7 @@ void ScExportTest::testXfDefaultValuesXLSX() { //tdf#70565 FORMATTING: User Defined Custom Formatting is not applied during importing XLSX documents ScDocShellRef xShell = loadDoc("xf_default_values.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/styles.xml"); @@ -639,7 +639,7 @@ void ScExportTest::testColumnWidthResaveXLSX() // tdf#91475 FILESAVE: Column width is not preserved in XLSX / after round trip. // Test if after resave .xlsx file, columns width is identical with with previous one ScDocShellRef xShell = loadDoc("different-column-width-excel2010.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -680,7 +680,7 @@ void ScExportTest::testColumnWidthExportFromODStoXLSX() ScDocShellRef xShell = loadDoc("different-column-width.", FORMAT_ODS); - CPPUNIT_ASSERT( xShell.Is() ); + CPPUNIT_ASSERT( xShell.is() ); ScDocument& rOdsDoc = xShell->GetDocument(); @@ -708,7 +708,7 @@ void ScExportTest::testColumnWidthExportFromODStoXLSX() // We expect that column width from .ods will be exactly the same as imported from .xlsx ScDocShellRef xXlsxDocSh = saveAndReload( xShell.get(), FORMAT_XLSX ); - CPPUNIT_ASSERT( xXlsxDocSh.Is() ); + CPPUNIT_ASSERT( xXlsxDocSh.is() ); ScDocument& rDoc = xXlsxDocSh->GetDocument(); @@ -741,7 +741,7 @@ void ScExportTest::testOutlineExportXLSX() //tdf#100347 FILESAVE FILEOPEN after exporting to .xlsx format grouping are lost //tdf#51524 FILESAVE .xlsx and.xls looses width information for hidden/collapsed grouped columns ScDocShellRef xShell = loadDoc("outline.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -896,7 +896,7 @@ void ScExportTest::testHiddenEmptyRowsXLSX() { //tdf#98106 FILESAVE: Hidden and empty rows became visible when export to .XLSX ScDocShellRef xShell = loadDoc("hidden-empty-rows.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -912,7 +912,7 @@ void ScExportTest::testLandscapeOrientationXLSX() { //tdf#48767 - Landscape page orientation is not loaded from .xlsx format with MS Excel, after export with Libre Office ScDocShellRef xShell = loadDoc("hidden-empty-rows.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -926,10 +926,10 @@ void ScExportTest::testLandscapeOrientationXLSX() void ScExportTest::testDataBarExportXLSX() { ScDocShellRef xShell = loadDoc("databar.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1061,7 +1061,7 @@ void setEscapement( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart, s void ScExportTest::testNamedRangeBugfdo62729() { ScDocShellRef xShell = loadDoc("fdo62729.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocument& rDoc = xShell->GetDocument(); ScRangeName* pNames = rDoc.GetRangeName(); @@ -1073,7 +1073,7 @@ void ScExportTest::testNamedRangeBugfdo62729() ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_ODS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc2 = xDocSh->GetDocument(); pNames = rDoc2.GetRangeName(); @@ -1467,7 +1467,7 @@ void ScExportTest::testRichTextExportODS() ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_ODS); { xOrigDocSh->DoClose(); - CPPUNIT_ASSERT(xNewDocSh.Is()); + CPPUNIT_ASSERT(xNewDocSh.is()); ScDocument& rDoc2 = xNewDocSh->GetDocument(); CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one sheet.", rDoc2.GetTableCount() > 0); ScFieldEditEngine* pEE = &rDoc2.GetEditEngine(); @@ -1563,7 +1563,7 @@ void ScExportTest::testRichTextExportODS() void ScExportTest::testRichTextCellFormatXLSX() { ScDocShellRef xDocSh = loadDoc("cellformat.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -1649,7 +1649,7 @@ void ScExportTest::testCellValuesExportODS() // save and reload ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_ODS); xOrigDocSh->DoClose(); - CPPUNIT_ASSERT(xNewDocSh.Is()); + CPPUNIT_ASSERT(xNewDocSh.is()); ScDocument& rDoc = xNewDocSh->GetDocument(); CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one sheet.", rDoc.GetTableCount() > 0); @@ -1705,7 +1705,7 @@ void ScExportTest::testCellNoteExportODS() // save and reload ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_ODS); xOrigDocSh->DoClose(); - CPPUNIT_ASSERT(xNewDocSh.Is()); + CPPUNIT_ASSERT(xNewDocSh.is()); ScDocument& rDoc = xNewDocSh->GetDocument(); aPos.SetRow(0); // Move back to A1. @@ -1741,7 +1741,7 @@ void ScExportTest::testCellNoteExportXLS() ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_XLS); { xOrigDocSh->DoClose(); - CPPUNIT_ASSERT(xNewDocSh.Is()); + CPPUNIT_ASSERT(xNewDocSh.is()); ScDocument& rDoc = xNewDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL_MESSAGE("This document should have 3 sheets.", SCTAB(3), rDoc.GetTableCount()); @@ -1791,11 +1791,11 @@ void checkMatrixRange(ScDocument& rDoc, const ScRange& rRange) void ScExportTest::testInlineArrayXLS() { ScDocShellRef xShell = loadDoc("inline-array.", FORMAT_XLS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1814,11 +1814,11 @@ void ScExportTest::testInlineArrayXLS() void ScExportTest::testEmbeddedChartXLS() { ScDocShellRef xShell = loadDoc("embedded-chart.", FORMAT_XLS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1841,10 +1841,10 @@ void ScExportTest::testEmbeddedChartXLS() void ScExportTest::testCellAnchoredGroupXLS() { ScDocShellRef xDocSh_in = loadDoc("cell-anchored-group.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-group.xls", xDocSh_in.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-group.xls", xDocSh_in.is()); ScDocShellRef xDocSh = saveAndReload(&(*xDocSh_in), FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to save and reload cell-anchored-group.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to save and reload cell-anchored-group.ods", xDocSh.is()); // the document contains a group anchored on the first cell, make sure it's there in the right place ScDocument& rDoc = xDocSh->GetDocument(); @@ -1868,11 +1868,11 @@ void ScExportTest::testCellAnchoredGroupXLS() void ScExportTest::testFormulaReferenceXLS() { ScDocShellRef xShell = loadDoc("formula-reference.", FORMAT_XLS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1891,10 +1891,10 @@ void ScExportTest::testFormulaReferenceXLS() void ScExportTest::testSheetProtectionXLSX() { ScDocShellRef xShell = loadDoc("ProtecteSheet1234Pass.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const ScTableProtection* pTabProtect = rDoc.GetTabProtection(0); @@ -1960,7 +1960,7 @@ void ScExportTest::testExcelCellBorders( sal_uLong nFormatType ) }; ScDocShellRef xDocSh = loadDoc("cell-borders.", nFormatType); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); { ScDocument& rDoc = xDocSh->GetDocument(); @@ -2050,10 +2050,10 @@ void ScExportTest::testBordersExchangeXLSX() }; ScDocShellRef xShell = loadDoc("test_borders_export.", FORMAT_ODS); // load the ods with our Borders - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); // save the ods to xlsx and load xlsx - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); for (size_t nCol = 0; nCol < nMaxCol; ++nCol) @@ -2291,7 +2291,7 @@ void ScExportTest::testTrackChangesSimpleXLSX() // First, test the xls variant. ScDocShellRef xDocSh = loadDoc("track-changes/simple-cell-changes.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument* pDoc = &xDocSh->GetDocument(); bool bGood = aTest.check(*pDoc); CPPUNIT_ASSERT_MESSAGE("Initial check failed (xls).", bGood); @@ -2319,7 +2319,7 @@ void ScExportTest::testTrackChangesSimpleXLSX() // Now, test the xlsx variant the same way. xDocSh = loadDoc("track-changes/simple-cell-changes.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); pDoc = &xDocSh->GetDocument(); aTest.check(*pDoc); CPPUNIT_ASSERT_MESSAGE("Initial check failed (xlsx).", bGood); @@ -2387,14 +2387,14 @@ void ScExportTest::testSheetTabColorsXLSX() ScDocShellRef xDocSh = loadDoc("sheet-tab-color.", FORMAT_XLSX); { - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); bool bRes = aTest.checkContent(rDoc); CPPUNIT_ASSERT_MESSAGE("Failed on the initial content check.", bRes); } ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.is()); xDocSh->DoClose(); ScDocument& rDoc = xDocSh2->GetDocument(); bool bRes = aTest.checkContent(rDoc); @@ -2474,7 +2474,7 @@ void ScExportTest::testSharedFormulaExportXLS() ScDocShellRef xDocSh = loadDoc("shared-formula/3d-reference.", FORMAT_ODS); { - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check the content of the original. @@ -2484,7 +2484,7 @@ void ScExportTest::testSharedFormulaExportXLS() ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLS); xDocSh->DoClose(); - CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.is()); ScDocument& rDoc = xDocSh2->GetDocument(); @@ -2565,7 +2565,7 @@ void ScExportTest::testSharedFormulaExportXLSX() ScDocShellRef xDocSh = loadDoc("shared-formula/3d-reference.", FORMAT_XLSX); { - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); bool bRes = aTest.checkContent(rDoc); @@ -2580,7 +2580,7 @@ void ScExportTest::testSharedFormulaExportXLSX() ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); xDocSh->DoClose(); - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh2.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh2.is()); ScDocument& rDoc = xDocSh2->GetDocument(); rDoc.CalcAll(); // Recalculate to flush all cached results. @@ -2635,7 +2635,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX() ScDocShellRef xDocSh = loadDoc("shared-formula/text-results.", FORMAT_XLSX); { - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check content without re-calculation, to test cached formula results. @@ -2650,7 +2650,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX() // Reload and check again. ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); xDocSh->DoClose(); - CPPUNIT_ASSERT_MESSAGE("Failed to re-load file.", xDocSh2.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to re-load file.", xDocSh2.is()); ScDocument& rDoc = xDocSh2->GetDocument(); bool bRes = aTest.checkContent(rDoc); @@ -2662,7 +2662,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX() void ScExportTest::testFunctionsExcel2010( sal_uLong nFormatType ) { ScDocShellRef xShell = loadDoc("functions-excel-2010.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), nFormatType); ScDocument& rDoc = xDocSh->GetDocument(); @@ -2686,7 +2686,7 @@ void ScExportTest::testFunctionsExcel2010XLS() void ScExportTest::testCeilingFloor( sal_uLong nFormatType ) { ScDocShellRef xShell = loadDoc("ceiling-floor.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), nFormatType); ScDocument& rDoc = xDocSh->GetDocument(); @@ -2716,7 +2716,7 @@ void ScExportTest::testCeilingFloorODS() void ScExportTest::testRelativePathsODS() { ScDocShellRef xDocSh = loadDoc("fdo79305.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "content.xml", FORMAT_ODS); CPPUNIT_ASSERT(pDoc); @@ -2743,7 +2743,7 @@ void testSheetProtection_Impl(ScDocument& rDoc) void ScExportTest::testSheetProtectionODS() { ScDocShellRef xDocSh = loadDoc("sheet-protection.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); { ScDocument& rDoc = xDocSh->GetDocument(); @@ -2878,7 +2878,7 @@ void ScExportTest::testPivotTableXLSX() } aTest; ScDocShellRef xDocSh = loadDoc("pivot-table/many-fields-in-cache.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument* pDoc = &xDocSh->GetDocument(); // Initial check. @@ -2887,7 +2887,7 @@ void ScExportTest::testPivotTableXLSX() ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); xDocSh->DoClose(); - CPPUNIT_ASSERT(xDocSh2.Is()); + CPPUNIT_ASSERT(xDocSh2.is()); pDoc = &xDocSh2->GetDocument(); // Reload check. @@ -2998,7 +2998,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX() } aTest; ScDocShellRef xDocSh = loadDoc("pivot-table/two-data-fields.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument* pDoc = &xDocSh->GetDocument(); // Initial check. @@ -3007,7 +3007,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX() ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); xDocSh->DoClose(); - CPPUNIT_ASSERT(xDocSh2.Is()); + CPPUNIT_ASSERT(xDocSh2.is()); pDoc = &xDocSh2->GetDocument(); // Reload check. @@ -3020,7 +3020,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX() void ScExportTest::testPivotTableMedianODS() { ScDocShellRef xDocSh = loadDoc("pivot-table-median.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load test document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load test document.", xDocSh.is()); // Export the document and import again for a check ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_ODS); @@ -3079,7 +3079,7 @@ void ScExportTest::testSwappedOutImageExport() ScDocShellRef xDocSh = loadDoc("document_with_two_images.", FORMAT_ODS); const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter]; - CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.is()); // Export the document and import again for a check ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), nFilter); @@ -3158,11 +3158,11 @@ void ScExportTest::tearDown() void ScExportTest::testSupBookVirtualPathXLS() { ScDocShellRef xShell = loadDoc("external-ref.", FORMAT_XLS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3230,7 +3230,7 @@ void ScExportTest::testImageWithSpecialID() ScDocShellRef xDocSh = loadDoc("images_with_special_IDs.", FORMAT_ODS); const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter]; - CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.is()); // Export the document and import again for a check ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), nFilter); @@ -3310,10 +3310,10 @@ void ScExportTest::testSheetLocalRangeNameXLS() void ScExportTest::testSheetTextBoxHyperlinkXLSX() { ScDocShellRef xShell = loadDoc("textbox-hyperlink.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3326,7 +3326,7 @@ void ScExportTest::testSheetTextBoxHyperlinkXLSX() void ScExportTest::testFontSizeXLSX() { ScDocShellRef xDocSh = loadDoc("fontSize.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3339,10 +3339,10 @@ void ScExportTest::testFontSizeXLSX() void ScExportTest::testSheetCharacterKerningSpaceXLSX() { ScDocShellRef xShell = loadDoc("textbox-CharKerningSpace.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3359,10 +3359,10 @@ void ScExportTest::testSheetCharacterKerningSpaceXLSX() void ScExportTest::testSheetCondensedCharacterSpaceXLSX() { ScDocShellRef xShell = loadDoc("textbox-CondensedCharacterSpace.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3380,7 +3380,7 @@ void ScExportTest::testTextUnderlineColorXLSX() { ScDocShellRef xDocSh = loadDoc("underlineColor.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3393,10 +3393,10 @@ void ScExportTest::testTextUnderlineColorXLSX() void ScExportTest::testSheetRunParagraphPropertyXLSX() { ScDocShellRef xShell = loadDoc("TextColor.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/sharedStrings.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3411,7 +3411,7 @@ void ScExportTest::testPreserveTextWhitespaceXLSX() { ScDocShellRef xShell = loadDoc("preserve-whitespace.", FORMAT_XLSX); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/sharedStrings.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3423,7 +3423,7 @@ void ScExportTest::testPreserveTextWhitespace2XLSX() { ScDocShellRef xShell = loadDoc("preserve_space.", FORMAT_XLSX); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/sharedStrings.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3436,7 +3436,7 @@ void ScExportTest::testPreserveTextWhitespace2XLSX() void ScExportTest::testHiddenShapeXLSX() { ScDocShellRef xDocSh = loadDoc("hiddenShape.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3446,7 +3446,7 @@ void ScExportTest::testHiddenShapeXLSX() void ScExportTest::testHyperlinkXLSX() { ScDocShellRef xDocSh = loadDoc("hyperlink.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/_rels/drawing1.xml.rels", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3456,7 +3456,7 @@ void ScExportTest::testHyperlinkXLSX() void ScExportTest::testMoveCellAnchoredShapesODS() { ScDocShellRef xDocSh = loadDoc("move-cell-anchored-shapes.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods", xDocSh.is()); // There are two cell-anchored objects on the first sheet. ScDocument& rDoc = xDocSh->GetDocument(); @@ -3619,10 +3619,10 @@ void ScExportTest::testMoveCellAnchoredShapesODS() void ScExportTest::testMatrixMultiplicationXLSX() { ScDocShellRef xShell = loadDoc("matrix-multiplication.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3645,11 +3645,11 @@ void ScExportTest::testMatrixMultiplicationXLSX() void ScExportTest::testRefStringXLSX() { ScDocShellRef xDocSh = loadDoc("ref_string.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); //make sure ref syntax gets saved for MSO-produced docs xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScCalcConfig aCalcConfig = rDoc.GetCalcConfig(); @@ -3662,10 +3662,10 @@ void ScExportTest::testRefStringConfigXLSX() { // this doc is configured with CalcA1 ref syntax ScDocShellRef xDocSh = loadDoc("empty.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScCalcConfig aConfig = rDoc.GetCalcConfig(); @@ -3676,7 +3676,7 @@ void ScExportTest::testRefStringConfigXLSX() // this doc has no entry for ref syntax xDocSh = loadDoc("empty-noconf.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open 2nd doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open 2nd doc", xDocSh.is()); ScDocument& rDoc2 = xDocSh->GetDocument(); aConfig = rDoc2.GetCalcConfig(); @@ -3689,7 +3689,7 @@ void ScExportTest::testRefStringConfigXLSX() rDoc2.SetCalcConfig( aConfig ); ScDocShellRef xNewDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to reload 2nd doc", xNewDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload 2nd doc", xNewDocSh.is()); // ... and make sure it got saved ScDocument& rDoc3 = xNewDocSh->GetDocument(); @@ -3718,7 +3718,7 @@ void ScExportTest::testRefStringUnspecified() rDoc.SetGrammar( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); ScDocShellRef xDocSh = saveAndReload(pShell, FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is()); // with string ref syntax at its default value, we should've saved ExcelA1 ScDocument& rDoc2 = xDocSh->GetDocument(); @@ -3747,7 +3747,7 @@ void ScExportTest::testHeaderImageODS() void ScExportTest::testTextDirectionXLSX() { ScDocShellRef xDocSh = loadDoc("writingMode.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/styles.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3759,7 +3759,7 @@ void ScExportTest::testTextDirectionXLSX() void ScExportTest::testTdf88657ODS() { ScDocShellRef xDocSh = loadDoc("tdf88657.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "styles.xml", FORMAT_ODS); CPPUNIT_ASSERT(pDoc); @@ -3770,7 +3770,7 @@ void ScExportTest::testTdf88657ODS() void ScExportTest::testConditionalFormatRangeListXLSX() { ScDocShellRef xDocSh = loadDoc("conditionalformat_rangelist.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3781,9 +3781,9 @@ void ScExportTest::testConditionalFormatRangeListXLSX() void ScExportTest::testEscapeCharInNumberFormatXLSX() { ScDocShellRef xDocSh = loadDoc("tdf81939.", FORMAT_XLSX); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/styles.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3808,9 +3808,9 @@ void ScExportTest::testEscapeCharInNumberFormatXLSX() void ScExportTest::testNatNumInNumberFormatXLSX() { ScDocShellRef xDocSh = loadDoc("tdf79398_NatNum5.", FORMAT_ODS); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); // Convert [NatNum5] to [DBNum2] in Chinese - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/styles.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3823,12 +3823,12 @@ void ScExportTest::testNatNumInNumberFormatXLSX() void ScExportTest::testExponentWithoutSignFormatXLSX() { ScDocShellRef xDocSh = loadDoc("tdf102370_ExponentWithoutSign.", FORMAT_ODS); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); sal_uInt32 nNumberFormat; @@ -3845,9 +3845,9 @@ void ScExportTest::testExponentWithoutSignFormatXLSX() void ScExportTest::testExtendedLCIDXLSX() { ScDocShellRef xDocSh = loadDoc("tdf36038_ExtendedLCID.", FORMAT_ODS); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/styles.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3886,7 +3886,7 @@ void ScExportTest::testExtendedLCIDXLSX() void ScExportTest::testHiddenRepeatedRowsODS() { ScDocShellRef xDocSh = loadDoc("empty.", FORMAT_ODS); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); { ScDocument& rDoc = xDocSh->GetDocument(); @@ -3907,7 +3907,7 @@ void ScExportTest::testHiddenRepeatedRowsODS() void ScExportTest::testHyperlinkTargetFrameODS() { ScDocShellRef xDocSh = loadDoc("hyperlink_frame.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const EditTextObject* pEditText = rDoc.GetEditText(ScAddress(2, 5, 0)); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index e7b436d90bb1..76def6f36e40 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -364,7 +364,7 @@ bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, { ScDocShellRef xDocShRef = ScBootstrapFixture::load( rURL, rFilter, rUserData, OUString(), nFilterFlags, nClipboardID, nFilterVersion); - bool bLoaded = xDocShRef.Is(); + bool bLoaded = xDocShRef.is(); //reference counting of ScDocShellRef is very confused. if (bLoaded) xDocShRef->DoClose(); @@ -409,7 +409,7 @@ void testRangeNameImpl(ScDocument& rDoc) void ScFiltersTest::testBasicCellContentODS() { ScDocShellRef xDocSh = loadDoc("basic-cell-content.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load basic-cell-content.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load basic-cell-content.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aStr = rDoc.GetString(1, 1, 0); // B2 @@ -436,7 +436,7 @@ void ScFiltersTest::testBooleanFormatXLSX() SvNumberFormatter* pNumFormatter = rDoc.GetFormatTable(); const OUString aBooleanTypeStr = "\"TRUE\";\"TRUE\";\"FALSE\""; - CPPUNIT_ASSERT_MESSAGE("Failed to load check-boolean.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load check-boolean.xlsx", xDocSh.is()); sal_uInt32 nNumberFormat; for (SCROW i = 0; i <= 1; i++) @@ -516,7 +516,7 @@ void ScFiltersTest::testHardRecalcODS() ScDocShellRef xDocSh = loadDoc("hard-recalc.", FORMAT_ODS); xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load hard-recalc.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load hard-recalc.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -533,7 +533,7 @@ void ScFiltersTest::testFunctionsODS() ScDocShellRef xDocSh = loadDoc("functions.", FORMAT_ODS); xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -562,7 +562,7 @@ void ScFiltersTest::testFunctionsODS() xDocSh->DoClose(); xDocSh = loadDoc("database-functions.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); xDocSh->DoHardRecalc(true); ScDocument& rDoc2 = xDocSh->GetDocument(); @@ -572,7 +572,7 @@ void ScFiltersTest::testFunctionsODS() xDocSh->DoClose(); xDocSh = loadDoc("date-time-functions.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); xDocSh->DoHardRecalc(true); ScDocument& rDoc3 = xDocSh->GetDocument(); createCSVPath("date-time-functions.", aCSVFileName); @@ -591,7 +591,7 @@ void ScFiltersTest::testFunctionsODS() void ScFiltersTest::testFunctionsExcel2010() { ScDocShellRef xDocSh = loadDoc("functions-excel-2010.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); // perform hard re-calculation. @@ -603,7 +603,7 @@ void ScFiltersTest::testFunctionsExcel2010() void ScFiltersTest::testCeilingFloorXLSX() { ScDocShellRef xDocSh = loadDoc("ceiling-floor.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); // perform hard re-calculation. @@ -616,7 +616,7 @@ void ScFiltersTest::testCachedFormulaResultsODS() { { ScDocShellRef xDocSh = loadDoc("functions.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -642,7 +642,7 @@ void ScFiltersTest::testCachedFormulaResultsODS() { ScDocShellRef xDocSh = loadDoc("cachedValue.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load cachedValue.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cachedValue.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -689,7 +689,7 @@ void ScFiltersTest::testCachedMatrixFormulaResultsODS() { ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); //test matrix @@ -722,7 +722,7 @@ void ScFiltersTest::testCachedMatrixFormulaResultsODS() void ScFiltersTest::testFormulaDepAcrossSheetsODS() { ScDocShellRef xDocSh = loadDoc("formula-across-sheets.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); sc::AutoCalcSwitch aACSwitch(rDoc, true); // Make sure auto calc is turned on. @@ -746,7 +746,7 @@ void ScFiltersTest::testFormulaDepAcrossSheetsODS() void ScFiltersTest::testFormulaDepDeleteContentsODS() { ScDocShellRef xDocSh = loadDoc("formula-delete-contents.", FORMAT_ODS, true); - CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); sc::UndoSwitch aUndoSwitch(rDoc, true); // Enable undo. @@ -901,7 +901,7 @@ void ScFiltersTest::testMatrixXLS() ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_XLS); xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -916,7 +916,7 @@ void ScFiltersTest::testDoubleThinBorder() // double-thin borders created with size less than 1.15 where invisible (and subsequently lost) on round-trips. ScDocShellRef xDocSh = loadDoc("tdf88827_borderDoubleThin.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load tdf88827_borderDoubleThin.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load tdf88827_borderDoubleThin.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const editeng::SvxBorderLine* pLeft = nullptr; @@ -935,7 +935,7 @@ void ScFiltersTest::testBorderODS() { ScDocShellRef xDocSh = loadDoc("border.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load border.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load border.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const editeng::SvxBorderLine* pLeft = nullptr; @@ -1031,7 +1031,7 @@ void ScFiltersTest::testBordersOoo33() ScDocShellRef xDocSh = loadDoc("borders_ooo33.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load borders_ooo33.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load borders_ooo33.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const editeng::SvxBorderLine* pLeft = nullptr; @@ -1083,7 +1083,7 @@ void ScFiltersTest::testBordersOoo33() void ScFiltersTest::testBugFixesODS() { ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.ods", xDocSh.is()); xDocSh->DoHardRecalc(true); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1119,7 +1119,7 @@ void ScFiltersTest::testBugFixesODS() void ScFiltersTest::testBugFixesXLS() { ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.is()); xDocSh->DoHardRecalc(true); xDocSh->GetDocument(); @@ -1129,7 +1129,7 @@ void ScFiltersTest::testBugFixesXLS() void ScFiltersTest::testBugFixesXLSX() { ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.is()); xDocSh->DoHardRecalc(true); xDocSh->GetDocument(); @@ -1351,7 +1351,7 @@ void ScFiltersTest::testDataValidityODS() void ScFiltersTest::testDataTableMortgageXLS() { ScDocShellRef xDocSh = loadDoc("data-table/mortgage.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScFormulaOptions aOptions; aOptions.SetFormulaSepArg(","); @@ -1384,7 +1384,7 @@ void ScFiltersTest::testDataTableMortgageXLS() void ScFiltersTest::testDataTableOneVarXLSX() { ScDocShellRef xDocSh = loadDoc("data-table/one-variable.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScFormulaOptions aOptions; aOptions.SetFormulaSepArg(","); @@ -1427,7 +1427,7 @@ void ScFiltersTest::testDataTableOneVarXLSX() void ScFiltersTest::testDataTableMultiTableXLSX() { ScDocShellRef xDocSh = loadDoc("data-table/multi-table.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScFormulaOptions aOptions; aOptions.SetFormulaSepArg(","); @@ -1471,7 +1471,7 @@ void ScFiltersTest::testBrokenQuotesCSV() ScDocShellRef xDocSh = ScBootstrapFixture::load(aFileName, aFilterName, OUString(), aFilterType, nFormatType, nClipboardId); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo48621_broken_quotes.csv", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo48621_broken_quotes.csv", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aSheet2CSV("fdo48621_broken_quotes_exported."); @@ -1498,7 +1498,7 @@ void ScFiltersTest::testCellValueXLSX() ScDocShellRef xDocSh = ScBootstrapFixture::load( aFileName, aFilterName, OUString(), aFilterType, nFormatType, nClipboardId); - CPPUNIT_ASSERT_MESSAGE("Failed to load cell-value.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cell-value.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVPath; @@ -1511,7 +1511,7 @@ void ScFiltersTest::testCellValueXLSX() void ScFiltersTest::testRowIndex1BasedXLSX() { ScDocShellRef xDocSh = loadDoc("row-index-1-based.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // A1 @@ -1564,10 +1564,10 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) { xDocSh->DoClose(); // load failed. - xDocSh.Clear(); + xDocSh.clear(); } - CPPUNIT_ASSERT_MESSAGE("Failed to load password.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load password.ods", xDocSh.is()); xDocSh->GetDocument(); xDocSh->DoClose(); } @@ -1597,7 +1597,7 @@ void ScFiltersTest::testPasswordWrongSHA() void ScFiltersTest::testControlImport() { ScDocShellRef xDocSh = loadDoc("singlecontrol.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load singlecontrol.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load singlecontrol.xlsx", xDocSh.is()); uno::Reference< frame::XModel > xModel = xDocSh->GetModel(); uno::Reference< sheet::XSpreadsheetDocument > xDoc(xModel, UNO_QUERY_THROW); @@ -1613,7 +1613,7 @@ void ScFiltersTest::testControlImport() void ScFiltersTest::testChartImportODS() { ScDocShellRef xDocSh = loadDoc("chart-import-basic.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load chart-import-basic.ods.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load chart-import-basic.ods.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1647,7 +1647,7 @@ void ScFiltersTest::testChartImportODS() void ScFiltersTest::testChartImportXLS() { ScDocShellRef xDocSh = loadDoc("chartx.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load chartx.xls.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load chartx.xls.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1664,7 +1664,7 @@ void ScFiltersTest::testChartImportXLS() void ScFiltersTest::testNumberFormatHTML() { ScDocShellRef xDocSh = loadDoc("numberformat.", FORMAT_HTML); - CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1691,7 +1691,7 @@ void ScFiltersTest::testNumberFormatHTML() void ScFiltersTest::testNumberFormatCSV() { ScDocShellRef xDocSh = loadDoc("numberformat.", FORMAT_CSV); - CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.csv", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.csv", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1718,7 +1718,7 @@ void ScFiltersTest::testNumberFormatCSV() void ScFiltersTest::testCellAnchoredShapesODS() { ScDocShellRef xDocSh = loadDoc("cell-anchored-shapes.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.ods", xDocSh.is()); // There are two cell-anchored objects on the first sheet. ScDocument& rDoc = xDocSh->GetDocument(); @@ -1746,7 +1746,7 @@ void ScFiltersTest::testCellAnchoredShapesODS() void ScFiltersTest::testCellAnchoredHiddenShapesXLSX() { ScDocShellRef xDocSh = loadDoc("cell-anchored-hidden-shapes.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.xlsx", xDocSh.is()); // There are two cell-anchored objects on the first sheet. ScDocument& rDoc = xDocSh->GetDocument(); @@ -1790,7 +1790,7 @@ bool hasDimension(const std::vector<const ScDPSaveDimension*>& rDims, const OUSt void ScFiltersTest::testPivotTableBasicODS() { ScDocShellRef xDocSh = loadDoc("pivot-table-basic.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-basic.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-basic.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL_MESSAGE( @@ -1853,7 +1853,7 @@ void ScFiltersTest::testPivotTableBasicODS() void ScFiltersTest::testPivotTableNamedRangeSourceODS() { ScDocShellRef xDocSh = loadDoc("pivot-table-named-range-source.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-named-range-source.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-named-range-source.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1909,7 +1909,7 @@ bool checkVisiblePageFieldMember( const ScDPSaveDimension::MemberList& rMembers, void ScFiltersTest::testPivotTableSharedCacheGroupODS() { ScDocShellRef xDocSh = loadDoc("pivot-table-shared-cache-with-group.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Make sure that page field's visibility settings are loaded correctly. @@ -2044,7 +2044,7 @@ void ScFiltersTest::testPivotTableSharedCacheGroupODS() void ScFiltersTest::testGetPivotDataXLS() { ScDocShellRef xDocSh = loadDoc("pivot-getpivotdata.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -2060,7 +2060,7 @@ void ScFiltersTest::testGetPivotDataXLS() void ScFiltersTest::testPivotTableSharedGroupXLSX() { ScDocShellRef xDocSh = loadDoc("pivot-table/shared-group-field.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check whether right group names are imported for both tables @@ -2100,7 +2100,7 @@ void ScFiltersTest::testPivotTableSharedGroupXLSX() void ScFiltersTest::testPivotTableSharedDateGroupXLSX() { ScDocShellRef xDocSh = loadDoc("pivot-table/shared-dategroup.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check whether right date labels are imported for both tables @@ -2139,7 +2139,7 @@ void ScFiltersTest::testPivotTableSharedDateGroupXLSX() void ScFiltersTest::testPivotTableSharedNestedDateGroupXLSX() { ScDocShellRef xDocSh = loadDoc("pivot-table/shared-nested-dategroup.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check whether right date groups are imported for both tables @@ -2184,7 +2184,7 @@ void ScFiltersTest::testPivotTableSharedNestedDateGroupXLSX() void ScFiltersTest::testPivotTableSharedNumGroupXLSX() { ScDocShellRef xDocSh = loadDoc("pivot-table/shared-numgroup.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check whether right number groups are imported for both tables @@ -2221,7 +2221,7 @@ void ScFiltersTest::testPivotTableSharedNumGroupXLSX() void ScFiltersTest::testRowHeightODS() { ScDocShellRef xDocSh = loadDoc("row-height-import.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load row-height-import.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load row-height-import.ods", xDocSh.is()); SCTAB nTab = 0; SCROW nRow = 0; @@ -2264,7 +2264,7 @@ void ScFiltersTest::testRowHeightODS() void ScFiltersTest::testRichTextContentODS() { ScDocShellRef xDocSh = loadDoc("rich-text-cells.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load rich-text-cells.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load rich-text-cells.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aTabName; @@ -2524,7 +2524,7 @@ void ScFiltersTest::testRichTextContentODS() void ScFiltersTest::testDataBarODS() { ScDocShellRef xDocSh = loadDoc("databar.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testDataBar_Impl(rDoc); @@ -2535,7 +2535,7 @@ void ScFiltersTest::testDataBarODS() void ScFiltersTest::testDataBarXLSX() { ScDocShellRef xDocSh = loadDoc("databar.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testDataBar_Impl(rDoc); @@ -2546,7 +2546,7 @@ void ScFiltersTest::testDataBarXLSX() void ScFiltersTest::testColorScaleODS() { ScDocShellRef xDocSh = loadDoc("colorscale.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testColorScale2Entry_Impl(rDoc); @@ -2558,7 +2558,7 @@ void ScFiltersTest::testColorScaleODS() void ScFiltersTest::testColorScaleXLSX() { ScDocShellRef xDocSh = loadDoc("colorscale.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testColorScale2Entry_Impl(rDoc); @@ -2571,7 +2571,7 @@ void ScFiltersTest::testNewCondFormatODS() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("new_cond_format_test.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -2587,7 +2587,7 @@ void ScFiltersTest::testNewCondFormatXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("new_cond_format_test.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -2603,7 +2603,7 @@ void ScFiltersTest::testCondFormatThemeColorXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("condformat_theme_color.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load condformat_theme_color.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load condformat_theme_color.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScConditionalFormat* pFormat = rDoc.GetCondFormat(0, 0, 0); @@ -2641,7 +2641,7 @@ void ScFiltersTest::testCondFormatThemeColor2XLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("cond_format_theme_color2.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load cond_format_theme_color2.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cond_format_theme_color2.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScConditionalFormat* pFormat = rDoc.GetCondFormat(5, 5, 0); @@ -2680,7 +2680,7 @@ void ScFiltersTest::testCondFormatThemeColor3XLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("cond_format_theme_color3.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load document", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load document", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScConditionalFormat* pFormat = rDoc.GetCondFormat(1, 3, 0); @@ -2754,7 +2754,7 @@ void ScFiltersTest::testComplexIconSetsXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("complex_icon_set.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load complex_icon_set.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load complex_icon_set.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL(size_t(3), rDoc.GetCondFormList(0)->size()); @@ -2780,7 +2780,7 @@ void ScFiltersTest::testCondFormatParentXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("cond_parent.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load cond_parent.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cond_parent.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const SfxItemSet* pCondSet = rDoc.GetCondResult(2, 5, 0); @@ -2796,7 +2796,7 @@ void ScFiltersTest::testColorScaleNumWithRefXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("colorscale_num_with_ref.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load colorscale_num_with_ref.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load colorscale_num_with_ref.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScConditionalFormatList* pList = rDoc.GetCondFormList(0); @@ -3041,7 +3041,7 @@ void ScFiltersTest::testOrcusODSStyleInterface() void ScFiltersTest::testLiteralInFormulaXLS() { ScDocShellRef xDocSh = loadDoc("shared-string/literal-in-formula.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3217,7 +3217,7 @@ void ScFiltersTest::testOutlineODS() void ScFiltersTest::testColumnStyleXLSX() { ScDocShellRef xDocSh = loadDoc("column-style.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const ScPatternAttr* pPattern = rDoc.GetPattern(0,0,0); @@ -3238,7 +3238,7 @@ void ScFiltersTest::testColumnStyleXLSX() void ScFiltersTest::testSharedFormulaHorizontalXLS() { ScDocShellRef xDocSh = loadDoc("shared-formula/horizontal.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Make sure K2:S2 on the 2nd sheet are all formula cells. @@ -3278,7 +3278,7 @@ void ScFiltersTest::testSharedFormulaHorizontalXLS() void ScFiltersTest::testSharedFormulaWrappedRefsXLS() { ScDocShellRef xDocSh = loadDoc("shared-formula/wrapped-refs.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3306,7 +3306,7 @@ void ScFiltersTest::testSharedFormulaWrappedRefsXLS() void ScFiltersTest::testSharedFormulaBIFF5() { ScDocShellRef xDocSh = loadDoc("shared-formula/biff5.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3322,7 +3322,7 @@ void ScFiltersTest::testSharedFormulaBIFF5() void ScFiltersTest::testSharedFormulaXLSB() { ScDocShellRef xDocSh = loadDoc("shared_formula.", FORMAT_XLSB); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3345,7 +3345,7 @@ void ScFiltersTest::testSharedFormulaXLS() { // fdo#80091 ScDocShellRef xDocSh = loadDoc("shared-formula/relative-refs1.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3366,7 +3366,7 @@ void ScFiltersTest::testSharedFormulaXLS() { // fdo#84556 and some related tests ScDocShellRef xDocSh = loadDoc("shared-formula/relative-refs2.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3435,7 +3435,7 @@ void ScFiltersTest::testSharedFormulaColumnLabelsODS() { ScDocShellRef xDocSh = loadDoc("shared-formula/column-labels.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3464,7 +3464,7 @@ void ScFiltersTest::testSharedFormulaColumnRowLabelsODS() { ScDocShellRef xDocSh = loadDoc("shared-formula/column-row-labels.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3502,7 +3502,7 @@ void ScFiltersTest::testSharedFormulaColumnRowLabelsODS() void ScFiltersTest::testExternalRefCacheXLSX() { ScDocShellRef xDocSh = loadDoc("external-refs.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // These string values are cached external cell values. @@ -3518,7 +3518,7 @@ void ScFiltersTest::testExternalRefCacheODS() { ScDocShellRef xDocSh = loadDoc("external-ref-cache.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Cells B2:B4 have VLOOKUP with external references which should all show "text". @@ -3537,7 +3537,7 @@ void ScFiltersTest::testHybridSharedStringODS() { ScDocShellRef xDocSh = loadDoc("hybrid-shared-string.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // A2 contains formula with MATCH function. The result must be 2, not #N/A! @@ -3549,7 +3549,7 @@ void ScFiltersTest::testHybridSharedStringODS() void ScFiltersTest::testCopyMergedNumberFormats() { ScDocShellRef xDocSh = loadDoc("copy-merged-number-formats.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Cells B1, C1 and D1 are formatted as dates. @@ -3572,7 +3572,7 @@ void ScFiltersTest::testCopyMergedNumberFormats() void ScFiltersTest::testVBAUserFunctionXLSM() { ScDocShellRef xDocSh = loadDoc("vba-user-function.", FORMAT_XLSM); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // A1 contains formula with user-defined function, and the function is defined in VBA. @@ -3600,7 +3600,7 @@ void ScFiltersTest::testEmbeddedImageXLS() // imported properly. ScDocShellRef xDocSh = loadDoc("file-with-png-image.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScDrawLayer* pDL = rDoc.GetDrawLayer(); @@ -3621,7 +3621,7 @@ void ScFiltersTest::testEmbeddedImageXLS() void ScFiltersTest::testErrorOnExternalReferences() { ScDocShellRef xDocSh = loadDoc("blank.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to open empty doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open empty doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3640,7 +3640,7 @@ void ScFiltersTest::testErrorOnExternalReferences() void ScFiltersTest::testEditEngStrikeThroughXLSX() { ScDocShellRef xDocSh = loadDoc("strike-through.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3673,7 +3673,7 @@ void ScFiltersTest::testEditEngStrikeThroughXLSX() void ScFiltersTest::testRefStringXLSX() { ScDocShellRef xDocSh = loadDoc("ref_string.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3689,7 +3689,7 @@ void ScFiltersTest::testRefStringXLSX() void ScFiltersTest::testColumnStyle2XLSX() { ScDocShellRef xDocSh = loadDoc("column_style.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const ScPatternAttr* pAttr = rDoc.GetPattern(1, 1, 0); @@ -3728,7 +3728,7 @@ void ScFiltersTest::testColumnStyle2XLSX() void ScFiltersTest::testBnc762542() { ScDocShellRef xDocSh = loadDoc("bnc762542.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer(); @@ -3754,7 +3754,7 @@ void ScFiltersTest::testBnc762542() void ScFiltersTest::testHiddenSheetsXLSX() { ScDocShellRef xDocSh = loadDoc("hidden_sheets.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL_MESSAGE("1st sheet should be hidden", false, rDoc.IsVisible(0)); @@ -3783,7 +3783,7 @@ void checkValidationFormula(const ScAddress& rPos, ScDocument& rDoc, const OUStr void ScFiltersTest::testRelFormulaValidationXLS() { ScDocShellRef xDocSh = loadDoc("validation.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3796,7 +3796,7 @@ void ScFiltersTest::testRelFormulaValidationXLS() void ScFiltersTest::testTdf100458() { ScDocShellRef xDocSh = loadDoc("tdf100458_lost_zero_value.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT(rDoc.HasValueData(0, 0, 0)); CPPUNIT_ASSERT_EQUAL(double(0.0), rDoc.GetValue(0,0,0)); @@ -3807,7 +3807,7 @@ void ScFiltersTest::testTdf100458() void ScFiltersTest::testTdf100709XLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("tdf100709.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load tdf100709.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load tdf100709.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Cell B52 should not be formatted with a $", OUString("218"), rDoc.GetString(1, 51, 0)); @@ -3819,7 +3819,7 @@ void ScFiltersTest::testTdf100709XLSX() void ScFiltersTest::testTdf97598XLSX() { ScDocShellRef xDocSh = loadDoc("tdf97598_scenarios.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load tdf97598_secenarios.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load tdf97598_secenarios.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aStr = rDoc.GetString(0, 0, 0); // A1 diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index a23bda10a9f2..86f04c4b8f5b 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -144,7 +144,7 @@ void Test::setUp() void Test::tearDown() { m_pImpl->m_xDocShell->DoClose(); - m_pImpl->m_xDocShell.Clear(); + m_pImpl->m_xDocShell.clear(); BootstrapFixture::tearDown(); } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index a9f5a875a0f2..97ffab7b2899 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1132,7 +1132,7 @@ void ScDocument::LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList ) { ScRangeListRef aNew = new ScRangeList; - if (rRangeList.Is()) + if (rRangeList.is()) { for ( size_t i = 0, nCount = rRangeList->size(); i < nCount; i++ ) { diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 2d5c3ad6264f..3b5e8485c2c2 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -621,7 +621,7 @@ void ScGlobal::Clear() ScDocumentPool::DeleteVersionMaps(); DELETEZ(pEmptyOUString); - xDrawClipDocShellRef.Clear(); + xDrawClipDocShellRef.clear(); } rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index f055130c4e98..8d6bfa1d8119 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -357,7 +357,7 @@ bool ScTableProtectionImpl::updateReference( UpdateRefMode eMode, ScDocument* pD for (::std::vector<ScEnhancedProtection>::iterator it(maEnhancedProtection.begin()); it != maEnhancedProtection.end(); ++it) { - if ((*it).maRangeList.Is()) + if ((*it).maRangeList.is()) bChanged |= (*it).maRangeList->UpdateReference( eMode, pDoc, rWhere, nDx, nDy, nDz); } return bChanged; @@ -382,7 +382,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange& rRange ) const for (::std::vector<ScEnhancedProtection>::const_iterator it(maEnhancedProtection.begin()), itEnd(maEnhancedProtection.end()); it != itEnd; ++it) { - if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.Is()) + if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.is()) { if ((*it).maRangeList->In( rRange)) { @@ -402,7 +402,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange& rRange ) const for (::std::vector<ScEnhancedProtection>::const_iterator it(maEnhancedProtection.begin()), itEnd(maEnhancedProtection.end()); it != itEnd; ++it) { - if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.Is()) + if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.is()) { ScRangeList aList( (*it).maRangeList->GetIntersectedRange( rRange)); if (aList.size() == 1 && *aList[0] == rRange) @@ -423,7 +423,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange& rRange ) const for (::std::vector<ScEnhancedProtection>::const_iterator it(maEnhancedProtection.begin()), itEnd(maEnhancedProtection.end()); it != itEnd; ++it) { - if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.Is()) + if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.is()) { // Ranges are editable if no password is assigned. if (!(*it).hasPassword()) diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 37285a353c04..cb6b9f5ad980 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -321,7 +321,7 @@ void ScChartHelper::AddRangesIfProtectedChart( ScRangeListVector& rRangesVector, if (pListener) { const ScRangeListRef& rRangeList = pListener->GetRangeList(); - if ( rRangeList.Is() ) + if ( rRangeList.is() ) { rRangesVector.push_back( *rRangeList ); } diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index dd294347e9b9..98a501319662 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -655,8 +655,8 @@ void ScChartListenerCollection::SetDiffDirty( { const ScRangeListRef& rList1 = pCL->GetRangeList(); const ScRangeListRef& rList2 = pCLCmp->GetRangeList(); - bool b1 = rList1.Is(); - bool b2 = rList2.Is(); + bool b1 = rList1.is(); + bool b2 = rList2.is(); if ( b1 != b2 || (b1 && b2 && (*rList1 != *rList2)) ) pDoc->SetChartRangeList( pCL->GetName(), rList1 ); } @@ -678,7 +678,7 @@ void ScChartListenerCollection::SetRangeDirty( const ScRange& rRange ) { ScChartListener *const pCL = it.second.get(); const ScRangeListRef& rList = pCL->GetRangeList(); - if ( rList.Is() && rList->Intersects( rRange ) ) + if ( rList.is() && rList->Intersects( rRange ) ) { bDirty = true; pCL->SetDirty( true ); diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index f4bd0c8c5615..7d820e437658 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -67,7 +67,7 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rR bRowHeaders( false ), bDummyUpperLeft( false ) { - if ( aRangeListRef.Is() ) + if ( aRangeListRef.is() ) CheckColRowHeaders(); } diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 781b02549c9c..e5462e838a0e 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -78,15 +78,15 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument } // try to open "Book" or "Workbook" stream in OLE storage - if( xRootStrg.Is() ) + if( xRootStrg.is() ) { // try to open the "Book" stream tools::SvRef<SotStorageStream> xBookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_BOOK ); - XclBiff eBookBiff = xBookStrm.Is() ? XclImpStream::DetectBiffVersion( *xBookStrm ) : EXC_BIFF_UNKNOWN; + XclBiff eBookBiff = xBookStrm.is() ? XclImpStream::DetectBiffVersion( *xBookStrm ) : EXC_BIFF_UNKNOWN; // try to open the "Workbook" stream tools::SvRef<SotStorageStream> xWorkbookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_WORKBOOK ); - XclBiff eWorkbookBiff = xWorkbookStrm.Is() ? XclImpStream::DetectBiffVersion( *xWorkbookStrm ) : EXC_BIFF_UNKNOWN; + XclBiff eWorkbookBiff = xWorkbookStrm.is() ? XclImpStream::DetectBiffVersion( *xWorkbookStrm ) : EXC_BIFF_UNKNOWN; // decide which stream to use if( (eWorkbookBiff != EXC_BIFF_UNKNOWN) && ((eBookBiff == EXC_BIFF_UNKNOWN) || (eWorkbookBiff > eBookBiff)) ) @@ -167,7 +167,7 @@ static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, // open the "Book"/"Workbook" stream tools::SvRef<SotStorageStream> xStrgStrm = ScfTools::OpenStorageStreamWrite( xRootStrg, aStrmName ); - if( !xStrgStrm.Is() || xStrgStrm->GetError() ) return eERR_OPEN; + if( !xStrgStrm.is() || xStrgStrm->GetError() ) return eERR_OPEN; xStrgStrm->SetBufferSize( 0x8000 ); // still needed? diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index d7f1ab76243e..a0fed54c1ab1 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -365,7 +365,7 @@ void ImportExcel8::ReadBasic() SfxObjectShell* pShell = GetDocShell(); tools::SvRef<SotStorage> xRootStrg = GetRootStorage(); const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get(); - if( pShell && xRootStrg.Is() ) try + if( pShell && xRootStrg.is() ) try { // #FIXME need to get rid of this, we can also do this from within oox // via the "ooo.vba.VBAGlobals" service @@ -375,7 +375,7 @@ void ImportExcel8::ReadBasic() { // see if we have the XCB stream tools::SvRef<SotStorageStream> xXCB = xRootStrg->OpenSotStream( "XCB", StreamMode::STD_READ ); - if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() ) + if ( xXCB.is()|| SVSTREAM_OK == xXCB->GetError() ) { ScCTBWrapper wrapper; if ( wrapper.Read( *xXCB ) ) @@ -450,7 +450,7 @@ void ImportExcel8::PostDocLoad() { // BIFF5+ without storage is possible tools::SvRef<SotStorage> xRootStrg = GetRootStorage(); - if( xRootStrg.Is() ) try + if( xRootStrg.is() ) try { uno::Reference< document::XDocumentPropertiesSupplier > xDPS( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< document::XDocumentProperties > xDocProps( xDPS->getDocumentProperties(), uno::UNO_SET_THROW ); diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 623041d41585..d0e96abc9eb1 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -519,7 +519,7 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) XML_hashValue, (*it).maHashValue.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maHashValue).getStr(), XML_saltValue, (*it).maSaltValue.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maSaltValue).getStr(), XML_spinCount, (*it).mnSpinCount ? OString::number( (*it).mnSpinCount).getStr() : nullptr, - XML_sqref, (*it).maRangeList.Is() ? XclXmlUtils::ToOString( *(*it).maRangeList).getStr() : nullptr, + XML_sqref, (*it).maRangeList.is() ? XclXmlUtils::ToOString( *(*it).maRangeList).getStr() : nullptr, FSEND); } rWorksheet->endElement( XML_protectedRanges); diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index a268427ccd69..289ffb78fc62 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -77,7 +77,7 @@ FltError ExportBiff5::Write() OSL_ENSURE( pDocShell, "ExportBiff5::Write - no document shell" ); tools::SvRef<SotStorage> xRootStrg = GetRootStorage(); - OSL_ENSURE( xRootStrg.Is(), "ExportBiff5::Write - no root storage" ); + OSL_ENSURE( xRootStrg.is(), "ExportBiff5::Write - no root storage" ); VBAExportMode eVbaExportMode = VBAExportMode::NONE; if( GetBiff() == EXC_BIFF8 ) @@ -92,7 +92,7 @@ FltError ExportBiff5::Write() } } - if ( pDocShell && xRootStrg.Is() && eVbaExportMode == VBAExportMode::FULL_EXPORT) + if ( pDocShell && xRootStrg.is() && eVbaExportMode == VBAExportMode::FULL_EXPORT) { VbaExport aExport(pDocShell->GetModel()); if (aExport.containsVBAProject()) @@ -101,7 +101,7 @@ FltError ExportBiff5::Write() aExport.exportVBA( xVBARoot.get() ); } } - else if( pDocShell && xRootStrg.Is() && eVbaExportMode == VBAExportMode::REEXPORT_STREAM ) + else if( pDocShell && xRootStrg.is() && eVbaExportMode == VBAExportMode::REEXPORT_STREAM ) { SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg ); const ErrCode nErr = aBasicImport.SaveOrDelMSVBAStorage( true, EXC_STORAGE_VBA_PROJECT ); @@ -112,7 +112,7 @@ FltError ExportBiff5::Write() pExcDoc->ReadDoc(); // ScDoc -> ExcDoc pExcDoc->Write( aOut ); // wechstreamen - if( pDocShell && xRootStrg.Is() ) + if( pDocShell && xRootStrg.is() ) { using namespace ::com::sun::star; uno::Reference<document::XDocumentPropertiesSupplier> xDPS( diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 62f84eb69ae5..568843df78e1 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -804,7 +804,7 @@ void XclExpPivotCache::WriteCacheStream() { tools::SvRef<SotStorage> xSvStrg = OpenStorage( EXC_STORAGE_PTCACHE ); tools::SvRef<SotStorageStream> xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( maPCInfo.mnStrmId ) ); - if( xSvStrm.Is() ) + if( xSvStrm.is() ) { XclExpStream aStrm( *xSvStrm, GetRoot() ); // SXDB diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 2d3221ab5702..350324b98d89 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3393,7 +3393,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicOb { if( rPicObj.IsOcxControl() ) { - if( mxCtlsStrm.Is() ) try + if( mxCtlsStrm.is() ) try { /* set controls form, needed in virtual function InsertControl() called from ReadOCXExcelKludgeStream() */ @@ -3425,7 +3425,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicOb SfxObjectShell* pDocShell = GetDocShell(); tools::SvRef<SotStorage> xSrcStrg = GetRootStorage(); OUString aStrgName = rPicObj.GetOleStorageName(); - if( pDocShell && xSrcStrg.Is() && (!aStrgName.isEmpty()) ) + if( pDocShell && xSrcStrg.is() && (!aStrgName.isEmpty()) ) { // first try to resolve graphic from DFF storage Graphic aGraphic; diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 9888e08d6581..fc451bf173a2 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -711,7 +711,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm ) // open pivot cache storage stream tools::SvRef<SotStorage> xSvStrg = OpenStorage( EXC_STORAGE_PTCACHE ); tools::SvRef<SotStorageStream> xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( mnStrmId ) ); - if( !xSvStrm.Is() ) + if( !xSvStrm.is() ) return; // create Excel record stream object diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index cef5e3886a38..58f37e30bb71 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -239,7 +239,7 @@ uno::Sequence< beans::NamedValue > XclRoot::RequestEncryptionData( ::comphelper: bool XclRoot::HasVbaStorage() const { tools::SvRef<SotStorage> xRootStrg = GetRootStorage(); - return xRootStrg.Is() && xRootStrg->IsContained( EXC_STORAGE_VBA_PROJECT ); + return xRootStrg.is() && xRootStrg->IsContained( EXC_STORAGE_VBA_PROJECT ); } tools::SvRef<SotStorage> XclRoot::OpenStorage( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrgName ) const diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index ea78de7c3df8..1ba516220885 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -164,7 +164,7 @@ OUString ScfTools::ConvertToScDefinedName(const OUString& rName ) tools::SvRef<SotStorage> ScfTools::OpenStorageRead( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrgName ) { tools::SvRef<SotStorage> xSubStrg; - if( xStrg.Is() && xStrg->IsContained( rStrgName ) ) + if( xStrg.is() && xStrg->IsContained( rStrgName ) ) xSubStrg = xStrg->OpenSotStorage( rStrgName, StreamMode::STD_READ ); return xSubStrg; } @@ -172,7 +172,7 @@ tools::SvRef<SotStorage> ScfTools::OpenStorageRead( tools::SvRef<SotStorage> con tools::SvRef<SotStorage> ScfTools::OpenStorageWrite( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrgName ) { tools::SvRef<SotStorage> xSubStrg; - if( xStrg.Is() ) + if( xStrg.is() ) xSubStrg = xStrg->OpenSotStorage( rStrgName, StreamMode::STD_WRITE ); return xSubStrg; } @@ -180,16 +180,16 @@ tools::SvRef<SotStorage> ScfTools::OpenStorageWrite( tools::SvRef<SotStorage> co tools::SvRef<SotStorageStream> ScfTools::OpenStorageStreamRead( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrmName ) { tools::SvRef<SotStorageStream> xStrm; - if( xStrg.Is() && xStrg->IsContained( rStrmName ) && xStrg->IsStream( rStrmName ) ) + if( xStrg.is() && xStrg->IsContained( rStrmName ) && xStrg->IsStream( rStrmName ) ) xStrm = xStrg->OpenSotStream( rStrmName, StreamMode::STD_READ ); return xStrm; } tools::SvRef<SotStorageStream> ScfTools::OpenStorageStreamWrite( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrmName ) { - OSL_ENSURE( !xStrg.Is() || !xStrg->IsContained( rStrmName ), "ScfTools::OpenStorageStreamWrite - stream exists already" ); + OSL_ENSURE( !xStrg.is() || !xStrg->IsContained( rStrmName ), "ScfTools::OpenStorageStreamWrite - stream exists already" ); tools::SvRef<SotStorageStream> xStrm; - if( xStrg.Is() ) + if( xStrg.is() ) xStrm = xStrg->OpenSotStream( rStrmName, StreamMode::STD_WRITE | StreamMode::TRUNC ); return xStrm; } diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index b1d7ce658002..a3254edbe451 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1601,8 +1601,8 @@ bool XclExpChangeTrack::WriteUserNamesStream() { bool bRet = false; tools::SvRef<SotStorageStream> xSvStrm = OpenStream( EXC_STREAM_USERNAMES ); - OSL_ENSURE( xSvStrm.Is(), "XclExpChangeTrack::WriteUserNamesStream - no stream" ); - if( xSvStrm.Is() ) + OSL_ENSURE( xSvStrm.is(), "XclExpChangeTrack::WriteUserNamesStream - no stream" ); + if( xSvStrm.is() ) { XclExpStream aXclStrm( *xSvStrm, GetRoot() ); XclExpChTr0x0191().Save( aXclStrm ); @@ -1623,8 +1623,8 @@ void XclExpChangeTrack::Write() if( WriteUserNamesStream() ) { tools::SvRef<SotStorageStream> xSvStrm = OpenStream( EXC_STREAM_REVLOG ); - OSL_ENSURE( xSvStrm.Is(), "XclExpChangeTrack::Write - no stream" ); - if( xSvStrm.Is() ) + OSL_ENSURE( xSvStrm.is(), "XclExpChangeTrack::Write - no stream" ); + if( xSvStrm.is() ) { XclExpStream aXclStrm( *xSvStrm, GetRoot(), EXC_MAXRECSIZE_BIFF8 + 8 ); diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 6b1b40e5c839..986ffff734ad 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -45,11 +45,11 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStrea // "Revision Log" and "User Names" streams when Change Tracking is active but the Revision log // remains if Change Tracking is turned off. tools::SvRef<SotStorageStream> xUserStrm = OpenStream( EXC_STREAM_USERNAMES ); - if( !xUserStrm.Is() ) + if( !xUserStrm.is() ) return; xInStrm = OpenStream( EXC_STREAM_REVLOG ); - if( xInStrm.Is() ) + if( xInStrm.is() ) { xInStrm->Seek( STREAM_SEEK_TO_END ); sal_uInt64 const nStreamLen = xInStrm->Tell(); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index a79b695a514a..4a1438f0052f 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -413,9 +413,9 @@ std::unique_ptr<XclExpOcxControlObj> XclEscherEx::CreateOCXCtrlObj( Reference< X if( xCtrlModel.is() ) { // output stream - if( !mxCtlsStrm.Is() ) + if( !mxCtlsStrm.is() ) mxCtlsStrm = OpenStream( EXC_STREAM_CTLS ); - if( mxCtlsStrm.Is() ) + if( mxCtlsStrm.is() ) { OUString aClassName; sal_uInt32 nStrmStart = static_cast< sal_uInt32 >( mxCtlsStrm->Tell() ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 4d1c3c0f5793..f35be3157e1f 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -890,7 +890,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) ); aStorageName += OUString::createFromAscii(aBuf); tools::SvRef<SotStorage> xOleStg = pRootStorage->OpenSotStorage( aStorageName ); - if( xOleStg.Is() ) + if( xOleStg.is() ) { uno::Reference < embed::XEmbeddedObject > xObj( static_cast<const SdrOle2Obj&>(rOleObj).GetObjRef() ); if ( xObj.is() ) @@ -1605,7 +1605,7 @@ void XclExpSheetEnhancedProtection::WriteBody( XclExpStream& rStrm ) rStrm.WriteZeroBytesToRecord(5); // reserved1 (1 bytes) and reserved2 (4 bytes) XclRangeList aRefs; - if (maEnhancedProtection.maRangeList.Is()) + if (maEnhancedProtection.maRangeList.is()) mrRoot.GetAddressConverter().ConvertRangeList( aRefs, *maEnhancedProtection.maRangeList, false); sal_uInt16 nCref = ulimit_cast<sal_uInt16>(aRefs.size()); rStrm << nCref; // cref diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 260817a97928..c7f169fc45f6 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3395,7 +3395,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, if (pListener) { const ScRangeListRef& rRangeList = pListener->GetRangeList(); - if ( rRangeList.Is() ) + if ( rRangeList.is() ) { ScRangeStringConverter::GetStringFromRangeList( sRanges, rRangeList.get(), pDoc, FormulaGrammar::CONV_OOO ); if ( !sRanges.isEmpty() ) diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 1c0a506e1cda..d2f3deb9e7cd 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -236,10 +236,10 @@ ScDrawTransferObj::~ScDrawTransferObj() } aOleData = TransferableDataHelper(); // clear before releasing the mutex - aDocShellRef.Clear(); + aDocShellRef.clear(); delete pModel; - aDrawPersistRef.Clear(); // after the model + aDrawPersistRef.clear(); // after the model delete pBookmark; delete pDragSourceView; @@ -715,7 +715,7 @@ void ScDrawTransferObj::CreateOLEData() void ScDrawTransferObj::InitDocShell() { - if ( !aDocShellRef.Is() ) + if ( !aDocShellRef.is() ) { ScDocShell* pDocSh = new ScDocShell; aDocShellRef = pDocSh; // ref must be there before InitNew diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 34fa4e0a58b7..16880d5a5deb 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -197,9 +197,9 @@ ScTransferObj::~ScTransferObj() delete pDoc; // ScTransferObj is owner of clipboard document - aDocShellRef.Clear(); // before releasing the mutex + aDocShellRef.clear(); // before releasing the mutex - aDrawPersistRef.Clear(); // after the model + aDrawPersistRef.clear(); // after the model } @@ -612,7 +612,7 @@ ScMarkData ScTransferObj::GetSourceMarkData() void ScTransferObj::InitDocShell(bool bLimitToPageSize) { - if ( !aDocShellRef.Is() ) + if ( !aDocShellRef.is() ) { ScDocShell* pDocSh = new ScDocShell; aDocShellRef = pDocSh; // ref must be there before InitNew @@ -759,7 +759,7 @@ SfxObjectShell* ScTransferObj::SetDrawClipDoc( bool bAnyOle ) { // update ScGlobal::xDrawClipDocShellRef - ScGlobal::xDrawClipDocShellRef.Clear(); + ScGlobal::xDrawClipDocShellRef.clear(); if (bAnyOle) { ScGlobal::xDrawClipDocShellRef = new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT | SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS); // there must be a ref @@ -768,7 +768,7 @@ SfxObjectShell* ScTransferObj::SetDrawClipDoc( bool bAnyOle ) } else { - ScGlobal::xDrawClipDocShellRef.Clear(); + ScGlobal::xDrawClipDocShellRef.clear(); return nullptr; } } diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index d76404bba990..61b412bfd819 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -248,7 +248,7 @@ void ScDocShell::UnlockPaint_Impl(bool bDoc) pPaintLockData = nullptr; // nicht weitersammeln ScRangeListRef xRangeList = pPaint->GetRangeList(); - if ( xRangeList.Is() ) + if ( xRangeList.is() ) { PaintPartFlags nParts = pPaint->GetParts(); for ( size_t i = 0, nCount = xRangeList->size(); i < nCount; i++ ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 3f11472077cf..6b2ee929d124 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -292,7 +292,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) bValid = true; } else - aRangeListRef.Clear(); + aRangeListRef.clear(); } ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 94b8752f429e..fa08f9492ae3 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2460,7 +2460,7 @@ ScDocument* ScExternalRefManager::getSrcDocument(sal_uInt16 nFileId) catch (const css::uno::Exception&) { } - if (!aSrcDoc.maShell.Is()) + if (!aSrcDoc.maShell.is()) { // source document could not be loaded. return nullptr; @@ -2559,7 +2559,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt if (!pNewShell->DoLoad(pMedium.release())) { aRef->DoClose(); - aRef.Clear(); + aRef.clear(); return aRef; } @@ -2913,7 +2913,7 @@ bool ScExternalRefManager::refreshSrcDocument(sal_uInt16 nFileId) } catch ( const css::uno::Exception& ) {} - if (!xDocShell.Is()) + if (!xDocShell.is()) // Failed to load the document. Bail out. return false; diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 138c4eb613a2..ed7aca968e17 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -33,7 +33,7 @@ ScPaintLockData::~ScPaintLockData() void ScPaintLockData::AddRange( const ScRange& rRange, PaintPartFlags nP ) { - if (!xRangeList.Is()) + if (!xRangeList.is()) xRangeList = new ScRangeList; xRangeList->Join( rRange ); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 5c2ff38af891..7c83260d88ba 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -534,7 +534,7 @@ ScDocumentLoader::ScDocumentLoader( const OUString& rFileName, ScDocumentLoader::~ScDocumentLoader() { - if ( aRef.Is() ) + if ( aRef.is() ) aRef->DoClose(); else if ( pMedium ) delete pMedium; @@ -542,14 +542,14 @@ ScDocumentLoader::~ScDocumentLoader() void ScDocumentLoader::ReleaseDocRef() { - if ( aRef.Is() ) + if ( aRef.is() ) { // release reference without calling DoClose - caller must // have another reference to the doc and call DoClose later pDocShell = nullptr; pMedium = nullptr; - aRef.Clear(); + aRef.clear(); } } diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 69afe42fe9ec..241b370ac4d9 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -346,7 +346,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg else { pDocShTables->DoClose(); - aDocShTablesRef.Clear(); + aDocShTablesRef.clear(); pDocShTables = nullptr; FillTables_Impl( nullptr ); diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 67bc379f9c7f..94fc4e677dff 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -126,7 +126,7 @@ void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const OUString& rFilt // unload old document pSourceShell->DoClose(); pSourceShell = nullptr; - aSourceRef.Clear(); + aSourceRef.clear(); } if ( !rFile.isEmpty() ) @@ -239,7 +239,7 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, { pSourceShell->DoClose(); pSourceShell = nullptr; - aSourceRef.Clear(); + aSourceRef.clear(); m_pCbUrl->SetText( EMPTY_OUSTRING ); } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index ae624ce46827..5ae09b2d92be 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -3034,7 +3034,7 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const xChartRanges->Append( ScRange( nStartX, nStartY, nTab, nEndX, nEndY, nTab ) ); } } - if (!xChartRanges.Is()) // sonst Ranges direkt uebernehmen + if (!xChartRanges.is()) // sonst Ranges direkt uebernehmen xChartRanges = new ScRangeList(aRanges); ScChartArray aArr( &pDocShell->GetDocument(), xChartRanges, OUString() ); @@ -3113,7 +3113,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub long nRowCount = aData.getLength(); long nColCount = nRowCount ? aData[0].getLength() : 0; ScRangeListRef xChartRanges = GetLimitedChartRanges_Impl( nColCount, nRowCount ); - if ( pDocShell && xChartRanges.Is() ) + if ( pDocShell && xChartRanges.is() ) { ScDocument& rDoc = pDocShell->GetDocument(); ScChartArray aArr( &rDoc, xChartRanges, OUString() ); @@ -3184,7 +3184,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( { long nRowCount = aRowDescriptions.getLength(); ScRangeListRef xChartRanges = GetLimitedChartRanges_Impl( 1, nRowCount ); - if ( pDocShell && xChartRanges.Is() ) + if ( pDocShell && xChartRanges.is() ) { ScDocument& rDoc = pDocShell->GetDocument(); ScChartArray aArr( &rDoc, xChartRanges, OUString() ); @@ -3253,7 +3253,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( { long nColCount = aColumnDescriptions.getLength(); ScRangeListRef xChartRanges = GetLimitedChartRanges_Impl( nColCount, 1 ); - if ( pDocShell && xChartRanges.Is() ) + if ( pDocShell && xChartRanges.is() ) { ScDocument& rDoc = pDocShell->GetDocument(); ScChartArray aArr( &rDoc, xChartRanges, OUString() ); @@ -9293,7 +9293,7 @@ public: void Join( const ScRange& rNewRange ); const ScRangeList& GetRanges(); - void Clear() { aReturnRanges.Clear(); } // aJoinedRanges and aCompletedRanges are cleared in GetRanges + void Clear() { aReturnRanges.clear(); } // aJoinedRanges and aCompletedRanges are cleared in GetRanges }; void ScUniqueFormatsEntry::Join( const ScRange& rNewRange ) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 10d89ce5e6ab..e8ad9ea2caea 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -601,7 +601,7 @@ void ScChartObj::getFastPropertyValue( uno::Any& rValue, sal_Int32 nHandle ) con break; const ScRangeListRef& rRangeList = pListener->GetRangeList(); - if (!rRangeList.Is()) + if (!rRangeList.is()) break; size_t nCount = rRangeList->size(); @@ -685,7 +685,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() ScRangeListRef xRanges = new ScRangeList; bool bColHeaders, bRowHeaders; GetData_Impl( xRanges, bColHeaders, bRowHeaders ); - if ( xRanges.Is() ) + if ( xRanges.is() ) { size_t nCount = xRanges->size(); @@ -732,7 +732,7 @@ void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress } ScRangeListRef xNewRanges( pList ); - if ( !xOldRanges.Is() || *xOldRanges != *xNewRanges ) + if ( !xOldRanges.is() || *xOldRanges != *xNewRanges ) Update_Impl( xNewRanges, bColHeaders, bRowHeaders ); } diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index d0c72c57600b..bb5bcd3f98eb 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -67,7 +67,7 @@ bool hasStream(const uno::Reference<io::XInputStream>& xInStream, const OUString try { tools::SvRef<SotStorage> xStorage = new SotStorage(pStream, false); - if (!xStorage.Is() || xStorage->GetError()) + if (!xStorage.is() || xStorage->GetError()) return false; return xStorage->IsStream(rName); } diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index f0851b5b092a..e9be96c7d5f1 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -356,7 +356,7 @@ void ScDrawView::DoCopy() // update ScGlobal::xDrawClipDocShellRef ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc(!aRanges.empty()) ); - if (ScGlobal::xDrawClipDocShellRef.Is()) + if (ScGlobal::xDrawClipDocShellRef.is()) { // Copy data referenced by the chart objects to the draw clip // document. We need to do this before GetMarkedObjModel() below. @@ -382,7 +382,7 @@ void ScDrawView::DoCopy() ScDrawTransferObj* pTransferObj = new ScDrawTransferObj( pModel, pDocSh, aObjDesc ); uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); - if ( ScGlobal::xDrawClipDocShellRef.Is() ) + if ( ScGlobal::xDrawClipDocShellRef.is() ) { pTransferObj->SetDrawPersist( ScGlobal::xDrawClipDocShellRef.get() ); // keep persist for ole objects alive } @@ -418,7 +418,7 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() ScDrawTransferObj* pTransferObj = new ScDrawTransferObj( pModel, pDocSh, aObjDesc ); uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); - if ( ScGlobal::xDrawClipDocShellRef.Is() ) + if ( ScGlobal::xDrawClipDocShellRef.is() ) { pTransferObj->SetDrawPersist( ScGlobal::xDrawClipDocShellRef.get() ); // keep persist for ole objects alive } diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 0d4dc36c7ec5..b01c9de1158b 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -146,7 +146,7 @@ void ScSpellDialogChildWindow::Reset() mxUndoDoc.reset(); mxRedoDoc.reset(); mxOldSel.reset(); - mxOldRangeList.Clear(); + mxOldRangeList.clear(); mpViewShell = nullptr; mpViewData = nullptr; mpDocShell = nullptr; diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 2c481f5ce0fe..64a5cb68b362 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -272,7 +272,7 @@ bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRanges, b ScTransferObj* pTransferObj = new ScTransferObj( pClipDoc, aObjDesc ); uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); - if ( ScGlobal::xDrawClipDocShellRef.Is() ) + if ( ScGlobal::xDrawClipDocShellRef.is() ) { SfxObjectShellRef aPersistRef( ScGlobal::xDrawClipDocShellRef.get() ); pTransferObj->SetDrawPersist( aPersistRef );// keep persist for ole objects alive @@ -381,7 +381,7 @@ bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRanges, b ScTransferObj* pTransferObj = new ScTransferObj( pDocClip.release(), aObjDesc ); uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); - if ( ScGlobal::xDrawClipDocShellRef.Is() ) + if ( ScGlobal::xDrawClipDocShellRef.is() ) { SfxObjectShellRef aPersistRef( ScGlobal::xDrawClipDocShellRef.get() ); pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 48c322485a35..1076636ec120 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -161,12 +161,12 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, OUString aStr; tools::SvRef<SotStorageStream> xStream; - if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RTF, xStream ) && xStream.Is() ) + if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RTF, xStream ) && xStream.is() ) // mba: clipboard always must contain absolute URLs (could be from alien source) aImpEx.ImportStream( *xStream, OUString(), SotClipboardFormatId::RTF ); else if ( aDataHelper.GetString( SotClipboardFormatId::RTF, aStr ) ) aImpEx.ImportString( aStr, SotClipboardFormatId::RTF ); - else if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RICHTEXT, xStream ) && xStream.Is() ) + else if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RICHTEXT, xStream ) && xStream.is() ) aImpEx.ImportStream( *xStream, OUString(), SotClipboardFormatId::RICHTEXT ); else if ( aDataHelper.GetString( SotClipboardFormatId::RICHTEXT, aStr ) ) aImpEx.ImportString( aStr, SotClipboardFormatId::RICHTEXT ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 6f1cc0646ecd..ac66ce82421e 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -164,7 +164,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, } xDocShRef->DoClose(); - xDocShRef.Clear(); + xDocShRef.clear(); } else { @@ -298,7 +298,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, OUString aStr; tools::SvRef<SotStorageStream> xStream; - if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.Is() ) + if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.is() ) { if (nFormatId == SotClipboardFormatId::HTML) { diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index f99f60f19423..f4136e14582f 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -162,7 +162,7 @@ namespace basprov Any aReturn; - if ( m_xMethod.Is() ) + if ( m_xMethod.is() ) { // check if compiled SbModule* pModule = static_cast< SbModule* >( m_xMethod->GetParent() ); @@ -212,7 +212,7 @@ namespace basprov xSbxVar->SetFlag( SbxFlagBits::Fixed ); } } - if ( xSbxParams.Is() ) + if ( xSbxParams.is() ) m_xMethod->SetParameters( xSbxParams.get() ); // call method @@ -242,7 +242,7 @@ namespace basprov } // get output parameters - if ( xSbxParams.Is() ) + if ( xSbxParams.is() ) { SbxInfo* pInfo_ = m_xMethod->GetInfo(); if ( pInfo_ ) diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index d7027f9b0830..ff95dc91968d 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -74,7 +74,7 @@ sd::DrawDocShellRef SdMiscTest::Load(const OUString& rURL, sal_Int32 nFormat) // 1. Open the document sd::DrawDocShellRef xDocSh = loadURL(rURL, nFormat); - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); uno::Reference< frame::XModel2 > xModel2(xDocSh->GetModel(), uno::UNO_QUERY); CPPUNIT_ASSERT(xModel2.is()); diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index 68a3f220173c..8060618f09f4 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -136,9 +136,9 @@ protected: ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false); SfxMedium* pSrcMed = new SfxMedium(rURL, StreamMode::STD_READ, pFilt, pParams); - if ( !xDocShRef->DoLoad(pSrcMed) || !xDocShRef.Is() ) + if ( !xDocShRef->DoLoad(pSrcMed) || !xDocShRef.is() ) { - if (xDocShRef.Is()) + if (xDocShRef.is()) xDocShRef->DoClose(); CPPUNIT_ASSERT_MESSAGE( OUStringToOString( "failed to load " + rURL, RTL_TEXTENCODING_UTF8 ).getStr(), false ); } @@ -226,7 +226,7 @@ protected: */ void compareWithShapesDump( ::sd::DrawDocShellRef xDocShRef, const OUString &rShapesDumpFileNameBase, bool bCreate ) { - CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() ); + CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.is() ); CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() ); uno::Reference<frame::XModel> xTempModel(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index ec85bb7cb0a7..fbfb5883c73c 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -249,7 +249,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium* pMedium) CloseBookmarkDoc(); pBookmarkDoc = nullptr; } - else if (mxBookmarkDocShRef.Is()) + else if (mxBookmarkDocShRef.is()) { pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); } @@ -267,7 +267,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const OUString& rBookmarkFile) std::unique_ptr<SfxMedium> xMedium(new SfxMedium(rBookmarkFile, StreamMode::READ)); pBookmarkDoc = OpenBookmarkDoc(xMedium.release()); } - else if (mxBookmarkDocShRef.Is()) + else if (mxBookmarkDocShRef.is()) { pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); } @@ -301,7 +301,7 @@ void SdDrawDocument::InsertBookmark( { pBookmarkDoc = pBookmarkDocSh->GetDoc(); } - else if ( mxBookmarkDocShRef.Is() ) + else if ( mxBookmarkDocShRef.is() ) { pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); } @@ -396,7 +396,7 @@ bool SdDrawDocument::InsertBookmarkAsPage( aBookmarkName = pBookmarkDocSh->GetMedium()->GetName(); } } - else if ( mxBookmarkDocShRef.Is() ) + else if ( mxBookmarkDocShRef.is() ) { pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); aBookmarkName = maBookmarkFile; @@ -990,7 +990,7 @@ bool SdDrawDocument::InsertBookmarkAsObject( { pBookmarkDoc = pBookmarkDocSh->GetDoc(); } - else if ( mxBookmarkDocShRef.Is() ) + else if ( mxBookmarkDocShRef.is() ) { pBookmarkDoc = mxBookmarkDocShRef->GetDoc(); } @@ -1143,12 +1143,12 @@ bool SdDrawDocument::InsertBookmarkAsObject( // Stops the bookmark insertion void SdDrawDocument::CloseBookmarkDoc() { - if (mxBookmarkDocShRef.Is()) + if (mxBookmarkDocShRef.is()) { mxBookmarkDocShRef->DoClose(); } - mxBookmarkDocShRef.Clear(); + mxBookmarkDocShRef.clear(); maBookmarkFile.clear(); } @@ -1164,12 +1164,12 @@ void SdDrawDocument::SetAllocDocSh(bool bAlloc) { mbAllocDocSh = bAlloc; - if(mxAllocedDocShRef.Is()) + if(mxAllocedDocShRef.is()) { mxAllocedDocShRef->DoClose(); } - mxAllocedDocShRef.Clear(); + mxAllocedDocShRef.clear(); } // Return list of CustomShows (create it, too, if necessary) diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 96556e6280a7..616a4c7478f4 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -101,7 +101,7 @@ PPTWriter::PPTWriter( tools::SvRef<SotStorage>& rSvStorage, void PPTWriter::exportPPTPre( const std::vector< css::beans::PropertyValue >& rMediaData ) { - if ( !mrStg.Is() ) + if ( !mrStg.is() ) return; // master pages + slides and notes + notes master page @@ -1451,13 +1451,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS aMSVBas.SaveOrDelMSVBAStorage( true, "_MS_VBA_Overhead" ); tools::SvRef<SotStorage> xOverhead = xDest->OpenSotStorage( "_MS_VBA_Overhead" ); - if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) + if ( xOverhead.is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) { tools::SvRef<SotStorage> xOverhead2 = xOverhead->OpenSotStorage( "_MS_VBA_Overhead" ); - if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) + if ( xOverhead2.is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) { tools::SvRef<SotStorageStream> xTemp = xOverhead2->OpenSotStream( "_MS_VBA_Overhead2" ); - if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) + if ( xTemp.is() && ( xTemp->GetError() == SVSTREAM_OK ) ) { sal_uInt32 nLen = xTemp->GetSize(); if ( nLen ) diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index cb3283935a3e..d1ae32eb4e21 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2763,7 +2763,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPT(const OUString &rURL return false; tools::SvRef<SotStorageStream> xDocStream(xStorage->OpenSotStream( "PowerPoint Document", StreamMode::STD_READ)); - if ( !xDocStream.Is() ) + if ( !xDocStream.is() ) return false; SdDLL::Init(); diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index d567b2c77855..8eb2daf523e2 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -543,7 +543,7 @@ PropRead::PropRead( SotStorage& rStorage, const OUString& rName ) : if ( rStorage.IsStream( rName ) ) { mpSvStream = rStorage.OpenSotStream( rName, StreamMode::STD_READ ); - if ( mpSvStream.Is() ) + if ( mpSvStream.is() ) { mpSvStream->SetEndian( SvStreamEndian::LITTLE ); memset( mApplicationCLSID, 0, 16 ); diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index d64a1e145005..b66cd3f2294c 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -144,7 +144,7 @@ bool SdPPTFilter::Export() ExportPPTPointer PPTExport = ExportPPT; #endif - if( PPTExport && xStorRef.Is() ) + if( PPTExport && xStorRef.is() ) { sal_uInt32 nCnvrtFlags = 0; const SvtFilterOptions& rFilterOptions = SvtFilterOptions::Get(); diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index bd0249929db0..27ec957c04f5 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -174,7 +174,7 @@ tools::SvRef<SotStorageStream> SdModule::GetOptionStream( const OUString& rOptio { DocumentType eType = pDocSh->GetDoc()->GetDocumentType(); - if( !xOptionStorage.Is() ) + if( !xOptionStorage.is() ) { INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 4e512d410aa2..3a5f63fa5a13 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -125,14 +125,14 @@ SdTransferable::~SdTransferable() delete mpOLEDataHelper; - if( maDocShellRef.Is() ) + if( maDocShellRef.is() ) { SfxObjectShell* pObj = maDocShellRef.get(); ::sd::DrawDocShell* pDocSh = static_cast< ::sd::DrawDocShell*>(pObj); pDocSh->DoClose(); } - maDocShellRef.Clear(); + maDocShellRef.clear(); if( mbOwnDocument ) delete mpSdDrawDocumentIntern; @@ -287,10 +287,10 @@ void SdTransferable::CreateData() if( mpSourceDoc ) mpSourceDoc->CreatingDataObj(nullptr); - if( !maDocShellRef.Is() && mpSdDrawDocumentIntern->GetDocSh() ) + if( !maDocShellRef.is() && mpSdDrawDocumentIntern->GetDocSh() ) maDocShellRef = mpSdDrawDocumentIntern->GetDocSh(); - if( !maDocShellRef.Is() ) + if( !maDocShellRef.is() ) { OSL_FAIL( "SdTransferable::CreateData(), failed to create a model with persist, clipboard operation will fail for OLE objects!" ); mbOwnDocument = true; @@ -499,7 +499,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo { SfxObjectShellRef aOldRef( maDocShellRef ); - maDocShellRef.Clear(); + maDocShellRef.clear(); if( mpSdViewIntern ) { @@ -510,7 +510,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo bOK = SetObject( pDoc, SDTRANSFER_OBJECTTYPE_DRAWMODEL, rFlavor ); - if( maDocShellRef.Is() ) + if( maDocShellRef.is() ) { maDocShellRef->DoClose(); } @@ -569,7 +569,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo SdrSwapGraphicsMode nOldSwapMode = mpSdDrawDocumentIntern->GetSwapGraphicsMode(); mpSdDrawDocumentIntern->SetSwapGraphicsMode( SdrSwapGraphicsMode::PURGE ); - if( !maDocShellRef.Is() ) + if( !maDocShellRef.is() ) { maDocShellRef = new ::sd::DrawDocShell( mpSdDrawDocumentIntern, diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index bd3704be59a9..055059e931b3 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -84,7 +84,7 @@ void MorphDlg::LoadSettings() sal_uInt16 nSteps; bool bOrient, bAttrib; - if( xIStm.Is() ) + if( xIStm.is() ) { SdIOCompat aCompat( *xIStm, StreamMode::READ ); @@ -106,7 +106,7 @@ void MorphDlg::SaveSettings() const tools::SvRef<SotStorageStream> xOStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING , SD_OPTION_STORE ) ); - if( xOStm.Is() ) + if( xOStm.is() ) { SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 ); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index c1c6bab04031..2e0f718e81cd 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1002,10 +1002,10 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed) */ void SdPageObjsTLB::CloseBookmarkDoc() { - if (mxBookmarkDocShRef.Is()) + if (mxBookmarkDocShRef.is()) { mxBookmarkDocShRef->DoClose(); - mxBookmarkDocShRef.Clear(); + mxBookmarkDocShRef.clear(); // Medium is owned by document, so it's destroyed already mpOwnMedium = nullptr; diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 32d9b2051945..1e991ac179b1 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -312,7 +312,7 @@ void SdVectorizeDlg::LoadSettings() sal_uInt16 nFillHoles; bool bFillHoles; - if( xIStm.Is() ) + if( xIStm.is() ) { SdIOCompat aCompat( *xIStm, StreamMode::READ ); xIStm->ReadUInt16( nLayers ).ReadUInt16( nReduce ).ReadUInt16( nFillHoles ).ReadCharAsBool( bFillHoles ); @@ -339,7 +339,7 @@ void SdVectorizeDlg::SaveSettings() const SD_OPTION_VECTORIZE , SD_OPTION_STORE ) ); - if( xOStm.Is() ) + if( xOStm.is() ) { SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 ); xOStm->WriteUInt16( m_pNmLayers->GetValue() ).WriteUInt16( m_pMtReduce->GetValue() ); diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index da82353cd0e4..2842a1e2a97d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -697,7 +697,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) || rSet.GetItemState(SID_PASTE_SPECIAL) == SfxItemState::DEFAULT) { // no own clipboard data? - if ( !pTransferClip || !pTransferClip->GetDocShell().Is() ) + if ( !pTransferClip || !pTransferClip->GetDocShell().is() ) { rSet.DisableItem(SID_PASTE); rSet.DisableItem(SID_PASTE_SPECIAL); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index ccdf2ada88f6..1c693043badd 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -676,7 +676,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, { ::tools::SvRef<SotStorageStream> xStm; - if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::XFA, xStm ) && xStm.Is() ) + if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::XFA, xStm ) && xStm.is() ) { XFillExchangeData aFillData( XFillAttrSetItem( &mrDoc.GetPool() ) ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 50146ced52b0..cb5dc0b44078 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -365,7 +365,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, // Paste only if SfxClassificationHelper recommends so. const SfxObjectShellRef& pSource = pOwnData->GetDocShell(); SfxObjectShell* pDestination = mrDoc.GetDocSh(); - if (pSource.Is() && pDestination) + if (pSource.is() && pDestination) { SfxClassificationCheckPasteResult eResult = SfxClassificationHelper::CheckPaste(pSource->getDocProperties(), pDestination->getDocProperties()); if (!SfxClassificationHelper::ShowPasteInfo(eResult)) @@ -377,7 +377,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, { const View* pSourceView = pOwnData->GetView(); - if( pOwnData->GetDocShell().Is() && pOwnData->IsPageTransferable() ) + if( pOwnData->GetDocShell().is() && pOwnData->IsPageTransferable() ) { mpClipboard->HandlePageDrop (*pOwnData); bReturn = true; @@ -919,7 +919,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, } xDocShRef->DoClose(); - xDocShRef.Clear(); + xDocShRef.clear(); } else 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() ) ) diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx index 931d7f84177a..c4e961271801 100644 --- a/sot/qa/cppunit/test_sot.cxx +++ b/sot/qa/cppunit/test_sot.cxx @@ -108,7 +108,7 @@ namespace { SvFileStream aStream(rURL, StreamMode::READ); tools::SvRef<SotStorage> xObjStor = new SotStorage(aStream); - if (!xObjStor.Is() || xObjStor->GetError()) + if (!xObjStor.is() || xObjStor->GetError()) return false; CPPUNIT_ASSERT_MESSAGE("sot storage is not valid", xObjStor->Validate()); @@ -127,10 +127,10 @@ namespace SvFileStream aStream(aURL, StreamMode::READ); tools::SvRef<SotStorage> xObjStor = new SotStorage(aStream); CPPUNIT_ASSERT_MESSAGE("sot storage failed to open", - xObjStor.Is() && !xObjStor->GetError()); + xObjStor.is() && !xObjStor->GetError()); tools::SvRef<SotStorageStream> xStream = xObjStor->OpenSotStream("Book"); CPPUNIT_ASSERT_MESSAGE("stream failed to open", - xStream.Is() && !xObjStor->GetError()); + xStream.is() && !xObjStor->GetError()); CPPUNIT_ASSERT_MESSAGE("error in opened stream", !xStream->GetError()); sal_uLong nPos = xStream->GetSize(); CPPUNIT_ASSERT_EQUAL_MESSAGE("odd stream length", static_cast<sal_uLong>(13312), nPos); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 0bd242585578..adce130e11f3 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -472,7 +472,7 @@ SvMemoryStream * SotStorage::CreateMemoryStream() } else { - aStg.Clear(); // Storage vorher freigeben + aStg.clear(); // Storage vorher freigeben delete pStm; pStm = nullptr; } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 1e1bf9426632..3be2e67efcc9 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -570,14 +570,14 @@ struct UCBStorageElement_Impl void SetContentType( const OUString& ); OUString GetOriginalContentType(); bool IsLoaded() - { return m_xStream.Is() || m_xStorage.Is(); } + { return m_xStream.is() || m_xStorage.is(); } }; ::ucbhelper::Content* UCBStorageElement_Impl::GetContent() { - if ( m_xStream.Is() ) + if ( m_xStream.is() ) return m_xStream->m_pContent; - else if ( m_xStorage.Is() ) + else if ( m_xStorage.is() ) return m_xStorage->GetContent(); else return nullptr; @@ -585,9 +585,9 @@ struct UCBStorageElement_Impl OUString UCBStorageElement_Impl::GetContentType() { - if ( m_xStream.Is() ) + if ( m_xStream.is() ) return m_xStream->m_aContentType; - else if ( m_xStorage.Is() ) + else if ( m_xStorage.is() ) return m_xStorage->m_aContentType; else { @@ -598,10 +598,10 @@ OUString UCBStorageElement_Impl::GetContentType() void UCBStorageElement_Impl::SetContentType( const OUString& rType ) { - if ( m_xStream.Is() ) { + if ( m_xStream.is() ) { m_xStream->m_aContentType = m_xStream->m_aOriginalContentType = rType; } - else if ( m_xStorage.Is() ) { + else if ( m_xStorage.is() ) { m_xStorage->m_aContentType = m_xStorage->m_aOriginalContentType = rType; } else { @@ -611,9 +611,9 @@ void UCBStorageElement_Impl::SetContentType( const OUString& rType ) OUString UCBStorageElement_Impl::GetOriginalContentType() { - if ( m_xStream.Is() ) + if ( m_xStream.is() ) return m_xStream->m_aOriginalContentType; - else if ( m_xStorage.Is() ) + else if ( m_xStorage.is() ) return m_xStorage->m_aOriginalContentType; else return OUString(); @@ -624,9 +624,9 @@ bool UCBStorageElement_Impl::IsModified() bool bModified = m_bIsRemoved || m_bIsInserted || m_aName != m_aOriginalName; if ( bModified ) { - if ( m_xStream.Is() ) + if ( m_xStream.is() ) bModified = m_xStream->m_aContentType != m_xStream->m_aOriginalContentType; - else if ( m_xStorage.Is() ) + else if ( m_xStorage.is() ) bModified = m_xStorage->m_aContentType != m_xStorage->m_aOriginalContentType; } @@ -1774,7 +1774,7 @@ void UCBStorage_Impl::ReadContent() { if ( m_bIsLinked ) OpenStorage( pElement, m_nMode, m_bDirect ); - if ( pElement->m_xStorage.Is() ) + if ( pElement->m_xStorage.is() ) pElement->m_xStorage->Init(); } else if ( bIsOfficeDocument ) @@ -1857,8 +1857,8 @@ sal_Int32 UCBStorage_Impl::GetObjectCount() sal_Int32 nCount = m_aChildrenList.size(); for (UCBStorageElement_Impl* pElement : m_aChildrenList) { - DBG_ASSERT( !pElement->m_bIsFolder || pElement->m_xStorage.Is(), "Storage should be open!" ); - if ( pElement->m_bIsFolder && pElement->m_xStorage.Is() ) + DBG_ASSERT( !pElement->m_bIsFolder || pElement->m_xStorage.is(), "Storage should be open!" ); + if ( pElement->m_bIsFolder && pElement->m_xStorage.is() ) nCount += pElement->m_xStorage->GetObjectCount(); } @@ -1913,8 +1913,8 @@ void UCBStorage_Impl::SetProps( const Sequence < Sequence < PropertyValue > >& r for (UCBStorageElement_Impl* pElement : m_aChildrenList) { - DBG_ASSERT( !pElement->m_bIsFolder || pElement->m_xStorage.Is(), "Storage should be open!" ); - if ( pElement->m_bIsFolder && pElement->m_xStorage.Is() ) + DBG_ASSERT( !pElement->m_bIsFolder || pElement->m_xStorage.is(), "Storage should be open!" ); + if ( pElement->m_bIsFolder && pElement->m_xStorage.is() ) pElement->m_xStorage->SetProps( rSequence, aPath ); else { @@ -1964,8 +1964,8 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert // now the properties of my elements for (UCBStorageElement_Impl* pElement : m_aChildrenList) { - DBG_ASSERT( !pElement->m_bIsFolder || pElement->m_xStorage.Is(), "Storage should be open!" ); - if ( pElement->m_bIsFolder && pElement->m_xStorage.Is() ) + DBG_ASSERT( !pElement->m_bIsFolder || pElement->m_xStorage.is(), "Storage should be open!" ); + if ( pElement->m_bIsFolder && pElement->m_xStorage.is() ) // storages add there properties by themselves ( see above ) pElement->m_xStorage->GetProps( nProps, rSequence, aPath ); else @@ -2087,7 +2087,7 @@ sal_Int16 UCBStorage_Impl::Commit() if ( !pElement->m_bIsInserted ) { // first remove all open stream handles - if (pContent && (!pElement->m_xStream.Is() || pElement->m_xStream->Clear())) + if (pContent && (!pElement->m_xStream.is() || pElement->m_xStream->Clear())) { pContent->executeCommand( "delete", makeAny( true ) ); nRet = COMMIT_RESULT_SUCCESS; @@ -2100,7 +2100,7 @@ sal_Int16 UCBStorage_Impl::Commit() else { sal_Int16 nLocalRet = COMMIT_RESULT_NOTHING_TO_DO; - if ( pElement->m_xStorage.Is() ) + if ( pElement->m_xStorage.is() ) { // element is a storage // do a commit in the following cases: @@ -2113,7 +2113,7 @@ sal_Int16 UCBStorage_Impl::Commit() pContent = pElement->GetContent(); } } - else if ( pElement->m_xStream.Is() ) + else if ( pElement->m_xStream.is() ) { // element is a stream nLocalRet = pElement->m_xStream->Commit(); @@ -2333,12 +2333,12 @@ bool UCBStorage_Impl::Revert() } else { - if ( pElement->m_xStream.Is() ) + if ( pElement->m_xStream.is() ) { pElement->m_xStream->m_bCommited = false; pElement->m_xStream->Revert(); } - else if ( pElement->m_xStorage.Is() ) + else if ( pElement->m_xStorage.is() ) { pElement->m_xStorage->m_bCommited = false; pElement->m_xStorage->Revert(); @@ -2431,7 +2431,7 @@ void UCBStorage::FillInfoList( SvStorageInfoList* pList ) const { // problem: what about the size of a substorage ?! sal_uLong nSize = pElement->m_nSize; - if ( pElement->m_xStream.Is() ) + if ( pElement->m_xStream.is() ) nSize = pElement->m_xStream->GetSize(); SvStorageInfo aInfo( pElement->m_aName, nSize, pElement->m_bIsStorage ); pList->push_back( aInfo ); @@ -2453,7 +2453,7 @@ bool UCBStorage::CopyStorageElement_Impl( UCBStorageElement_Impl& rElement, Base bool bDeleteStream = false; // if stream is already open, it is allowed to copy it, so be aware of this - if ( rElement.m_xStream.Is() ) + if ( rElement.m_xStream.is() ) pStream = rElement.m_xStream->m_pAntiImpl; if ( !pStream ) { @@ -2479,7 +2479,7 @@ bool UCBStorage::CopyStorageElement_Impl( UCBStorageElement_Impl& rElement, Base // if stream is already open, it is allowed to copy it, so be aware of this bool bDeleteStorage = false; - if ( rElement.m_xStorage.Is() ) + if ( rElement.m_xStorage.is() ) pStorage = rElement.m_xStorage->m_pAntiImpl; if ( !pStorage ) { @@ -2632,7 +2632,7 @@ BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode if ( !pElement->m_bIsFolder ) { // check if stream is already created - if ( pElement->m_xStream.Is() ) + if ( pElement->m_xStream.is() ) { // stream has already been created; if it has no external reference, it may be opened another time if ( pElement->m_xStream->m_pAntiImpl ) @@ -2732,7 +2732,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const OUString& rEleName, StreamMode // Such a storage will be created on a UCBStorageStream; it will write into the stream // if it is opened in direct mode or when it is committed. In this case the stream will be // modified and then it MUST be treated as committed. - if ( !pElement->m_xStream.Is() ) + if ( !pElement->m_xStream.is() ) { BaseStorageStream* pStr = OpenStream( rEleName, nMode, bDirect ); UCBStorageStream* pStream = dynamic_cast<UCBStorageStream*>( pStr ); @@ -2757,7 +2757,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const OUString& rEleName, StreamMode pElement->m_bIsStorage = true; return pElement->m_xStream->CreateStorage(); // can only be created in transacted mode } - else if ( pElement->m_xStorage.Is() ) + else if ( pElement->m_xStorage.is() ) { // storage has already been opened; if it has no external reference, it may be opened another time if ( pElement->m_xStorage->m_pAntiImpl ) @@ -2783,7 +2783,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const OUString& rEleName, StreamMode } } } - else if ( !pElement->m_xStream.Is() ) + else if ( !pElement->m_xStream.is() ) { // storage is opened the first time bool bIsWritable = bool(pImp->m_nMode & StreamMode::WRITE); diff --git a/starmath/qa/cppunit/test_cursor.cxx b/starmath/qa/cppunit/test_cursor.cxx index 6cbc4fe2ef41..dd6b86f39439 100644 --- a/starmath/qa/cppunit/test_cursor.cxx +++ b/starmath/qa/cppunit/test_cursor.cxx @@ -61,7 +61,7 @@ void Test::setUp() void Test::tearDown() { - xDocShRef.Clear(); + xDocShRef.clear(); BootstrapFixture::tearDown(); } diff --git a/starmath/qa/cppunit/test_node.cxx b/starmath/qa/cppunit/test_node.cxx index 68396b78eb95..3a450b5329f5 100644 --- a/starmath/qa/cppunit/test_node.cxx +++ b/starmath/qa/cppunit/test_node.cxx @@ -55,7 +55,7 @@ void NodeTest::setUp() void NodeTest::tearDown() { - if (mxDocShell.Is()) + if (mxDocShell.is()) mxDocShell->DoClose(); BootstrapFixture::tearDown(); } diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index 662cc2c165dc..bc131de94027 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -94,7 +94,7 @@ void Test::setUp() void Test::tearDown() { - xDocShRef.Clear(); + xDocShRef.clear(); BootstrapFixture::tearDown(); } diff --git a/starmath/qa/cppunit/test_parse.cxx b/starmath/qa/cppunit/test_parse.cxx index 2aff581cf375..80da700be4cc 100644 --- a/starmath/qa/cppunit/test_parse.cxx +++ b/starmath/qa/cppunit/test_parse.cxx @@ -52,7 +52,7 @@ void ParseTest::setUp() void ParseTest::tearDown() { - if (mxDocShell.Is()) + if (mxDocShell.is()) mxDocShell->DoClose(); BootstrapFixture::tearDown(); } diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index 05cddc500d8e..7a5688a1463d 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -102,7 +102,7 @@ void Test::tearDown() m_pSmCmdBoxWindow.disposeAndClear(); m_pDispatcher.reset(); m_xDocShRef->DoClose(); - m_xDocShRef.Clear(); + m_xDocShRef.clear(); BootstrapFixture::tearDown(); } diff --git a/starmath/qa/extras/mmlexport-test.cxx b/starmath/qa/extras/mmlexport-test.cxx index b3cb3aa38e3f..8254eec92ef9 100644 --- a/starmath/qa/extras/mmlexport-test.cxx +++ b/starmath/qa/extras/mmlexport-test.cxx @@ -65,7 +65,7 @@ void MathMLExportTest::setUp() void MathMLExportTest::tearDown() { - if (mxDocShell.Is()) + if (mxDocShell.is()) mxDocShell->DoClose(); BootstrapFixture::tearDown(); } diff --git a/starmath/qa/extras/mmlimport-test.cxx b/starmath/qa/extras/mmlimport-test.cxx index aa9e0f7fe33b..430209a1d383 100644 --- a/starmath/qa/extras/mmlimport-test.cxx +++ b/starmath/qa/extras/mmlimport-test.cxx @@ -88,7 +88,7 @@ void Test::setUp() void Test::tearDown() { - if (mxDocShell.Is()) mxDocShell->DoClose(); + if (mxDocShell.is()) mxDocShell->DoClose(); BootstrapFixture::tearDown(); } diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index 5ffc66e68a2f..aa6fdaca6d02 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -32,7 +32,7 @@ bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) tools::SvRef<SotStorageStream> xSrc = pStor->OpenSotStream( "Equation Native", StreamMode::STD_READ); - if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) + if ( (!xSrc.is()) || (SVSTREAM_OK != xSrc->GetError())) return bSuccess; SotStorageStream *pS = xSrc.get(); pS->SetEndian( SvStreamEndian::LITTLE ); diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 1e107158b9df..791dc9bd1583 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -558,7 +558,7 @@ bool MathType::Parse(SotStorage *pStor) tools::SvRef<SotStorageStream> xSrc = pStor->OpenSotStream( "Equation Native", StreamMode::STD_READ); - if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) + if ( (!xSrc.is()) || (SVSTREAM_OK != xSrc->GetError())) return false; pS = xSrc.get(); pS->SetEndian( SvStreamEndian::LITTLE ); @@ -1914,11 +1914,11 @@ bool MathType::ConvertFromStarMath( SfxMedium& rMedium ) }; tools::SvRef<SotStorageStream> xStor2( pStor->OpenSotStream("\1Ole")); xStor2->WriteBytes(aOle, sizeof(aOle)); - xStor.Clear(); - xStor2.Clear(); + xStor.clear(); + xStor2.clear(); tools::SvRef<SotStorageStream> xSrc = pStor->OpenSotStream("Equation Native"); - if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) + if ( (!xSrc.is()) || (SVSTREAM_OK != xSrc->GetError())) return false; pS = xSrc.get(); diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 224272595908..837e3ede5343 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -131,7 +131,7 @@ bool SfxLockBytesItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) // virtual bool SfxLockBytesItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { - if ( _xVal.Is() ) + if ( _xVal.is() ) { sal_uInt32 nLen; SvLockBytesStat aStat; diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 2b167d84e15a..d81d10d87949 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -945,7 +945,7 @@ namespace svt if (nEditRow >= 0 && nEditCol > HandleColumnId) { aController = GetController(nRow, nCol); - if (aController.Is()) + if (aController.is()) { Rectangle aRect( GetCellRect(nEditRow, nEditCol, false)); ResizeController(aController, aRect); @@ -990,7 +990,7 @@ namespace svt } aOldController = aController; - aController.Clear(); + aController.clear(); // reset the modify handler aOldController->SetModifyHdl(Link<LinkParamNone*,void>()); diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 153b5c7a2219..efccd3322f7c 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -115,7 +115,7 @@ void EditBrowseBoxImpl::clearActiveCell() void EditBrowseBox::GrabTableFocus() { - if ( aController.Is() ) + if ( aController.is() ) aController->GetWindow().GrabFocus(); } diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 9bfa8d95e3b2..b2ef739ee1a5 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -576,7 +576,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus ) if( !aVscrollSB ) return; - if ( !mxFontCharMap.Is() ) + if ( !mxFontCharMap.is() ) RecalculateFont( *this ); if( nNewIndex < 0 ) @@ -657,7 +657,7 @@ void SvxShowCharSet::OutputIndex( int nNewIndex ) void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew ) { - if ( !mxFontCharMap.Is() ) + if ( !mxFontCharMap.is() ) RecalculateFont( *this ); // get next available char of current font @@ -1656,7 +1656,7 @@ void SubsetMap::InitList() void SubsetMap::ApplyCharMap( const FontCharMapRef& rxFontCharMap ) { - if( !rxFontCharMap.Is() ) + if( !rxFontCharMap.is() ) return; // remove subsets that are not matched in any range diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 1e39c967d65d..df87cc08052b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1085,7 +1085,7 @@ void FmGridControl::propertyChange(const css::beans::PropertyChangeEvent& evt) const DbGridRowRef& xRow = GetCurrentRow(); // waehrend Positionierung wird kein abgleich der Properties vorgenommen Reference<XPropertySet> xSet(evt.Source,UNO_QUERY); - if (xRow.Is() && (::cppu::any2bool(xSet->getPropertyValue(FM_PROP_ISNEW))|| CompareBookmark(getDataSource()->getBookmark(), xRow->GetBookmark()))) + if (xRow.is() && (::cppu::any2bool(xSet->getPropertyValue(FM_PROP_ISNEW))|| CompareBookmark(getDataSource()->getBookmark(), xRow->GetBookmark()))) { if (evt.PropertyName == FM_PROP_ISMODIFIED) { @@ -1149,7 +1149,7 @@ void FmGridControl::DeleteSelectedRows() if ( IsCurrentAppending() ) return; // is the insert row selected - if (GetEmptyRow().Is() && IsRowSelected(GetRowCount() - 1)) + if (GetEmptyRow().is() && IsRowSelected(GetRowCount() - 1)) nSelectedRows -= 1; // nothing to do @@ -1216,10 +1216,10 @@ void FmGridControl::DeleteSelectedRows() Any aBookmark; bool bNewPos = false; // if the current row isn't selected we take the row as row after deletion - OSL_ENSURE( GetCurrentRow().Is(), "FmGridControl::DeleteSelectedRows: no current row here?" ); + OSL_ENSURE( GetCurrentRow().is(), "FmGridControl::DeleteSelectedRows: no current row here?" ); // crash reports suggest it can happen we don't have a current row - how? // #154303# / 2008-04-23 / frank.schoenheit@sun.com - if ( !IsRowSelected( GetCurrentPos() ) && !IsCurrentAppending() && GetCurrentRow().Is() ) + if ( !IsRowSelected( GetCurrentPos() ) && !IsCurrentAppending() && GetCurrentRow().is() ) { aBookmark = GetCurrentRow()->GetBookmark(); bNewPos = true; @@ -1314,7 +1314,7 @@ void FmGridControl::DeleteSelectedRows() --nRecordCount; // there are no rows left and we have an insert row - if (!nRecordCount && GetEmptyRow().Is()) + if (!nRecordCount && GetEmptyRow().is()) { Reference< XResultSetUpdate > xUpdateCursor(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); xUpdateCursor->moveToInsertRow(); @@ -1423,7 +1423,7 @@ bool FmGridControl::commit() // wird if (!IsUpdating()) { - if (Controller().Is() && Controller()->IsModified()) + if (Controller().is() && Controller()->IsModified()) { if (!SaveModified()) return false; @@ -1435,7 +1435,7 @@ bool FmGridControl::commit() void FmGridControl::inserted(const css::lang::EventObject& /*rEvent*/) { const DbGridRowRef& xRow = GetCurrentRow(); - if (!xRow.Is()) + if (!xRow.is()) return; // Zeile ist eingefuegt worden, dann den status und mode zuruecksetzen diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 33af56e75e49..0fa2357ccced 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1251,7 +1251,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType pCol = aColumns[ nModelPos ]; const DbGridRowRef xRow = pGrid->GetSeekRow(); - xFieldContent = (xRow.Is() && xRow->HasField(pCol->GetFieldPos())) ? xRow->GetField(pCol->GetFieldPos()).getColumn() : Reference< css::sdb::XColumn > (); + xFieldContent = (xRow.is() && xRow->HasField(pCol->GetFieldPos())) ? xRow->GetField(pCol->GetFieldPos()).getColumn() : Reference< css::sdb::XColumn > (); if (!xFieldContent.is()) // can't supply anything without a field content // FS - 07.12.99 - 54391 @@ -1291,7 +1291,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type // don't use GetCurrentRow as this isn't affected by the above SeekRow // FS - 30.09.99 - 68644 DbGridRowRef xPaintRow = pGrid->GetPaintRow(); - ENSURE_OR_THROW( xPaintRow.Is(), "invalid paint row" ); + ENSURE_OR_THROW( xPaintRow.is(), "invalid paint row" ); // I need the columns of the control for GetFieldText DbGridColumns aColumns = pGrid->GetColumns(); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 2195b90708dd..705653d61bc7 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -441,7 +441,7 @@ Reference< css::sdb::XColumn > DbGridColumn::GetCurrentFieldValue() const { Reference< css::sdb::XColumn > xField; const DbGridRowRef xRow = m_rParent.GetCurrentRow(); - if (xRow.Is() && xRow->HasField(m_nFieldPos)) + if (xRow.is() && xRow->HasField(m_nFieldPos)) { xField = xRow->GetField(m_nFieldPos).getColumn(); } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index f901dd3d5ab8..61947d437828 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::container; using namespace com::sun::star::accessibility; -#define ROWSTATUS(row) (!row.Is() ? "NULL" : row->GetStatus() == GridRowStatus::Clean ? "CLEAN" : row->GetStatus() == GridRowStatus::Modified ? "MODIFIED" : row->GetStatus() == GridRowStatus::Deleted ? "DELETED" : "INVALID") +#define ROWSTATUS(row) (!row.is() ? "NULL" : row->GetStatus() == GridRowStatus::Clean ? "CLEAN" : row->GetStatus() == GridRowStatus::Modified ? "MODIFIED" : row->GetStatus() == GridRowStatus::Deleted ? "DELETED" : "INVALID") #define DEFAULT_BROWSE_MODE \ BrowserMode::COLUMNSELECTION \ @@ -1286,7 +1286,7 @@ void DbGridControl::EnableNavigationBar(bool bEnable) DbGridControlOptions DbGridControl::SetOptions(DbGridControlOptions nOpt) { - DBG_ASSERT(!m_xCurrentRow.Is() || !m_xCurrentRow->IsModified(), + DBG_ASSERT(!m_xCurrentRow.is() || !m_xCurrentRow->IsModified(), "DbGridControl::SetOptions : please do not call when editing a record (things are much easier this way ;) !"); // for the next setDataSource (which is triggered by a refresh, for instance) @@ -1917,7 +1917,7 @@ void DbGridControl::RowInserted(long nRow, long nNumRows, bool bDoPaint) // if we have an insert row we have to reduce to count by 1 // as the total count reflects only the existing rows in database m_nTotalCount = GetRowCount() + nNumRows; - if (m_xEmptyRow.Is()) + if (m_xEmptyRow.is()) --m_nTotalCount; } else if (m_nTotalCount >= 0) @@ -1936,7 +1936,7 @@ void DbGridControl::RowRemoved(long nRow, long nNumRows, bool bDoPaint) { m_nTotalCount = GetRowCount() - nNumRows; // if we have an insert row reduce by 1 - if (m_xEmptyRow.Is()) + if (m_xEmptyRow.is()) --m_nTotalCount; } else if (m_nTotalCount >= 0) @@ -2112,7 +2112,7 @@ bool DbGridControl::SetCurrent(long nNewRow) if ( !m_pSeekCursor->isBeforeFirst() && !m_pSeekCursor->isAfterLast() ) { Any aBookmark = m_pSeekCursor->getBookmark(); - if (!m_xCurrentRow.Is() || m_xCurrentRow->IsNew() || !CompareBookmark(aBookmark, m_pDataCursor->getBookmark())) + if (!m_xCurrentRow.is() || m_xCurrentRow->IsNew() || !CompareBookmark(aBookmark, m_pDataCursor->getBookmark())) { // adjust the cursor to the new desired row if (!m_pDataCursor->moveToBookmark(aBookmark)) @@ -2219,7 +2219,7 @@ void DbGridControl::AdjustDataSource(bool bFull) // but this is only possible for rows which are not inserted, in that case the comparison result // may not be correct else - if ( m_xCurrentRow.Is() + if ( m_xCurrentRow.is() && !m_xCurrentRow->IsNew() && !m_pDataCursor->isBeforeFirst() && !m_pDataCursor->isAfterLast() @@ -2247,7 +2247,7 @@ void DbGridControl::AdjustDataSource(bool bFull) m_xPaintRow = m_xSeekRow; // not up-to-date row, thus, adjust completely - if (!m_xCurrentRow.Is()) + if (!m_xCurrentRow.is()) AdjustRows(); sal_Int32 nNewPos = AlignSeekCursor(); @@ -2260,7 +2260,7 @@ void DbGridControl::AdjustDataSource(bool bFull) if (m_bSynchDisplay) DbGridControl_Base::GoToRow(nNewPos); - if (!m_xCurrentRow.Is()) + if (!m_xCurrentRow.is()) // Happens e.g. when deleting the n last datasets (n>1) while the cursor was positioned // on the last one. In this case, AdjustRows deletes two rows from BrowseBox, by what // CurrentRow is corrected to point two rows down, so that GoToRow will point into @@ -2276,7 +2276,7 @@ void DbGridControl::AdjustDataSource(bool bFull) // if the data cursor was moved from outside, this section is voided SetNoSelection(); - m_aBar->InvalidateAll(m_nCurrentPos, m_xCurrentRow.Is()); + m_aBar->InvalidateAll(m_nCurrentPos, m_xCurrentRow.is()); } sal_Int32 DbGridControl::AlignSeekCursor() @@ -2746,7 +2746,7 @@ void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) if (xSource.is()) bIsNew = ::comphelper::getBOOL(xSource->getPropertyValue(FM_PROP_ISNEW)); - if (bIsNew && m_xCurrentRow.Is()) + if (bIsNew && m_xCurrentRow.is()) { DBG_ASSERT(::comphelper::getBOOL(xSource->getPropertyValue(FM_PROP_ROWCOUNTFINAL)), "DbGridControl::DataSourcePropertyChanged : somebody moved the form to a new record before the row count was final !"); sal_Int32 nRecordCount = 0; @@ -2774,7 +2774,7 @@ void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) } } } - if (m_xCurrentRow.Is()) + if (m_xCurrentRow.is()) { m_xCurrentRow->SetStatus(::comphelper::getBOOL(evt.NewValue) ? GridRowStatus::Modified : GridRowStatus::Clean); m_xCurrentRow->SetNew( bIsNew ); @@ -3114,7 +3114,7 @@ bool DbGridControl::IsModified() const bool DbGridControl::IsCurrentAppending() const { - return m_xCurrentRow.Is() && m_xCurrentRow->IsNew(); + return m_xCurrentRow.is() && m_xCurrentRow->IsNew(); } bool DbGridControl::IsInsertionRow(long nRow) const @@ -3137,8 +3137,8 @@ bool DbGridControl::SaveModified() size_t Location = GetModelColumnPos( GetCurColumnId() ); DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; bool bOK = pColumn && pColumn->Commit(); - DBG_ASSERT( Controller().Is(), "DbGridControl::SaveModified: was modified, by have no controller?!" ); - if ( !Controller().Is() ) + DBG_ASSERT( Controller().is(), "DbGridControl::SaveModified: was modified, by have no controller?!" ); + if ( !Controller().is() ) // this might happen if the callbacks implicitly triggered by Commit // fiddled with the form or the control ... // (Note that this here is a workaround, at most. We need a general concept how @@ -3178,7 +3178,7 @@ bool DbGridControl::SaveRow() if (!IsValid(m_xCurrentRow) || !IsModified()) return true; // value of the controller was not saved, yet - else if (Controller().Is() && Controller()->IsModified()) + else if (Controller().is() && Controller()->IsModified()) { if (!SaveModified()) return false; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index b58c364e661d..071ebf753e03 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -994,7 +994,7 @@ namespace svxform // SfxObjectShellRef is good here since the model controls the lifetime of the object SfxObjectShellRef xObjectShell = m_rFormModel.GetObjectShell(); - if( !xObjectShell.Is() ) + if( !xObjectShell.is() ) return; // the script to execute diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 3ae443c30f74..c71a6acddfbc 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -126,7 +126,7 @@ private: Reference< XPropertySet > const xListenerProps( xScriptListener, UNO_QUERY_THROW ); // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell(); - ENSURE_OR_THROW( xObjectShell.Is(), "no object shell!" ); + ENSURE_OR_THROW( xObjectShell.is(), "no object shell!" ); xListenerProps->setPropertyValue("Model", makeAny( xObjectShell->GetModel() ) ); m_vbaListener = xScriptListener; diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 180cec48a1ae..65956e0187ce 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -427,13 +427,13 @@ void GalleryTransferable::InitData( bool bLazy ) mpGraphicObject = new GraphicObject( aGraphic ); } - if( !mxModelStream.Is() ) + if( !mxModelStream.is() ) { mxModelStream = new SotStorageStream( "" ); mxModelStream->SetBufferSize( 16348 ); if( !mpTheme->GetModelStream( mnObjectPos, mxModelStream ) ) - mxModelStream.Clear(); + mxModelStream.clear(); else mxModelStream->Seek( 0 ); } @@ -514,7 +514,7 @@ bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, cons if( ( SotClipboardFormatId::DRAWING == nFormat ) && ( SgaObjKind::SvDraw == meObjectKind ) ) { - bRet = ( mxModelStream.Is() && SetObject( mxModelStream.get(), SotClipboardFormatId::NONE, rFlavor ) ); + bRet = ( mxModelStream.is() && SetObject( mxModelStream.get(), SotClipboardFormatId::NONE, rFlavor ) ); } else if( ( SotClipboardFormatId::SVIM == nFormat ) && mpImageMap ) { @@ -569,7 +569,7 @@ void GalleryTransferable::DragFinished( sal_Int8 nDropAction ) void GalleryTransferable::ObjectReleased() { - mxModelStream.Clear(); + mxModelStream.clear(); delete mpGraphicObject; mpGraphicObject = nullptr; delete mpImageMap; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index db774bd754fa..4e65d6cee710 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -569,12 +569,12 @@ void GalleryTheme::Actualize( const Link<const INetURLObject&, void>& rActualize } else { - if ( aSvDrawStorageRef.Is() ) + if ( aSvDrawStorageRef.is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( pEntry->aURL ) ); tools::SvRef<SotStorageStream> pIStm = aSvDrawStorageRef->OpenSotStream( aStmName, StreamMode::READ ); - if( pIStm.Is() && !pIStm->GetError() ) + if( pIStm.is() && !pIStm->GetError() ) { pIStm->SetBufferSize( 16384 ); @@ -670,7 +670,7 @@ void GalleryTheme::Actualize( const Link<const INetURLObject&, void>& rActualize if( nStorErr == ERRCODE_NONE ) { - aSvDrawStorageRef.Clear(); + aSvDrawStorageRef.clear(); CopyFile( aTmpURL, GetSdvURL() ); ImplCreateSvDrawStorage(); } @@ -931,12 +931,12 @@ bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool ) const INetURLObject aURL( ImplGetURL( pObject ) ); tools::SvRef<SotStorage> xStor( GetSvDrawStorage() ); - if( xStor.Is() ) + if( xStor.is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( aURL ) ); tools::SvRef<SotStorageStream> xIStm( xStor->OpenSotStream( aStmName, StreamMode::READ ) ); - if( xIStm.Is() && !xIStm->GetError() ) + if( xIStm.is() && !xIStm->GetError() ) { xIStm->SetBufferSize( STREAMBUF_SIZE ); bRet = GallerySvDrawImport( *xIStm, rModel ); @@ -954,12 +954,12 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPo tools::SvRef<SotStorage> xStor( GetSvDrawStorage() ); bool bRet = false; - if( xStor.Is() ) + if( xStor.is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( aURL ) ); tools::SvRef<SotStorageStream> xOStm( xStor->OpenSotStream( aStmName, StreamMode::WRITE | StreamMode::TRUNC ) ); - if( xOStm.Is() && !xOStm->GetError() ) + if( xOStm.is() && !xOStm->GetError() ) { SvMemoryStream aMemStm( 65535, 65535 ); FmFormModel* pFormModel = const_cast<FmFormModel*>(&rModel); @@ -1003,12 +1003,12 @@ bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStre const INetURLObject aURL( ImplGetURL( pObject ) ); tools::SvRef<SotStorage> xStor( GetSvDrawStorage() ); - if( xStor.Is() ) + if( xStor.is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( aURL ) ); tools::SvRef<SotStorageStream> xIStm( xStor->OpenSotStream( aStmName, StreamMode::READ ) ); - if( xIStm.Is() && !xIStm->GetError() ) + if( xIStm.is() && !xIStm->GetError() ) { sal_uInt32 nVersion = 0; @@ -1050,12 +1050,12 @@ bool GalleryTheme::InsertModelStream( const tools::SvRef<SotStorageStream>& rxMo tools::SvRef<SotStorage> xStor( GetSvDrawStorage() ); bool bRet = false; - if( xStor.Is() ) + if( xStor.is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( aURL ) ); tools::SvRef<SotStorageStream> xOStm( xStor->OpenSotStream( aStmName, StreamMode::WRITE | StreamMode::TRUNC ) ); - if( xOStm.Is() && !xOStm->GetError() ) + if( xOStm.is() && !xOStm->GetError() ) { GalleryCodec aCodec( *xOStm ); SvMemoryStream aMemStm( 65535, 65535 ); diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 326f567bab0f..9b1faeff2999 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -178,7 +178,7 @@ public: virtual bool RestorePersistentData() override; /// Query link-data. - bool IsGrfLink() const { return refLink.Is(); } + bool IsGrfLink() const { return refLink.is(); } bool IsLinkedFile() const; bool IsLinkedDDE() const; const tools::SvRef<sfx2::SvBaseLink>& GetLink() const { return refLink; } @@ -215,12 +215,12 @@ inline const SwGrfNode *SwNode::GetGrfNode() const inline bool SwGrfNode::IsLinkedFile() const { - return refLink.Is() && OBJECT_CLIENT_GRF == refLink->GetObjType(); + return refLink.is() && OBJECT_CLIENT_GRF == refLink->GetObjType(); } inline bool SwGrfNode::IsLinkedDDE() const { - return refLink.Is() && OBJECT_CLIENT_DDE == refLink->GetObjType(); + return refLink.is() && OBJECT_CLIENT_DDE == refLink->GetObjType(); } #endif diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index bd0908db2871..1824460a5b0f 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -215,14 +215,14 @@ public: void SetRefObject( SwServerObject* pObj ); const SwServerObject* GetObject() const { return m_RefObj.get(); } SwServerObject* GetObject() { return m_RefObj.get(); } - bool IsServer() const { return m_RefObj.Is(); } + bool IsServer() const { return m_RefObj.is(); } // Methods for linked ranges. SfxLinkUpdateMode GetUpdateType() const { return m_RefLink->GetUpdateMode(); } void SetUpdateType(SfxLinkUpdateMode nType ) { m_RefLink->SetUpdateMode(nType); } - bool IsConnected() const { return m_RefLink.Is(); } + bool IsConnected() const { return m_RefLink.is(); } void UpdateNow() { m_RefLink->Update(); } void Disconnect() { m_RefLink->Disconnect(); } diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index b8cb7c506ac6..0eff13b14c06 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -110,7 +110,7 @@ bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL, bool bLoaded = xDocShRef->DoLoad(pSrcMed); if (!bExport) { - if (xDocShRef.Is()) + if (xDocShRef.is()) xDocShRef->DoClose(); return bLoaded; } @@ -124,7 +124,7 @@ bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL, SfxMedium aDstMed(aTempFile.GetURL(), StreamMode::STD_WRITE); aDstMed.SetFilter(pExportFilter); bool bSaved = xDocShRef->DoSaveAs(aDstMed); - if (xDocShRef.Is()) + if (xDocShRef.is()) xDocShRef->DoClose(); return bSaved; } diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 7de5c5d946c2..e5b17891d802 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -1699,7 +1699,7 @@ void SwDocTest::tearDown() { m_pDoc = nullptr; // deleted by DoClose() m_xDocShRef->DoClose(); - m_xDocShRef.Clear(); + m_xDocShRef.clear(); BootstrapFixture::tearDown(); } diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 417a56baba7f..69add5f044c5 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -251,13 +251,13 @@ namespace sw { namespace mark void DdeBookmark::DeregisterFromDoc(SwDoc* const pDoc) { - if(m_aRefObj.Is()) + if(m_aRefObj.is()) pDoc->getIDocumentLinksAdministration().GetLinkManager().RemoveServer(m_aRefObj.get()); } DdeBookmark::~DdeBookmark() { - if( m_aRefObj.Is() ) + if( m_aRefObj.is() ) { if(m_aRefObj->HasDataLinks()) { diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index ccbe757d2323..947e9f2ff8ff 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -416,7 +416,7 @@ bool DocumentLinksAdministrationManager::EmbedAllLinks() xLink->Closed(); // if one forgot to remove itself - if( xLink.Is() ) + if( xLink.is() ) rLnkMgr.Remove( xLink.get() ); bRet = true; diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx index ee851d45e80f..9c7432dbebaa 100644 --- a/sw/source/core/doc/swserv.cxx +++ b/sw/source/core/doc/swserv.cxx @@ -58,7 +58,7 @@ bool SwServerObject::GetData( uno::Any & rData, default: break; } - if( xWrt.Is() ) + if( xWrt.is() ) { SwPaM* pPam = nullptr; switch( eType ) diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 275a534cae62..35d4158a00fa 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -246,7 +246,7 @@ SwSection::~SwSection() pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() ); } - if (m_RefObj.Is()) + if (m_RefObj.is()) { pDoc->getIDocumentLinksAdministration().GetLinkManager().RemoveServer( m_RefObj.get() ); } @@ -261,7 +261,7 @@ SwSection::~SwSection() pDoc->DelSectionFormat( pFormat ); } } - if (m_RefObj.Is()) + if (m_RefObj.is()) { m_RefObj->Closed(); } @@ -544,7 +544,7 @@ void SwSection::SetCondHidden(bool const bFlag) // Set/remove the linked FileName OUString SwSection::GetLinkFileName() const { - if (m_RefLink.Is()) + if (m_RefLink.is()) { OUString sTmp; switch (m_Data.GetType()) @@ -582,7 +582,7 @@ OUString SwSection::GetLinkFileName() const void SwSection::SetLinkFileName(const OUString& rNew) { - if (m_RefLink.Is()) + if (m_RefLink.is()) { m_RefLink->SetLinkSourceName( rNew ); } @@ -1309,7 +1309,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) { tools::SvRef<SwServerObject> refObj( static_cast<SwServerObject*>( pDoc->getIDocumentLinksAdministration().CreateLinkSource( sRange ))); - if( refObj.Is() ) + if( refObj.is() ) { bRecursion = refObj->IsLinkInServer( this ) || ChkNoDataFlag(); @@ -1385,7 +1385,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) // Update all Links in this Section lcl_UpdateLinksInSect( *this, *pSectNd ); } - if( xDocSh.Is() ) + if( xDocSh.is() ) { if( 2 == nRet ) xDocSh->DoClose(); @@ -1503,7 +1503,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType ) SfxLinkUpdateMode nUpdateType = SfxLinkUpdateMode::ALWAYS; - if (!m_RefLink.Is()) + if (!m_RefLink.is()) { // create BaseLink m_RefLink = new SwIntrnlSectRefLink( *pFormat, nUpdateType ); @@ -1569,7 +1569,7 @@ void SwSection::BreakLink() } // Release link, if it exists - if (m_RefLink.Is()) + if (m_RefLink.is()) { SwSectionFormat *const pFormat( GetFormat() ); OSL_ENSURE(pFormat, "SwSection::BreakLink: no format?"); @@ -1577,7 +1577,7 @@ void SwSection::BreakLink() { pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() ); } - m_RefLink.Clear(); + m_RefLink.clear(); } // change type SetType( CONTENT_SECTION ); diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index 8602ef9a4173..4fbd3b7a5137 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -457,7 +457,7 @@ const SwNode* SwBaseLink::GetAnchor() const bool SwBaseLink::IsRecursion( const SwBaseLink* pChkLnk ) const { tools::SvRef<SwServerObject> aRef( static_cast<SwServerObject*>(GetObj()) ); - if( aRef.Is() ) + if( aRef.is() ) { // As it's a ServerObject, we query all contained Links // if we are contained in them. Else we have a recursion. diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 48ee031537c8..3dd2d8cfaca0 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -280,7 +280,7 @@ bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk ) #endif WriterRef xWrt; SwReaderWriter::GetWriter( FILTER_TEXT, OUString(), xWrt ); - if( xWrt.Is() ) + if( xWrt.is() ) { // write selected areas into a ASCII document SwWriter aWriter( aStream, *this); diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 2c4e596d4ddb..e83b66c7ddec 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -283,7 +283,7 @@ void SwDDEFieldType::SetDoc( SwDoc* pNewDoc ) if( pNewDoc == pDoc ) return; - if( pDoc && refLink.Is() ) + if( pDoc && refLink.is() ) { OSL_ENSURE( !nRefCnt, "How do we get the references?" ); pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() ); diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 94142cfa8a68..13a1f87d6134 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -148,7 +148,7 @@ bool SwGrfNode::ReRead( "GraphicNode without a name, Graphic or GraphicObject" ); // with name - if( refLink.Is() ) + if( refLink.is() ) { OSL_ENSURE( !bInSwapIn, "ReRead: I am still in SwapIn" ); @@ -179,7 +179,7 @@ bool SwGrfNode::ReRead( else // no name anymore, so remove link { GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() ); - refLink.Clear(); + refLink.clear(); } if( pGraphic ) @@ -202,7 +202,7 @@ bool SwGrfNode::ReRead( Graphic aGrf; aGrf.SetDefaultType(); maGrfObj.SetGraphic( aGrf, rGrfName ); - if( refLink.Is() ) + if( refLink.is() ) { if( getLayoutFrame( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) { @@ -296,7 +296,7 @@ SwGrfNode::~SwGrfNode() mpThreadConsumer.reset(); SwDoc* pDoc = GetDoc(); - if( refLink.Is() ) + if( refLink.is() ) { OSL_ENSURE( !bInSwapIn, "DTOR: I am still in SwapIn" ); pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() ); @@ -608,7 +608,7 @@ bool SwGrfNode::SwapOut() maGrfObj.GetType() != GraphicType::NONE && !maGrfObj.IsSwappedOut() && !bInSwapIn ) { - if( refLink.Is() ) + if( refLink.is() ) { // written graphics and links are removed here return maGrfObj.SwapOut( GRFMGR_AUTOSWAPSTREAM_LINK ); @@ -625,7 +625,7 @@ bool SwGrfNode::SwapOut() bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const { bool bRet = false; - if( refLink.Is() && refLink->GetLinkManager() ) + if( refLink.is() && refLink->GetLinkManager() ) { sal_uInt16 nType = refLink->GetObjType(); if( OBJECT_CLIENT_GRF == nType ) @@ -656,7 +656,7 @@ bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const */ bool SwGrfNode::SavePersistentData() { - if( refLink.Is() ) + if( refLink.is() ) { OSL_ENSURE( !bInSwapIn, "SavePersistentData: I am still in SwapIn" ); GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() ); @@ -684,7 +684,7 @@ bool SwGrfNode::SavePersistentData() bool SwGrfNode::RestorePersistentData() { - if( refLink.Is() ) + if( refLink.is() ) { IDocumentLinksAdministration& rIDLA = getIDocumentLinksAdministration(); refLink->SetVisible( rIDLA.IsVisibleLinks() ); @@ -729,7 +729,7 @@ void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName ) void SwGrfNode::ReleaseLink() { - if( refLink.Is() ) + if( refLink.is() ) { const OUString aFileName(maGrfObj.GetLink()); const Graphic aLocalGraphic(maGrfObj.GetGraphic()); @@ -743,7 +743,7 @@ void SwGrfNode::ReleaseLink() } getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() ); - refLink.Clear(); + refLink.clear(); maGrfObj.SetLink(); // #i15508# added extra processing after getting rid of the link. Use whatever is @@ -962,7 +962,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, const GraphicObject*, pGrfObj, SvStream* ) // a DataChanged call lead to a paint of the graphic. if( pGrfObj->IsInSwapOut() && (IsSelected() || bInSwapIn) ) pRet = GRFMGR_AUTOSWAPSTREAM_NONE; - else if( refLink.Is() ) + else if( refLink.is() ) { if( pGrfObj->IsInSwapIn() ) { diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 6e1866002f0f..1528df16be72 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -142,7 +142,7 @@ namespace sw { const SwServerObject* GetRefObject() const { return m_aRefObj.get(); } SwServerObject* GetRefObject() { return m_aRefObj.get(); } - bool IsServer() const { return m_aRefObj.Is(); } + bool IsServer() const { return m_aRefObj.is(); } void SetRefObject( SwServerObject* pObj ); diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index cb4aee07af82..5660a4cc4725 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -122,7 +122,7 @@ SwXMLTextBlocks::~SwXMLTextBlocks() if ( bInfoChanged ) WriteInfo(); ResetBlockMode (); - if(xDocShellRef.Is()) + if(xDocShellRef.is()) xDocShellRef->DoClose(); xDocShellRef = nullptr; if( pDoc && !pDoc->release() ) diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index c2038745c6e7..4f48f916f24c 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -240,7 +240,7 @@ void DelBoxNode( SwTableSortBoxes& rSortCntBoxes ) SwTable::~SwTable() { - if( m_xRefObj.Is() ) + if( m_xRefObj.is() ) { SwDoc* pDoc = GetFrameFormat()->GetDoc(); if( !pDoc->IsInDtor() ) // then remove from the list @@ -1937,7 +1937,7 @@ SwTableNode* SwTable::GetTableNode() const void SwTable::SetRefObject( SwServerObject* pObj ) { - if( m_xRefObj.Is() ) + if( m_xRefObj.is() ) m_xRefObj->Closed(); m_xRefObj = pObj; diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 880ae23e4993..bb8048868038 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1045,7 +1045,7 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, SfxObjectShellRef aRef( pDocSh ); pMed->Download(); // if necessary: start the download - if( aRef.Is() && 1 < aRef->GetRefCount() ) // Ref still valid? + if( aRef.is() && 1 < aRef->GetRefCount() ) // Ref still valid? { SwReader* pRdr; SfxItemSet* pSet = pMed->GetItemSet(); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 8d0a03eb20b8..527cd59d13af 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -174,7 +174,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) WriterRef xWrt; // TODO/MBA: looks like a BaseURL doesn't make sense here SwReaderWriter::GetWriter( FILTER_TEXT_DLG, OUString(), xWrt ); - if( xWrt.Is() ) + if( xWrt.is() ) { SwWriter aWriter( aStream, rPam ); xWrt->bASCII_NoLastLineEnd = true; diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index c9cf78c2eac2..11d3a3152c77 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -202,7 +202,7 @@ std::shared_ptr<const SfxFilter> SwIoSystem::GetFileFilter(const OUString& rFile { } - if( xStg.Is() && ( xStg->GetError() == SVSTREAM_OK ) ) + if( xStg.is() && ( xStg->GetError() == SVSTREAM_OK ) ) { while ( pFilter ) { diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index de743ce1620f..91c9d40440a1 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -854,7 +854,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) sal_uLong nError = 0; if( pMedium ) nError = rxWriter->Write( *pPam, *pMedium, pRealFileName ); - else if( pStg.Is() ) + else if( pStg.is() ) nError = rxWriter->Write( *pPam, *pStg, pRealFileName ); else if( pStrm ) nError = rxWriter->Write( *pPam, *pStrm, pRealFileName ); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 2b8a8b24a277..d92784001782 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -3158,7 +3158,7 @@ void SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo sStorageName.append('_').append( static_cast<sal_Int64>( nObjId )); tools::SvRef<SotStorage> xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear()); - if (!xOleStg.Is()) + if (!xOleStg.is()) return; OUString sUName; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 4710b544d616..7994b3d9b73e 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3369,7 +3369,7 @@ void WW8Export::ExportDocument_Impl() xDataStrm->SetBufferSize( 0 ); if( 0 == pDataStrm->Seek( STREAM_SEEK_TO_END )) { - xDataStrm.Clear(); + xDataStrm.clear(); pDataStrm = nullptr; GetWriter().GetStorage().Remove(SL::aData); } diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 959c9a2702d6..e90e349e851c 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -210,7 +210,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) tools::SvRef<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage(SL::aObjectPool); - if( xObjStg.Is() ) + if( xObjStg.is() ) { uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode&>(rOLENode).GetOLEObj().GetOleRef()); if( xObj.is() ) @@ -229,7 +229,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) OUString sStorageName('_'); sStorageName += OUString::number( nPictureId ); tools::SvRef<SotStorage> xOleStg = xObjStg->OpenSotStorage( sStorageName ); - if( xOleStg.Is() ) + if( xOleStg.is() ) { /* If this object storage has been written already don't @@ -247,7 +247,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) { const sal_uInt8 pObjInfoData[] = { 0x40, 0x00, 0x03, 0x00 }; tools::SvRef<SotStorageStream> rObjInfoStream = xOleStg->OpenSotStream( aObjInfo ); - if ( rObjInfoStream.Is() && !rObjInfoStream->GetError() ) + if ( rObjInfoStream.is() && !rObjInfoStream->GetError() ) { rObjInfoStream->WriteBytes(pObjInfoData, sizeof(pObjInfoData)); xOleStg->Commit(); @@ -324,10 +324,10 @@ void WW8Export::OutputLinkedOLE( const OUString& rOleId ) tools::SvRef<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage(SL::aObjectPool); - if( xObjStg.Is() && xObjSrc.Is() ) + if( xObjStg.is() && xObjSrc.is() ) { tools::SvRef<SotStorage> xOleDst = xObjStg->OpenSotStorage( rOleId ); - if ( xOleDst.Is() ) + if ( xOleDst.is() ) xObjSrc->CopyTo( xOleDst.get() ); if ( !xOleDst->GetError( ) ) diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 24a13480f100..b441a0aed8b5 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -45,7 +45,7 @@ WW8Glossary::WW8Glossary(tools::SvRef<SotStorageStream> &refStrm, sal_uInt8 nVer xTableStream = pStg->OpenSotStream( aWwFib.m_fWhichTableStm ? SL::a1Table : SL::a0Table, StreamMode::STD_READ); - if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) + if (xTableStream.is() && SVSTREAM_OK == xTableStream->GetError()) { xTableStream->SetEndian(SvStreamEndian::LITTLE); pGlossary.reset( new WW8GlossaryFib(*refStrm, nVersion, *xTableStream, aWwFib) ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 1a0be1031770..6bec800c8bce 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4886,7 +4886,7 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom, tools::SvRef<SotStorageStream> xTableStream = rRoot->OpenSotStream(aWwFib.m_fWhichTableStm ? SL::a1Table : SL::a0Table, StreamMode::STD_READ); - if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) + if (xTableStream.is() && SVSTREAM_OK == xTableStream->GetError()) { xTableStream->SetEndian(SvStreamEndian::LITTLE); WW8Customizations aGblCustomisations( xTableStream.get(), aWwFib ); @@ -5432,7 +5432,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(tools::SvRef<SotStorageStream> &rTableS rDataStream = m_pStg->OpenSotStream(SL::aData, StreamMode::STD_READ); - if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError()) + if (rDataStream.is() && SVSTREAM_OK == rDataStream->GetError()) { m_pDataStream = rDataStream.get(); m_pDataStream->SetEndian(SvStreamEndian::LITTLE); @@ -6229,7 +6229,7 @@ sal_uLong WW8Reader::OpenMainStream( tools::SvRef<SotStorageStream>& rRef, sal_u OSL_ENSURE( pStg.get(), "Where is my Storage?" ); rRef = pStg->OpenSotStream( "WordDocument", StreamMode::READ | StreamMode::SHARE_DENYALL); - if( rRef.Is() ) + if( rRef.is() ) { if( SVSTREAM_OK == rRef->GetError() ) { @@ -6273,7 +6273,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, co else if ( sFltName=="CWW7" ) nVersion = 7; - if( pStg.Is() ) + if( pStg.is() ) { nRet = OpenMainStream( refStrm, nOldBuffSize ); pIn = refStrm.get(); @@ -6307,10 +6307,10 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, co nRet = ERR_WW8_NO_WW8_FILE_ERR; } - if( refStrm.Is() ) + if( refStrm.is() ) { refStrm->SetBufferSize( nOldBuffSize ); - refStrm.Clear(); + refStrm.clear(); } else { diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 8f23de26b177..7a4c6c002677 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -425,7 +425,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, { tools::SvRef<SotStorageStream> xObjInfoSrc = xSrc1->OpenSotStream("\3ObjInfo", StreamMode::STD_READ ); - if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() ) + if ( xObjInfoSrc.is() && !xObjInfoSrc->GetError() ) { sal_uInt8 nByte = 0; xObjInfoSrc->ReadUChar( nByte ); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index efe2f0e88d39..278c8633b235 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -641,7 +641,7 @@ sal_uInt16 SwWW8ImplReader::End_Field() "OLELinks", embed::ElementModes::WRITE ); tools::SvRef<SotStorage> xObjDst = SotStorage::OpenOLEStorage( xOleStg, sOleId ); - if ( xObjDst.Is() ) + if ( xObjDst.is() ) { xSrc1->CopyTo( xObjDst.get() ); diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 7429a27cc954..ef108972ad20 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -145,7 +145,7 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami ePropToken = XML_TABLE_CELL_PROPERTIES; } - if( xItemMap.Is() ) + if( xItemMap.is() ) { m_pTableItemMapper->setMapEntries( xItemMap ); m_pTableItemMapper->exportXML( *this, diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 42c2702c97d9..1b761e2a237b 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -535,7 +535,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) WriterRef xWriter; SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter ); - if( !xWriter.Is() ) + if( !xWriter.is() ) { // Filter not available ScopedVclPtrInstance<InfoBox>(nullptr, SW_RESSTR(STR_DLLNOTFOUND))->Execute(); return false; diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 7808ab038c37..8aa945362474 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1587,7 +1587,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, if( !IsMergeError() && bMT_SHELL ) // leave docshell available for caller (e.g. MM wizard) rMergeDescriptor.pMailMergeConfigItem->SetTargetView( pTargetView ); - else if( xTargetDocShell.Is() ) + else if( xTargetDocShell.is() ) xTargetDocShell->DoClose(); rescheduleGui(); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index f7bc082018d2..8ddf1448c2bd 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -236,10 +236,10 @@ SwTransferable::~SwTransferable() SolarMutexGuard aSolarGuard; // the DDELink still needs the WrtShell! - if( m_xDdeLink.Is() ) + if( m_xDdeLink.is() ) { static_cast<SwTrnsfrDdeLink*>( m_xDdeLink.get() )->Disconnect( true ); - m_xDdeLink.Clear(); + m_xDdeLink.clear(); } m_pWrtShell = nullptr; @@ -515,7 +515,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo switch( nFormat ) { case SotClipboardFormatId::LINK: - if( m_xDdeLink.Is() ) + if( m_xDdeLink.is() ) bOK = SetObject( m_xDdeLink.get(), SWTRANSFER_OBJECTTYPE_DDE, rFlavor ); break; @@ -727,7 +727,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream, case SWTRANSFER_OBJECTTYPE_STRING: GetASCWriter( aEmptyOUStr, OUString(), xWrt ); - if( xWrt.Is() ) + if( xWrt.is() ) { SwAsciiOptions aAOpt; aAOpt.SetCharSet( RTL_TEXTENCODING_UTF8 ); @@ -740,7 +740,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream, default: break; } - if( xWrt.Is() ) + if( xWrt.is() ) { SwDoc* pDoc = static_cast<SwDoc*>(pObject); xWrt->bWriteClipboardDoc = true; @@ -1705,7 +1705,7 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, nResId = STR_CLPBRD_FORMAT_ERROR; // Exist a SvMemoryStream? (data in the OUString and xStrm is empty) - if( pStream && !xStrm.Is() ) + if( pStream && !xStrm.is() ) delete pStream; if( bMsg && nResId ) @@ -3677,7 +3677,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ) { // then we create our "server" and connect to it refObj = pDocShell->DdeCreateLinkSource( sName ); - if( refObj.Is() ) + if( refObj.is() ) { refObj->AddConnectAdvise( this ); refObj->AddDataAdvise( this, @@ -3691,7 +3691,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ) SwTrnsfrDdeLink::~SwTrnsfrDdeLink() { - if( refObj.Is() ) + if( refObj.is() ) Disconnect( true ); } @@ -3710,7 +3710,7 @@ SwTrnsfrDdeLink::~SwTrnsfrDdeLink() bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm ) { - if( !refObj.Is() || !FindDocShell() ) + if( !refObj.is() || !FindDocShell() ) return false; rtl_TextEncoding eEncoding = DDE_TXT_ENCODING; @@ -3782,7 +3782,7 @@ void SwTrnsfrDdeLink::Disconnect( bool bRemoveDataAdvise ) bInDisconnect = true; // destroy the unused bookmark again (without Undo!)? - if( bDelBookmrk && refObj.Is() && FindDocShell() ) + if( bDelBookmrk && refObj.is() && FindDocShell() ) { SwDoc* pDoc = pDocShell->GetDoc(); ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); @@ -3804,7 +3804,7 @@ void SwTrnsfrDdeLink::Disconnect( bool bRemoveDataAdvise ) bDelBookmrk = false; } - if( refObj.Is() ) + if( refObj.is() ) { refObj->SetUpdateTimeout( nOldTimeOut ); refObj->RemoveConnectAdvise( this ); @@ -3814,7 +3814,7 @@ void SwTrnsfrDdeLink::Disconnect( bool bRemoveDataAdvise ) // (ADVISEMODE_ONLYONCE!!!!) // but always in normal Disconnect! refObj->RemoveAllDataAdvise( this ); - refObj.Clear(); + refObj.clear(); } bInDisconnect = bOldDisconnect; } @@ -3839,11 +3839,11 @@ bool SwTrnsfrDdeLink::FindDocShell() void SwTrnsfrDdeLink::Closed() { - if( !bInDisconnect && refObj.Is() ) + if( !bInDisconnect && refObj.is() ) { refObj->RemoveAllDataAdvise( this ); refObj->RemoveConnectAdvise( this ); - refObj.Clear(); + refObj.clear(); } } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 9b8392490a67..f66b7d0bee7b 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -2185,7 +2185,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe } pMedium->Download(); // start download if needed - if( aRef.Is() && 1 < aRef->GetRefCount() ) // still a valid ref? + if( aRef.is() && 1 < aRef->GetRefCount() ) // still a valid ref? { SwReader* pRdr; Reader *pRead = pDocSh->StartConvertFrom( *pMedium, &pRdr, m_pWrtShell ); @@ -2275,7 +2275,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe vcl::Window* pWin = &GetEditWin(); ScopedVclPtrInstance<MessageDialog>(pWin, SW_RES(STR_NO_MERGE_ENTRY), VclMessageType::Info)->Execute(); } - if( nRet==2 && xDocSh.Is() ) + if( nRet==2 && xDocSh.is() ) xDocSh->DoClose(); } } diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 00c0dc9c0ca6..a587bc08a5b3 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -713,7 +713,7 @@ SwXAutoTextEntry::~SwXAutoTextEntry() void SwXAutoTextEntry::implFlushDocument( bool _bCloseDoc ) { - if ( xDocSh.Is() ) + if ( xDocSh.is() ) { if ( xDocSh->GetDoc()->getIDocumentState().IsModified () ) xDocSh->Save(); @@ -724,7 +724,7 @@ void SwXAutoTextEntry::implFlushDocument( bool _bCloseDoc ) EndListening( *xDocSh ); xDocSh->DoClose(); - xDocSh.Clear(); + xDocSh.clear(); } } } @@ -740,7 +740,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) implFlushDocument(); mxBodyText.clear(); EndListening( *xDocSh ); - xDocSh.Clear(); + xDocSh.clear(); } } else @@ -752,7 +752,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) // stop listening at the docu EndListening( *xDocSh ); // and release our reference - xDocSh.Clear(); + xDocSh.clear(); } } } @@ -763,7 +763,7 @@ void SwXAutoTextEntry::GetBodyText () SolarMutexGuard aGuard; xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, false ); - OSL_ENSURE( xDocSh.Is(), "SwXAutoTextEntry::GetBodyText: unexpected: no doc returned by EditGroupDoc!" ); + OSL_ENSURE( xDocSh.is(), "SwXAutoTextEntry::GetBodyText: unexpected: no doc returned by EditGroupDoc!" ); // start listening at the document StartListening( *xDocSh ); diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 350ac64ecbcb..9035a9cecff1 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -256,7 +256,7 @@ std::size_t SvStream::GetData( void* pData, std::size_t nSize ) { if( !GetError() ) { - DBG_ASSERT( m_xLockBytes.Is(), "pure virtual function" ); + DBG_ASSERT( m_xLockBytes.is(), "pure virtual function" ); std::size_t nRet(0); m_nError = m_xLockBytes->ReadAt(m_nActPos, pData, nSize, &nRet); m_nActPos += nRet; @@ -269,7 +269,7 @@ std::size_t SvStream::PutData( const void* pData, std::size_t nSize ) { if( !GetError() ) { - DBG_ASSERT( m_xLockBytes.Is(), "pure virtual function" ); + DBG_ASSERT( m_xLockBytes.is(), "pure virtual function" ); std::size_t nRet(0); m_nError = m_xLockBytes->WriteAt(m_nActPos, pData, nSize, &nRet); m_nActPos += nRet; @@ -284,7 +284,7 @@ sal_uInt64 SvStream::SeekPos(sal_uInt64 const nPos) assert(nPos != SAL_MAX_UINT32); if( !GetError() && nPos == STREAM_SEEK_TO_END ) { - DBG_ASSERT( m_xLockBytes.Is(), "pure virtual function" ); + DBG_ASSERT( m_xLockBytes.is(), "pure virtual function" ); SvLockBytesStat aStat; m_xLockBytes->Stat( &aStat, SVSTATFLAG_DEFAULT ); m_nActPos = aStat.nSize; @@ -298,14 +298,14 @@ void SvStream::FlushData() { if( !GetError() ) { - DBG_ASSERT( m_xLockBytes.Is(), "pure virtual function" ); + DBG_ASSERT( m_xLockBytes.is(), "pure virtual function" ); m_nError = m_xLockBytes->Flush(); } } void SvStream::SetSize(sal_uInt64 const nSize) { - DBG_ASSERT( m_xLockBytes.Is(), "pure virtual function" ); + DBG_ASSERT( m_xLockBytes.is(), "pure virtual function" ); m_nError = m_xLockBytes->SetSize( nSize ); } @@ -361,7 +361,7 @@ SvStream::SvStream( SvLockBytes* pLockBytesP ) : SvStream() SvStream::~SvStream() { - if (m_xLockBytes.Is()) + if (m_xLockBytes.is()) Flush(); delete[] m_pRWBuf; diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index d3f41ad5e286..bad020f8049d 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -24,7 +24,7 @@ namespace utl sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) { - if (!m_xLockBytes.Is()) + if (!m_xLockBytes.is()) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); if (nBytesToRead < 0) @@ -61,7 +61,7 @@ sal_Int64 SAL_CALL OInputStreamHelper::getPosition( ) sal_Int64 SAL_CALL OInputStreamHelper::getLength( ) { - if (!m_xLockBytes.Is()) + if (!m_xLockBytes.is()) return 0; ::osl::MutexGuard aGuard( m_aMutex ); @@ -80,7 +80,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(css::uno::Sequence< sal_Int void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) { ::osl::MutexGuard aGuard( m_aMutex ); - if (!m_xLockBytes.Is()) + if (!m_xLockBytes.is()) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); if (nBytesToSkip < 0) @@ -92,7 +92,7 @@ void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) sal_Int32 SAL_CALL OInputStreamHelper::available() { ::osl::MutexGuard aGuard( m_aMutex ); - if (!m_xLockBytes.Is()) + if (!m_xLockBytes.is()) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); return m_nAvailable; @@ -101,7 +101,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::available() void SAL_CALL OInputStreamHelper::closeInput() { ::osl::MutexGuard aGuard( m_aMutex ); - if (!m_xLockBytes.Is()) + if (!m_xLockBytes.is()) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); m_xLockBytes = nullptr; diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index 8628634d59ac..034eaf287d33 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -120,7 +120,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo comphelper::getProcessComponentContext() ); xLockBytes = UcbLockBytes::CreateLockBytes( aContent.get(), Sequence < PropertyValue >(), eOpenMode, xInteractionHandler ); - if ( xLockBytes.Is() ) + if ( xLockBytes.is() ) { pStream = new SvStream( xLockBytes.get() ); pStream->SetBufferSize( 4096 ); @@ -169,7 +169,7 @@ SvStream* UcbStreamHelper::CreateStream( const Reference < XInputStream >& xStre { SvStream* pStream = nullptr; UcbLockBytesRef xLockBytes = UcbLockBytes::CreateInputLockBytes( xStream ); - if ( xLockBytes.Is() ) + if ( xLockBytes.is() ) { pStream = new SvStream( xLockBytes.get() ); pStream->SetBufferSize( 4096 ); @@ -185,7 +185,7 @@ SvStream* UcbStreamHelper::CreateStream( const Reference < XStream >& xStream ) if ( xStream->getOutputStream().is() ) { UcbLockBytesRef xLockBytes = UcbLockBytes::CreateLockBytes( xStream ); - if ( xLockBytes.Is() ) + if ( xLockBytes.is() ) { pStream = new SvStream( xLockBytes.get() ); pStream->SetBufferSize( 4096 ); @@ -202,7 +202,7 @@ SvStream* UcbStreamHelper::CreateStream( const Reference < XInputStream >& xStre { SvStream* pStream = nullptr; UcbLockBytesRef xLockBytes = UcbLockBytes::CreateInputLockBytes( xStream ); - if ( xLockBytes.Is() ) + if ( xLockBytes.is() ) { if ( !bCloseStream ) xLockBytes->setDontClose_Impl(); @@ -221,7 +221,7 @@ SvStream* UcbStreamHelper::CreateStream( const Reference < XStream >& xStream, b if ( xStream->getOutputStream().is() ) { UcbLockBytesRef xLockBytes = UcbLockBytes::CreateLockBytes( xStream ); - if ( xLockBytes.Is() ) + if ( xLockBytes.is() ) { if ( !bCloseStream ) xLockBytes->setDontClose_Impl(); diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index e38f5d29f9e0..5c24d2290937 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -104,7 +104,7 @@ CoreTextFontFace::CoreTextFontFace( const CoreTextFontFace& rSrc ) : PhysicalFontFace( rSrc ) , mnFontId( rSrc.mnFontId ) { - if( rSrc.mxCharMap.Is() ) + if( rSrc.mxCharMap.is() ) mxCharMap = rSrc.mxCharMap; } @@ -117,10 +117,6 @@ CoreTextFontFace::CoreTextFontFace( const FontAttributes& rDFA, sal_IntPtr nFont CoreTextFontFace::~CoreTextFontFace() { - if( mxCharMap.Is() ) - { - mxCharMap = nullptr; - } } sal_IntPtr CoreTextFontFace::GetFontId() const @@ -131,7 +127,7 @@ sal_IntPtr CoreTextFontFace::GetFontId() const const FontCharMapRef CoreTextFontFace::GetFontCharMap() const { // return the cached charmap - if( mxCharMap.Is() ) + if( mxCharMap.is() ) return mxCharMap; // set the default charmap @@ -800,7 +796,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV CoreTextFontFace rCTFontData(*pFontData, pFontData->GetFontId()); FontCharMapRef xFCMap = rCTFontData.GetFontCharMap(); - SAL_WARN_IF( !xFCMap.Is() || !xFCMap->GetCharCount(), "vcl", "no charmap" ); + SAL_WARN_IF( !xFCMap.is() || !xFCMap->GetCharCount(), "vcl", "no charmap" ); // get unicode<->glyph encoding // TODO? avoid sft mapping by using the xFCMap itself diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 572ac6739430..cea5665cc6ac 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -239,7 +239,7 @@ bool OutputDevice::GetFontCharMap( FontCharMapRef& rxFontCharMap ) const return false; FontCharMapRef xFontCharMap ( mpGraphics->GetFontCharMap() ); - if (!xFontCharMap.Is()) + if (!xFontCharMap.is()) { FontCharMapRef xDefaultMap( new FontCharMap() ); rxFontCharMap = xDefaultMap; diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 62956369587b..903f560e1a55 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -183,8 +183,6 @@ FreetypeFontInfo::FreetypeFontInfo( const FontAttributes& rDevFontAttributes, FreetypeFontInfo::~FreetypeFontInfo() { - if( mxFontCharMap.Is() ) - mxFontCharMap.Clear(); } FT_FaceRec_* FreetypeFontInfo::GetFaceFT() @@ -672,7 +670,7 @@ const FontCharMapRef FreetypeFont::GetFontCharMap() const const FontCharMapRef& FreetypeFontInfo::GetFontCharMap() { // check if the charmap is already cached - if( mxFontCharMap.Is() ) + if( mxFontCharMap.is() ) return mxFontCharMap; // get the charmap and cache it diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index d1aebb3e6df6..ad7cc5653880 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -165,7 +165,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars(PhysicalFontFace* pFace, OU { WinFontFace* pWinFont = static_cast< WinFontFace* >(pFace); FontCharMapRef xFontCharMap = pWinFont->GetFontCharMap(); - if( !xFontCharMap.Is() ) + if( !xFontCharMap.is() ) { // construct a Size structure as the parameter of constructor of class FontSelectPattern const Size aSize( pFace->GetWidth(), pFace->GetHeight() ); @@ -192,7 +192,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars(PhysicalFontFace* pFace, OU } // avoid fonts with unknown CMAP subtables for glyph fallback - if( !xFontCharMap.Is() || xFontCharMap->IsDefaultMap() ) + if( !xFontCharMap.is() || xFontCharMap->IsDefaultMap() ) return false; int nMatchCount = 0; @@ -646,8 +646,7 @@ WinFontFace::WinFontFace( const FontAttributes& rDFS, WinFontFace::~WinFontFace() { - if( mxUnicodeMap.Is() ) - mxUnicodeMap = nullptr; + mxUnicodeMap.clear(); if( mpHbFont ) hb_font_destroy( mpHbFont ); @@ -663,7 +662,7 @@ static inline DWORD CalcTag( const char p[5]) { return (p[0]+(p[1]<<8)+(p[2]<<16 void WinFontFace::UpdateFromHDC( HDC hDC ) const { // short circuit if already initialized - if( mxUnicodeMap.Is() ) + if( mxUnicodeMap.is() ) return; ReadCmapTable( hDC ); @@ -683,7 +682,7 @@ bool WinFontFace::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) void WinFontFace::ReadCmapTable( HDC hDC ) const { - if( mxUnicodeMap.Is() ) + if( mxUnicodeMap.is() ) return; bool bIsSymbolFont = (meWinCharSet == SYMBOL_CHARSET); @@ -702,7 +701,7 @@ void WinFontFace::ReadCmapTable( HDC hDC ) const } } - if( !mxUnicodeMap.Is() ) + if( !mxUnicodeMap.is() ) { mxUnicodeMap = FontCharMap::GetDefaultMap( bIsSymbolFont ); } @@ -1816,7 +1815,7 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, } const WinFontFace* pWinFont = static_cast<const WinFontFace*>(pFont); FontCharMapRef xFCMap = pWinFont->GetFontCharMap(); - SAL_WARN_IF( !xFCMap.Is() || !xFCMap->GetCharCount(), "vcl", "no map" ); + SAL_WARN_IF( !xFCMap.is() || !xFCMap->GetCharCount(), "vcl", "no map" ); int nCharCount = xFCMap->GetCharCount(); sal_uInt32 nChar = xFCMap->GetFirstChar(); diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index eb54da2b16aa..4c4998cbaca7 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -196,7 +196,7 @@ tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString &rP if (maNameMap.end() == aIt) return tools::SvRef<SotStorageStream>(); - if (!maStreams[aIt->second].stream.ref.Is()) + if (!maStreams[aIt->second].stream.ref.is()) maStreams[aIt->second].stream.ref = createStream(aPath); return maStreams[aIt->second].stream.ref; @@ -204,7 +204,7 @@ tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString &rP tools::SvRef<SotStorageStream> const &OLEStorageImpl::getStream(const std::size_t nId) { - if (!maStreams[nId].stream.ref.Is()) + if (!maStreams[nId].stream.ref.is()) maStreams[nId].stream.ref = createStream(rtl::OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8)); return maStreams[nId].stream.ref; @@ -728,7 +728,7 @@ void WPXSvInputStreamImpl::invalidateReadBuffer() librevenge::RVNGInputStream *WPXSvInputStreamImpl::createWPXStream(const tools::SvRef<SotStorageStream> &rxStorage) { - if (rxStorage.Is()) + if (rxStorage.is()) { Reference < XInputStream > xContents(new utl::OSeekableInputStreamWrapper(rxStorage.get())); return new WPXSvInputStream(xContents); |