diff options
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 18 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 22 | ||||
-rw-r--r-- | filter/source/msfilter/svxmsbas2.cxx | 4 |
3 files changed, 22 insertions, 22 deletions
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; } |