diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-08 12:36:53 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-10 12:02:44 +0200 |
commit | 366d08f2f6d4de922f6099c62bb81b49d89e0a68 (patch) | |
tree | b232884af6e844c2f0994859e4b42efbc1ce654c /writerfilter/source | |
parent | 75a2257a5bd716a9f937abe5e53f305c983afd5d (diff) |
new loplugin:simplifypointertobool
Change-Id: Iff68e8f379614a6ab6a6e0d1bad18e70bc76d76a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91907
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source')
30 files changed, 165 insertions, 167 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index af05d4f5c92b..5769daa5b335 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -130,7 +130,7 @@ void BorderHandler::lcl_sprm(Sprm & rSprm) return; } writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties) { std::vector<beans::PropertyValue> aSavedGrabBag; if (!m_aInteropGrabBagName.isEmpty()) diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx index 8434092592a7..8b7b5fa77c23 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.cxx +++ b/writerfilter/source/dmapper/CellMarginHandler.cxx @@ -94,7 +94,7 @@ void CellMarginHandler::createGrabBag(const OUString& aName) void CellMarginHandler::lcl_sprm(Sprm & rSprm) { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties) { pProperties->resolve( *this ); const bool rtl = false; // TODO diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 07bd913f6773..e2d497c8a8d4 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -836,7 +836,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) // be a text frame "fixes" it. I'm not sure what "inline" is supposed to mean in practice // anyway, so as long as this doesn't cause trouble elsewhere ... PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); - if( pContext.get() ) + if( pContext ) { ParagraphPropertyMap* pParaContext = dynamic_cast< ParagraphPropertyMap* >( pContext.get() ); if (pParaContext) @@ -1162,7 +1162,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_DocPartGallery_val: { const OUString& sGlossaryEntryGallery = sStringValue; - if(m_pImpl->GetTopContext().get()) + if(m_pImpl->GetTopContext()) { OUString sName = sGlossaryEntryGallery + ":" + m_sGlossaryEntryName; // Add glossary entry name as a first paragraph in section @@ -1256,7 +1256,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) } OSL_ENSURE(rContext.get(), "PropertyMap has to be valid!"); - if(!rContext.get()) + if(!rContext) return ; sal_uInt32 nSprmId = rSprm.getId(); @@ -1312,7 +1312,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if (pStyleSheetPropertyMap) pStyleSheetPropertyMap->SetListId( nIntValue ); } - if( pList.get( ) ) + if( pList ) { if( !IsStyleSheetImport() ) { @@ -1375,7 +1375,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_CT_PBdr_between: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pBorderHandler = std::make_shared<BorderHandler>( true ); pProperties->resolve(*pBorderHandler); @@ -1430,7 +1430,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { //contains fore color, back color and shadow percentage, results in a brush writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pCellColorHandler = std::make_shared<CellColorHandler>(); pCellColorHandler->setOutputFormat( CellColorHandler::Paragraph ); @@ -1827,7 +1827,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { //contains fore color, back color and shadow percentage, results in a brush writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pCellColorHandler = std::make_shared<CellColorHandler>(); pCellColorHandler->setOutputFormat( CellColorHandler::Character ); @@ -1930,7 +1930,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_EG_RPrBase_bdr: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pBorderHandler = std::make_shared<BorderHandler>( true ); pProperties->resolve(*pBorderHandler); @@ -2052,7 +2052,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if (!m_pImpl->GetSdt()) { PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); - if( pContext.get() ) + if( pContext ) { // If there is a deferred page break applied to this framed paragraph, // create a dummy paragraph without extra properties, @@ -2120,7 +2120,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_EG_SectPrContents_cols: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { tools::SvRef< SectionColumnHandler > pSectHdl( new SectionColumnHandler ); @@ -2181,7 +2181,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_EG_SectPrContents_pgBorders: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get( ) && pSectionContext ) + if( pProperties && pSectionContext ) { tools::SvRef< PageBordersHandler > pHandler( new PageBordersHandler ); pProperties->resolve( *pHandler ); @@ -2219,7 +2219,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) // First check if the style exists in the document. StyleSheetEntryPtr pEntry = m_pImpl->GetStyleSheetTable( )->FindStyleSheetByConvertedStyleName( sConvertedName ); - bool bExists = pEntry.get( ) && ( pEntry->nStyleTypeCode == STYLE_TYPE_CHAR ); + bool bExists = pEntry && ( pEntry->nStyleTypeCode == STYLE_TYPE_CHAR ); // Add the property if the style exists, but do not add it elements in TOC: // they will receive later another style references from TOC if ( bExists && m_pImpl->GetTopContext() && !m_pImpl->IsInTOC()) @@ -2239,7 +2239,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_CT_TblCellMar_right: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { MeasureHandlerPtr pMeasureHandler( new MeasureHandler ); pProperties->resolve(*pMeasureHandler); @@ -2280,7 +2280,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { GraphicImportType eGraphicType = (NS_ooxml::LN_anchor_anchor == @@ -2323,7 +2323,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_CT_EdnProps_numFmt: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) { pProperties->resolve(*this); } @@ -2443,7 +2443,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_object: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get( ) ) + if( pProperties ) { auto pOLEHandler = std::make_shared<OLEHandler>(*this); pProperties->resolve(*pOLEHandler); @@ -2623,7 +2623,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_EG_SectPrContents_pgNumType: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { pProperties->resolve(*this); } @@ -2702,7 +2702,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if(aPropertyId) { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { pProperties->resolve(*pTextEffectsHandlerPtr); @@ -2727,7 +2727,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_CT_TblPrBase_tblLook: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) { pProperties->resolve(*this); m_pImpl->getTableManager().finishTableLook(); @@ -2868,7 +2868,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_CT_SmartTagRun_smartTagPr: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get() && m_pImpl->GetTopContextType() == CONTEXT_PARAGRAPH) + if (pProperties && m_pImpl->GetTopContextType() == CONTEXT_PARAGRAPH) pProperties->resolve(m_pImpl->getSmartTagHandler()); } break; diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index a3548cde909c..dd5a14b732eb 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -341,7 +341,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo // will receive the table style if any TableStyleSheetEntry* pTableStyle = nullptr; - if( m_aTableProperties.get() ) + if( m_aTableProperties ) { //create properties from the table attributes //...pPropMap->Insert( PROP_LEFT_MARGIN, uno::makeAny( m_nLeftMargin - m_nGapHalf )); @@ -674,7 +674,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo m_aTableProperties->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny( sal_Int32(0)), false); // if table is only a single row, and row is set as don't split, set the same value for the whole table. - if( m_aRowProperties.size() == 1 && m_aRowProperties[0].get() ) + if( m_aRowProperties.size() == 1 && m_aRowProperties[0] ) { std::optional<PropertyMap::Property> oSplitAllowed = m_aRowProperties[0]->getProperty(PROP_IS_SPLIT_ALLOWED); if( oSplitAllowed ) @@ -1469,7 +1469,7 @@ void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::X const TablePropertyMapPtr& pProps ) { sal_uInt32 nRow = m_aRowProperties.size(); - if ( pProps.get( ) ) + if ( pProps ) m_aCellProperties[nRow - 1].push_back( pProps.get() ); else { @@ -1484,14 +1484,14 @@ void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::X TagLogger::getInstance().startElement("table.cell.start"); TagLogger::getInstance().chars(XTextRangeToString(start)); TagLogger::getInstance().endElement(); - if (pProps.get()) + if (pProps) pProps->printProperties(); #endif //add a new 'row' of properties m_aCellRange.clear(); uno::Reference<text::XTextRange> xStart; - if (start.get()) + if (start) xStart = start->getStart(); m_aCellRange.push_back(xStart); } @@ -1506,7 +1506,7 @@ void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTe #endif uno::Reference<text::XTextRange> xEnd; - if (end.get()) + if (end) xEnd = end->getEnd(); m_aCellRange.push_back(xEnd); m_aRowRanges.push_back(comphelper::containerToSequence(m_aCellRange)); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 9e7cf46cca40..915b317d40d5 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -135,7 +135,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) { //contains unit and value writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { MeasureHandlerPtr pMeasureHandler( new MeasureHandler ); pProperties->resolve(*pMeasureHandler); @@ -322,7 +322,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) // us, later we'll just distribute these values in a // 0..10000 scale. writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { MeasureHandlerPtr pMeasureHandler(new MeasureHandler()); pProperties->resolve(*pMeasureHandler); @@ -340,7 +340,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); // Ignore <w:tblpPr> in shape text, those tables should be always non-floating ones. - if (!m_bIsInShape && pProperties.get()) + if (!m_bIsInShape && pProperties) { TablePositionHandlerPtr pHandler = m_aTmpPosition.back(); if ( !pHandler ) diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index cb298e12a4f2..50d5f2ff25ca 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -104,7 +104,7 @@ public: virtual void cellProps(const TablePropertyMapPtr& pProps) override { - if ( m_pStyleProps.get( ) ) + if ( m_pStyleProps ) m_pStyleProps->InsertProps(pProps.get()); else TableManager::cellProps( pProps ); @@ -112,7 +112,7 @@ public: virtual void insertRowProps(const TablePropertyMapPtr& pProps) override { - if ( m_pStyleProps.get( ) ) + if ( m_pStyleProps ) m_pStyleProps->InsertProps(pProps.get()); else TableManager::insertRowProps( pProps ); @@ -120,7 +120,7 @@ public: virtual void insertTableProps(const TablePropertyMapPtr& pProps) override { - if ( m_pStyleProps.get( ) ) + if ( m_pStyleProps ) m_pStyleProps->InsertProps(pProps.get()); else m_aTmpTableProperties.back()->InsertProps(pProps.get()); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index ec77ea4c55fa..3b68ff3f582b 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -804,7 +804,7 @@ OUString DomainMapper_Impl::GetDefaultParaStyleName() uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId, StyleSheetEntryPtr pEntry, const bool bDocDefaults, const bool bPara, bool* pIsDocDefault) { - while(pEntry.get( ) ) + while(pEntry) { if(pEntry->pProperties) { @@ -1081,7 +1081,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) return; TextAppendContext& rAppendContext = m_aTextAppendStack.top(); // n#779642: ignore fly frame inside table as it could lead to messy situations - if (!rAppendContext.pLastParagraphProperties.get()) + if (!rAppendContext.pLastParagraphProperties) return; if (!rAppendContext.pLastParagraphProperties->IsFrameMode()) return; @@ -1096,7 +1096,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) std::vector<beans::PropertyValue> aFrameProperties; - if ( pParaStyle.get( ) ) + if ( pParaStyle ) { const ParagraphProperties* pStyleProperties = dynamic_cast<const ParagraphProperties*>( pParaStyle->pProperties.get() ); if (!pStyleProperties) @@ -1509,7 +1509,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con sal_Int32 nCount = xParaCursor->getString().getLength(); pToBeSavedProperties->SetDropCapLength(nCount > 0 && nCount < 255 ? static_cast<sal_Int8>(nCount) : 1); } - if( rAppendContext.pLastParagraphProperties.get() ) + if( rAppendContext.pLastParagraphProperties ) { if( sal::static_int_cast<Id>(rAppendContext.pLastParagraphProperties->GetDropCap()) != NS_ooxml::LN_Value_doc_ST_DropCap_none) { @@ -1554,12 +1554,12 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con } } std::vector<beans::PropertyValue> aProperties; - if (pPropertyMap.get()) + if (pPropertyMap) { aProperties = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(pPropertyMap->GetPropertyValues()); } // TODO: this *should* work for RTF but there are test failures, maybe rtftok doesn't distinguish between formatting for the paragraph marker and for the paragraph as a whole; needs investigation - if (pPropertyMap.get() && IsOOXMLImport()) + if (pPropertyMap && IsOOXMLImport()) { // tdf#64222 filter out the "paragraph marker" formatting and // set it as a separate paragraph property, not a empty hint at @@ -1600,7 +1600,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con { xTextRange = xTextAppend->finishParagraphInsert( comphelper::containerToSequence(aProperties), rAppendContext.xInsertPosition ); rAppendContext.xCursor->gotoNextParagraph(false); - if (rAppendContext.pLastParagraphProperties.get()) + if (rAppendContext.pLastParagraphProperties) rAppendContext.pLastParagraphProperties->SetEndingRange(xTextRange->getEnd()); } else @@ -1779,7 +1779,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con xCur->goLeft( 1 , true ); // Extend the redline ranges for empty paragraphs - if ( !m_bParaChanged && m_previousRedline.get() ) + if ( !m_bParaChanged && m_previousRedline ) CreateRedline( xCur, m_previousRedline ); CheckParaMarkerRedline( xCur ); } @@ -1953,7 +1953,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con SetIsFirstParagraphInSection(false); // count first not deleted paragraph as first paragraph in section to avoid of // its deletion later, resulting loss of the associated page break - if (!m_previousRedline.get()) + if (!m_previousRedline) { SetIsFirstParagraphInSectionAfterRedline(false); SetIsLastParagraphInSection(false); @@ -2075,7 +2075,7 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper } // reset moveFrom data of non-terminating runs of the paragraph - if ( m_pParaMarkerRedlineMoveFrom.get( ) ) + if ( m_pParaMarkerRedlineMoveFrom ) { m_pParaMarkerRedlineMoveFrom.clear(); } @@ -2514,7 +2514,7 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote ) void DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xRange, const RedlineParamsPtr& pRedline) { - if ( pRedline.get( ) ) + if ( pRedline ) { try { @@ -2569,22 +2569,22 @@ void DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xR void DomainMapper_Impl::CheckParaMarkerRedline( uno::Reference< text::XTextRange > const& xRange ) { - if ( m_pParaMarkerRedline.get( ) ) + if ( m_pParaMarkerRedline ) { CreateRedline( xRange, m_pParaMarkerRedline ); - if ( m_pParaMarkerRedline.get( ) ) + if ( m_pParaMarkerRedline ) { m_pParaMarkerRedline.clear(); m_currentRedline.clear(); } } - else if ( m_pParaMarkerRedlineMoveFrom.get( ) ) + else if ( m_pParaMarkerRedlineMoveFrom ) { // terminating moveFrom redline removes also the paragraph mark m_pParaMarkerRedlineMoveFrom->m_nToken = XML_del; CreateRedline( xRange, m_pParaMarkerRedlineMoveFrom ); } - if ( m_pParaMarkerRedlineMoveFrom.get( ) ) + if ( m_pParaMarkerRedlineMoveFrom ) { m_pParaMarkerRedlineMoveFrom.clear(); } @@ -3860,7 +3860,7 @@ void DomainMapper_Impl::AppendFieldCommand(OUString const & rPartOfCommand) FieldContextPtr pContext = m_aFieldStack.back(); OSL_ENSURE( pContext.get(), "no field context available"); - if( pContext.get() ) + if( pContext ) { pContext->AppendCommand( rPartOfCommand ); } @@ -4128,7 +4128,7 @@ void DomainMapper_Impl::handleRubyEQField( const FieldContextPtr& pContext) PropertyValueVector_t aProps = comphelper::sequenceToContainer< PropertyValueVector_t >(pRubyContext->GetPropertyValues()); aInfo.sRubyStyle = m_rDMapper.getOrCreateCharStyle(aProps, /*bAlwaysCreate=*/false); PropertyMapPtr pCharContext(new PropertyMap()); - if (m_pLastCharacterContext.get()) + if (m_pLastCharacterContext) pCharContext->InsertProps(m_pLastCharacterContext); pCharContext->InsertProps(pContext->getProperties()); pCharContext->Insert(PROP_RUBY_TEXT, uno::makeAny( aInfo.sRubyText ) ); @@ -4832,7 +4832,7 @@ void DomainMapper_Impl::CloseFieldCommand() if(!m_aFieldStack.empty()) pContext = m_aFieldStack.back(); OSL_ENSURE( pContext.get(), "no field context available"); - if( pContext.get() ) + if( pContext ) { m_bSetUserFieldContent = false; m_bSetCitation = false; @@ -4848,7 +4848,7 @@ void DomainMapper_Impl::CloseFieldCommand() OUString const sFirstParam(vArguments.empty() ? OUString() : vArguments.front()); // apply font size to the form control - if ( m_pLastCharacterContext.get() && m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) ) + if ( m_pLastCharacterContext && m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) ) { uno::Reference< text::XTextAppend > xTextAppend = m_aTextAppendStack.top().xTextAppend; if (xTextAppend.is()) @@ -5640,7 +5640,7 @@ bool DomainMapper_Impl::IsFieldResultAsString() OSL_ENSURE( !m_aFieldStack.empty(), "field stack empty?"); FieldContextPtr pContext = m_aFieldStack.back(); OSL_ENSURE( pContext.get(), "no field context available"); - if( pContext.get() ) + if( pContext ) { bRet = pContext->GetTextField().is() || pContext->GetFieldId() == FIELD_FORMDROPDOWN @@ -5666,8 +5666,8 @@ void DomainMapper_Impl::AppendFieldResult(OUString const& rString) { assert(!m_aFieldStack.empty()); FieldContextPtr pContext = m_aFieldStack.back(); - SAL_WARN_IF(!pContext.get(), "writerfilter.dmapper", "no field context"); - if (pContext.get()) + SAL_WARN_IF(!pContext, "writerfilter.dmapper", "no field context"); + if (pContext) { FieldContextPtr pOuter = GetParentFieldContext(m_aFieldStack); if (pOuter) @@ -5732,7 +5732,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) } } - if( pContext.get() ) + if( pContext ) { uno::Reference<text::XTextField> xTextField = pContext->GetTextField(); try @@ -5858,7 +5858,7 @@ void DomainMapper_Impl::SetFieldFFData(const FFDataHandler::Pointer_t& pFFDataHa if (!m_aFieldStack.empty()) { FieldContextPtr pContext = m_aFieldStack.back(); - if (pContext.get()) + if (pContext) { pContext->setFFDataHandler(pFFDataHandler); } @@ -5882,7 +5882,7 @@ void DomainMapper_Impl::PopFieldContext() FieldContextPtr pContext = m_aFieldStack.back(); OSL_ENSURE( pContext.get(), "no field context available"); - if( pContext.get() ) + if( pContext ) { if( !pContext->IsCommandCompleted() ) CloseFieldCommand(); @@ -5947,7 +5947,7 @@ void DomainMapper_Impl::PopFieldContext() // properties from there. // Also merge in the properties from the field context, // e.g. SdtEndBefore. - if (m_pLastCharacterContext.get()) + if (m_pLastCharacterContext) aMap.InsertProps(m_pLastCharacterContext); aMap.InsertProps(m_aFieldStack.back()->getProperties()); appendTextContent(xToInsert, aMap.GetPropertyValues()); @@ -6616,7 +6616,7 @@ void DomainMapper_Impl::SetCurrentRedlineIsRead() sal_Int32 DomainMapper_Impl::GetCurrentRedlineToken( ) const { - assert(m_currentRedline.get()); + assert(m_currentRedline); return m_currentRedline->m_nToken; } @@ -6624,7 +6624,7 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( const OUString& sAuthor ) { if (!m_xAnnotationField.is()) { - if (m_currentRedline.get()) + if (m_currentRedline) m_currentRedline->m_sAuthor = sAuthor; else SAL_INFO("writerfilter.dmapper", "numberingChange not implemented"); @@ -6643,7 +6643,7 @@ void DomainMapper_Impl::SetCurrentRedlineDate( const OUString& sDate ) { if (!m_xAnnotationField.is()) { - if (m_currentRedline.get()) + if (m_currentRedline) m_currentRedline->m_sDate = sDate; else SAL_INFO("writerfilter.dmapper", "numberingChange not implemented"); @@ -6662,20 +6662,20 @@ void DomainMapper_Impl::SetCurrentRedlineId( sal_Int32 sId ) { // This should be an assert, but somebody had the smart idea to reuse this function also for comments and whatnot, // and in some cases the id is actually not handled, which may be in fact a bug. - if( !m_currentRedline.get()) + if( !m_currentRedline) SAL_INFO("writerfilter.dmapper", "no current redline"); } } void DomainMapper_Impl::SetCurrentRedlineToken( sal_Int32 nToken ) { - assert(m_currentRedline.get()); + assert(m_currentRedline); m_currentRedline->m_nToken = nToken; } void DomainMapper_Impl::SetCurrentRedlineRevertProperties( const uno::Sequence<beans::PropertyValue>& aProperties ) { - assert(m_currentRedline.get()); + assert(m_currentRedline); m_currentRedline->m_aRevertProperties = aProperties; } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index ddce87060a6e..334af118500c 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -884,7 +884,7 @@ public: void appendTableHandler( ) { - if (m_pTableHandler.get()) + if (m_pTableHandler) m_aTableManagers.top()->setHandler(m_pTableHandler); } diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx index 6fcf06cf81f4..507327cf8333 100644 --- a/writerfilter/source/dmapper/FFDataHandler.cxx +++ b/writerfilter/source/dmapper/FFDataHandler.cxx @@ -159,7 +159,7 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm) void FFDataHandler::resolveSprm(Sprm & r_Sprm) { writerfilter::Reference<Properties>::Pointer_t pProperties = r_Sprm.getProps(); - if( pProperties.get()) + if( pProperties) pProperties->resolve(*this); } diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 4a76c0ac51de..3c74e97d0adc 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -113,7 +113,7 @@ void FontTable::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_CT_Font_embedBoldItalic: { writerfilter::Reference< Properties >::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get( )) + if( pProperties ) { EmbeddedFontHandler handler( m_pImpl->pCurrentEntry->sFontName, nSprmId == NS_ooxml::LN_CT_Font_embedRegular ? "" @@ -143,7 +143,7 @@ void FontTable::lcl_sprm(Sprm& rSprm) void FontTable::resolveSprm(Sprm & r_Sprm) { writerfilter::Reference<Properties>::Pointer_t pProperties = r_Sprm.getProps(); - if( pProperties.get()) + if( pProperties ) pProperties->resolve(*this); } diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 760bb1bb6b3e..74ce96871499 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -510,7 +510,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) case NS_ooxml::LN_blip: //the binary graphic data in a shape { writerfilter::Reference<Properties>::Pointer_t pProperties = rValue.getProperties(); - if( pProperties.get()) + if( pProperties ) { pProperties->resolve(*this); } @@ -519,7 +519,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) case NS_ooxml::LN_payload : { writerfilter::Reference<BinaryObj>::Pointer_t pPictureData = rValue.getBinary(); - if( pPictureData.get()) + if( pPictureData ) pPictureData->resolve(*this); } break; @@ -1067,7 +1067,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_hlinkClick_hlinkClick: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { pProperties->resolve(*this); } @@ -1097,7 +1097,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) // Use a special handler for the positioning auto pHandler = std::make_shared<PositionHandler>( m_pImpl->m_rPositionOffsets, m_pImpl->m_rAligns ); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get( ) ) + if( pProperties ) { pProperties->resolve( *pHandler ); if( !m_pImpl->bUseSimplePos ) @@ -1125,7 +1125,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) // Use a special handler for the positioning auto pHandler = std::make_shared<PositionHandler>( m_pImpl->m_rPositionOffsets, m_pImpl->m_rAligns); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get( ) ) + if( pProperties ) { pProperties->resolve( *pHandler ); if( !m_pImpl->bUseSimplePos ) @@ -1195,14 +1195,14 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) m_pImpl->bIsGraphic = true; writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) pProperties->resolve(*this); } break; case NS_ooxml::LN_CT_NonVisualDrawingProps_a_hlinkClick: // 90689; { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get( ) ) + if( pProperties ) pProperties->resolve( *this ); } break; diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 63700f23db75..252d543d67b7 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -519,7 +519,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, // Get the char style uno::Sequence< beans::PropertyValue > aAbsCharStyleProps = pAbsLevel->GetCharStyleProperties( ); - if ( pLevel.get( ) ) + if ( pLevel ) { uno::Sequence< beans::PropertyValue >& rAbsCharStyleProps = aAbsCharStyleProps; uno::Sequence< beans::PropertyValue > aCharStyleProps = @@ -543,7 +543,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, // and add them to the level properties OUString sText = pAbsLevel->GetBulletChar( ); // Inherit <w:lvlText> from the abstract level in case the override would be empty. - if (pLevel.get() && !pLevel->GetBulletChar().isEmpty()) + if (pLevel && !pLevel->GetBulletChar().isEmpty()) sText = pLevel->GetBulletChar( ); if (sText.isEmpty()) @@ -663,14 +663,14 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) if (nName != NS_ooxml::LN_CT_NumPicBullet_numPicBulletId) { OSL_ENSURE( m_pCurrentDefinition.get(), "current entry has to be set here"); - if(!m_pCurrentDefinition.get()) + if(!m_pCurrentDefinition) return ; pCurrentLvl = m_pCurrentDefinition->GetCurrentLevel( ); } else { - SAL_WARN_IF(!m_pCurrentNumPicBullet.get(), "writerfilter", "current entry has to be set here"); - if (!m_pCurrentNumPicBullet.get()) + SAL_WARN_IF(!m_pCurrentNumPicBullet, "writerfilter", "current entry has to be set here"); + if (!m_pCurrentNumPicBullet) return; } int nIntValue = rVal.getInt(); @@ -685,7 +685,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) //these numbers can be mixed randomly together with separators pre- and suffixes //the Writer supports only a number of upper levels to show, separators is always a dot //and each level can have a prefix and a suffix - if(pCurrentLvl.get()) + if(pCurrentLvl) { //if the BulletChar is a soft-hyphen (0xad) //replace it with a hard-hyphen (0x2d) @@ -701,7 +701,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) case NS_ooxml::LN_CT_NumFmt_val: case NS_ooxml::LN_CT_Lvl_isLgl: case NS_ooxml::LN_CT_Lvl_legacy: - if ( pCurrentLvl.get( ) ) + if ( pCurrentLvl ) { if (nName == NS_ooxml::LN_CT_NumFmt_format) { @@ -728,7 +728,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) m_pCurrentDefinition->AddLevel(); writerfilter::Reference<Properties>::Pointer_t pProperties = rVal.getProperties(); - if(pProperties.get()) + if(pProperties) pProperties->resolve(*this); } break; @@ -742,17 +742,17 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) break; case NS_ooxml::LN_CT_Ind_start: case NS_ooxml::LN_CT_Ind_left: - if ( pCurrentLvl.get( ) ) + if ( pCurrentLvl ) pCurrentLvl->Insert( PROP_INDENT_AT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Ind_hanging: - if ( pCurrentLvl.get( ) ) + if ( pCurrentLvl ) pCurrentLvl->Insert( PROP_FIRST_LINE_INDENT, uno::makeAny( - ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Ind_firstLine: - if ( pCurrentLvl.get( ) ) + if ( pCurrentLvl ) pCurrentLvl->Insert( PROP_FIRST_LINE_INDENT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; @@ -763,7 +763,7 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) case NS_ooxml::LN_CT_TabStop_pos: { //no paragraph attributes in ListTable char style sheets - if ( pCurrentLvl.get( ) ) + if ( pCurrentLvl ) pCurrentLvl->SetValue( nName, ConversionHelper::convertTwipToMM100( nIntValue ) ); } @@ -785,10 +785,10 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) { //fill the attributes of the style sheet sal_uInt32 nSprmId = rSprm.getId(); - if( m_pCurrentDefinition.get() || + if( m_pCurrentDefinition || nSprmId == NS_ooxml::LN_CT_Numbering_abstractNum || nSprmId == NS_ooxml::LN_CT_Numbering_num || - (nSprmId == NS_ooxml::LN_CT_NumPicBullet_pict && m_pCurrentNumPicBullet.get()) || + (nSprmId == NS_ooxml::LN_CT_NumPicBullet_pict && m_pCurrentNumPicBullet) || nSprmId == NS_ooxml::LN_CT_Numbering_numPicBullet) { static bool bIsStartVisited = false; @@ -798,10 +798,10 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_Numbering_abstractNum: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if(pProperties.get()) + if(pProperties) { //create a new Abstract list entry - OSL_ENSURE( !m_pCurrentDefinition.get(), "current entry has to be NULL here"); + OSL_ENSURE( !m_pCurrentDefinition, "current entry has to be NULL here"); m_pCurrentDefinition = new AbstractListDef; pProperties->resolve( *this ); //append it to the table @@ -813,10 +813,10 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_Numbering_num: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if(pProperties.get()) + if(pProperties) { // Create a new list entry - OSL_ENSURE( !m_pCurrentDefinition.get(), "current entry has to be NULL here"); + OSL_ENSURE( !m_pCurrentDefinition, "current entry has to be NULL here"); ListDef::Pointer listDef( new ListDef ); m_pCurrentDefinition = listDef.get(); pProperties->resolve( *this ); @@ -830,7 +830,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_Numbering_numPicBullet: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) { NumPicBullet::Pointer numPicBullet(new NumPicBullet()); m_pCurrentNumPicBullet = numPicBullet; @@ -920,7 +920,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) { m_pCurrentDefinition->AddLevel(); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if(pProperties.get()) + if(pProperties) pProperties->resolve(*this); } break; @@ -932,7 +932,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_Lvl_numFmt: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) { pProperties->resolve(*this); } @@ -975,7 +975,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_Lvl_rPr : //contains LN_EG_RPrBase_rFonts { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if(pProperties.get()) + if(pProperties) pProperties->resolve(*this); } break; @@ -983,7 +983,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) { // overwrite level writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if(pProperties.get()) + if(pProperties) pProperties->resolve(*this); } break; @@ -1020,7 +1020,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) { //todo: how to handle paragraph properties within numbering levels (except LeftIndent and FirstLineIndent)? writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if(pProperties.get()) + if(pProperties) pProperties->resolve(*this); } break; @@ -1028,7 +1028,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_Tabs_tab: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if(pProperties.get()) + if(pProperties) pProperties->resolve(*this); } break; @@ -1046,7 +1046,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_Num_lvlOverride: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) pProperties->resolve(*this); } break; @@ -1094,7 +1094,7 @@ void ListsManager::lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref else { // Create AbstractListDef's - OSL_ENSURE( !m_pCurrentDefinition.get(), "current entry has to be NULL here"); + OSL_ENSURE( !m_pCurrentDefinition, "current entry has to be NULL here"); m_pCurrentDefinition = new AbstractListDef( ); ref->resolve(*this); //append it to the table @@ -1109,7 +1109,7 @@ AbstractListDef::Pointer ListsManager::GetAbstractList( sal_Int32 nId ) int nLen = m_aAbstractLists.size( ); int i = 0; - while ( !pAbstractList.get( ) && i < nLen ) + while ( !pAbstractList && i < nLen ) { if ( m_aAbstractLists[i]->GetId( ) == nId ) { @@ -1151,7 +1151,7 @@ ListDef::Pointer ListsManager::GetList( sal_Int32 nId ) int nLen = m_aLists.size( ); int i = 0; - while ( !pList.get( ) && i < nLen ) + while ( !pList && i < nLen ) { if ( m_aLists[i]->GetId( ) == nId ) pList = m_aLists[i]; diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index 1c437f8d2819..dd7b13137754 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -139,7 +139,7 @@ void OLEHandler::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_OLEObject_OLEObject: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { pProperties->resolve(*this); } @@ -148,7 +148,7 @@ void OLEHandler::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_wrap_wrap: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if ( pProperties.get( ) ) + if ( pProperties ) { tools::SvRef<WrapHandler> pHandler( new WrapHandler ); pProperties->resolve( *pHandler ); diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx index 7f97faf320ee..d6a0fdd1f502 100644 --- a/writerfilter/source/dmapper/PageBordersHandler.cxx +++ b/writerfilter/source/dmapper/PageBordersHandler.cxx @@ -92,7 +92,7 @@ void PageBordersHandler::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_PageBorders_right: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pBorderHandler = std::make_shared<BorderHandler>( true ); pProperties->resolve(*pBorderHandler); diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index e10b82daed0a..44127d0d7f86 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1615,7 +1615,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) sal_Int32 nCharWidth = 423; //240 twip/ 12 pt const StyleSheetEntryPtr pEntry = rDM_Impl.GetStyleSheetTable()->FindStyleSheetByConvertedStyleName( "Standard" ); - if ( pEntry.get() ) + if ( pEntry ) { std::optional< PropertyMap::Property > pPropHeight = pEntry->pProperties->getProperty( PROP_CHAR_HEIGHT_ASIAN ); if ( pPropHeight ) diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx index 8d5be18a1cf1..9ce0cdc85ad6 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.cxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx @@ -77,7 +77,7 @@ void SectionColumnHandler::lcl_sprm(Sprm & rSprm) { m_aTempColumn.nWidth = m_aTempColumn.nSpace = 0; writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { pProperties->resolve(*this); m_aCols.push_back(m_aTempColumn); diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 81fadad6ac40..93bc03b60f75 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -521,7 +521,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_CT_Settings_mailMerge: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) pProperties->resolve(*this); } break; @@ -544,7 +544,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_CT_Compat_compatSetting: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) { pProperties->resolve(*this); diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index f0524e71ed32..e6704b068ff1 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -538,8 +538,8 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) { sal_uInt32 nSprmId = rSprm.getId(); Value::Pointer_t pValue = rSprm.getValue(); - sal_Int32 nIntValue = pValue.get() ? pValue->getInt() : 0; - OUString sStringValue = pValue.get() ? pValue->getString() : OUString(); + sal_Int32 nIntValue = pValue ? pValue->getInt() : 0; + OUString sStringValue = pValue ? pValue->getString() : OUString(); switch(nSprmId) { @@ -581,7 +581,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_Style_tcPr: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get() && m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_TABLE) + if( pProperties && m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_TABLE) { auto pTblStylePrHandler = std::make_shared<TblStylePrHandler>(m_pImpl->m_rDMapper); pProperties->resolve(*pTblStylePrHandler); @@ -655,7 +655,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_EG_RPrBase_rFonts: //table fonts { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pTblStylePrHandler = std::make_shared<TblStylePrHandler>( m_pImpl->m_rDMapper ); pProperties->resolve( *pTblStylePrHandler ); @@ -694,7 +694,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_DocDefaults_pPrDefault: m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultParaProps ); resolveSprmProps( m_pImpl->m_rDMapper, rSprm ); - if ( nSprmId == NS_ooxml::LN_CT_DocDefaults_pPrDefault && m_pImpl->m_pDefaultParaProps.get() && + if ( nSprmId == NS_ooxml::LN_CT_DocDefaults_pPrDefault && m_pImpl->m_pDefaultParaProps && !m_pImpl->m_pDefaultParaProps->isSet( PROP_PARA_TOP_MARGIN ) ) { SetDefaultParaProps( PROP_PARA_TOP_MARGIN, uno::makeAny( sal_Int32(0) ) ); @@ -719,7 +719,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_TblPrBase_tblBorders: //table borders, might be defined in table style { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pBorderHandler = std::make_shared<BorderHandler>(m_pImpl->m_rDMapper.IsOOXMLImport()); pProperties->resolve(*pBorderHandler); @@ -737,7 +737,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_LatentStyles_lsdException: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) { tools::SvRef<LatentStyleHandler> pLatentStyleHandler(new LatentStyleHandler()); pProperties->resolve(*pLatentStyleHandler); @@ -1529,7 +1529,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) } // WARNING: these defaults only take effect IF there is a DocDefaults style section. Normally there is, but not always. - if( bParaProperties && m_pImpl->m_pDefaultParaProps.get()) + if( bParaProperties && m_pImpl->m_pDefaultParaProps) { // tdf#87533 LO will have different defaults here, depending on the locale. Import with documented defaults SetDefaultParaProps(PROP_WRITING_MODE, uno::makeAny(sal_Int16(text::WritingMode_LR_TB))); @@ -1561,7 +1561,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) } } } - if( !bParaProperties && m_pImpl->m_pDefaultCharProps.get()) + if( !bParaProperties && m_pImpl->m_pDefaultCharProps ) { // tdf#108350: Earlier in DomainMapper for DOCX, Calibri/11pt was set to match MSWord 2007+, // but that is valid only if DocDefaults_rPrDefault is omitted. diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index 3b9bd40282bf..acd29d5ac274 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -310,7 +310,7 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal) void TDefTableHandler::localResolve(Id rName, const writerfilter::Reference<Properties>::Pointer_t& pProperties) { - if( pProperties.get()) + if( pProperties ) { m_nLineWidth = m_nLineType = m_nLineColor = 0; std::vector<beans::PropertyValue> aSavedGrabBag; diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx index 16be82444505..3140a00d71aa 100644 --- a/writerfilter/source/dmapper/TableData.hxx +++ b/writerfilter/source/dmapper/TableData.hxx @@ -75,7 +75,7 @@ public: */ void insertProperties(TablePropertyMapPtr pProps) { - if( mpProps.get() ) + if( mpProps ) mpProps->InsertProps(pProps.get()); else mpProps = pProps; @@ -164,9 +164,9 @@ public: */ void insertProperties(TablePropertyMapPtr pProperties) { - if( pProperties.get() ) + if( pProperties ) { - if( !mpProperties.get() ) + if( !mpProperties ) mpProperties = pProperties; else mpProperties->InsertProps(pProperties.get()); diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx index 7dd05c51a090..d7c5b9322dee 100644 --- a/writerfilter/source/dmapper/TableManager.cxx +++ b/writerfilter/source/dmapper/TableManager.cxx @@ -68,7 +68,7 @@ void TableManager::insertTableProps(const TablePropertyMapPtr& pProps) TagLogger::getInstance().startElement("tablemanager.insertTableProps"); #endif - if (getTableProps().get() && getTableProps() != pProps) + if (getTableProps() && getTableProps() != pProps) getTableProps()->InsertProps(pProps.get()); else mState.setTableProps(pProps); @@ -84,7 +84,7 @@ void TableManager::insertRowProps(const TablePropertyMapPtr& pProps) TagLogger::getInstance().startElement("tablemanager.insertRowProps"); #endif - if (getRowProps().get()) + if (getRowProps()) getRowProps()->InsertProps(pProps.get()); else mState.setRowProps(pProps); @@ -100,7 +100,7 @@ void TableManager::cellProps(const TablePropertyMapPtr& pProps) TagLogger::getInstance().startElement("tablemanager.cellProps"); #endif - if (getCellProps().get()) + if (getCellProps()) getCellProps()->InsertProps(pProps.get()); else mState.setCellProps(pProps); diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index bd8fde34d36d..abce3a1e6b14 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -70,7 +70,7 @@ namespace writerfilter::dmapper { { //contains unit and value writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { //contains attributes x2902 (LN_unit) and x17e2 (LN_trleft) MeasureHandlerPtr pMeasureHandler( new MeasureHandler ); pProperties->resolve(*pMeasureHandler); @@ -87,7 +87,7 @@ namespace writerfilter::dmapper { case NS_ooxml::LN_CT_TrPr_del: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { sal_Int32 nToken = sal_Int32(); switch( nSprmId ) @@ -115,7 +115,7 @@ namespace writerfilter::dmapper { case NS_ooxml::LN_CT_TcPrBase_cellDel: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { sal_Int32 nToken; switch( nSprmId ) @@ -186,7 +186,7 @@ namespace writerfilter::dmapper { case NS_ooxml::LN_CT_TblPrBase_tblBorders: //table borders, might be defined in table style { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pBorderHandler = std::make_shared<BorderHandler>(true); if (m_pCurrentInteropGrabBag) @@ -214,7 +214,7 @@ namespace writerfilter::dmapper { case NS_ooxml::LN_CT_TblPrEx_tblBorders: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties) { auto pBorderHandler = std::make_shared<BorderHandler>(true); pProperties->resolve(*pBorderHandler); @@ -234,7 +234,7 @@ namespace writerfilter::dmapper { //contains CT_TcBorders_left, right, top, bottom { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { //in OOXML there's one set of borders at each cell (if there is any) tools::SvRef< TDefTableHandler > pTDefTableHandler( new TDefTableHandler()); @@ -253,7 +253,7 @@ namespace writerfilter::dmapper { { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) { auto pCellMarginHandler = std::make_shared<CellMarginHandler>(); if (m_pCurrentInteropGrabBag) @@ -293,7 +293,7 @@ namespace writerfilter::dmapper { // each color sprm contains as much colors as cells are in a row //LN_CT_TcPrBase_shd: cell shading contains: LN_CT_Shd_val, LN_CT_Shd_fill, LN_CT_Shd_color writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pCellColorHandler = std::make_shared<CellColorHandler>(); pCellColorHandler->enableInteropGrabBag("shd"); //enable to store shd unsupported props in grab bag @@ -313,7 +313,7 @@ namespace writerfilter::dmapper { //contains LN_CT_TblCellMar_top, LN_CT_TblCellMar_left, LN_CT_TblCellMar_bottom, LN_CT_TblCellMar_right // LN_CT_TblCellMar_start, LN_CT_TblCellMar_end writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { auto pCellMarginHandler = std::make_shared<CellMarginHandler>(); if (m_pCurrentInteropGrabBag) @@ -337,7 +337,7 @@ namespace writerfilter::dmapper { case NS_ooxml::LN_CT_TblPrBase_tblInd: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties) { MeasureHandlerPtr pHandler(new MeasureHandler); if (m_pCurrentInteropGrabBag) diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx index 21dd6f619894..001cecbd9f86 100644 --- a/writerfilter/source/dmapper/TblStylePrHandler.cxx +++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx @@ -174,7 +174,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) { //contains unit and value writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) { MeasureHandlerPtr pMeasureHandler( new MeasureHandler ); pProperties->resolve(*pMeasureHandler); @@ -187,7 +187,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_TblPrBase_tblCellMar: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if ( pProperties.get() ) + if ( pProperties ) { auto pCellMarginHandler = std::make_shared<CellMarginHandler>(); pCellMarginHandler->enableInteropGrabBag("tblCellMar"); @@ -233,7 +233,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) void TblStylePrHandler::resolveSprmProps(Sprm & rSprm) { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) pProperties->resolve(*this); } diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index afd69d0281e4..13fed5237051 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -732,7 +732,7 @@ void TextEffectsHandler::lcl_sprm(Sprm& rSprm) mpGrabBagStack->push(aElementName); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( !pProperties.get()) + if( !pProperties ) return; pProperties->resolve( *this ); diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index 255dba1e0b1e..ffa2262cdecc 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -110,7 +110,7 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_CT_BaseStyles_fontScheme: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) pProperties->resolve(*this); } break; @@ -119,7 +119,7 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); m_pImpl->m_currentFontThemeEntry = std::map<sal_uInt32, OUString>(); - if( pProperties.get()) + if( pProperties ) pProperties->resolve(*this); m_pImpl->m_themeFontMap[nSprmId] = m_pImpl->m_currentFontThemeEntry; } @@ -130,14 +130,14 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) { m_pImpl->m_currentThemeFontId = nSprmId; writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties ) pProperties->resolve(*this); } break; case NS_ooxml::LN_CT_FontCollection_font: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if (pProperties.get()) + if (pProperties ) pProperties->resolve(*this); } break; diff --git a/writerfilter/source/dmapper/util.cxx b/writerfilter/source/dmapper/util.cxx index de1e2c9db24e..d4389fce7571 100644 --- a/writerfilter/source/dmapper/util.cxx +++ b/writerfilter/source/dmapper/util.cxx @@ -29,7 +29,7 @@ std::string XTextRangeToString(uno::Reference< text::XTextRange > const & textRa std::string result; #ifdef DBG_UTIL - if (textRange.get()) + if (textRange) { OUString aOUStr; @@ -62,7 +62,7 @@ std::string XTextRangeToString(uno::Reference< text::XTextRange > const & textRa void resolveSprmProps(Properties & rHandler, Sprm & rSprm) { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + if( pProperties) pProperties->resolve(rHandler); } diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 4cb719818012..e425025fbbe0 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1235,7 +1235,7 @@ void OOXMLFastContextHandlerValue::setDefaultStringValue() void OOXMLFastContextHandlerValue::pushBiDiEmbedLevel() { const bool bRtl - = mpValue.get() && mpValue->getInt() == NS_ooxml::LN_Value_ST_Direction_rtl; + = mpValue && mpValue->getInt() == NS_ooxml::LN_Value_ST_Direction_rtl; OOXMLFactory::characters(this, bRtl ? u"\u202B" : u"\u202A"); // RLE / LRE } diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx index 54886fb81d9e..ff13dedcf5fa 100644 --- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx +++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx @@ -331,7 +331,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) if (pCols) { RTFValue::Pointer_t pNum = pCols->getAttributes().find(NS_ooxml::LN_CT_Columns_num); - if (pNum.get() && pNum->getInt() > 1) + if (pNum && pNum->getInt() > 1) bColumns = true; } checkFirstRun(); @@ -365,11 +365,11 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) // Unless we're on a title page. RTFValue::Pointer_t pTitlePg = m_aStates.top().getSectionSprms().find(NS_ooxml::LN_EG_SectPrContents_titlePg); - if (((pBreak.get() + if (((pBreak && pBreak->getInt() == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_continuous)) || m_nResetBreakOnSectBreak == RTF_SBKNONE) - && !(pTitlePg.get() && pTitlePg->getInt())) + && !(pTitlePg && pTitlePg->getInt())) { if (m_bWasInFrame) { diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 227fba3c24fa..2738e96b403f 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -390,11 +390,11 @@ bool RTFDocumentImpl::dispatchTableValue(RTFKeyword nKeyword, int nParam) // If there is a negative left margin, then the first cellx is relative to that. RTFValue::Pointer_t pTblInd = m_aStates.top().getTableRowSprms().find(NS_ooxml::LN_CT_TblPrBase_tblInd); - if (rCurrentCellX == 0 && pTblInd.get()) + if (rCurrentCellX == 0 && pTblInd) { RTFValue::Pointer_t pWidth = pTblInd->getAttributes().find(NS_ooxml::LN_CT_TblWidth_w); - if (pWidth.get() && pWidth->getInt() < 0) + if (pWidth && pWidth->getInt() < 0) nCellX = -1 * (pWidth->getInt() - nParam); } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 3de574e75c12..e174a0973bd8 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -89,7 +89,7 @@ void putNestedAttribute(RTFSprms& rSprms, Id nParent, Id nId, const RTFValue::Po RTFOverwrite eOverwrite, bool bAttribute) { RTFValue::Pointer_t pParent = rSprms.find(nParent, /*bFirst=*/true, /*bForWrite=*/true); - if (!pParent.get()) + if (!pParent) { RTFSprms aAttributes; if (nParent == NS_ooxml::LN_CT_TcPrBase_shd) @@ -133,7 +133,7 @@ RTFValue::Pointer_t getNestedSprm(RTFSprms& rSprms, Id nParent, Id nId) bool eraseNestedAttribute(RTFSprms& rSprms, Id nParent, Id nId) { RTFValue::Pointer_t pParent = rSprms.find(nParent); - if (!pParent.get()) + if (!pParent) // It doesn't even have a parent, we're done. return false; RTFSprms& rAttributes = pParent->getAttributes(); @@ -143,7 +143,7 @@ bool eraseNestedAttribute(RTFSprms& rSprms, Id nParent, Id nId) RTFSprms& getLastAttributes(RTFSprms& rSprms, Id nId) { RTFValue::Pointer_t p = rSprms.find(nId); - if (p.get() && !p->getSprms().empty()) + if (p && !p->getSprms().empty()) return p->getSprms().back().second->getAttributes(); SAL_WARN("writerfilter.rtf", "trying to set property when no type is defined"); @@ -555,10 +555,8 @@ void RTFDocumentImpl::checkNeedPap() // Writer will ignore a page break before a text frame, so guard it with empty paragraphs bool hasBreakBeforeFrame = m_aStates.top().getFrame().hasProperties() - && m_aStates.top() - .getParagraphSprms() - .find(NS_ooxml::LN_CT_PPrBase_pageBreakBefore) - .get(); + && m_aStates.top().getParagraphSprms().find( + NS_ooxml::LN_CT_PPrBase_pageBreakBefore); if (hasBreakBeforeFrame) { dispatchSymbol(RTF_PAR); @@ -649,7 +647,7 @@ void RTFDocumentImpl::sectBreak(bool bFinal) RTFValue::Pointer_t pBreak = m_aStates.top().getSectionSprms().find(NS_ooxml::LN_EG_SectPrContents_type); bool bContinuous - = pBreak.get() + = pBreak && pBreak->getInt() == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_continuous); // If there is no paragraph in this section, then insert a dummy one, as required by Writer, @@ -1483,7 +1481,7 @@ void RTFDocumentImpl::text(OUString& rString) } // Are we in the middle of the table definition? (No cell defs yet, but we already have some cell props.) - if (m_aStates.top().getTableCellSprms().find(NS_ooxml::LN_CT_TcPrBase_vAlign).get() + if (m_aStates.top().getTableCellSprms().find(NS_ooxml::LN_CT_TcPrBase_vAlign) && m_nTopLevelCells == 0) { m_aTableBufferStack.back().emplace_back( @@ -1553,7 +1551,7 @@ void RTFDocumentImpl::prepareProperties( // Table width. RTFValue::Pointer_t const pTableWidthProps = rState.getTableRowSprms().find(NS_ooxml::LN_CT_TblPrBase_tblW); - if (!pTableWidthProps.get()) + if (!pTableWidthProps) { auto pUnitValue = new RTFValue(3); putNestedAttribute(rState.getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblW, @@ -1568,7 +1566,7 @@ void RTFDocumentImpl::prepareProperties( RTFValue::Pointer_t const pCellMar = rState.getTableRowSprms().find(NS_ooxml::LN_CT_TblPrBase_tblCellMar); - if (!pCellMar.get()) + if (!pCellMar) { // If no cell margins are defined, the default left/right margin is 0 in Word, but not in Writer. RTFSprms aAttributes; @@ -3182,7 +3180,7 @@ void RTFDocumentImpl::afterPopState(RTFParserState& rState) { RTFValue::Pointer_t pIdValue = rState.getTableAttributes().find(NS_ooxml::LN_CT_AbstractNum_nsid); - if (pIdValue.get() && !m_aStates.empty()) + if (pIdValue && !m_aStates.empty()) { // Abstract numbering RTFSprms aLeveltextAttributes; |