diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-07-05 10:21:27 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-05 10:28:47 +0200 |
commit | f8c77bd35e88a04fb0985c6b9e72836e4614aded (patch) | |
tree | 20c1ac66ecc33b7863e75259658a185b262433ef /writerfilter | |
parent | update (diff) | |
download | core-f8c77bd35e88a04fb0985c6b9e72836e4614aded.tar.gz core-f8c77bd35e88a04fb0985c6b9e72836e4614aded.zip |
writerfilter: PropertyMap::Insert's bIsTextProperty parameter is unused
Change-Id: I2d55043490f895ef439e88bcd1fed51b857255be
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/BorderHandler.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/CellColorHandler.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 268 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 56 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 24 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 | ||||
-rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 8 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 22 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 26 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TDefTableHandler.cxx | 16 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TablePropertiesHandler.cxx | 20 |
12 files changed, 227 insertions, 231 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index c219d397597c..a5d8560f70f0 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -159,7 +159,7 @@ PropertyMapPtr BorderHandler::getProperties() for( sal_Int32 nProp = 0; nProp < BORDER_COUNT; ++nProp) { if ( m_aFilledLines[nProp] ) { - pPropertyMap->Insert( aPropNames[nProp], false, uno::makeAny( m_aBorderLines[nProp] ) ); + pPropertyMap->Insert( aPropNames[nProp], uno::makeAny( m_aBorderLines[nProp] ) ); } } } diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index a6d36b844d3e..d9acbd6c2700 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -263,12 +263,12 @@ TablePropertyMapPtr CellColorHandler::getProperties() }; // Write the shading pattern property - pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, false, uno::makeAny( aWWShadingPatterns[m_nShadingPattern] )); + pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, uno::makeAny( aWWShadingPatterns[m_nShadingPattern] )); } pPropertyMap->Insert( m_OutputFormat == Form ? PROP_BACK_COLOR : m_OutputFormat == Paragraph ? PROP_PARA_BACK_COLOR - : PROP_CHAR_BACK_COLOR, false, uno::makeAny( nApplyColor )); + : PROP_CHAR_BACK_COLOR, uno::makeAny( nApplyColor )); return pPropertyMap; } } //namespace dmapper diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 4a932d59cd32..70db8467a75e 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -307,7 +307,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->GetTopContext()->Insert( bParaStyle ? PROP_PARA_STYLE_NAME : PROP_CHAR_STYLE_NAME, - true, uno::makeAny( m_pImpl->GetStyleSheetTable()->ConvertStyleName( pEntry->sStyleName ) ) ); } @@ -852,16 +851,16 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case 1: // vertical text if (m_pImpl->GetTopContext()) { - m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION, true, uno::makeAny ( sal_Int16(900) )); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, true, uno::makeAny (((nIntValue & 0x00FF0000) >> 16) != 0)); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION, uno::makeAny ( sal_Int16(900) )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, uno::makeAny (((nIntValue & 0x00FF0000) >> 16) != 0)); } break; case 2: // two lines in one if (m_pImpl->GetTopContext()) { - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_IS_ON, true, uno::makeAny ( true )); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_PREFIX, true, uno::makeAny ( getBracketStringFromEnum((nIntValue & 0x00FF0000) >> 16))); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_SUFFIX, true, uno::makeAny ( getBracketStringFromEnum((nIntValue & 0x00FF0000) >> 16, false))); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_IS_ON, uno::makeAny ( true )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_PREFIX, uno::makeAny ( getBracketStringFromEnum((nIntValue & 0x00FF0000) >> 16))); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_SUFFIX, uno::makeAny ( getBracketStringFromEnum((nIntValue & 0x00FF0000) >> 16, false))); } break; default: @@ -903,20 +902,20 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } else //a real symbol if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, true, uno::makeAny( sStringValue )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, uno::makeAny( sStringValue )); break; case NS_ooxml::LN_CT_Underline_val: handleUnderlineType(nIntValue, m_pImpl->GetTopContext()); break; case NS_ooxml::LN_CT_Color_val: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, true, uno::makeAny( nIntValue ) ); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, uno::makeAny( nIntValue ) ); break; case NS_ooxml::LN_CT_Underline_color: if (m_pImpl->GetTopContext()) { - m_pImpl->GetTopContext()->Insert(PROP_CHAR_UNDERLINE_HAS_COLOR, true, uno::makeAny( true ) ); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_UNDERLINE_COLOR, true, uno::makeAny( nIntValue ) ); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_UNDERLINE_HAS_COLOR, uno::makeAny( true ) ); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_UNDERLINE_COLOR, uno::makeAny( nIntValue ) ); } break; @@ -940,11 +939,11 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_Fonts_ascii: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, true, uno::makeAny( sStringValue )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, uno::makeAny( sStringValue )); break; case NS_ooxml::LN_CT_Fonts_asciiTheme: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, true, uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme(nIntValue) )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme(nIntValue) )); break; case NS_ooxml::LN_CT_Fonts_hAnsi: break;//unsupported @@ -952,29 +951,29 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; //unsupported case NS_ooxml::LN_CT_Fonts_eastAsia: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_ASIAN, true, uno::makeAny( sStringValue )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_ASIAN, uno::makeAny( sStringValue )); break; case NS_ooxml::LN_CT_Fonts_eastAsiaTheme: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, true, uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme(nIntValue) ) ); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme(nIntValue) ) ); break; case NS_ooxml::LN_CT_Fonts_cs: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, true, uno::makeAny( sStringValue )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, uno::makeAny( sStringValue )); break; case NS_ooxml::LN_CT_Fonts_cstheme: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, true, uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme(nIntValue) )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme(nIntValue) )); break; case NS_ooxml::LN_CT_Spacing_before: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Spacing_beforeLines: break; case NS_ooxml::LN_CT_Spacing_after: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Spacing_afterLines: break; @@ -1024,7 +1023,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) aSpacing.Mode = style::LineSpacingMode::FIX; } if (pTopContext) - pTopContext->Insert(PROP_PARA_LINE_SPACING, true, uno::makeAny( aSpacing )); + pTopContext->Insert(PROP_PARA_LINE_SPACING, uno::makeAny( aSpacing )); } break; case NS_ooxml::LN_CT_Ind_start: @@ -1036,10 +1035,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) sal_Int32 nFirstLineIndent = m_pImpl->getCurrentNumberingProperty("FirstLineIndent"); if (nFirstLineIndent != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, true, uno::makeAny(nFirstLineIndent)); + m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent)); m_pImpl->GetTopContext()->Insert( - PROP_PARA_LEFT_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); + PROP_PARA_LEFT_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); } break; case NS_ooxml::LN_CT_Ind_end: @@ -1052,12 +1051,12 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty("IndentAt"); if (nFirstLineIndent != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, true, uno::makeAny(nFirstLineIndent)); + m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent)); if (nParaLeftMargin != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, true, uno::makeAny(nParaLeftMargin)); + m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin)); m_pImpl->GetTopContext()->Insert( - PROP_PARA_RIGHT_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); + PROP_PARA_RIGHT_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); } break; case NS_ooxml::LN_CT_Ind_hanging: @@ -1065,40 +1064,40 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) { sal_Int32 nValue = ConversionHelper::convertTwipToMM100( nIntValue ); m_pImpl->GetTopContext()->Insert( - PROP_PARA_FIRST_LINE_INDENT, true, uno::makeAny( - nValue )); + PROP_PARA_FIRST_LINE_INDENT, uno::makeAny( - nValue )); } break; case NS_ooxml::LN_CT_Ind_firstLine: if (m_pImpl->GetTopContext()) m_pImpl->GetTopContext()->Insert( - PROP_PARA_FIRST_LINE_INDENT, true, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); + PROP_PARA_FIRST_LINE_INDENT, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); break; case NS_ooxml::LN_CT_EastAsianLayout_id: break; case NS_ooxml::LN_CT_EastAsianLayout_combine: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_IS_ON, true, uno::makeAny ( nIntValue ? true : false )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_IS_ON, uno::makeAny ( nIntValue ? true : false )); break; case NS_ooxml::LN_CT_EastAsianLayout_combineBrackets: if (m_pImpl->GetTopContext()) { OUString sCombinePrefix = getBracketStringFromEnum(nIntValue); OUString sCombineSuffix = getBracketStringFromEnum(nIntValue, false); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_PREFIX, true, uno::makeAny ( sCombinePrefix )); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_SUFFIX, true, uno::makeAny ( sCombineSuffix )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_PREFIX, uno::makeAny ( sCombinePrefix )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_SUFFIX, uno::makeAny ( sCombineSuffix )); } break; case NS_ooxml::LN_CT_EastAsianLayout_vert: if (m_pImpl->GetTopContext()) { sal_Int16 nRotationAngle = (nIntValue ? 900 : 0); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION, true, uno::makeAny ( nRotationAngle )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION, uno::makeAny ( nRotationAngle )); } break; case NS_ooxml::LN_CT_EastAsianLayout_vertCompress: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, true, uno::makeAny ( nIntValue ? true : false)); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, uno::makeAny ( nIntValue ? true : false)); break; case NS_ooxml::LN_CT_PageSz_code: @@ -1149,7 +1148,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) if (m_pImpl->GetTopContext()) m_pImpl->GetTopContext()->Insert(NS_ooxml::LN_CT_Language_val== nName ? PROP_CHAR_LOCALE : NS_ooxml::LN_CT_Language_eastAsia == nName ? PROP_CHAR_LOCALE_ASIAN : PROP_CHAR_LOCALE_COMPLEX, - true, uno::makeAny( aLocale ) ); } break; @@ -1157,15 +1155,15 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) #define AUTO_PARA_SPACING sal_Int32(49) case NS_ooxml::LN_CT_Spacing_beforeAutospacing: if (!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing()) - m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, uno::makeAny( AUTO_PARA_SPACING ) ); else - m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) ); break; case NS_ooxml::LN_CT_Spacing_afterAutospacing: if (!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing()) - m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, uno::makeAny( AUTO_PARA_SPACING ) ); else - m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) ); break; case NS_ooxml::LN_CT_SmartTagRun_uri: case NS_ooxml::LN_CT_SmartTagRun_element: @@ -1563,13 +1561,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; // sprmPFSideBySide case NS_sprm::LN_PFKeep: // sprmPFKeep - rContext->Insert(PROP_PARA_SPLIT, true, uno::makeAny(nIntValue ? false : true)); + rContext->Insert(PROP_PARA_SPLIT, uno::makeAny(nIntValue ? false : true)); break; case NS_sprm::LN_PFKeepFollow: // sprmPFKeepFollow - rContext->Insert(PROP_PARA_KEEP_TOGETHER, true, uno::makeAny( nIntValue ? true : false) ); + rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ? true : false) ); break; case NS_sprm::LN_PFPageBreakBefore: - rContext->Insert(PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE ) ); + rContext->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE ) ); break; // sprmPFPageBreakBefore case NS_sprm::LN_PBrcl: break; // sprmPBrcl @@ -1589,7 +1587,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType pStyleSheetPropertyMap->SetListLevel( (sal_Int16)nIntValue ); } else - rContext->Insert( PROP_NUMBERING_LEVEL, true, uno::makeAny( (sal_Int16)nIntValue )); + rContext->Insert( PROP_NUMBERING_LEVEL, uno::makeAny( (sal_Int16)nIntValue )); break; case NS_sprm::LN_PIlfo: // sprmPIlfo { @@ -1607,7 +1605,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType if( !m_pImpl->IsStyleSheetImport() ) { uno::Any aRules = uno::makeAny( pList->GetNumberingRules( ) ); - rContext->Insert( PROP_NUMBERING_RULES, true, aRules ); + rContext->Insert( PROP_NUMBERING_RULES, aRules ); // erase numbering from pStyle if already set rContext->erase( PropertyDefinition( PROP_NUMBERING_STYLE_NAME )); } @@ -1622,13 +1620,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType } else { - rContext->Insert( PROP_NUMBERING_STYLE_NAME, true, uno::makeAny( OUString() ) ); + rContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny( OUString() ) ); } } } break; case NS_sprm::LN_PFNoLineNumb: // sprmPFNoLineNumb - rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, true, uno::makeAny( nIntValue ? false : true) ); + rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, uno::makeAny( nIntValue ? false : true) ); break; case NS_sprm::LN_PChgTabsPapx: // sprmPChgTabsPapx { @@ -1643,7 +1641,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType //create a new tab stop property - this is done with the contained properties resolveSprmProps(*this, rSprm); //add this property - rContext->Insert(PROP_PARA_TAB_STOPS, true, uno::makeAny( m_pImpl->GetCurrentTabStopAndClear())); + rContext->Insert(PROP_PARA_TAB_STOPS, uno::makeAny( m_pImpl->GetCurrentTabStopAndClear())); } break; case 0x845d: //right margin Asian - undocumented @@ -1657,11 +1655,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType if( NS_sprm::LN_PDxaLeft == nSprmId || 0x17 == nSprmId|| (bExchangeLeftRight && nSprmId == 0x845d) || ( !bExchangeLeftRight && nSprmId == 0x845e)) rContext->Insert( eSprmType == SPRM_DEFAULT ? PROP_PARA_LEFT_MARGIN : PROP_LEFT_MARGIN, - true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); else if(eSprmType == SPRM_DEFAULT) rContext->Insert( - PROP_PARA_RIGHT_MARGIN, true, + PROP_PARA_RIGHT_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); } //TODO: what happens to the right margins in numberings? @@ -1675,7 +1672,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_PDxaLeft180: // sprmPDxaLeft180 rContext->Insert( eSprmType == SPRM_DEFAULT ? PROP_PARA_FIRST_LINE_INDENT : PROP_FIRST_LINE_OFFSET, - true, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); break; case 20 : // sprmPDyaLine @@ -1702,16 +1698,16 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType aSpacing.Height = sal_Int16(ConversionHelper::convertTwipToMM100(nDistance)); } } - rContext->Insert(PROP_PARA_LINE_SPACING, true, uno::makeAny( aSpacing )); + rContext->Insert(PROP_PARA_LINE_SPACING, uno::makeAny( aSpacing )); } break; case 21 : // legacy version case NS_sprm::LN_PDyaBefore: // sprmPDyaBefore - rContext->Insert(PROP_PARA_TOP_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + rContext->Insert(PROP_PARA_TOP_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case 22 : case NS_sprm::LN_PDyaAfter: // sprmPDyaAfter - rContext->Insert(PROP_PARA_BOTTOM_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + rContext->Insert(PROP_PARA_BOTTOM_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case 23: //sprmPChgTabs @@ -1798,9 +1794,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType default:; } if( eBorderId ) - rContext->Insert( eBorderId, true, uno::makeAny( pBorderHandler->getBorderLine()) , true); + rContext->Insert( eBorderId, uno::makeAny( pBorderHandler->getBorderLine()) , true); if(eBorderDistId) - rContext->Insert(eBorderDistId, true, uno::makeAny( pBorderHandler->getLineDistance()), true); + rContext->Insert(eBorderDistId, uno::makeAny( pBorderHandler->getLineDistance()), true); } } else @@ -1831,8 +1827,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType eBorderId = PROP_BOTTOM_BORDER ; eBorderDistId = PROP_BOTTOM_BORDER_DISTANCE; } - rContext->Insert(eBorderId, true, uno::makeAny( aBorderLine )); - rContext->Insert(eBorderDistId, true, uno::makeAny( nLineDistance )); + rContext->Insert(eBorderId, uno::makeAny( aBorderLine )); + rContext->Insert(eBorderDistId, uno::makeAny( nLineDistance )); } } break; @@ -1845,7 +1841,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_PBrcBar: break; // sprmPBrcBar case NS_sprm::LN_PFNoAutoHyph: // sprmPFNoAutoHyph - rContext->Insert(PROP_PARA_IS_HYPHENATION, true, uno::makeAny( nIntValue ? false : true )); + rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::makeAny( nIntValue ? false : true )); break; case NS_sprm::LN_PWHeightAbs: break; // sprmPWHeightAbs @@ -1875,8 +1871,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_ooxml::LN_CT_PPrBase_widowControl: { uno::Any aVal( uno::makeAny( sal_Int8(nIntValue ? 2 : 0 ))); - rContext->Insert( PROP_PARA_WIDOWS, true, aVal ); - rContext->Insert( PROP_PARA_ORPHANS, true, aVal ); + rContext->Insert( PROP_PARA_WIDOWS, aVal ); + rContext->Insert( PROP_PARA_ORPHANS, aVal ); } break; // sprmPFWidowControl case NS_sprm::LN_PRuler: @@ -1886,7 +1882,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_PFWordWrap: break; // sprmPFWordWrap case NS_sprm::LN_PFOverflowPunct: ; // sprmPFOverflowPunct - hanging punctuation - rContext->Insert(PROP_PARA_IS_HANGING_PUNCTUATION, true, uno::makeAny( nIntValue ? false : true )); + rContext->Insert(PROP_PARA_IS_HANGING_PUNCTUATION, uno::makeAny( nIntValue ? false : true )); break; case NS_sprm::LN_PFTopLinePunct: break; // sprmPFTopLinePunct @@ -1915,7 +1911,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType default: break; } - rContext->Insert( PROP_PARA_VERT_ALIGNMENT, true, uno::makeAny( nAlignment) ); + rContext->Insert( PROP_PARA_VERT_ALIGNMENT, uno::makeAny( nAlignment) ); } break; // sprmPWAlignFont case NS_sprm::LN_PFrameTextFlow: @@ -1938,7 +1934,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType else { nLvl = nLvl >= WW_OUTLINE_MIN && nLvl < WW_OUTLINE_MAX? nLvl+1 : 0; //0 means no outline level set on - rContext->Insert(PROP_OUTLINE_LEVEL, true, uno::makeAny ( nLvl )); + rContext->Insert(PROP_OUTLINE_LEVEL, uno::makeAny ( nLvl )); } } break; // sprmPOutLvl @@ -1946,15 +1942,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { if (nIntValue != 0) { - rContext->Insert(PROP_WRITING_MODE, false, uno::makeAny( text::WritingMode2::RL_TB )); - rContext->Insert(PROP_PARA_ADJUST, false, uno::makeAny( style::ParagraphAdjust_RIGHT )); + rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::RL_TB )); + rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT )); } } break; // sprmPFBiDi case NS_ooxml::LN_EG_SectPrContents_bidi: if (pSectionContext != NULL) - pSectionContext->Insert(PROP_WRITING_MODE,false, uno::makeAny( text::WritingMode2::RL_TB)); + pSectionContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::RL_TB)); break; case NS_sprm::LN_PFNumRMIns: break; // sprmPFNumRMIns @@ -2000,9 +1996,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { sal_Int32 nColor = 0; if(true ==( mbIsHighlightSet = getColorFromIndex(nIntValue, nColor))) - rContext->Insert(PROP_CHAR_BACK_COLOR, true, uno::makeAny( nColor )); + rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nColor )); else if (mnBackgroundColor) - rContext->Insert(PROP_CHAR_BACK_COLOR, true, uno::makeAny( mnBackgroundColor )); + rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( mnBackgroundColor )); } break; // sprmCHighlight case NS_sprm::LN_CObjLocation: @@ -2018,7 +2014,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_CPlain: break; // sprmCPlain case NS_sprm::LN_CKcd: - rContext->Insert(PROP_CHAR_EMPHASIS, true, uno::makeAny ( getEmphasisValue (nIntValue))); + rContext->Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue (nIntValue))); break; // sprmCKcd case NS_sprm::LN_CFEmboss:// sprmCFEmboss case 60:// sprmCFBold @@ -2110,9 +2106,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { uno::Any aBold( uno::makeAny( nIntValue ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) ); - rContext->Insert(ePropertyId, true, aBold ); + rContext->Insert(ePropertyId, aBold ); if( nSprmId != NS_sprm::LN_CFBoldBi ) // sprmCFBoldBi - rContext->Insert(PROP_CHAR_WEIGHT_ASIAN, true, aBold ); + rContext->Insert(PROP_CHAR_WEIGHT_ASIAN, aBold ); uno::Reference<beans::XPropertySet> xCharStyle(m_pImpl->GetCurrentNumberingCharStyle()); if (xCharStyle.is()) @@ -2124,34 +2120,34 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_CFItalicBi: // sprmCFItalicBi { uno::Any aPosture( uno::makeAny( nIntValue ? awt::FontSlant_ITALIC : awt::FontSlant_NONE ) ); - rContext->Insert( ePropertyId, true, aPosture ); + rContext->Insert( ePropertyId, aPosture ); if( nSprmId != NS_sprm::LN_CFItalicBi ) // sprmCFItalicBi - rContext->Insert(PROP_CHAR_POSTURE_ASIAN, true, aPosture ); + rContext->Insert(PROP_CHAR_POSTURE_ASIAN, aPosture ); } break; case NS_sprm::LN_CFStrike: /*sprmCFStrike*/ - rContext->Insert(ePropertyId, true, + rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? awt::FontStrikeout::SINGLE : awt::FontStrikeout::NONE ) ); break; case NS_sprm::LN_CFDStrike : /*sprmCFDStrike double strike through*/ - rContext->Insert(ePropertyId, true, + rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? awt::FontStrikeout::DOUBLE : awt::FontStrikeout::NONE ) ); break; case NS_sprm::LN_CFOutline: /*sprmCFOutline*/ case NS_sprm::LN_CFShadow: /*sprmCFShadow*/ case NS_sprm::LN_CFVanish: /*sprmCFVanish*/ - rContext->Insert(ePropertyId, true, uno::makeAny( nIntValue ? true : false )); + rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? true : false )); break; case NS_sprm::LN_CFSmallCaps: /*sprmCFSmallCaps*/ - rContext->Insert(ePropertyId, true, + rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE)); break; case NS_sprm::LN_CFCaps: /*sprmCFCaps*/ - rContext->Insert(ePropertyId, true, + rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::UPPERCASE : style::CaseMap::NONE)); break; case NS_sprm::LN_CFEmboss: /*sprmCFEmboss*/ - rContext->Insert(ePropertyId, true, + rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? awt::FontRelief::EMBOSSED : awt::FontRelief::NONE )); break; @@ -2178,7 +2174,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { sal_Int32 nColor = 0; if (getColorFromIndex(nIntValue, nColor)) - rContext->Insert(PROP_CHAR_COLOR, true, uno::makeAny( nColor ) ); + rContext->Insert(PROP_CHAR_COLOR, uno::makeAny( nColor ) ); } break; // sprmCIco case NS_sprm::LN_CHpsBi: // sprmCHpsBi @@ -2189,13 +2185,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType uno::Any aVal = uno::makeAny( fVal ); if( NS_sprm::LN_CHpsBi == nSprmId ) { - rContext->Insert( PROP_CHAR_HEIGHT_COMPLEX, true, aVal ); + rContext->Insert( PROP_CHAR_HEIGHT_COMPLEX, aVal ); } else if (!m_pImpl->m_bInTableStyleRunProps) { //Asian get the same value as Western - rContext->Insert( PROP_CHAR_HEIGHT, true, aVal ); - rContext->Insert( PROP_CHAR_HEIGHT_ASIAN, true, aVal ); + rContext->Insert( PROP_CHAR_HEIGHT, aVal ); + rContext->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal ); uno::Reference<beans::XPropertySet> xCharStyle(m_pImpl->GetCurrentNumberingCharStyle()); if (xCharStyle.is()) @@ -2232,8 +2228,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; case 0: nProp = 0;break; //none } - rContext->Insert(PROP_CHAR_ESCAPEMENT, true, uno::makeAny( nEscapement ) ); - rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, true, uno::makeAny( nProp ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( nEscapement ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::makeAny( nProp ) ); } break; case NS_sprm::LN_CHpsNew50: @@ -2252,11 +2248,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { nResult = static_cast<sal_Int16>(nIntValue); } - rContext->Insert(PROP_CHAR_CHAR_KERNING, true, uno::makeAny(nResult)); + rContext->Insert(PROP_CHAR_CHAR_KERNING, uno::makeAny(nResult)); } break; case NS_sprm::LN_CHpsKern: // sprmCHpsKern auto kerning is bound to a minimum font size in Word - but not in Writer :-( - rContext->Insert(PROP_CHAR_AUTO_KERNING, true, uno::makeAny( sal_Bool(nIntValue) ) ); + rContext->Insert(PROP_CHAR_AUTO_KERNING, uno::makeAny( sal_Bool(nIntValue) ) ); break; case NS_sprm::LN_CMajority50: break; // sprmCMajority50 @@ -2301,19 +2297,19 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType (void)eFontFamily; (void)eFontStyle; const FontEntry::Pointer_t pFontEntry(pFontTable->getFontEntry(sal_uInt32(nIntValue))); - rContext->Insert(eFontName, true, uno::makeAny( pFontEntry->sFontName )); - rContext->Insert(eFontCharSet, true, uno::makeAny( (sal_Int16)pFontEntry->nTextEncoding )); - rContext->Insert(eFontPitch, true, uno::makeAny( pFontEntry->nPitchRequest )); + rContext->Insert(eFontName, uno::makeAny( pFontEntry->sFontName )); + rContext->Insert(eFontCharSet, uno::makeAny( (sal_Int16)pFontEntry->nTextEncoding )); + rContext->Insert(eFontPitch, uno::makeAny( pFontEntry->nPitchRequest )); } } break; case NS_sprm::LN_CCharScale: // sprmCCharScale - rContext->Insert(PROP_CHAR_SCALE_WIDTH, true, + rContext->Insert(PROP_CHAR_SCALE_WIDTH, uno::makeAny( sal_Int16(nIntValue) )); break; case NS_sprm::LN_CFImprint: // sprmCFImprint 1 or 0 // FontRelief: NONE, EMBOSSED, ENGRAVED - rContext->Insert(PROP_CHAR_RELIEF, true, + rContext->Insert(PROP_CHAR_RELIEF, uno::makeAny( nIntValue ? awt::FontRelief::ENGRAVED : awt::FontRelief::NONE )); break; case NS_sprm::LN_CFObj: @@ -2324,9 +2320,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType // The file-format has many character animations. We have only // one, so we use it always. Suboptimal solution though. if (nIntValue) - rContext->Insert(PROP_CHAR_FLASH, true, uno::makeAny( true )); + rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( true )); else - rContext->Insert(PROP_CHAR_FLASH, true, uno::makeAny( false )); + rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false )); break; // sprmCSfxText case NS_sprm::LN_CFBiDi: break; // sprmCFBiDi @@ -2385,7 +2381,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; } - rContext->Insert(aPropId, true, uno::makeAny( aLocale ) ); + rContext->Insert(aPropId, uno::makeAny( aLocale ) ); } break; @@ -2511,7 +2507,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType default: nNumbering = style::NumberingType::ARABIC; } - rContext->Insert( PROP_NUMBERING_TYPE, false, uno::makeAny( nNumbering ) ); + rContext->Insert( PROP_NUMBERING_TYPE, uno::makeAny( nNumbering ) ); break; case NS_sprm::LN_SDyaPgn: break; // sprmSDyaPgn @@ -2594,7 +2590,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType OSL_ENSURE(pSectionContext, "SectionContext unavailable!"); if(pSectionContext) pSectionContext->SetLandscape( nIntValue > 0 ); - rContext->Insert( PROP_IS_LANDSCAPE , false, uno::makeAny( nIntValue > 0 )); + rContext->Insert( PROP_IS_LANDSCAPE , uno::makeAny( nIntValue > 0 )); break; // sprmSBOrientation case NS_sprm::LN_SBCustomize: break; // sprmSBCustomize @@ -2603,14 +2599,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { //page height, rounded to default values, default: 0x3dc0 twip sal_Int32 nHeight = ConversionHelper::convertTwipToMM100( nIntValue ); - rContext->Insert( PROP_HEIGHT, false, uno::makeAny( PaperInfo::sloppyFitPageDimension( nHeight ) ) ); + rContext->Insert( PROP_HEIGHT, uno::makeAny( PaperInfo::sloppyFitPageDimension( nHeight ) ) ); } break; case NS_sprm::LN_SXaPage: // sprmSXaPage { //page width, rounded to default values, default 0x2fd0 twip sal_Int32 nWidth = ConversionHelper::convertTwipToMM100( nIntValue ); - rContext->Insert( PROP_WIDTH, false, uno::makeAny( PaperInfo::sloppyFitPageDimension( nWidth ) ) ); + rContext->Insert( PROP_WIDTH, uno::makeAny( PaperInfo::sloppyFitPageDimension( nWidth ) ) ); } break; case 166: @@ -2621,7 +2617,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType sal_Int32 nConverted = ConversionHelper::convertTwipToMM100( nIntValue ); if(pSectionContext) pSectionContext->SetLeftMargin( nConverted ); - rContext->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( nConverted )); + rContext->Insert( PROP_LEFT_MARGIN, uno::makeAny( nConverted )); } break; case 167: @@ -2632,7 +2628,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType sal_Int32 nConverted = ConversionHelper::convertTwipToMM100( nIntValue ); if(pSectionContext) pSectionContext->SetRightMargin( nConverted ); - rContext->Insert( PROP_RIGHT_MARGIN, false, uno::makeAny( nConverted )); + rContext->Insert( PROP_RIGHT_MARGIN, uno::makeAny( nConverted )); } break; case 168: @@ -2641,7 +2637,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType //top page margin default 1440 twip //todo: check cast of SVBT16 sal_Int32 nConverted = ConversionHelper::convertTwipToMM100( static_cast< sal_Int16 >( nIntValue ) ); - rContext->Insert( PROP_TOP_MARGIN, false, uno::makeAny( nConverted ) ); + rContext->Insert( PROP_TOP_MARGIN, uno::makeAny( nConverted ) ); OSL_ENSURE(pSectionContext, "SectionContext unavailable!"); if(pSectionContext) pSectionContext->SetTopMargin( nConverted ); @@ -2653,7 +2649,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType //bottom page margin default 1440 twip //todo: check cast of SVBT16 sal_Int32 nConverted = ConversionHelper::convertTwipToMM100( static_cast< sal_Int16 >( nIntValue ) ); - rContext->Insert( PROP_BOTTOM_MARGIN, false, uno::makeAny( nConverted) ); + rContext->Insert( PROP_BOTTOM_MARGIN, uno::makeAny( nConverted) ); OSL_ENSURE(pSectionContext, "SectionContext unavailable!"); if(pSectionContext) pSectionContext->SetBottomMargin( nConverted ); @@ -2765,7 +2761,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; default:; } - rContext->Insert( PROP_GRID_MODE, false, uno::makeAny( nGridType ) ); + rContext->Insert( PROP_GRID_MODE, uno::makeAny( nGridType ) ); //Seems to force this behaviour in word ? if(nGridType != text::TextGridMode::NONE) @@ -2803,7 +2799,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType pTargetContext = pSectionContext; } - pTargetContext->Insert(PROP_WRITING_MODE, false, uno::makeAny( nDirection ) ); + pTargetContext->Insert(PROP_WRITING_MODE, uno::makeAny( nDirection ) ); } break; // sprmSTextFlow case NS_sprm::LN_TJc: // sprmTJc @@ -2862,13 +2858,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { //contains a color as 0xTTRRGGBB while SO uses 0xTTRRGGBB sal_Int32 nColor = ConversionHelper::ConvertColor(nIntValue); - rContext->Insert(PROP_CHAR_COLOR, true, uno::makeAny( nColor ) ); + rContext->Insert(PROP_CHAR_COLOR, uno::makeAny( nColor ) ); } break; case 0x6877: //underlining color { - rContext->Insert(PROP_CHAR_UNDERLINE_HAS_COLOR, true, uno::makeAny( true ) ); - rContext->Insert(PROP_CHAR_UNDERLINE_COLOR, true, uno::makeAny( nIntValue ) ); + rContext->Insert(PROP_CHAR_UNDERLINE_HAS_COLOR, uno::makeAny( true ) ); + rContext->Insert(PROP_CHAR_UNDERLINE_COLOR, uno::makeAny( nIntValue ) ); } break; case 0x6815: @@ -2913,7 +2909,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType } } resolveSprmProps(*this, rSprm); - rContext->Insert(PROP_PARA_TAB_STOPS, true, uno::makeAny( m_pImpl->GetCurrentTabStopAndClear())); + rContext->Insert(PROP_PARA_TAB_STOPS, uno::makeAny( m_pImpl->GetCurrentTabStopAndClear())); } break; @@ -2999,9 +2995,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType OSL_ENSURE(pSectionContext, "SectionContext unavailable!"); if(pSectionContext) { - pSectionContext->Insert( PROP_HEIGHT, false, uno::makeAny( CT_PageSz.h ) ); - pSectionContext->Insert( PROP_IS_LANDSCAPE, false, uno::makeAny( CT_PageSz.orient )); - pSectionContext->Insert( PROP_WIDTH, false, uno::makeAny( CT_PageSz.w ) ); + pSectionContext->Insert( PROP_HEIGHT, uno::makeAny( CT_PageSz.h ) ); + pSectionContext->Insert( PROP_IS_LANDSCAPE, uno::makeAny( CT_PageSz.orient )); + pSectionContext->Insert( PROP_WIDTH, uno::makeAny( CT_PageSz.w ) ); pSectionContext->SetLandscape( CT_PageSz.orient ); } break; @@ -3086,7 +3082,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType StyleSheetTablePtr pStyleTable = m_pImpl->GetStyleSheetTable(); const OUString sConvertedStyleName = pStyleTable->ConvertStyleName( sStringValue, true ); if (m_pImpl->GetTopContext() && m_pImpl->GetTopContextType() != CONTEXT_SECTION) - m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, true, uno::makeAny( sConvertedStyleName )); + m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, uno::makeAny( sConvertedStyleName )); //apply numbering to paragraph if it was set at the style, but only if the paragraph itself //does not specify the numbering if( rContext->find( PropertyDefinition( PROP_NUMBERING_RULES )) == rContext->end()) // !contains @@ -3097,7 +3093,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType if( pStyleSheetProperties && pStyleSheetProperties->GetListId() >= 0 ) { - rContext->Insert( PROP_NUMBERING_STYLE_NAME, true, uno::makeAny( + rContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny( ListDef::GetStyleName( pStyleSheetProperties->GetListId( ) ) ), false); // We're inheriting properties from a numbering style. Make sure a possible right margin is inherited from the base style. @@ -3115,16 +3111,16 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType sal_Int32 nFirstLineIndent = lcl_getCurrentNumberingProperty(m_pImpl->GetCurrentNumberingRules(), pStyleSheetProperties->GetListLevel(), "FirstLineIndent"); sal_Int32 nParaLeftMargin = lcl_getCurrentNumberingProperty(m_pImpl->GetCurrentNumberingRules(), pStyleSheetProperties->GetListLevel(), "IndentAt"); if (nFirstLineIndent != 0) - rContext->Insert(PROP_PARA_FIRST_LINE_INDENT, true, uno::makeAny(nFirstLineIndent)); + rContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent)); if (nParaLeftMargin != 0) - rContext->Insert(PROP_PARA_LEFT_MARGIN, true, uno::makeAny(nParaLeftMargin)); + rContext->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin)); - rContext->Insert(PROP_PARA_RIGHT_MARGIN, true, uno::makeAny(nParaRightMargin)); + rContext->Insert(PROP_PARA_RIGHT_MARGIN, uno::makeAny(nParaRightMargin)); } } if( pStyleSheetProperties && pStyleSheetProperties->GetListLevel() >= 0 ) - rContext->Insert( PROP_NUMBERING_LEVEL, true, uno::makeAny(pStyleSheetProperties->GetListLevel()), false); + rContext->Insert( PROP_NUMBERING_LEVEL, uno::makeAny(pStyleSheetProperties->GetListLevel()), false); } } break; @@ -3137,7 +3133,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType // Add the property if the style exists if ( bExists && m_pImpl->GetTopContext() ) - m_pImpl->GetTopContext()->Insert( PROP_CHAR_STYLE_NAME, true, uno::makeAny( sConvertedName ) ); + m_pImpl->GetTopContext()->Insert( PROP_CHAR_STYLE_NAME, uno::makeAny( sConvertedName ) ); } break; case NS_ooxml::LN_CT_TblPrBase_tblCellMar: //cell margins @@ -3181,7 +3177,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; default:; } - rContext->Insert( eId, false, uno::makeAny(nMeasureValue), false); + rContext->Insert( eId, uno::makeAny(nMeasureValue), false); } } break; @@ -3221,8 +3217,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType else nProp = 100; - rContext->Insert(PROP_CHAR_ESCAPEMENT, true, uno::makeAny( nEscapement ) ); - rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, true, uno::makeAny( nProp ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( nEscapement ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::makeAny( nProp ) ); } break; case NS_ooxml::LN_CT_FtnProps_pos: @@ -3328,7 +3324,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_ooxml::LN_EG_RPrBase_snapToGrid: // "Use document grid settings for inter-paragraph spacing" break; case NS_sprm::LN_PContextualSpacing: - rContext->Insert(PROP_PARA_CONTEXT_MARGIN, true, uno::makeAny( sal_Bool( nIntValue ) )); + rContext->Insert(PROP_PARA_CONTEXT_MARGIN, uno::makeAny( sal_Bool( nIntValue ) )); break; case NS_ooxml::LN_EG_SectPrContents_formProt: //section protection, only form editing is enabled - unsupported case NS_ooxml::LN_EG_SectPrContents_vAlign: @@ -3448,8 +3444,8 @@ void DomainMapper::processDeferredCharacterProperties( const std::map< sal_Int32 nEscapement = ( nIntValue > 0 ) ? 58: -58; } } - rContext->Insert(PROP_CHAR_ESCAPEMENT, true, uno::makeAny( nEscapement ) ); - rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, true, uno::makeAny( nProp ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( nEscapement ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::makeAny( nProp ) ); } break; // sprmCHpsPos default: @@ -3496,13 +3492,13 @@ void DomainMapper::lcl_startParagraphGroup() { if (!m_pImpl->IsInShape()) { - m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, true, uno::makeAny( sDefault ) ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, uno::makeAny( sDefault ) ); m_pImpl->SetCurrentParaStyleId(sDefault); } if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); + m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); + m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); } m_pImpl->clearDeferredBreaks(); } @@ -3535,7 +3531,7 @@ void DomainMapper::lcl_startShape( uno::Reference< drawing::XShape > xShape ) lcl_endCharacterGroup(); lcl_endParagraphGroup(); lcl_startParagraphGroup(); - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE)); } m_pImpl->PushShapeContext( xShape ); lcl_startParagraphGroup(); @@ -3640,9 +3636,9 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) if ( pContext && !pContext->GetFootnote().is() ) { if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); + m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); + m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); m_pImpl->clearDeferredBreaks(); } @@ -3705,9 +3701,9 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) if (pContext && m_pImpl->GetSettingsTable()->GetSplitPgBreakAndParaMark()) { if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - pContext->Insert(PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE)); + pContext->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE)); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - pContext->Insert(PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE)); + pContext->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE)); m_pImpl->clearDeferredBreaks(); } @@ -3727,9 +3723,9 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) if ( pContext && !pContext->GetFootnote().is() ) { if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); + m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); + m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); m_pImpl->clearDeferredBreaks(); } @@ -3902,7 +3898,7 @@ void DomainMapper::handleUnderlineType(const sal_Int32 nIntValue, const ::boost: switch(nIntValue) { case 0: eUnderline = awt::FontUnderline::NONE; break; - case 2: pContext->Insert(PROP_CHAR_WORD_MODE, true, uno::makeAny( true ) ); // TODO: how to get rid of it? + case 2: pContext->Insert(PROP_CHAR_WORD_MODE, uno::makeAny( true ) ); // TODO: how to get rid of it? case 1: eUnderline = awt::FontUnderline::SINGLE; break; case 3: eUnderline = awt::FontUnderline::DOUBLE; break; case 4: eUnderline = awt::FontUnderline::DOTTED; break; @@ -3921,7 +3917,7 @@ void DomainMapper::handleUnderlineType(const sal_Int32 nIntValue, const ::boost: case 43:eUnderline = awt::FontUnderline::DOUBLEWAVE; break; default: ; } - pContext->Insert(PROP_CHAR_UNDERLINE, true, uno::makeAny( eUnderline ) ); + pContext->Insert(PROP_CHAR_UNDERLINE, uno::makeAny( eUnderline ) ); } void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::boost::shared_ptr<PropertyMap> pContext, const bool bExchangeLeftRight) @@ -3947,8 +3943,8 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::bo nAdjust = static_cast< sal_Int16 > (bExchangeLeftRight ? style::ParagraphAdjust_RIGHT : style::ParagraphAdjust_LEFT); break; } - pContext->Insert( PROP_PARA_ADJUST, true, uno::makeAny( nAdjust ) ); - pContext->Insert( PROP_PARA_LAST_LINE_ADJUST, true, uno::makeAny( nLastLineAdjust ) ); + pContext->Insert( PROP_PARA_ADJUST, uno::makeAny( nAdjust ) ); + pContext->Insert( PROP_PARA_LAST_LINE_ADJUST, uno::makeAny( nLastLineAdjust ) ); } bool DomainMapper::getColorFromIndex(const sal_Int32 nIndex, sal_Int32 &nColor) diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index ec763f8571ce..3d695feebac0 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -133,7 +133,7 @@ void lcl_mergeBorder( PropertyIds nId, PropertyMapPtr pOrig, PropertyMapPtr pDes if ( pOrigIt != pOrig->end( ) ) { - pDest->Insert( nId, false, pOrigIt->second, false ); + pDest->Insert( nId, pOrigIt->second, false ); } } @@ -181,22 +181,22 @@ void lcl_computeCellBorders( PropertyMapPtr pTableBorders, PropertyMapPtr pCellP { lcl_mergeBorder( PROP_LEFT_BORDER, pTableBorders, pCellProps ); if ( bHasVert ) - pCellProps->Insert( PROP_RIGHT_BORDER, false, aVertProp, false ); + pCellProps->Insert( PROP_RIGHT_BORDER, aVertProp, false ); } if ( bIsEndCol ) { lcl_mergeBorder( PROP_RIGHT_BORDER, pTableBorders, pCellProps ); if ( bHasVert ) - pCellProps->Insert( PROP_LEFT_BORDER, false, aVertProp, false ); + pCellProps->Insert( PROP_LEFT_BORDER, aVertProp, false ); } if ( nCell > 0 && !bIsEndCol ) { if ( bHasVert ) { - pCellProps->Insert( PROP_RIGHT_BORDER, false, aVertProp, false ); - pCellProps->Insert( PROP_LEFT_BORDER, false, aVertProp, false ); + pCellProps->Insert( PROP_RIGHT_BORDER, aVertProp, false ); + pCellProps->Insert( PROP_LEFT_BORDER, aVertProp, false ); } } @@ -204,22 +204,22 @@ void lcl_computeCellBorders( PropertyMapPtr pTableBorders, PropertyMapPtr pCellP { lcl_mergeBorder( PROP_TOP_BORDER, pTableBorders, pCellProps ); if ( bHasHoriz ) - pCellProps->Insert( PROP_BOTTOM_BORDER, false, aHorizProp, false ); + pCellProps->Insert( PROP_BOTTOM_BORDER, aHorizProp, false ); } if ( bIsEndRow ) { lcl_mergeBorder( PROP_BOTTOM_BORDER, pTableBorders, pCellProps ); if ( bHasHoriz ) - pCellProps->Insert( PROP_TOP_BORDER, false, aHorizProp, false ); + pCellProps->Insert( PROP_TOP_BORDER, aHorizProp, false ); } if ( nRow > 0 && !bIsEndRow ) { if ( bHasHoriz ) { - pCellProps->Insert( PROP_TOP_BORDER, false, aHorizProp, false ); - pCellProps->Insert( PROP_BOTTOM_BORDER, false, aHorizProp, false ); + pCellProps->Insert( PROP_TOP_BORDER, aHorizProp, false ); + pCellProps->Insert( PROP_BOTTOM_BORDER, aHorizProp, false ); } } } @@ -295,7 +295,7 @@ bool lcl_extractTableBorderProperty(PropertyMapPtr pTableProperties, const Prope { OSL_VERIFY(aTblBorderIter->second >>= rLine); - rInfo.pTableBorders->Insert( nId, false, uno::makeAny( rLine ) ); + rInfo.pTableBorders->Insert( nId, uno::makeAny( rLine ) ); PropertyMap::iterator pIt = rInfo.pTableDefaults->find( PropertyDefinition( nId ) ); if ( pIt != rInfo.pTableDefaults->end( ) ) rInfo.pTableDefaults->erase( pIt ); @@ -316,8 +316,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if( m_aTableProperties.get() ) { //create properties from the table attributes - //...pPropMap->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( m_nLeftMargin - m_nGapHalf )); - //pPropMap->Insert( PROP_HORI_ORIENT, false, uno::makeAny( text::HoriOrientation::RIGHT )); + //...pPropMap->Insert( PROP_LEFT_MARGIN, uno::makeAny( m_nLeftMargin - m_nGapHalf )); + //pPropMap->Insert( PROP_HORI_ORIENT, uno::makeAny( text::HoriOrientation::RIGHT )); sal_Int32 nGapHalf = 0; sal_Int32 nLeftMargin = 0; sal_Int32 nTableWidth = 0; @@ -401,12 +401,12 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo aDistances.LeftDistance = static_cast<sal_Int16>( rInfo.nLeftBorderDistance ); aDistances.RightDistance = static_cast<sal_Int16>( rInfo.nRightBorderDistance ); - m_aTableProperties->Insert( PROP_TABLE_BORDER_DISTANCES, false, uno::makeAny( aDistances ) ); + m_aTableProperties->Insert( PROP_TABLE_BORDER_DISTANCES, uno::makeAny( aDistances ) ); // Set table above/bottom spacing to 0. // TODO: handle 'Around' text wrapping mode - m_aTableProperties->Insert( PROP_TOP_MARGIN, true, uno::makeAny( sal_Int32( 0 ) ) ); - m_aTableProperties->Insert( PROP_BOTTOM_MARGIN, true, uno::makeAny( sal_Int32( 0 ) ) ); + m_aTableProperties->Insert( PROP_TOP_MARGIN, uno::makeAny( sal_Int32( 0 ) ) ); + m_aTableProperties->Insert( PROP_BOTTOM_MARGIN, uno::makeAny( sal_Int32( 0 ) ) ); //table border settings table::TableBorder aTableBorder; @@ -449,7 +449,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo aTableBorder.Distance = 0; aTableBorder.IsDistanceValid = sal_False; - m_aTableProperties->Insert( PROP_TABLE_BORDER, false, uno::makeAny( aTableBorder ) ); + m_aTableProperties->Insert( PROP_TABLE_BORDER, uno::makeAny( aTableBorder ) ); #ifdef DEBUG_DMAPPER_TABLE_HANDLER lcl_debug_TableBorder(aTableBorder); @@ -461,11 +461,11 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo // - nested tables: the goal is to have left-most border starting at table_indent pos if (rInfo.nNestLevel > 1) { - m_aTableProperties->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( nLeftMargin - nGapHalf )); + m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny( nLeftMargin - nGapHalf )); } else { - m_aTableProperties->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance )); + m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny( nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance )); } m_aTableProperties->getValue( TablePropertyMap::TABLE_WIDTH, nTableWidth ); @@ -473,23 +473,23 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if( nTableWidthType == text::SizeType::FIX ) { if( nTableWidth > 0 ) - m_aTableProperties->Insert( PROP_WIDTH, false, uno::makeAny( nTableWidth )); + m_aTableProperties->Insert( PROP_WIDTH, uno::makeAny( nTableWidth )); } else { - m_aTableProperties->Insert( PROP_RELATIVE_WIDTH, false, uno::makeAny( sal_Int16( nTableWidth ) ) ); - m_aTableProperties->Insert( PROP_IS_WIDTH_RELATIVE, false, uno::makeAny( sal_Bool( sal_True ) ) ); + m_aTableProperties->Insert( PROP_RELATIVE_WIDTH, uno::makeAny( sal_Int16( nTableWidth ) ) ); + m_aTableProperties->Insert( PROP_IS_WIDTH_RELATIVE, uno::makeAny( sal_Bool( sal_True ) ) ); } sal_Int32 nHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH; m_aTableProperties->getValue( TablePropertyMap::HORI_ORIENT, nHoriOrient ) ; - m_aTableProperties->Insert( PROP_HORI_ORIENT, false, uno::makeAny( sal_Int16(nHoriOrient) ) ); + m_aTableProperties->Insert( PROP_HORI_ORIENT, uno::makeAny( sal_Int16(nHoriOrient) ) ); //fill default value - if not available const PropertyMap::const_iterator aRepeatIter = 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 )); + m_aTableProperties->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny( (sal_Int32)0 )); rInfo.aTableProperties = m_aTableProperties->GetPropertyValues(); @@ -653,24 +653,24 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl const PropertyMap::const_iterator aLeftDistanceIter = aCellIterator->get()->find( PropertyDefinition(PROP_LEFT_BORDER_DISTANCE) ); if( aLeftDistanceIter == aCellIterator->get()->end() ) - aCellIterator->get()->Insert( PROP_LEFT_BORDER_DISTANCE, false, + aCellIterator->get()->Insert( PROP_LEFT_BORDER_DISTANCE, uno::makeAny(rInfo.nLeftBorderDistance ) ); const PropertyMap::const_iterator aRightDistanceIter = aCellIterator->get()->find( PropertyDefinition(PROP_RIGHT_BORDER_DISTANCE) ); if( aRightDistanceIter == aCellIterator->get()->end() ) - aCellIterator->get()->Insert( PROP_RIGHT_BORDER_DISTANCE, false, + aCellIterator->get()->Insert( PROP_RIGHT_BORDER_DISTANCE, uno::makeAny((sal_Int32) rInfo.nRightBorderDistance ) ); const PropertyMap::const_iterator aTopDistanceIter = aCellIterator->get()->find( PropertyDefinition(PROP_TOP_BORDER_DISTANCE) ); if( aTopDistanceIter == aCellIterator->get()->end() ) - aCellIterator->get()->Insert( PROP_TOP_BORDER_DISTANCE, false, + aCellIterator->get()->Insert( PROP_TOP_BORDER_DISTANCE, uno::makeAny((sal_Int32) rInfo.nTopBorderDistance ) ); const PropertyMap::const_iterator aBottomDistanceIter = aCellIterator->get()->find( PropertyDefinition(PROP_BOTTOM_BORDER_DISTANCE) ); if( aBottomDistanceIter == aCellIterator->get()->end() ) - aCellIterator->get()->Insert( PROP_BOTTOM_BORDER_DISTANCE, false, + aCellIterator->get()->Insert( PROP_BOTTOM_BORDER_DISTANCE, uno::makeAny((sal_Int32) rInfo.nBottomBorderDistance ) ); pSingleCellProperties[nCell] = aCellIterator->get()->GetPropertyValues(); @@ -734,7 +734,7 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties() { //set default to 'break across pages" if( aRowIter->get()->find( PropertyDefinition( PROP_IS_SPLIT_ALLOWED )) == aRowIter->get()->end()) - aRowIter->get()->Insert( PROP_IS_SPLIT_ALLOWED, false, uno::makeAny(sal_True ) ); + aRowIter->get()->Insert( PROP_IS_SPLIT_ALLOWED, uno::makeAny(sal_True ) ); aRowProperties[nRow] = (*aRowIter)->GetPropertyValues(); #ifdef DEBUG_DMAPPER_TABLE_HANDLER diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 54bbe4af1bad..739d3e74a648 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -192,7 +192,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) { ++m_nHeaderRepeat; TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_HEADER_ROW_COUNT, false, uno::makeAny( m_nHeaderRepeat )); + pPropMap->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny( m_nHeaderRepeat )); insertTableProps(pPropMap); } else @@ -278,7 +278,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) { m_sTableStyleName = pValue->getString(); TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( META_PROP_TABLE_STYLE_NAME, false, uno::makeAny( m_sTableStyleName )); + pPropMap->Insert( META_PROP_TABLE_STYLE_NAME, uno::makeAny( m_sTableStyleName )); insertTableProps(pPropMap); } break; @@ -294,7 +294,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) { // values can be: LN_Value_ST_Merge_restart, LN_Value_ST_Merge_continue, in reality the second one is a 0 TablePropertyMapPtr pMergeProps( new TablePropertyMap ); - pMergeProps->Insert( PROP_VERTICAL_MERGE, false, uno::makeAny( bool( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Merge_restart )) ); + pMergeProps->Insert( PROP_VERTICAL_MERGE, uno::makeAny( bool( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Merge_restart )) ); cellProps( pMergeProps); } break; @@ -311,7 +311,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) case NS_ooxml::LN_CT_TblPrBase_tblLook: { TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_TBL_LOOK, false, uno::makeAny( nIntValue )); + pPropMap->Insert( PROP_TBL_LOOK, uno::makeAny( nIntValue )); insertTableProps(pPropMap); } break; @@ -324,28 +324,28 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) case 1: // tbRl // Binary filter takes BiDirection into account ( but I have no idea about that here ) // or even what it is. But... here's where to handle it if it becomes an issue - pPropMap->Insert( PROP_FRM_DIRECTION, false, uno::makeAny( text::WritingMode2::TB_RL )); + pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::TB_RL )); SAL_INFO( "writerfilter", "Have inserted textDirection " << nIntValue ); break; case 3: // btLr { // We have to fake this text direction - pPropMap->Insert( PROP_FRM_DIRECTION, false, uno::makeAny( text::WritingMode2::LR_TB )); - pPropMap->Insert( PROP_CHAR_ROTATION, false, uno::makeAny( sal_Int16( 900 ) )); + pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::LR_TB )); + pPropMap->Insert( PROP_CHAR_ROTATION, uno::makeAny( sal_Int16( 900 ) )); SAL_INFO( "writerfilter", "Have inserted textDirection " << nIntValue ); // We're faking a text direction, so don't allow multiple lines. TablePropertyMapPtr pRowPropMap( new TablePropertyMap ); - pRowPropMap->Insert(PROP_SIZE_TYPE, false, uno::makeAny(text::SizeType::FIX)); + pRowPropMap->Insert(PROP_SIZE_TYPE, uno::makeAny(text::SizeType::FIX)); m_bRowSizeTypeInserted = true; insertRowProps(pRowPropMap); } break; case 4: // lrTbV - pPropMap->Insert( PROP_FRM_DIRECTION, false, uno::makeAny( text::WritingMode2::LR_TB )); + pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::LR_TB )); break; case 5: // tbRlV - pPropMap->Insert( PROP_FRM_DIRECTION, false, uno::makeAny( text::WritingMode2::TB_RL )); + pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::TB_RL )); break; case 0: // lrTb case NS_ooxml::LN_Value_ST_TextDirection_tbLrV: @@ -649,7 +649,7 @@ void DomainMapperTableManager::endOfRowAction() ++aSpansIter; } TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny( aSeparators ) ); + pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) ); #ifdef DEBUG_DOMAINMAPPER dmapper_logger->startElement("rowProperties"); @@ -683,7 +683,7 @@ void DomainMapperTableManager::endOfRowAction() } TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny( aSeparators ) ); + pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) ); #ifdef DEBUG_DOMAINMAPPER dmapper_logger->startElement("rowProperties"); pPropMap->dumpXml( dmapper_logger ); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index bd9ace150f70..f3fc0eea125d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1501,15 +1501,15 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote ) { const FontEntry::Pointer_t pFontEntry(pFontTable->getFontEntry(sal_uInt32(pTopContext->GetFootnoteFontId()))); PropertyMapPtr aFontProps( new PropertyMap ); - aFontProps->Insert(PROP_CHAR_FONT_NAME, true, uno::makeAny( pFontEntry->sFontName )); - aFontProps->Insert(PROP_CHAR_FONT_CHAR_SET, true, uno::makeAny( (sal_Int16)pFontEntry->nTextEncoding )); - aFontProps->Insert(PROP_CHAR_FONT_PITCH, true, uno::makeAny( pFontEntry->nPitchRequest )); + aFontProps->Insert(PROP_CHAR_FONT_NAME, uno::makeAny( pFontEntry->sFontName )); + aFontProps->Insert(PROP_CHAR_FONT_CHAR_SET, uno::makeAny( (sal_Int16)pFontEntry->nTextEncoding )); + aFontProps->Insert(PROP_CHAR_FONT_PITCH, uno::makeAny( pFontEntry->nPitchRequest )); aFontProperties = aFontProps->GetPropertyValues(); } else if(!pTopContext->GetFootnoteFontName().isEmpty()) { PropertyMapPtr aFontProps( new PropertyMap ); - aFontProps->Insert(PROP_CHAR_FONT_NAME, true, uno::makeAny( pTopContext->GetFootnoteFontName() )); + aFontProps->Insert(PROP_CHAR_FONT_NAME, uno::makeAny( pTopContext->GetFootnoteFontName() )); aFontProperties = aFontProps->GetPropertyValues(); } appendTextContent( uno::Reference< text::XTextContent >( xFootnoteText, uno::UNO_QUERY_THROW ), aFontProperties ); @@ -2976,7 +2976,7 @@ void DomainMapper_Impl::CloseFieldCommand() double dHeight = 0; if (GetPropertyFromStyleSheet(PROP_CHAR_HEIGHT) >>= dHeight) // Character escapement should be given in negative percents for subscripts. - pCharContext->Insert(PROP_CHAR_ESCAPEMENT, true, uno::makeAny( sal_Int16(- 100 * nDown / dHeight) ) ); + pCharContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( sal_Int16(- 100 * nDown / dHeight) ) ); appendTextPortion(aContent, pCharContext); } } diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 1923c867470c..97cbb4f45517 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -808,15 +808,15 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) break; case NS_ooxml::LN_CT_Ind_left: pCurrentLvl->Insert( - PROP_INDENT_AT, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + PROP_INDENT_AT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Ind_hanging: pCurrentLvl->Insert( - PROP_FIRST_LINE_INDENT, true, uno::makeAny( - ConversionHelper::convertTwipToMM100( nIntValue ) )); + PROP_FIRST_LINE_INDENT, uno::makeAny( - ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Ind_firstLine: pCurrentLvl->Insert( - PROP_FIRST_LINE_INDENT, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + PROP_FIRST_LINE_INDENT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Lvl_ilvl: //overrides previous level - unsupported case NS_ooxml::LN_CT_Lvl_tplc: //template code - unsupported @@ -1036,7 +1036,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) text::HoriOrientation::RIGHT }; m_pCurrentDefinition->GetCurrentLevel( )->Insert( - PROP_ADJUST, true, uno::makeAny( aWWAlignments[ nIntValue ] ) ); + PROP_ADJUST, uno::makeAny( aWWAlignments[ nIntValue ] ) ); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); } break; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 3b69a86dceb8..f526bc10e582 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -131,7 +131,7 @@ static void lcl_AnyToTag(const uno::Any & rAny) } #endif -void PropertyMap::Insert( PropertyIds eId, bool /*bIsTextProperty*/, const uno::Any& rAny, bool bOverwrite ) +void PropertyMap::Insert( PropertyIds eId, const uno::Any& rAny, bool bOverwrite ) { #ifdef DEBUG_DMAPPER_PROPERTY_MAP const OUString& rInsert = PropertyNameSupplier:: @@ -294,23 +294,23 @@ SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) : //initialize defaults PaperInfo aLetter(PAPER_LETTER); //page height, 1/100mm - Insert( PROP_HEIGHT, false, uno::makeAny( (sal_Int32) aLetter.getHeight() ) ); + Insert( PROP_HEIGHT, uno::makeAny( (sal_Int32) aLetter.getHeight() ) ); //page width, 1/100mm - Insert( PROP_WIDTH, false, uno::makeAny( (sal_Int32) aLetter.getWidth() ) ); + Insert( PROP_WIDTH, uno::makeAny( (sal_Int32) aLetter.getWidth() ) ); //page left margin, default 0x708 (1800) twip -> 3175 1/100 mm - Insert( PROP_LEFT_MARGIN, false, uno::makeAny( (sal_Int32) 3175 ) ); + Insert( PROP_LEFT_MARGIN, uno::makeAny( (sal_Int32) 3175 ) ); //page right margin, default 0x708 (1800) twip -> 3175 1/100 mm - Insert( PROP_RIGHT_MARGIN, false, uno::makeAny( (sal_Int32) 3175 ) ); + Insert( PROP_RIGHT_MARGIN, uno::makeAny( (sal_Int32) 3175 ) ); //page top margin, default 0x5a0 (1440) twip -> 2540 1/100 mm - Insert( PROP_TOP_MARGIN, false, uno::makeAny( (sal_Int32)2540 ) ); + Insert( PROP_TOP_MARGIN, uno::makeAny( (sal_Int32)2540 ) ); //page bottom margin, default 0x5a0 (1440) twip -> 2540 1/100 mm - Insert( PROP_BOTTOM_MARGIN, false, uno::makeAny( (sal_Int32) 2540 ) ); + Insert( PROP_BOTTOM_MARGIN, uno::makeAny( (sal_Int32) 2540 ) ); //page style layout - Insert(PROP_PAGE_STYLE_LAYOUT, false, uno::makeAny(style::PageStyleLayout_ALL)); + Insert(PROP_PAGE_STYLE_LAYOUT, uno::makeAny(style::PageStyleLayout_ALL)); uno::Any aFalse( ::uno::makeAny( false ) ); - Insert( PROP_GRID_DISPLAY, false, aFalse); - Insert( PROP_GRID_PRINT, false, aFalse); - Insert( PROP_GRID_MODE, false, uno::makeAny(text::TextGridMode::NONE)); + Insert( PROP_GRID_DISPLAY, aFalse); + Insert( PROP_GRID_PRINT, aFalse); + Insert( PROP_GRID_MODE, uno::makeAny(text::TextGridMode::NONE)); if( m_bIsFirstSection ) diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index e9a7a7a1e551..ba15e89300ee 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -102,7 +102,7 @@ public: bool hasEmptyPropertyValues() const {return !m_aValues.getLength();} /** Add property, usually overwrites already available attributes. It shouldn't overwrite in case of default attributes */ - void Insert( PropertyIds eId, bool bIsTextProperty, const ::com::sun::star::uno::Any& rAny, bool bOverwrite = true ); + void Insert( PropertyIds eId, const ::com::sun::star::uno::Any& rAny, bool bOverwrite = true ); void InsertProps(const boost::shared_ptr<PropertyMap> pMap); const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const; diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index d45a5fe89705..0f9218388e8e 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -293,9 +293,9 @@ StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, uno::Referenc { //set font height default to 10pt uno::Any aVal = uno::makeAny( double(10.) ); - m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT, true, aVal ); - m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_ASIAN, true, aVal ); - m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_COMPLEX, true, aVal ); + m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT, aVal ); + m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal ); + m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_COMPLEX, aVal ); } @@ -552,7 +552,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) applyDefaults( false ); break; case NS_ooxml::LN_CT_TblPrBase_jc: //table alignment - row properties! - m_pImpl->m_pCurrentEntry->pProperties->Insert( PROP_HORI_ORIENT, false, + m_pImpl->m_pCurrentEntry->pProperties->Insert( PROP_HORI_ORIENT, uno::makeAny( ConversionHelper::convertTableJustification( nIntValue ))); break; case NS_ooxml::LN_CT_TrPrBase_jc: //table alignment - row properties! @@ -762,30 +762,30 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) { uno::Any aTwoHundredFortyTwip = uno::makeAny(12.); // font size to 240 twip (12 pts) for all if not set - pEntry->pProperties->Insert(PROP_CHAR_HEIGHT, true, aTwoHundredFortyTwip, false); + pEntry->pProperties->Insert(PROP_CHAR_HEIGHT, aTwoHundredFortyTwip, false); // western font not already set -> apply first font const FontEntry::Pointer_t pWesternFontEntry(rFontTable->getFontEntry( 0 )); OUString sWesternFontName = pWesternFontEntry->sFontName; - pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME, true, uno::makeAny( sWesternFontName ), false); + pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME, uno::makeAny( sWesternFontName ), false); // CJK ... apply second font const FontEntry::Pointer_t pCJKFontEntry(rFontTable->getFontEntry( 2 )); - pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME_ASIAN, true, uno::makeAny( pCJKFontEntry->sFontName ), false); - pEntry->pProperties->Insert(PROP_CHAR_HEIGHT_ASIAN, true, aTwoHundredFortyTwip, false); + pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME_ASIAN, uno::makeAny( pCJKFontEntry->sFontName ), false); + pEntry->pProperties->Insert(PROP_CHAR_HEIGHT_ASIAN, aTwoHundredFortyTwip, false); // CTL ... apply third font, if available if( nFontCount > 3 ) { const FontEntry::Pointer_t pCTLFontEntry(rFontTable->getFontEntry( 3 )); - pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME_COMPLEX, true, uno::makeAny( pCTLFontEntry->sFontName ), false); - pEntry->pProperties->Insert(PROP_CHAR_HEIGHT_COMPLEX, true, aTwoHundredFortyTwip, false); + pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME_COMPLEX, uno::makeAny( pCTLFontEntry->sFontName ), false); + pEntry->pProperties->Insert(PROP_CHAR_HEIGHT_COMPLEX, aTwoHundredFortyTwip, false); } } // Widow/Orphan -> set both to two if not already set uno::Any aTwo = uno::makeAny(sal_Int8(2)); - pEntry->pProperties->Insert(PROP_PARA_WIDOWS, true, aTwo, false); - pEntry->pProperties->Insert(PROP_PARA_ORPHANS, true, aTwo, false); + pEntry->pProperties->Insert(PROP_PARA_WIDOWS, aTwo, false); + pEntry->pProperties->Insert(PROP_PARA_ORPHANS, aTwo, false); // Left-to-right direction if not already set - pEntry->pProperties->Insert(PROP_WRITING_MODE, true, uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false); + pEntry->pProperties->Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false); // Don't set font color to Auto if not already set: this could hide the default font color setting } diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index 79e72b09e683..04466f429f9e 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -227,7 +227,7 @@ PropertyMapPtr TDefTableHandler::getRowProperties() const pSeparators[nBorder - 1].Position = nRelPos; pSeparators[nBorder - 1].IsVisible = sal_True; } - pPropertyMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny( aSeparators ) ); + pPropertyMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) ); } return pPropertyMap; @@ -246,20 +246,20 @@ void TDefTableHandler::fillCellProperties( case 2: nVertOrient = text::VertOrientation::BOTTOM; break; default:; } - pCellProperties->Insert( PROP_VERT_ORIENT, false, uno::makeAny( nVertOrient ) ); + pCellProperties->Insert( PROP_VERT_ORIENT, uno::makeAny( nVertOrient ) ); } if( m_aTopBorderLines.size() > nCell ) - pCellProperties->Insert( PROP_TOP_BORDER, false, uno::makeAny( m_aTopBorderLines[nCell] ) ); + pCellProperties->Insert( PROP_TOP_BORDER, uno::makeAny( m_aTopBorderLines[nCell] ) ); if( m_aLeftBorderLines.size() > nCell ) - pCellProperties->Insert( PROP_LEFT_BORDER, false, uno::makeAny( m_aLeftBorderLines[nCell] ) ); + pCellProperties->Insert( PROP_LEFT_BORDER, uno::makeAny( m_aLeftBorderLines[nCell] ) ); if( m_aBottomBorderLines.size() > nCell ) - pCellProperties->Insert( PROP_BOTTOM_BORDER, false, uno::makeAny( m_aBottomBorderLines[nCell] ) ); + pCellProperties->Insert( PROP_BOTTOM_BORDER, uno::makeAny( m_aBottomBorderLines[nCell] ) ); if( m_aRightBorderLines.size() > nCell ) - pCellProperties->Insert( PROP_RIGHT_BORDER, false, uno::makeAny( m_aRightBorderLines[nCell] ) ); + pCellProperties->Insert( PROP_RIGHT_BORDER, uno::makeAny( m_aRightBorderLines[nCell] ) ); if( m_aInsideHBorderLines.size() > nCell ) - pCellProperties->Insert( META_PROP_HORIZONTAL_BORDER, false, uno::makeAny( m_aInsideHBorderLines[nCell] ) ); + pCellProperties->Insert( META_PROP_HORIZONTAL_BORDER, uno::makeAny( m_aInsideHBorderLines[nCell] ) ); if( m_aInsideVBorderLines.size() > nCell ) - pCellProperties->Insert( META_PROP_VERTICAL_BORDER, false, uno::makeAny( m_aInsideVBorderLines[nCell] ) ); + pCellProperties->Insert( META_PROP_VERTICAL_BORDER, uno::makeAny( m_aInsideVBorderLines[nCell] ) ); } diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 4023a2134abb..8153df269d68 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -97,9 +97,9 @@ namespace dmapper { // In case a cell already wanted fixed size, we should not overwrite it here. DomainMapperTableManager* pManager = dynamic_cast<DomainMapperTableManager*>(m_pTableManager); if (!pManager || !pManager->IsRowSizeTypeInserted()) - pPropMap->Insert( PROP_SIZE_TYPE, false, uno::makeAny( pMeasureHandler->GetRowHeightSizeType() ), false); + pPropMap->Insert( PROP_SIZE_TYPE, uno::makeAny( pMeasureHandler->GetRowHeightSizeType() ), false); - pPropMap->Insert( PROP_HEIGHT, false, uno::makeAny(pMeasureHandler->getMeasureValue() )); + pPropMap->Insert( PROP_HEIGHT, uno::makeAny(pMeasureHandler->getMeasureValue() )); insertRowProps(pPropMap); } } @@ -109,7 +109,7 @@ namespace dmapper { { //row can't break across pages if nIntValue == 1 TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_IS_SPLIT_ALLOWED, false, uno::makeAny(sal_Bool( nIntValue == 1 ? sal_False : sal_True ) )); + pPropMap->Insert( PROP_IS_SPLIT_ALLOWED, uno::makeAny(sal_Bool( nIntValue == 1 ? sal_False : sal_True ) )); insertRowProps(pPropMap); } break; @@ -124,8 +124,8 @@ namespace dmapper { bMinHeight = false; nHeight *= -1; } - pPropMap->Insert( PROP_SIZE_TYPE, false, uno::makeAny(bMinHeight ? text::SizeType::MIN : text::SizeType::FIX )); - pPropMap->Insert( PROP_HEIGHT, false, uno::makeAny(ConversionHelper::convertTwipToMM100( nHeight ))); + pPropMap->Insert( PROP_SIZE_TYPE, uno::makeAny(bMinHeight ? text::SizeType::MIN : text::SizeType::FIX )); + pPropMap->Insert( PROP_HEIGHT, uno::makeAny(ConversionHelper::convertTwipToMM100( nHeight ))); insertRowProps(pPropMap); } break; @@ -139,7 +139,7 @@ namespace dmapper { default:; }; TablePropertyMapPtr pCellPropMap( new TablePropertyMap() ); - pCellPropMap->Insert( PROP_VERT_ORIENT, false, uno::makeAny( nVertOrient ) ); + pCellPropMap->Insert( PROP_VERT_ORIENT, uno::makeAny( nVertOrient ) ); //todo: in ooxml import the value of m_ncell is wrong cellProps( pCellPropMap ); } @@ -192,13 +192,13 @@ namespace dmapper { pProperties->resolve(*pCellMarginHandler); TablePropertyMapPtr pCellProperties(new TablePropertyMap); if (pCellMarginHandler->m_bTopMarginValid) - pCellProperties->Insert(PROP_TOP_BORDER_DISTANCE, false, uno::makeAny(pCellMarginHandler->m_nTopMargin)); + pCellProperties->Insert(PROP_TOP_BORDER_DISTANCE, uno::makeAny(pCellMarginHandler->m_nTopMargin)); if (pCellMarginHandler->m_bLeftMarginValid) - pCellProperties->Insert(PROP_LEFT_BORDER_DISTANCE, false, uno::makeAny(pCellMarginHandler->m_nLeftMargin)); + pCellProperties->Insert(PROP_LEFT_BORDER_DISTANCE, uno::makeAny(pCellMarginHandler->m_nLeftMargin)); if (pCellMarginHandler->m_bBottomMarginValid) - pCellProperties->Insert(PROP_BOTTOM_BORDER_DISTANCE, false, uno::makeAny(pCellMarginHandler->m_nBottomMargin)); + pCellProperties->Insert(PROP_BOTTOM_BORDER_DISTANCE, uno::makeAny(pCellMarginHandler->m_nBottomMargin)); if (pCellMarginHandler->m_bRightMarginValid) - pCellProperties->Insert(PROP_RIGHT_BORDER_DISTANCE, false, uno::makeAny(pCellMarginHandler->m_nRightMargin)); + pCellProperties->Insert(PROP_RIGHT_BORDER_DISTANCE, uno::makeAny(pCellMarginHandler->m_nRightMargin)); cellProps(pCellProperties); } } |