diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8par.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 3435ae2e7292..d06d1de741ed 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -302,17 +302,17 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell const * pDocS xTextMark.reset(new OUString(read_uInt32_lenPrefixed_uInt16s_ToOUString(rStrm))); } - if( !xLongName.get() && xShortName.get() ) + if (!xLongName && xShortName.get()) { xLongName.reset( new OUString ); *xLongName += *xShortName; } - else if( !xLongName.get() && xTextMark.get() ) + else if (!xLongName && xTextMark.get()) xLongName.reset( new OUString ); - if( xLongName.get() ) + if (xLongName) { - if( xTextMark.get() ) + if (xTextMark) { if (xLongName->isEmpty()) *xTextMark = xTextMark->replace('!', '.'); @@ -488,7 +488,7 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId, if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg )) { tools::SvRef<SotStorage> xSrc = xSrcStg->OpenSotStorage( sStorageName ); - OSL_ENSURE(rReader.m_xFormImpl.get(), "No Form Implementation!"); + OSL_ENSURE(rReader.m_xFormImpl, "No Form Implementation!"); css::uno::Reference< css::drawing::XShape > xShape; if ( (!(rReader.m_bIsHeader || rReader.m_bIsFooter)) && rReader.m_xFormImpl->ReadOCXStream(xSrc,&xShape,true)) @@ -6252,7 +6252,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW2(SvStream &rStream) ErrCode WW8Reader::OpenMainStream( tools::SvRef<SotStorageStream>& rRef, sal_uInt16& rBuffSize ) { ErrCode nRet = ERR_SWG_READ_ERROR; - OSL_ENSURE( m_pStorage.get(), "Where is my Storage?" ); + OSL_ENSURE(m_pStorage, "Where is my Storage?"); rRef = m_pStorage->OpenSotStream( "WordDocument", StreamMode::READ | StreamMode::SHARE_DENYALL); if( rRef.is() ) |