diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-07-04 10:30:42 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-04 10:37:00 +0200 |
commit | 25bfc4a4e6fd34c10d352c87e38e36c9303edfd2 (patch) | |
tree | a4e86af8cdbe0eb3f7b161c295507d1e82c29c58 /writerfilter/source/dmapper/DomainMapperTableHandler.cxx | |
parent | 90b836fc3ba19ef3bf638f0f122e2e050a6a2000 (diff) |
writerfilter::dmapper::PropertyDefinition::bIsTextProperty is never read
Change-Id: I9d0ce39c1c47d8b89bd675ce91f6cfe2e9c3a061
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapperTableHandler.cxx')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 75863963c117..ec763f8571ce 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -128,7 +128,7 @@ PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntr void lcl_mergeBorder( PropertyIds nId, PropertyMapPtr pOrig, PropertyMapPtr pDest ) { - PropertyDefinition aDef( nId, false ); + PropertyDefinition aDef( nId ); PropertyMap::iterator pOrigIt = pOrig->find( aDef ); if ( pOrigIt != pOrig->end( ) ) @@ -140,8 +140,8 @@ void lcl_mergeBorder( PropertyIds nId, PropertyMapPtr pOrig, PropertyMapPtr pDes void lcl_computeCellBorders( PropertyMapPtr pTableBorders, PropertyMapPtr pCellProps, sal_Int32 nCell, sal_Int32 nRow, bool bIsEndCol, bool bIsEndRow ) { - PropertyDefinition aVertPDef( META_PROP_VERTICAL_BORDER, false ); - PropertyDefinition aHorizPDef( META_PROP_HORIZONTAL_BORDER, false ); + PropertyDefinition aVertPDef( META_PROP_VERTICAL_BORDER ); + PropertyDefinition aHorizPDef( META_PROP_HORIZONTAL_BORDER ); PropertyMap::iterator aVerticalIter = pCellProps->find( aVertPDef ); PropertyMap::iterator aHorizontalIter = pCellProps->find( aHorizPDef ); @@ -290,13 +290,13 @@ namespace bool lcl_extractTableBorderProperty(PropertyMapPtr pTableProperties, const PropertyIds nId, TableInfo& rInfo, table::BorderLine2& rLine) { - PropertyMap::iterator aTblBorderIter = pTableProperties->find( PropertyDefinition(nId, false) ); + PropertyMap::iterator aTblBorderIter = pTableProperties->find( PropertyDefinition(nId) ); if( aTblBorderIter != pTableProperties->end() ) { OSL_VERIFY(aTblBorderIter->second >>= rLine); rInfo.pTableBorders->Insert( nId, false, uno::makeAny( rLine ) ); - PropertyMap::iterator pIt = rInfo.pTableDefaults->find( PropertyDefinition( nId, false ) ); + PropertyMap::iterator pIt = rInfo.pTableDefaults->find( PropertyDefinition( nId ) ); if ( pIt != rInfo.pTableDefaults->end( ) ) rInfo.pTableDefaults->erase( pIt ); @@ -324,7 +324,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo sal_Int32 nTableWidthType = text::SizeType::FIX; PropertyMap::iterator aTableStyleIter = - m_aTableProperties->find( PropertyDefinition( META_PROP_TABLE_STYLE_NAME, false ) ); + m_aTableProperties->find( PropertyDefinition( META_PROP_TABLE_STYLE_NAME ) ); if(aTableStyleIter != m_aTableProperties->end()) { // Apply table style properties recursively @@ -363,7 +363,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo } PropertyMap::iterator const aTblLookIter = - m_aTableProperties->find(PropertyDefinition(PROP_TBL_LOOK, false)); + m_aTableProperties->find(PropertyDefinition(PROP_TBL_LOOK)); if(aTblLookIter != m_aTableProperties->end()) { aTblLookIter->second >>= rInfo.nTblLook; @@ -487,7 +487,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo //fill default value - if not available const PropertyMap::const_iterator aRepeatIter = - m_aTableProperties->find( PropertyDefinition( PROP_HEADER_ROW_COUNT, false ) ); + m_aTableProperties->find( PropertyDefinition( PROP_HEADER_ROW_COUNT ) ); if( aRepeatIter == m_aTableProperties->end() ) m_aTableProperties->Insert( PROP_HEADER_ROW_COUNT, false, uno::makeAny( (sal_Int32)0 )); @@ -633,7 +633,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl // Remove properties from style/row that aren't allowed in cells const PropertyMap::iterator aDefaultRepeatIt = pAllCellProps->find( - PropertyDefinition( PROP_HEADER_ROW_COUNT, false ) ); + PropertyDefinition( PROP_HEADER_ROW_COUNT ) ); if ( aDefaultRepeatIt != pAllCellProps->end( ) ) pAllCellProps->erase( aDefaultRepeatIt ); @@ -651,24 +651,24 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl //now set the default left+right border distance TODO: there's an sprm containing the default distance! const PropertyMap::const_iterator aLeftDistanceIter = - aCellIterator->get()->find( PropertyDefinition(PROP_LEFT_BORDER_DISTANCE, false) ); + aCellIterator->get()->find( PropertyDefinition(PROP_LEFT_BORDER_DISTANCE) ); if( aLeftDistanceIter == aCellIterator->get()->end() ) aCellIterator->get()->Insert( PROP_LEFT_BORDER_DISTANCE, false, uno::makeAny(rInfo.nLeftBorderDistance ) ); const PropertyMap::const_iterator aRightDistanceIter = - aCellIterator->get()->find( PropertyDefinition(PROP_RIGHT_BORDER_DISTANCE, false) ); + aCellIterator->get()->find( PropertyDefinition(PROP_RIGHT_BORDER_DISTANCE) ); if( aRightDistanceIter == aCellIterator->get()->end() ) aCellIterator->get()->Insert( PROP_RIGHT_BORDER_DISTANCE, false, uno::makeAny((sal_Int32) rInfo.nRightBorderDistance ) ); const PropertyMap::const_iterator aTopDistanceIter = - aCellIterator->get()->find( PropertyDefinition(PROP_TOP_BORDER_DISTANCE, false) ); + aCellIterator->get()->find( PropertyDefinition(PROP_TOP_BORDER_DISTANCE) ); if( aTopDistanceIter == aCellIterator->get()->end() ) aCellIterator->get()->Insert( PROP_TOP_BORDER_DISTANCE, false, uno::makeAny((sal_Int32) rInfo.nTopBorderDistance ) ); const PropertyMap::const_iterator aBottomDistanceIter = - aCellIterator->get()->find( PropertyDefinition(PROP_BOTTOM_BORDER_DISTANCE, false) ); + aCellIterator->get()->find( PropertyDefinition(PROP_BOTTOM_BORDER_DISTANCE) ); if( aBottomDistanceIter == aCellIterator->get()->end() ) aCellIterator->get()->Insert( PROP_BOTTOM_BORDER_DISTANCE, false, uno::makeAny((sal_Int32) rInfo.nBottomBorderDistance ) ); @@ -733,7 +733,7 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties() if( aRowIter->get() ) { //set default to 'break across pages" - if( aRowIter->get()->find( PropertyDefinition( PROP_IS_SPLIT_ALLOWED, false )) == aRowIter->get()->end()) + if( aRowIter->get()->find( PropertyDefinition( PROP_IS_SPLIT_ALLOWED )) == aRowIter->get()->end()) aRowIter->get()->Insert( PROP_IS_SPLIT_ALLOWED, false, uno::makeAny(sal_True ) ); aRowProperties[nRow] = (*aRowIter)->GetPropertyValues(); |