diff options
Diffstat (limited to 'writerfilter')
4 files changed, 11 insertions, 11 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 962f7130e6f9..a8d90962c4cc 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -579,7 +579,7 @@ void DomainMapperTableManager::endOfRowAction() IntVectorPtr pTableGrid = getCurrentGrid( ); IntVectorPtr pCellWidths = getCurrentCellWidths( ); - if(!m_nTableWidth && pTableGrid->size()) + if(!m_nTableWidth && !pTableGrid->empty()) { #ifdef DEBUG_WRITERFILTER TagLogger::getInstance().startElement("tableWidth"); @@ -697,7 +697,7 @@ void DomainMapperTableManager::endOfRowAction() #endif insertRowProps(pPropMap); } - else if ( pCellWidths->size() > 0 && + else if ( !pCellWidths->empty() && ( m_nLayoutType == NS_ooxml::LN_Value_doc_ST_TblLayout_fixed || pCellWidths->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) ) ) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index ced0cda06778..de36dbcf9755 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2419,7 +2419,7 @@ void DomainMapper_Impl::PopShapeContext() getTableManager().endLevel(); popTableManager(); } - if ( m_aAnchoredStack.size() > 0 ) + if ( !m_aAnchoredStack.empty() ) { // For OLE object replacement shape, the text append context was already removed // or the OLE object couldn't be inserted. @@ -4922,7 +4922,7 @@ void DomainMapper_Impl::SetFieldFFData(const FFDataHandler::Pointer_t& pFFDataHa TagLogger::getInstance().startElement("setFieldFFData"); #endif - if (m_aFieldStack.size()) + if (!m_aFieldStack.empty()) { FieldContextPtr pContext = m_aFieldStack.top(); if (pContext.get()) diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 35ae974dd7b8..41ad7869b1fd 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1576,7 +1576,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) if ( m_nColumnCount > 0 ) { // skip custom-width columns since we don't know what column the shape is in. - if ( m_aColWidth.size() ) + if ( !m_aColWidth.empty() ) nParagraphWidth = 0; else nParagraphWidth = (nParagraphWidth - (m_nColumnDistance * m_nColumnCount)) / (m_nColumnCount + 1); diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index 0658a9f8c128..68f8494f586f 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -415,17 +415,17 @@ void TDefTableHandler::lcl_sprm(Sprm & rSprm) void TDefTableHandler::fillCellProperties( const ::tools::SvRef< TablePropertyMap >& pCellProperties ) const { - if( m_aTopBorderLines.size() ) + if( !m_aTopBorderLines.empty() ) pCellProperties->Insert( PROP_TOP_BORDER, uno::makeAny( m_aTopBorderLines[0] ) ); - if( m_aLeftBorderLines.size() ) + if( !m_aLeftBorderLines.empty() ) pCellProperties->Insert( PROP_LEFT_BORDER, uno::makeAny( m_aLeftBorderLines[0] ) ); - if( m_aBottomBorderLines.size() ) + if( !m_aBottomBorderLines.empty() ) pCellProperties->Insert( PROP_BOTTOM_BORDER, uno::makeAny( m_aBottomBorderLines[0] ) ); - if( m_aRightBorderLines.size() ) + if( !m_aRightBorderLines.empty() ) pCellProperties->Insert( PROP_RIGHT_BORDER, uno::makeAny( m_aRightBorderLines[0] ) ); - if( m_aInsideHBorderLines.size() ) + if( !m_aInsideHBorderLines.empty() ) pCellProperties->Insert( META_PROP_HORIZONTAL_BORDER, uno::makeAny( m_aInsideHBorderLines[0] ) ); - if( m_aInsideVBorderLines.size() ) + if( !m_aInsideVBorderLines.empty() ) pCellProperties->Insert( META_PROP_VERTICAL_BORDER, uno::makeAny( m_aInsideVBorderLines[0] ) ); } |