diff options
27 files changed, 804 insertions, 810 deletions
diff --git a/writerfilter/qa/cppunittests/filters-test/filters-test.cxx b/writerfilter/qa/cppunittests/filters-test/filters-test.cxx index f377e8894c32..36ebeee2142e 100644 --- a/writerfilter/qa/cppunittests/filters-test/filters-test.cxx +++ b/writerfilter/qa/cppunittests/filters-test/filters-test.cxx @@ -46,7 +46,7 @@ bool RtfTest::load(const OUString&, const OUString& rURL, const OUString&, SfxFi SotClipboardFormatId, unsigned int) { uno::Sequence<beans::PropertyValue> aDescriptor = { beans::PropertyValue( - "URL", sal_Int32(0), uno::makeAny(rURL), beans::PropertyState_DIRECT_VALUE) }; + "URL", sal_Int32(0), uno::Any(rURL), beans::PropertyState_DIRECT_VALUE) }; try { return m_xFilter->filter(aDescriptor); diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index c9c793ca35ff..cb8e38c7512e 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -168,7 +168,7 @@ PropertyMapPtr BorderHandler::getProperties() for( auto nProp: o3tl::enumrange<BorderPosition>()) { if ( m_aFilledLines[nProp] ) { - pPropertyMap->Insert( aPropNames[nProp], uno::makeAny( m_aBorderLines[nProp] ) ); + pPropertyMap->Insert( aPropNames[nProp], uno::Any( m_aBorderLines[nProp] ) ); } } } diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index 765d5a3a5273..439806e20fa8 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -92,7 +92,7 @@ static uno::Any lcl_ConvertShd(sal_Int32 nIntValue) case NS_ooxml::LN_Value_ST_Shd_pct95: aRet = "pct95"; break; case NS_ooxml::LN_Value_ST_Shd_nil: aRet = "nil"; break; } - return uno::makeAny(aRet); + return uno::Any(aRet); } void CellColorHandler::lcl_attribute(Id rName, Value & rVal) @@ -107,7 +107,7 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal) } break; case NS_ooxml::LN_CT_Shd_fill: - createGrabBag("fill", uno::makeAny(msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue)))); + createGrabBag("fill", uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue)))); if( nIntValue == sal_Int32(COL_AUTO) ) nIntValue = 0xffffff; //fill color auto means white else @@ -117,29 +117,29 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal) m_bFillSpecified = true; break; case NS_ooxml::LN_CT_Shd_color: - createGrabBag("color", uno::makeAny(msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue)))); + createGrabBag("color", uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue)))); if( nIntValue == sal_Int32(COL_AUTO) ) nIntValue = 0; //shading color auto means black //color of the shading m_nColor = nIntValue; break; case NS_ooxml::LN_CT_Shd_themeFill: - createGrabBag("themeFill", uno::makeAny(TDefTableHandler::getThemeColorTypeString(nIntValue))); + createGrabBag("themeFill", uno::Any(TDefTableHandler::getThemeColorTypeString(nIntValue))); break; case NS_ooxml::LN_CT_Shd_themeFillShade: - createGrabBag("themeFillShade", uno::makeAny(OUString::number(nIntValue, 16))); + createGrabBag("themeFillShade", uno::Any(OUString::number(nIntValue, 16))); break; case NS_ooxml::LN_CT_Shd_themeFillTint: - createGrabBag("themeFillTint", uno::makeAny(OUString::number(nIntValue, 16))); + createGrabBag("themeFillTint", uno::Any(OUString::number(nIntValue, 16))); break; case NS_ooxml::LN_CT_Shd_themeColor: - createGrabBag("themeColor", uno::makeAny(TDefTableHandler::getThemeColorTypeString(nIntValue))); + createGrabBag("themeColor", uno::Any(TDefTableHandler::getThemeColorTypeString(nIntValue))); break; case NS_ooxml::LN_CT_Shd_themeShade: - createGrabBag("themeShade", uno::makeAny(OUString::number(nIntValue, 16))); + createGrabBag("themeShade", uno::Any(OUString::number(nIntValue, 16))); break; case NS_ooxml::LN_CT_Shd_themeTint: - createGrabBag("themeTint", uno::makeAny(OUString::number(nIntValue, 16))); + createGrabBag("themeTint", uno::Any(OUString::number(nIntValue, 16))); break; default: OSL_FAIL( "unknown attribute"); @@ -270,23 +270,23 @@ TablePropertyMapPtr CellColorHandler::getProperties() } // Write the shading pattern property - pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, uno::makeAny( nShadingPattern )); + pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, uno::Any( nShadingPattern )); } if (m_OutputFormat == Paragraph && m_nShadingPattern != NS_ooxml::LN_Value_ST_Shd_nil) { if (nWW8BrushStyle || !m_bAutoFillColor) - pPropertyMap->Insert(PROP_FILL_STYLE, uno::makeAny(drawing::FillStyle_SOLID)); + pPropertyMap->Insert(PROP_FILL_STYLE, uno::Any(drawing::FillStyle_SOLID)); else if (m_bFillSpecified) // m_bAutoFillColor == true - pPropertyMap->Insert(PROP_FILL_STYLE, uno::makeAny(drawing::FillStyle_NONE)); + pPropertyMap->Insert(PROP_FILL_STYLE, uno::Any(drawing::FillStyle_NONE)); - pPropertyMap->Insert(PROP_FILL_COLOR, uno::makeAny(nApplyColor)); + pPropertyMap->Insert(PROP_FILL_COLOR, uno::Any(nApplyColor)); } else if ( nWW8BrushStyle || !m_bAutoFillColor || m_bFillSpecified ) pPropertyMap->Insert( m_OutputFormat == Form ? PROP_BACK_COLOR - : PROP_CHAR_BACK_COLOR, uno::makeAny( nApplyColor )); + : PROP_CHAR_BACK_COLOR, uno::Any( nApplyColor )); - createGrabBag("originalColor", uno::makeAny(msfilter::util::ConvertColorOU(Color(ColorTransparency, nApplyColor)))); + createGrabBag("originalColor", uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nApplyColor)))); return pPropertyMap; } diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index cd0031f107f6..16da33f1a4a5 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -116,23 +116,23 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon // #i24363# tab stops relative to indent m_pImpl->SetDocumentSettingsProperty( getPropertyName( PROP_TABS_RELATIVE_TO_INDENT ), - uno::makeAny( false ) ); + uno::Any( false ) ); m_pImpl->SetDocumentSettingsProperty( getPropertyName( PROP_SURROUND_TEXT_WRAP_SMALL ), - uno::makeAny( true ) ); + uno::Any( true ) ); m_pImpl->SetDocumentSettingsProperty( getPropertyName( PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING ), - uno::makeAny( true ) ); + uno::Any( true ) ); // Don't load the default style definitions to avoid weird mix - m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::makeAny(true)); - m_pImpl->SetDocumentSettingsProperty("MsWordCompTrailingBlanks", uno::makeAny(true)); + m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::Any(true)); + m_pImpl->SetDocumentSettingsProperty("MsWordCompTrailingBlanks", uno::Any(true)); m_pImpl->SetDocumentSettingsProperty("HeaderSpacingBelowLastPara", - uno::makeAny(true)); - m_pImpl->SetDocumentSettingsProperty("FrameAutowidthWithMorePara", uno::makeAny(true)); - m_pImpl->SetDocumentSettingsProperty("FootnoteInColumnToPageEnd", uno::makeAny(true)); + uno::Any(true)); + m_pImpl->SetDocumentSettingsProperty("FrameAutowidthWithMorePara", uno::Any(true)); + m_pImpl->SetDocumentSettingsProperty("FootnoteInColumnToPageEnd", uno::Any(true)); - m_pImpl->SetDocumentSettingsProperty("TabAtLeftIndentForParagraphsInList", uno::makeAny(true)); + m_pImpl->SetDocumentSettingsProperty("TabAtLeftIndentForParagraphsInList", uno::Any(true)); // Initialize RDF metadata, to be able to add statements during the import. try @@ -229,7 +229,7 @@ DomainMapper::~DomainMapper() m_pImpl->GetSettingsTable()->ApplyProperties( m_pImpl->GetTextDocument( ) ); // now that importing is finished, re-enable default styles for any that were never defined/imported. - m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::makeAny(false)); + m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::Any(false)); // Grab-bag handling comphelper::SequenceAsHashMap aProperties; @@ -339,14 +339,14 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_Color_val: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, uno::makeAny( nIntValue ) ); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, uno::Any( nIntValue ) ); m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "val", msfilter::util::ConvertColorOU(Color(ColorTransparency,nIntValue))); break; case NS_ooxml::LN_CT_Underline_color: if (m_pImpl->GetTopContext()) { - m_pImpl->GetTopContext()->Insert(PROP_CHAR_UNDERLINE_HAS_COLOR, uno::makeAny( true ) ); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_UNDERLINE_COLOR, uno::makeAny( nIntValue ) ); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_UNDERLINE_HAS_COLOR, uno::Any( true ) ); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_UNDERLINE_COLOR, uno::Any( nIntValue ) ); } break; @@ -371,13 +371,13 @@ 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, uno::makeAny( sStringValue )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, uno::Any( sStringValue )); if (m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) && m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH)->isSet(PROP_NUMBERING_RULES)) { // Font of the paragraph mark should be used for the numbering as well. uno::Reference<beans::XPropertySet> xCharStyle(m_pImpl->GetCurrentNumberingCharStyle()); if (xCharStyle.is()) - xCharStyle->setPropertyValue("CharFontName", uno::makeAny(sStringValue)); + xCharStyle->setPropertyValue("CharFontName", uno::Any(sStringValue)); } } break; @@ -385,10 +385,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "asciiTheme", ThemeTable::getStringForTheme(nIntValue)); if (m_pImpl->GetTopContext()) { - uno::Any aPropValue = uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme( nIntValue ) ); + uno::Any aPropValue( m_pImpl->GetThemeTable()->getFontNameForTheme( nIntValue ) ); m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, aPropValue ); m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_FONT_NAME_ASCII, aPropValue, true, CHAR_GRAB_BAG ); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_ASCII, uno::makeAny( ThemeTable::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_ASCII, uno::Any( ThemeTable::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); } break; case NS_ooxml::LN_CT_Fonts_hAnsi: @@ -396,34 +396,34 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_Fonts_hAnsiTheme: m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "hAnsiTheme", ThemeTable::getStringForTheme(nIntValue)); if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_H_ANSI, uno::makeAny( ThemeTable::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_H_ANSI, uno::Any( ThemeTable::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); break; case NS_ooxml::LN_CT_Fonts_eastAsia: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_ASIAN, uno::makeAny( sStringValue )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_ASIAN, uno::Any( sStringValue )); break; case NS_ooxml::LN_CT_Fonts_eastAsiaTheme: m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "eastAsiaTheme", ThemeTable::getStringForTheme(nIntValue)); if (m_pImpl->GetTopContext()) { - uno::Any aPropValue = uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme( nIntValue ) ); + uno::Any aPropValue( m_pImpl->GetThemeTable()->getFontNameForTheme( nIntValue ) ); m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_ASIAN, aPropValue ); m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_FONT_NAME_EAST_ASIA, aPropValue, true, CHAR_GRAB_BAG ); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_EAST_ASIA, uno::makeAny( ThemeTable::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_EAST_ASIA, uno::Any( ThemeTable::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); } break; case NS_ooxml::LN_CT_Fonts_cs: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, uno::makeAny( sStringValue )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, uno::Any( sStringValue )); break; case NS_ooxml::LN_CT_Fonts_cstheme: m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "cstheme", ThemeTable::getStringForTheme(nIntValue)); if (m_pImpl->GetTopContext()) { - uno::Any aPropValue = uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme( nIntValue ) ); + uno::Any aPropValue( m_pImpl->GetThemeTable()->getFontNameForTheme( nIntValue ) ); m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, aPropValue ); m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_FONT_NAME_CS, aPropValue, true, CHAR_GRAB_BAG ); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_CS, uno::makeAny( ThemeTable::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_CS, uno::Any( ThemeTable::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); } break; case NS_ooxml::LN_CT_Spacing_before: @@ -432,7 +432,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) // Don't overwrite NS_ooxml::LN_CT_Spacing_beforeAutospacing. m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, - uno::makeAny(static_cast<sal_Int32>(convertTwipToMm100(nIntValue))), false); + uno::Any(static_cast<sal_Int32>(convertTwipToMm100(nIntValue))), false); break; case NS_ooxml::LN_CT_Spacing_beforeLines: m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "beforeLines", OUString::number(nIntValue)); @@ -440,14 +440,14 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) // NS_ooxml::LN_CT_Spacing_before in parent styles before style // sheet support can be enabled. if (m_pImpl->GetTopContext() && !IsStyleSheetImport()) - m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, uno::makeAny(ConversionHelper::convertTwipToMM100(nIntValue * nSingleLineSpacing / 100)), false); + m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, uno::Any(ConversionHelper::convertTwipToMM100(nIntValue * nSingleLineSpacing / 100)), false); break; case NS_ooxml::LN_CT_Spacing_after: m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "after", OUString::number(nIntValue)); if (m_pImpl->GetTopContext()) { // Don't overwrite NS_ooxml::LN_CT_Spacing_afterAutospacing. - m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ), false); + m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, uno::Any( ConversionHelper::convertTwipToMM100( nIntValue ) ), false); uno::Any aContextualSpacingFromStyle = m_pImpl->GetPropertyFromParaStyleSheet(PROP_PARA_CONTEXT_MARGIN); if (aContextualSpacingFromStyle.hasValue()) @@ -462,7 +462,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) // NS_ooxml::LN_CT_Spacing_after in parent styles before style // sheet support can be enabled. if (m_pImpl->GetTopContext() && !IsStyleSheetImport()) - m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, uno::makeAny(ConversionHelper::convertTwipToMM100(nIntValue * nSingleLineSpacing / 100)), false); + m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, uno::Any(ConversionHelper::convertTwipToMM100(nIntValue * nSingleLineSpacing / 100)), false); break; case NS_ooxml::LN_CT_Spacing_line: //91434 case NS_ooxml::LN_CT_Spacing_lineRule: //91435 @@ -521,7 +521,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } } if (pTopContext) - pTopContext->Insert(PROP_PARA_LINE_SPACING, uno::makeAny( aSpacing )); + pTopContext->Insert(PROP_PARA_LINE_SPACING, uno::Any( aSpacing )); } break; case NS_ooxml::LN_CT_Ind_start: @@ -540,10 +540,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; if (nFirstLineIndent != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent), /*bOverwrite=*/false); + m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::Any(nFirstLineIndent), /*bOverwrite=*/false); m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, - uno::makeAny(nParaLeftMargin)); + uno::Any(nParaLeftMargin)); } break; case NS_ooxml::LN_CT_Ind_end: @@ -556,12 +556,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, uno::makeAny(nFirstLineIndent), /*bOverwrite=*/false); + m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::Any(nFirstLineIndent), /*bOverwrite=*/false); if (nParaLeftMargin != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin), /*bOverwrite=*/false); + m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::Any(nParaLeftMargin), /*bOverwrite=*/false); m_pImpl->GetTopContext()->Insert( - PROP_PARA_RIGHT_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); + PROP_PARA_RIGHT_MARGIN, uno::Any( ConversionHelper::convertTwipToMM100(nIntValue ) )); } m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "right", OUString::number(nIntValue)); break; @@ -570,12 +570,12 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) { sal_Int32 nValue = ConversionHelper::convertTwipToMM100( nIntValue ); m_pImpl->GetTopContext()->Insert( - PROP_PARA_FIRST_LINE_INDENT, uno::makeAny( - nValue )); + PROP_PARA_FIRST_LINE_INDENT, uno::Any( - nValue )); // See above, need to inherit left margin from list style when first is set. sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty("IndentAt"); if (nParaLeftMargin != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin), /*bOverwrite=*/false); + m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::Any(nParaLeftMargin), /*bOverwrite=*/false); } break; case NS_ooxml::LN_CT_Ind_firstLine: @@ -589,7 +589,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) // numbering. break; m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, - uno::makeAny(nParaFirstLineIndent)); + uno::Any(nParaFirstLineIndent)); } break; case NS_ooxml::LN_CT_Ind_rightChars: @@ -600,27 +600,27 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_EastAsianLayout_combine: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_IS_ON, uno::makeAny ( nIntValue != 0 )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_IS_ON, uno::Any ( nIntValue != 0 )); 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, uno::makeAny ( sCombinePrefix )); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_SUFFIX, uno::makeAny ( sCombineSuffix )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_PREFIX, uno::Any ( sCombinePrefix )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_SUFFIX, uno::Any ( 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, uno::makeAny ( nRotationAngle )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION, uno::Any ( nRotationAngle )); } break; case NS_ooxml::LN_CT_EastAsianLayout_vertCompress: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, uno::makeAny ( nIntValue != 0 )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, uno::Any ( nIntValue != 0 )); break; case NS_ooxml::LN_CT_PageSz_code: @@ -698,7 +698,7 @@ 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, - uno::makeAny( aLocale ) ); + uno::Any( aLocale ) ); } break; // See SwWW8ImplReader::GetParagraphAutoSpace() on why these are 100 and 280 @@ -720,9 +720,9 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) default_spacing = 280; } // required at export (here mainly for StyleSheets) to determine if the setting has changed from grab_bag - m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, uno::makeAny(ConversionHelper::convertTwipToMM100(default_spacing))); + m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, uno::Any(ConversionHelper::convertTwipToMM100(default_spacing))); } - m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::Any( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } break; case NS_ooxml::LN_CT_Spacing_afterAutospacing: @@ -738,9 +738,9 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) else default_spacing = 280; } - m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, uno::makeAny(ConversionHelper::convertTwipToMM100(default_spacing))); + m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, uno::Any(ConversionHelper::convertTwipToMM100(default_spacing))); } - m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING, uno::Any( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } break; case NS_ooxml::LN_CT_SmartTagRun_uri: @@ -1293,7 +1293,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) { sal_Int16 nNumType = ConversionHelper::ConvertNumberingType(nIntValue); xFtnEdnSettings->setPropertyValue(getPropertyName(PROP_NUMBERING_TYPE), - uno::makeAny(nNumType)); + uno::Any(nNumType)); } } catch (const uno::Exception&) @@ -1366,13 +1366,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; } case NS_ooxml::LN_CT_PPrBase_keepLines: - rContext->Insert(PROP_PARA_SPLIT, uno::makeAny(nIntValue == 0)); + rContext->Insert(PROP_PARA_SPLIT, uno::Any(nIntValue == 0)); break; case NS_ooxml::LN_CT_PPrBase_keepNext: - rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue != 0 ) ); + rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::Any( nIntValue != 0 ) ); break; case NS_ooxml::LN_CT_PPrBase_pageBreakBefore: - rContext->Insert(PROP_BREAK_TYPE, uno::makeAny(nIntValue ? style::BreakType_PAGE_BEFORE : style::BreakType_NONE), /*bOverwrite=*/bool(nIntValue)); + rContext->Insert(PROP_BREAK_TYPE, uno::Any(nIntValue ? style::BreakType_PAGE_BEFORE : style::BreakType_NONE), /*bOverwrite=*/bool(nIntValue)); break; case NS_ooxml::LN_CT_NumPr_ilvl: if (nIntValue < 0 || 10 <= nIntValue) @@ -1394,7 +1394,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) // finishParagraph() will convert the 9 into "no numbering" for direct formatting. // (Styles only use this PROP for round-tripping and UI, but cannot trust it for import) if (!IsStyleSheetImport() || nIntValue != 9) - rContext->Insert(PROP_NUMBERING_LEVEL, uno::makeAny(static_cast<sal_Int16>(nIntValue))); + rContext->Insert(PROP_NUMBERING_LEVEL, uno::Any(static_cast<sal_Int16>(nIntValue))); break; case NS_ooxml::LN_CT_NumPr_numId: { @@ -1412,7 +1412,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { if( !IsStyleSheetImport() ) { - uno::Any aRules = uno::makeAny( pList->GetNumberingRules( ) ); + uno::Any aRules( pList->GetNumberingRules( ) ); rContext->Insert( PROP_NUMBERING_RULES, aRules ); PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); if (pContext) @@ -1437,17 +1437,17 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if( !IsStyleSheetImport() ) { // eg. disabled numbering using non-existent numId "0" - rContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny( OUString() ) ); + rContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::Any( OUString() ) ); // disable inheritance of indentation of parent styles - rContext->Insert( PROP_PARA_LEFT_MARGIN, uno::makeAny( sal_Int32(0) ), /*bOverwrite=*/false); + rContext->Insert( PROP_PARA_LEFT_MARGIN, uno::Any( sal_Int32(0) ), /*bOverwrite=*/false); rContext->Insert( PROP_PARA_FIRST_LINE_INDENT, - uno::makeAny( sal_Int32(0) ), /*bOverwrite=*/false); + uno::Any( sal_Int32(0) ), /*bOverwrite=*/false); } } } break; case NS_ooxml::LN_CT_PPrBase_suppressLineNumbers: - rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, uno::makeAny( nIntValue == 0 ) ); + rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, uno::Any( nIntValue == 0 ) ); break; case NS_ooxml::LN_inTbl: break; @@ -1503,21 +1503,21 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) eBorderDistId = PROP_TOP_BORDER_DISTANCE; } // Since there are borders in between, each paragraph will have own borders. No more joining - rContext->Insert(PROP_PARA_CONNECT_BORDERS, uno::makeAny(false)); + rContext->Insert(PROP_PARA_CONNECT_BORDERS, uno::Any(false)); break; default:; } if( eBorderId ) - rContext->Insert( eBorderId, uno::makeAny( pBorderHandler->getBorderLine()) ); + rContext->Insert( eBorderId, uno::Any( pBorderHandler->getBorderLine()) ); if(eBorderDistId) - rContext->Insert(eBorderDistId, uno::makeAny( pBorderHandler->getLineDistance())); + rContext->Insert(eBorderDistId, uno::Any( pBorderHandler->getLineDistance())); if ( nSprmId == NS_ooxml::LN_CT_PBdr_right ) { table::ShadowFormat aFormat; // Word only allows shadows on visible borders if ( pBorderHandler->getShadow() && pBorderHandler->getBorderLine().LineStyle != table::BorderLineStyle::NONE ) aFormat = writerfilter::dmapper::PropertyMap::getShadowFromBorder(pBorderHandler->getBorderLine()); - rContext->Insert(PROP_PARA_SHADOW_FORMAT, uno::makeAny(aFormat)); + rContext->Insert(PROP_PARA_SHADOW_FORMAT, uno::Any(aFormat)); } } } @@ -1525,7 +1525,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_CT_PBdr_bar: break; case NS_ooxml::LN_CT_PPrBase_suppressAutoHyphens: - rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::makeAny( nIntValue == 0 )); + rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::Any( nIntValue == 0 )); break; case NS_ooxml::LN_CT_FramePr_h: break; @@ -1558,13 +1558,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; case NS_ooxml::LN_CT_PPrBase_widowControl: { - uno::Any aVal( uno::makeAny( sal_Int8(nIntValue ? 2 : 0 ))); + uno::Any aVal( uno::Any( sal_Int8(nIntValue ? 2 : 0 ))); rContext->Insert( PROP_PARA_WIDOWS, aVal ); rContext->Insert( PROP_PARA_ORPHANS, aVal ); } break; // sprmPFWidowControl case NS_ooxml::LN_CT_PPrBase_overflowPunct: - rContext->Insert(PROP_PARA_IS_HANGING_PUNCTUATION, uno::makeAny( nIntValue == 0 )); + rContext->Insert(PROP_PARA_IS_HANGING_PUNCTUATION, uno::Any( nIntValue == 0 )); break; case NS_ooxml::LN_CT_PPrBase_topLinePunct: break; @@ -1593,7 +1593,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) default: break; } - rContext->Insert( PROP_PARA_VERT_ALIGNMENT, uno::makeAny( nAlignment) ); + rContext->Insert( PROP_PARA_VERT_ALIGNMENT, uno::Any( nAlignment) ); } break; case NS_ooxml::LN_CT_PPrBase_textDirection: @@ -1642,7 +1642,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { // convert MS body level (9) to LO body level (0) and equivalent outline levels sal_Int16 nLvl = nIntValue == WW_OUTLINE_MAX ? 0 : nIntValue + 1; - rContext->Insert(PROP_OUTLINE_LEVEL, uno::makeAny ( nLvl )); + rContext->Insert(PROP_OUTLINE_LEVEL, uno::Any ( nLvl )); } } break; @@ -1667,18 +1667,18 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { // RTL defaults to right adjust eAdjust = nIntValue ? style::ParagraphAdjust_RIGHT : style::ParagraphAdjust_LEFT; - rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( eAdjust ), /*bOverwrite=*/false); + rContext->Insert(PROP_PARA_ADJUST, uno::Any( eAdjust ), /*bOverwrite=*/false); } // 3,4. existing adjust: if RTL, then swap. If LTR, but previous was RTL, also swap. else if ( nIntValue || nParentBidi == sal_Int16(text::WritingMode2::RL_TB) ) { if ( eAdjust == style::ParagraphAdjust_RIGHT ) - rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT )); + rContext->Insert(PROP_PARA_ADJUST, uno::Any( style::ParagraphAdjust_LEFT )); else if ( eAdjust == style::ParagraphAdjust_LEFT ) - rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT )); + rContext->Insert(PROP_PARA_ADJUST, uno::Any( style::ParagraphAdjust_RIGHT )); } } - rContext->Insert(PROP_WRITING_MODE, uno::makeAny( nWritingMode )); + rContext->Insert(PROP_WRITING_MODE, uno::Any( nWritingMode )); } break; @@ -1686,14 +1686,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if (pSectionContext != nullptr) { const sal_Int16 writingMode = (nIntValue != 0) ? sal_Int16(text::WritingMode2::RL_TB) : sal_Int16(text::WritingMode2::LR_TB); - pSectionContext->Insert(PROP_WRITING_MODE, uno::makeAny(writingMode)); + pSectionContext->Insert(PROP_WRITING_MODE, uno::Any(writingMode)); } break; case NS_ooxml::LN_EG_SectPrContents_rtlGutter: if (pSectionContext != nullptr) { bool bRtlGutter = nIntValue != 0; - pSectionContext->Insert(PROP_RTL_GUTTER, uno::makeAny(bRtlGutter)); + pSectionContext->Insert(PROP_RTL_GUTTER, uno::Any(bRtlGutter)); } break; case NS_ooxml::LN_EG_RPrBase_highlight: @@ -1711,17 +1711,17 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { sal_Int32 nColor = 0; if( getColorFromId(nIntValue, nColor) ) - rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::makeAny( nColor )); + rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::Any( nColor )); } // RTF import uses the actual color value else if( IsRTFImport() ) { - rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::makeAny( nIntValue )); + rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::Any( nIntValue )); } } break; case NS_ooxml::LN_EG_RPrBase_em: - rContext->Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue (nIntValue))); + rContext->Insert(PROP_CHAR_EMPHASIS, uno::Any ( getEmphasisValue (nIntValue))); break; case NS_ooxml::LN_EG_RPrBase_emboss: case NS_ooxml::LN_EG_RPrBase_b: @@ -1808,7 +1808,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_EG_RPrBase_b: case NS_ooxml::LN_EG_RPrBase_bCs: { - uno::Any aBold( uno::makeAny( nIntValue ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) ); + uno::Any aBold( uno::Any( nIntValue ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) ); rContext->Insert(ePropertyId, aBold ); if( nSprmId != NS_ooxml::LN_EG_RPrBase_bCs ) @@ -1826,7 +1826,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_EG_RPrBase_i: case NS_ooxml::LN_EG_RPrBase_iCs: { - uno::Any aPosture( uno::makeAny( nIntValue ? awt::FontSlant_ITALIC : awt::FontSlant_NONE ) ); + uno::Any aPosture( uno::Any( nIntValue ? awt::FontSlant_ITALIC : awt::FontSlant_NONE ) ); rContext->Insert( ePropertyId, aPosture ); if (nSprmId != NS_ooxml::LN_EG_RPrBase_iCs) rContext->Insert(PROP_CHAR_POSTURE_ASIAN, aPosture ); @@ -1836,32 +1836,32 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; case NS_ooxml::LN_EG_RPrBase_strike: rContext->Insert(ePropertyId, - uno::makeAny( nIntValue ? awt::FontStrikeout::SINGLE : awt::FontStrikeout::NONE ) ); + uno::Any( nIntValue ? awt::FontStrikeout::SINGLE : awt::FontStrikeout::NONE ) ); break; case NS_ooxml::LN_EG_RPrBase_dstrike: rContext->Insert(ePropertyId, - uno::makeAny( nIntValue ? awt::FontStrikeout::DOUBLE : awt::FontStrikeout::NONE ) ); + uno::Any( nIntValue ? awt::FontStrikeout::DOUBLE : awt::FontStrikeout::NONE ) ); break; case NS_ooxml::LN_EG_RPrBase_outline: case NS_ooxml::LN_EG_RPrBase_shadow: case NS_ooxml::LN_EG_RPrBase_vanish: case NS_ooxml::LN_EG_RPrBase_webHidden: - rContext->Insert(ePropertyId, uno::makeAny( nIntValue != 0 )); + rContext->Insert(ePropertyId, uno::Any( nIntValue != 0 )); break; case NS_ooxml::LN_EG_RPrBase_smallCaps: // If smallcaps would be just disabled and another casemap is already inserted, don't do anything. if (nIntValue || !rContext->isSet(ePropertyId) ) - rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE)); + rContext->Insert(ePropertyId, uno::Any( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE)); m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "smallCaps", OUString::number(nIntValue)); break; case NS_ooxml::LN_EG_RPrBase_caps: rContext->Insert(ePropertyId, - uno::makeAny( nIntValue ? style::CaseMap::UPPERCASE : style::CaseMap::NONE)); + uno::Any( nIntValue ? style::CaseMap::UPPERCASE : style::CaseMap::NONE)); m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "caps", OUString::number(nIntValue)); break; case NS_ooxml::LN_EG_RPrBase_emboss: rContext->Insert(ePropertyId, - uno::makeAny( nIntValue ? awt::FontRelief::EMBOSSED : awt::FontRelief::NONE )); + uno::Any( nIntValue ? awt::FontRelief::EMBOSSED : awt::FontRelief::NONE )); break; } @@ -1873,7 +1873,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { //multiples of half points (12pt == 24) double fVal = double(nIntValue) / 2.; - uno::Any aVal = uno::makeAny( fVal ); + uno::Any aVal( fVal ); if( NS_ooxml::LN_EG_RPrBase_szCs == nSprmId ) { rContext->Insert( PROP_CHAR_HEIGHT_COMPLEX, aVal ); @@ -1907,7 +1907,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if ( nIntValue ) { if (!IsStyleSheetImport() && !IsNumberingImport()) - m_pImpl->deferCharacterProperty( nSprmId, uno::makeAny( nIntValue )); + m_pImpl->deferCharacterProperty( nSprmId, uno::Any( nIntValue )); else if (!m_pImpl->IsDocDefaultsImport()) { // For some undocumented reason, MS Word seems to ignore this in docDefaults @@ -1924,8 +1924,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) // which just assigned default values and ignored the actual/given escapement. sal_Int16 nEscapement = nIntValue > 0 ? DFLT_ESC_AUTO_SUPER : DFLT_ESC_AUTO_SUB; sal_Int8 nProp = DFLT_ESC_PROP; - rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( nEscapement ) ); - rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::makeAny( nProp ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::Any( nEscapement ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::Any( nProp ) ); } } break; @@ -1939,38 +1939,38 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { nResult = static_cast<sal_Int16>(nIntValue); } - rContext->Insert(PROP_CHAR_CHAR_KERNING, uno::makeAny(nResult)); + rContext->Insert(PROP_CHAR_CHAR_KERNING, uno::Any(nResult)); m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "spacing", OUString::number(nIntValue)); } break; case NS_ooxml::LN_EG_RPrBase_kern: // auto kerning is bound to a minimum font size in Word - but not in Writer :-( - rContext->Insert(PROP_CHAR_AUTO_KERNING, uno::makeAny( nIntValue != 0 ) ); + rContext->Insert(PROP_CHAR_AUTO_KERNING, uno::Any( nIntValue != 0 ) ); break; case NS_ooxml::LN_EG_RPrBase_w: // ST_TextScale must fall between 1% and 600% according to spec, otherwise resets to 100% according to experience if ((1 <= nIntValue) && (nIntValue <= 600)) { rContext->Insert(PROP_CHAR_SCALE_WIDTH, - uno::makeAny( sal_Int16(nIntValue) )); + uno::Any( sal_Int16(nIntValue) )); } else { rContext->Insert(PROP_CHAR_SCALE_WIDTH, - uno::makeAny( sal_Int16(100) )); + uno::Any( sal_Int16(100) )); } break; case NS_ooxml::LN_EG_RPrBase_imprint: // FontRelief: NONE, EMBOSSED, ENGRAVED rContext->Insert(PROP_CHAR_RELIEF, - uno::makeAny( nIntValue ? awt::FontRelief::ENGRAVED : awt::FontRelief::NONE )); + uno::Any( nIntValue ? awt::FontRelief::ENGRAVED : awt::FontRelief::NONE )); break; case NS_ooxml::LN_EG_RPrBase_effect: // The file-format has many character animations. We have only // one, so we use it always. Suboptimal solution though. if (nIntValue != NS_ooxml::LN_Value_ST_TextEffect_none) - rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( true )); + rContext->Insert(PROP_CHAR_FLASH, uno::Any( true )); else - rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false )); + rContext->Insert(PROP_CHAR_FLASH, uno::Any( false )); break; case NS_ooxml::LN_EG_RPrBase_rtl: break; @@ -1984,7 +1984,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) pCellColorHandler->setOutputFormat( CellColorHandler::Character ); pProperties->resolve(*pCellColorHandler); rContext->InsertProps(pCellColorHandler->getProperties().get()); - m_pImpl->GetTopContext()->Insert(PROP_CHAR_SHADING_MARKER, uno::makeAny(true), true, CHAR_GRAB_BAG ); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_SHADING_MARKER, uno::Any(true), true, CHAR_GRAB_BAG ); } break; } @@ -2016,7 +2016,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { //page height, rounded to default values, default: 0x3dc0 twip sal_Int32 nHeight = ConversionHelper::convertTwipToMM100( nIntValue ); - rContext->Insert( PROP_HEIGHT, uno::makeAny( PaperInfo::sloppyFitPageDimension( nHeight ) ) ); + rContext->Insert( PROP_HEIGHT, uno::Any( PaperInfo::sloppyFitPageDimension( nHeight ) ) ); } break; case NS_ooxml::LN_EG_SectPrContents_textDirection: @@ -2045,7 +2045,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) pTargetContext = pSectionContext; } - pTargetContext->Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(nDirection) ) ); + pTargetContext->Insert(PROP_WRITING_MODE, uno::Any( sal_Int16(nDirection) ) ); } break; // sprmSTextFlow // the following are not part of the official documentation @@ -2070,7 +2070,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) } } resolveSprmProps(*this, rSprm); - rContext->Insert(PROP_PARA_TAB_STOPS, uno::makeAny( m_pImpl->GetCurrentTabStopAndClear())); + rContext->Insert(PROP_PARA_TAB_STOPS, uno::Any( m_pImpl->GetCurrentTabStopAndClear())); } break; @@ -2086,21 +2086,21 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) auto pBorderHandler = std::make_shared<BorderHandler>( true ); pProperties->resolve(*pBorderHandler); - rContext->Insert( PROP_CHAR_TOP_BORDER, uno::makeAny( pBorderHandler->getBorderLine())); - rContext->Insert( PROP_CHAR_BOTTOM_BORDER, uno::makeAny( pBorderHandler->getBorderLine())); - rContext->Insert( PROP_CHAR_LEFT_BORDER, uno::makeAny( pBorderHandler->getBorderLine())); - rContext->Insert( PROP_CHAR_RIGHT_BORDER, uno::makeAny( pBorderHandler->getBorderLine())); + rContext->Insert( PROP_CHAR_TOP_BORDER, uno::Any( pBorderHandler->getBorderLine())); + rContext->Insert( PROP_CHAR_BOTTOM_BORDER, uno::Any( pBorderHandler->getBorderLine())); + rContext->Insert( PROP_CHAR_LEFT_BORDER, uno::Any( pBorderHandler->getBorderLine())); + rContext->Insert( PROP_CHAR_RIGHT_BORDER, uno::Any( pBorderHandler->getBorderLine())); - rContext->Insert( PROP_CHAR_TOP_BORDER_DISTANCE, uno::makeAny( pBorderHandler->getLineDistance())); - rContext->Insert( PROP_CHAR_BOTTOM_BORDER_DISTANCE, uno::makeAny( pBorderHandler->getLineDistance())); - rContext->Insert( PROP_CHAR_LEFT_BORDER_DISTANCE, uno::makeAny( pBorderHandler->getLineDistance())); - rContext->Insert( PROP_CHAR_RIGHT_BORDER_DISTANCE, uno::makeAny( pBorderHandler->getLineDistance())); + rContext->Insert( PROP_CHAR_TOP_BORDER_DISTANCE, uno::Any( pBorderHandler->getLineDistance())); + rContext->Insert( PROP_CHAR_BOTTOM_BORDER_DISTANCE, uno::Any( pBorderHandler->getLineDistance())); + rContext->Insert( PROP_CHAR_LEFT_BORDER_DISTANCE, uno::Any( pBorderHandler->getLineDistance())); + rContext->Insert( PROP_CHAR_RIGHT_BORDER_DISTANCE, uno::Any( pBorderHandler->getLineDistance())); table::ShadowFormat aFormat; // Word only allows shadows on visible borders if ( pBorderHandler->getShadow() && pBorderHandler->getBorderLine().LineStyle != table::BorderLineStyle::NONE ) aFormat = writerfilter::dmapper::PropertyMap::getShadowFromBorder(pBorderHandler->getBorderLine()); - rContext->Insert(PROP_CHAR_SHADOW_FORMAT, uno::makeAny(aFormat)); + rContext->Insert(PROP_CHAR_SHADOW_FORMAT, uno::Any(aFormat)); } } break; @@ -2174,22 +2174,22 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) uno::Reference< text::XLineNumberingProperties > xLineNumberingProperties( m_pImpl->GetTextDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xLineNumberingPropSet = xLineNumberingProperties->getLineNumberingProperties(); if( aSettings.nInterval == 0 ) - xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_IS_ON ), uno::makeAny(false) ); + xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_IS_ON ), uno::Any(false) ); else { - xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_IS_ON ), uno::makeAny(true) ); + xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_IS_ON ), uno::Any(true) ); if( aSettings.nInterval ) - xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_INTERVAL ), uno::makeAny(static_cast<sal_Int16>(aSettings.nInterval)) ); + xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_INTERVAL ), uno::Any(static_cast<sal_Int16>(aSettings.nInterval)) ); if( aSettings.nDistance != -1 ) - xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) ); + xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_DISTANCE ), uno::Any(aSettings.nDistance) ); else { // set Auto value (0.5 cm) - xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_DISTANCE ), uno::makeAny(static_cast<sal_Int32>(500)) ); + xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_DISTANCE ), uno::Any(static_cast<sal_Int32>(500)) ); if( pSectionContext ) pSectionContext->SetdxaLnn( static_cast<sal_Int32>(283) ); } - xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) ); + xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_RESTART_AT_EACH_PAGE ), uno::Any(aSettings.bRestartAtEachPage) ); } } catch( const uno::Exception& ) @@ -2213,7 +2213,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) pContext->Erase(PROP_BREAK_TYPE); lcl_startParagraphGroup(); - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_PAGE_BEFORE)); lcl_startCharacterGroup(); sal_uInt8 const sBreak[] = { 0xd }; lcl_text(sBreak, 1); @@ -2249,12 +2249,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { if (!m_pImpl->IsAltChunk()) { - pSectionContext->Insert(PROP_HEIGHT, uno::makeAny(CT_PageSz.h)); + pSectionContext->Insert(PROP_HEIGHT, uno::Any(CT_PageSz.h)); } - pSectionContext->Insert( PROP_IS_LANDSCAPE, uno::makeAny( CT_PageSz.orient )); + pSectionContext->Insert( PROP_IS_LANDSCAPE, uno::Any( CT_PageSz.orient )); if (!m_pImpl->IsAltChunk()) { - pSectionContext->Insert(PROP_WIDTH, uno::makeAny(CT_PageSz.w)); + pSectionContext->Insert(PROP_WIDTH, uno::Any(CT_PageSz.w)); } } break; @@ -2328,8 +2328,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if (xTextColumns.is()) { uno::Reference< beans::XPropertySet > xColumnPropSet( xTextColumns, uno::UNO_QUERY_THROW ); - xColumnPropSet->setPropertyValue( getPropertyName( PROP_AUTOMATIC_DISTANCE ), uno::makeAny( pSectHdl->GetSpace() )); - xTOC->setPropertyValue( getPropertyName( PROP_TEXT_COLUMNS ), uno::makeAny( xTextColumns ) ); + xColumnPropSet->setPropertyValue( getPropertyName( PROP_AUTOMATIC_DISTANCE ), uno::Any( pSectHdl->GetSpace() )); + xTOC->setPropertyValue( getPropertyName( PROP_TEXT_COLUMNS ), uno::Any( xTextColumns ) ); } } } @@ -2356,7 +2356,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_CT_PPrBase_snapToGrid: if (!IsStyleSheetImport()||!m_pImpl->isInteropGrabBagEnabled()) { - rContext->Insert( PROP_SNAP_TO_GRID, uno::makeAny(bool(nIntValue))); + rContext->Insert( PROP_SNAP_TO_GRID, uno::Any(bool(nIntValue))); } else { @@ -2369,7 +2369,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) const OUString sConvertedStyleName = pStyleTable->ConvertStyleName( sStringValue, true ); m_pImpl->SetCurrentParaStyleName( sConvertedStyleName ); if (m_pImpl->GetTopContext() && m_pImpl->GetTopContextType() != CONTEXT_SECTION) - m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, uno::makeAny( sConvertedStyleName )); + m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, uno::Any( sConvertedStyleName )); } break; case NS_ooxml::LN_EG_RPrBase_rStyle: @@ -2384,7 +2384,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) // 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()) - m_pImpl->GetTopContext()->Insert( PROP_CHAR_STYLE_NAME, uno::makeAny( sConvertedName ) ); + m_pImpl->GetTopContext()->Insert( PROP_CHAR_STYLE_NAME, uno::Any( sConvertedName ) ); } break; case NS_ooxml::LN_CT_TblPrBase_tblCellMar: //cell margins @@ -2428,7 +2428,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; default:; } - rContext->Insert( eId, uno::makeAny(nMeasureValue), false); + rContext->Insert( eId, uno::Any(nMeasureValue), false); } } break; @@ -2443,7 +2443,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if (m_pImpl->isBreakDeferred(BreakType::PAGE_BREAK)) { m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) - ->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); + ->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_PAGE_BEFORE)); m_pImpl->clearDeferredBreak(PAGE_BREAK); } writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); @@ -2477,8 +2477,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) else nProp = 100; - rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( nEscapement ) ); - rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::makeAny( nProp ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::Any( nEscapement ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::Any( nProp ) ); } break; case NS_ooxml::LN_CT_FtnProps_pos: @@ -2518,7 +2518,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { xFtnEdnSettings->setPropertyValue( getPropertyName( PROP_START_AT), - uno::makeAny( sal_Int16( nIntValue - 1 ))); + uno::Any( sal_Int16( nIntValue - 1 ))); } else if( NS_ooxml::LN_EG_FtnEdnNumProps_numRestart == nSprmId && xFtnEdnSettings.is()) { @@ -2532,14 +2532,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) } xFtnEdnSettings->setPropertyValue( getPropertyName( PROP_FOOTNOTE_COUNTING ), - uno::makeAny( nFootnoteCounting )); + uno::Any( nFootnoteCounting )); } else if (xFtnEdnSettings.is()) { sal_Int16 nNumType = ConversionHelper::ConvertNumberingType( nIntValue ); xFtnEdnSettings->setPropertyValue( getPropertyName( PROP_NUMBERING_TYPE), - uno::makeAny( nNumType )); + uno::Any( nNumType )); } } catch( const uno::Exception& ) @@ -2646,15 +2646,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) case NS_ooxml::LN_EG_RPrBase_snapToGrid: // "Use document grid settings for inter-paragraph spacing" break; case NS_ooxml::LN_CT_PPrBase_contextualSpacing: - rContext->Insert(PROP_PARA_CONTEXT_MARGIN, uno::makeAny( nIntValue != 0 )); + rContext->Insert(PROP_PARA_CONTEXT_MARGIN, uno::Any( nIntValue != 0 )); break; case NS_ooxml::LN_CT_PPrBase_mirrorIndents: // mirrorIndents - rContext->Insert(PROP_MIRROR_INDENTS, uno::makeAny( nIntValue != 0 ), true, PARA_GRAB_BAG); + rContext->Insert(PROP_MIRROR_INDENTS, uno::Any( nIntValue != 0 ), true, PARA_GRAB_BAG); break; case NS_ooxml::LN_EG_SectPrContents_formProt: //section protection { if( pSectionContext ) - pSectionContext->Insert( PROP_IS_PROTECTED, uno::makeAny( bool(nIntValue) ) ); + pSectionContext->Insert( PROP_IS_PROTECTED, uno::Any( bool(nIntValue) ) ); } break; case NS_ooxml::LN_EG_SectPrContents_vAlign: @@ -2677,7 +2677,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) default: break; } - pSectionContext->Insert( PROP_TEXT_VERTICAL_ADJUST, uno::makeAny( nVA ), true, PARA_GRAB_BAG ); + pSectionContext->Insert( PROP_TEXT_VERTICAL_ADJUST, uno::Any( nVA ), true, PARA_GRAB_BAG ); } } break; @@ -2913,7 +2913,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) // if first paragraph style in table has break-before-page, transfer that setting to the table itself. if( m_pImpl->m_nTableDepth == 0 ) { - const uno::Any aBreakType = uno::makeAny(style::BreakType_PAGE_BEFORE); + const uno::Any aBreakType(style::BreakType_PAGE_BEFORE); const PropertyMapPtr pParagraphProps = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); if( pParagraphProps && pParagraphProps->isSet(PROP_PARA_STYLE_NAME) ) { @@ -2968,19 +2968,19 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) pProperties->resolve(*pTextEffectsHandlerPtr); beans::PropertyValue aGrabBag = pTextEffectsHandlerPtr->getInteropGrabBag(); - rContext->Insert(*aPropertyId, uno::makeAny(aGrabBag), true, CHAR_GRAB_BAG); + rContext->Insert(*aPropertyId, uno::Any(aGrabBag), true, CHAR_GRAB_BAG); sal_Int16 nTransparency = TextEffectsHandler::GetTextFillSolidFillAlpha(aGrabBag); if (nTransparency != 0) { - rContext->Insert(PROP_CHAR_TRANSPARENCE, uno::makeAny(nTransparency)); + rContext->Insert(PROP_CHAR_TRANSPARENCE, uno::Any(nTransparency)); } } else if (nSprmId == NS_ooxml::LN_cntxtAlts_cntxtAlts) { pTextEffectsHandlerPtr->lcl_sprm(rSprm); beans::PropertyValue aGrabBag = pTextEffectsHandlerPtr->getInteropGrabBag(); - rContext->Insert(*aPropertyId, uno::makeAny(aGrabBag), true, CHAR_GRAB_BAG); + rContext->Insert(*aPropertyId, uno::Any(aGrabBag), true, CHAR_GRAB_BAG); } } } @@ -3007,7 +3007,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) resolveSprmProps(*this, rSprm); TablePropertyMapPtr pPropMap(new TablePropertyMap()); - pPropMap->Insert(PROP_ROW_CNF_STYLE, uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag)), true, ROW_GRAB_BAG); + pPropMap->Insert(PROP_ROW_CNF_STYLE, uno::Any(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag)), true, ROW_GRAB_BAG); m_pImpl->getTableManager().insertRowProps(pPropMap); m_pImpl->disableInteropGrabBag(); @@ -3019,7 +3019,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) resolveSprmProps(*this, rSprm); TablePropertyMapPtr pPropMap(new TablePropertyMap()); - pPropMap->Insert(PROP_CELL_CNF_STYLE, uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag)), true, CELL_GRAB_BAG); + pPropMap->Insert(PROP_CELL_CNF_STYLE, uno::Any(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag)), true, CELL_GRAB_BAG); m_pImpl->getTableManager().cellProps(pPropMap); m_pImpl->disableInteropGrabBag(); @@ -3029,7 +3029,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { m_pImpl->enableInteropGrabBag("cnfStyle"); resolveSprmProps(*this, rSprm); - rContext->Insert(PROP_PARA_CNF_STYLE, uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag)), true, PARA_GRAB_BAG); + rContext->Insert(PROP_PARA_CNF_STYLE, uno::Any(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag)), true, PARA_GRAB_BAG); m_pImpl->disableInteropGrabBag(); } break; @@ -3037,7 +3037,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { resolveSprmProps(*this, rSprm); SymbolData aSymbolData = m_pImpl->GetSymbolData(); - uno::Any aVal = uno::makeAny( aSymbolData.sFont ); + uno::Any aVal( aSymbolData.sFont ); auto xFootnote = rContext->GetFootnote(); if (!xFootnote.is() && m_pImpl->IsInCustomFootnote()) xFootnote = m_pImpl->GetFootnoteContext()->GetFootnote(); @@ -3061,7 +3061,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) xAnchorProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), aVal); xAnchorProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME_ASIAN), aVal); xAnchorProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME_COMPLEX), aVal); - xAnchorProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_CHAR_SET), uno::makeAny(awt::CharSet::SYMBOL)); + xAnchorProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_CHAR_SET), uno::Any(awt::CharSet::SYMBOL)); // remove the dummy char xHackRange->setString(""); @@ -3075,7 +3075,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) rContext->Insert(PROP_CHAR_FONT_NAME, aVal); rContext->Insert(PROP_CHAR_FONT_NAME_ASIAN, aVal); rContext->Insert(PROP_CHAR_FONT_NAME_COMPLEX, aVal); - rContext->Insert(PROP_CHAR_FONT_CHAR_SET, uno::makeAny(awt::CharSet::SYMBOL)); + rContext->Insert(PROP_CHAR_FONT_CHAR_SET, uno::Any(awt::CharSet::SYMBOL)); utext( reinterpret_cast < const sal_uInt8 * >( &(aSymbolData.cSymbol) ), 1 ); } } @@ -3102,11 +3102,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) const RubyInfo & aInfo = m_pImpl->GetRubyInfo(); if (aInfo.nSprmId == NS_ooxml::LN_CT_Ruby_rubyBase) { - rContext->Insert(PROP_RUBY_TEXT, uno::makeAny(aInfo.sRubyText)); - rContext->Insert(PROP_RUBY_STYLE, uno::makeAny(aInfo.sRubyStyle)); - rContext->Insert(PROP_RUBY_ADJUST, uno::makeAny(static_cast<sal_Int16>(ConversionHelper::convertRubyAlign(aInfo.nRubyAlign)))); + rContext->Insert(PROP_RUBY_TEXT, uno::Any(aInfo.sRubyText)); + rContext->Insert(PROP_RUBY_STYLE, uno::Any(aInfo.sRubyStyle)); + rContext->Insert(PROP_RUBY_ADJUST, uno::Any(static_cast<sal_Int16>(ConversionHelper::convertRubyAlign(aInfo.nRubyAlign)))); if ( aInfo.nRubyAlign == NS_ooxml::LN_Value_ST_RubyAlign_rightVertical ) - rContext->Insert(PROP_RUBY_POSITION, uno::makeAny(css::text::RubyPosition::INTER_CHARACTER)); + rContext->Insert(PROP_RUBY_POSITION, uno::Any(css::text::RubyPosition::INTER_CHARACTER)); m_pImpl->SetRubySprmId(0); } @@ -3205,8 +3205,8 @@ void DomainMapper::processDeferredCharacterProperties( const std::map< sal_Int32 else if ( nEscapement < -MAX_ESC_POS ) nEscapement = -MAX_ESC_POS; - rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( sal_Int16(nEscapement) ) ); - rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::makeAny( nProp ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::Any( sal_Int16(nEscapement) ) ); + rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::Any( nProp ) ); } break; default: @@ -3290,18 +3290,18 @@ void DomainMapper::lcl_startParagraphGroup() if (!m_pImpl->IsInShape()) { const OUString& sDefaultParaStyle = m_pImpl->GetDefaultParaStyleName(); - m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, uno::makeAny( sDefaultParaStyle ) ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, uno::Any( sDefaultParaStyle ) ); m_pImpl->SetCurrentParaStyleName( sDefaultParaStyle ); if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_PAGE_BEFORE)); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_COLUMN_BEFORE)); mbWasShapeInPara = false; } if (m_pImpl->isParaSdtEndDeferred()) - m_pImpl->GetTopContext()->Insert(PROP_PARA_SDT_END_BEFORE, uno::makeAny(true), true, PARA_GRAB_BAG); + m_pImpl->GetTopContext()->Insert(PROP_PARA_SDT_END_BEFORE, uno::Any(true), true, PARA_GRAB_BAG); } m_pImpl->SetIsFirstRun(true); m_pImpl->SetIsOutsideAParagraph(false); @@ -3360,7 +3360,7 @@ void DomainMapper::lcl_startShape(uno::Reference<drawing::XShape> const& xShape) lcl_endCharacterGroup(); lcl_endParagraphGroup(); lcl_startParagraphGroup(); - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_PAGE_BEFORE)); } m_pImpl->PushShapeContext( xShape ); lcl_startParagraphGroup(); @@ -3438,7 +3438,7 @@ void DomainMapper::lcl_startCharacterGroup() { // Fields have an empty character group before the real one, so don't // call setSdtEndDeferred(false) here, that will happen only in lcl_utext(). - m_pImpl->GetTopContext()->Insert(PROP_SDT_END_BEFORE, uno::makeAny(true), true, CHAR_GRAB_BAG); + m_pImpl->GetTopContext()->Insert(PROP_SDT_END_BEFORE, uno::Any(true), true, CHAR_GRAB_BAG); } } @@ -3499,7 +3499,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); if (pContext && m_pImpl->isBreakDeferred(COLUMN_BREAK)) { - pContext->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); + pContext->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_COLUMN_BEFORE)); m_pImpl->clearDeferredBreak(COLUMN_BREAK); } finishParagraph(); @@ -3533,9 +3533,9 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) if (!m_pImpl->GetFootnoteContext()) { if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_PAGE_BEFORE)); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_COLUMN_BEFORE)); m_pImpl->clearDeferredBreaks(); } @@ -3690,7 +3690,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) PropertyMapPtr pContext = m_pImpl->GetTopContext(); if (m_pImpl->IsOpenField()) pContext = m_pImpl->GetTopFieldContext()->getProperties(); - pContext->Insert(PROP_SDT_END_BEFORE, uno::makeAny(true), true, CHAR_GRAB_BAG); + pContext->Insert(PROP_SDT_END_BEFORE, uno::Any(true), true, CHAR_GRAB_BAG); m_pImpl->setSdtEndDeferred(false); } @@ -3748,11 +3748,11 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) // We have a field, insert the SDT properties to the field's grab-bag, so they won't be lost. pContext = m_pImpl->GetTopFieldContext()->getProperties(); - pContext->Insert(PROP_SDTPR, uno::makeAny(m_pImpl->m_pSdtHelper->getInteropGrabBagAndClear()), true, CHAR_GRAB_BAG); + pContext->Insert(PROP_SDTPR, uno::Any(m_pImpl->m_pSdtHelper->getInteropGrabBagAndClear()), true, CHAR_GRAB_BAG); } else m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH)->Insert(PROP_SDTPR, - uno::makeAny(m_pImpl->m_pSdtHelper->getInteropGrabBagAndClear()), true, PARA_GRAB_BAG); + uno::Any(m_pImpl->m_pSdtHelper->getInteropGrabBagAndClear()), true, PARA_GRAB_BAG); } else if (len == 1 && sText[0] == 0x03) { @@ -3830,7 +3830,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) } - pContext->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); + pContext->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_PAGE_BEFORE)); m_pImpl->clearDeferredBreaks(); } } @@ -3843,7 +3843,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) lcl_startParagraphGroup(); } - pContext->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); + pContext->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_COLUMN_BEFORE)); m_pImpl->clearDeferredBreaks(); } } @@ -3896,7 +3896,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) finishParagraph(); lcl_startParagraphGroup(); } - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_PAGE_BEFORE)); } else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) { @@ -3907,7 +3907,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) finishParagraph(); lcl_startParagraphGroup(); } - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_COLUMN_BEFORE)); } m_pImpl->clearDeferredBreaks(); } @@ -4016,7 +4016,7 @@ void DomainMapper::handleUnderlineType(const Id nId, const ::tools::SvRef<Proper nUnderline = awt::FontUnderline::NONE; break; case NS_ooxml::LN_Value_ST_Underline_words: - rContext->Insert(PROP_CHAR_WORD_MODE, uno::makeAny(true)); + rContext->Insert(PROP_CHAR_WORD_MODE, uno::Any(true)); [[fallthrough]]; case NS_ooxml::LN_Value_ST_Underline_single: nUnderline = awt::FontUnderline::SINGLE; @@ -4067,7 +4067,7 @@ void DomainMapper::handleUnderlineType(const Id nId, const ::tools::SvRef<Proper nUnderline = awt::FontUnderline::DOUBLEWAVE; break; } - rContext->Insert(PROP_CHAR_UNDERLINE, uno::makeAny(nUnderline)); + rContext->Insert(PROP_CHAR_UNDERLINE, uno::Any(nUnderline)); } void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::tools::SvRef<PropertyMap>& rContext, const bool bExchangeLeftRight) @@ -4099,8 +4099,8 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::to nAdjust = bExchangeLeftRight ? style::ParagraphAdjust_RIGHT : style::ParagraphAdjust_LEFT; break; } - rContext->Insert( PROP_PARA_ADJUST, uno::makeAny( nAdjust ) ); - rContext->Insert( PROP_PARA_LAST_LINE_ADJUST, uno::makeAny( nLastLineAdjust ) ); + rContext->Insert( PROP_PARA_ADJUST, uno::Any( nAdjust ) ); + rContext->Insert( PROP_PARA_LAST_LINE_ADJUST, uno::Any( nLastLineAdjust ) ); m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "jc", aStringValue); } diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 916ff5b5828d..d0c42576202e 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -267,7 +267,7 @@ bool lcl_extractTableBorderProperty(const PropertyMapPtr& pTableProperties, cons { OSL_VERIFY(aTblBorder->second >>= rLine); - rInfo.pTableBorders->Insert( nId, uno::makeAny( rLine ) ); + rInfo.pTableBorders->Insert( nId, uno::Any( rLine ) ); rInfo.pTableDefaults->Erase( nId ); return true; @@ -446,7 +446,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo // apply tblHeader setting of the table style PropertyMapPtr pHeaderStyleProps = pTableStyle->GetProperties(CNF_FIRST_ROW); if ( pHeaderStyleProps->getProperty(PROP_HEADER_ROW_COUNT) ) - m_aTableProperties->Insert(PROP_HEADER_ROW_COUNT, uno::makeAny( sal_Int32(1)), false); + m_aTableProperties->Insert(PROP_HEADER_ROW_COUNT, uno::Any( sal_Int32(1)), false); } } } @@ -504,7 +504,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if (!aGrabBag.empty()) { - m_aTableProperties->Insert( PROP_TABLE_INTEROP_GRAB_BAG, uno::makeAny( aGrabBag.getAsConstPropertyValueList() ) ); + m_aTableProperties->Insert( PROP_TABLE_INTEROP_GRAB_BAG, uno::Any( aGrabBag.getAsConstPropertyValueList() ) ); } m_aTableProperties->getValue( TablePropertyMap::GAP_HALF, nGapHalf ); @@ -537,14 +537,14 @@ 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, uno::makeAny( aDistances ) ); + m_aTableProperties->Insert( PROP_TABLE_BORDER_DISTANCES, uno::Any( aDistances ) ); if (!rFrameProperties.empty()) lcl_DecrementHoriOrientPosition(rFrameProperties, rInfo.nLeftBorderDistance); // Set table above/bottom spacing to 0. - m_aTableProperties->Insert( PROP_TOP_MARGIN, uno::makeAny( sal_Int32( 0 ) ) ); - m_aTableProperties->Insert( PROP_BOTTOM_MARGIN, uno::makeAny( sal_Int32( 0 ) ) ); + m_aTableProperties->Insert( PROP_TOP_MARGIN, uno::Any( sal_Int32( 0 ) ) ); + m_aTableProperties->Insert( PROP_BOTTOM_MARGIN, uno::Any( sal_Int32( 0 ) ) ); //table border settings table::TableBorder aTableBorder; @@ -585,7 +585,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo aTableBorder.Distance = 0; aTableBorder.IsDistanceValid = false; - m_aTableProperties->Insert( PROP_TABLE_BORDER, uno::makeAny( aTableBorder ) ); + m_aTableProperties->Insert( PROP_TABLE_BORDER, uno::Any( aTableBorder ) ); #ifdef DBG_UTIL lcl_debug_TableBorder(aTableBorder); @@ -624,7 +624,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if (((nMode < 0) || (0 < nMode && nMode <= 14)) && rInfo.nNestLevel == 1) { const sal_Int32 nAdjustedMargin = nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance; - m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny( nAdjustedMargin ) ); + m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::Any( nAdjustedMargin ) ); } else { @@ -634,7 +634,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if ( rInfo.nNestLevel > 1 && nLeftMargin < 0 ) nLeftMargin = 0; const sal_Int32 nAdjustedMargin = nLeftMargin - nGapHalf + (aLeftBorder.LineWidth / 2); - m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny( nAdjustedMargin ) ); + m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::Any( nAdjustedMargin ) ); } sal_Int32 nTableWidth = 0; @@ -644,7 +644,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if( nTableWidthType == text::SizeType::FIX ) { if( nTableWidth > 0 ) - m_aTableProperties->Insert( PROP_WIDTH, uno::makeAny( nTableWidth )); + m_aTableProperties->Insert( PROP_WIDTH, uno::Any( nTableWidth )); else { // tdf#109524: If there is no width for the table, make it simply 100% by default. @@ -655,17 +655,17 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo } if (nTableWidthType != text::SizeType::FIX) { - m_aTableProperties->Insert( PROP_RELATIVE_WIDTH, uno::makeAny( sal_Int16( nTableWidth ) ) ); - m_aTableProperties->Insert( PROP_IS_WIDTH_RELATIVE, uno::makeAny( true ) ); + m_aTableProperties->Insert( PROP_RELATIVE_WIDTH, uno::Any( sal_Int16( nTableWidth ) ) ); + m_aTableProperties->Insert( PROP_IS_WIDTH_RELATIVE, uno::Any( true ) ); } sal_Int32 nHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH; // Fetch Horizontal Orientation in rFrameProperties if not set in m_aTableProperties if ( !m_aTableProperties->getValue( TablePropertyMap::HORI_ORIENT, nHoriOrient ) ) lcl_extractHoriOrient( rFrameProperties, nHoriOrient ); - m_aTableProperties->Insert( PROP_HORI_ORIENT, uno::makeAny( sal_Int16(nHoriOrient) ) ); + m_aTableProperties->Insert( PROP_HORI_ORIENT, uno::Any( sal_Int16(nHoriOrient) ) ); //fill default value - if not available - m_aTableProperties->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny( sal_Int32(0)), false); + m_aTableProperties->Insert( PROP_HEADER_ROW_COUNT, uno::Any( 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] ) @@ -676,7 +676,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo bool bRowCanSplit = true; oSplitAllowed->second >>= bRowCanSplit; if( !bRowCanSplit ) - m_aTableProperties->Insert( PROP_SPLIT, uno::makeAny(bRowCanSplit) ); + m_aTableProperties->Insert( PROP_SPLIT, uno::Any(bRowCanSplit) ); } } @@ -936,13 +936,13 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl //now set the default left+right border distance TODO: there's an sprm containing the default distance! aCellIterator->get()->Insert( PROP_LEFT_BORDER_DISTANCE, - uno::makeAny(rInfo.nLeftBorderDistance ), false); + uno::Any(rInfo.nLeftBorderDistance ), false); aCellIterator->get()->Insert( PROP_RIGHT_BORDER_DISTANCE, - uno::makeAny(rInfo.nRightBorderDistance ), false); + uno::Any(rInfo.nRightBorderDistance ), false); aCellIterator->get()->Insert( PROP_TOP_BORDER_DISTANCE, - uno::makeAny(rInfo.nTopBorderDistance ), false); + uno::Any(rInfo.nTopBorderDistance ), false); aCellIterator->get()->Insert( PROP_BOTTOM_BORDER_DISTANCE, - uno::makeAny(rInfo.nBottomBorderDistance ), false); + uno::Any(rInfo.nBottomBorderDistance ), false); // Horizontal merge is not a UNO property, extract that info here to rMerges, and then remove it from the map. const std::optional<PropertyMap::Property> aHorizontalMergeVal = (*aCellIterator)->getProperty(PROP_HORIZONTAL_MERGE); @@ -1057,7 +1057,7 @@ css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTabl if (rRow) { //set default to 'break across pages" - rRow->Insert( PROP_IS_SPLIT_ALLOWED, uno::makeAny(true ), false ); + rRow->Insert( PROP_IS_SPLIT_ALLOWED, uno::Any(true ), false ); // tblHeader is only our property, remove before the property map hits UNO rRow->Erase(PROP_TBL_HEADER); @@ -1065,7 +1065,7 @@ css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTabl { // We have CellHideMark on all cells, and also all cells are empty: // Force the row height to be exactly as specified, and not just as the minimum suggestion. - rRow->Insert(PROP_SIZE_TYPE, uno::makeAny(text::SizeType::FIX)); + rRow->Insert(PROP_SIZE_TYPE, uno::Any(text::SizeType::FIX)); } aRowPropertiesRange[nRow] = rRow->GetPropertyValues(); @@ -1128,7 +1128,7 @@ void DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag auto pFillStyleProp = std::find_if(rCellProperties.begin(), rCellProperties.end(), [](const beans::PropertyValue& rProp) { return rProp.Name == "FillStyle"; }); if ( pFillStyleProp != rCellProperties.end() && - pFillStyleProp->Value == uno::makeAny(drawing::FillStyle_SOLID) ) + pFillStyleProp->Value == uno::Any(drawing::FillStyle_SOLID) ) { sPropertyName = "ParaBackColor"; } @@ -1183,7 +1183,7 @@ void DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag { // we need this for complete import of table-style based paragraph background color rParaProp.m_rPropertySet->setPropertyValue( "FillColor", pCellProp->Value ); - rParaProp.m_rPropertySet->setPropertyValue( "FillStyle", uno::makeAny(drawing::FillStyle_SOLID) ); + rParaProp.m_rPropertySet->setPropertyValue( "FillStyle", uno::Any(drawing::FillStyle_SOLID) ); } } else @@ -1324,21 +1324,21 @@ static void lcl_convertFormulaRanges(const uno::Reference<text::XTextTable> & xT { uno::Reference<text::XTextRange> xRun(xRunEnum->nextElement(), uno::UNO_QUERY); uno::Reference< beans::XPropertySet > xRunProperties( xRun, uno::UNO_QUERY_THROW ); - if ( xRunProperties->getPropertyValue("TextPortionType") == uno::makeAny(OUString("TextField")) ) + if ( xRunProperties->getPropertyValue("TextPortionType") == uno::Any(OUString("TextField")) ) { uno::Reference<text::XTextField> const xField(xRunProperties->getPropertyValue("TextField").get<uno::Reference<text::XTextField>>()); uno::Reference< beans::XPropertySet > xFieldProperties( xField, uno::UNO_QUERY_THROW ); // cell can contain multiple text fields, but only one is handled now (~formula cell) if ( rProp.Value != xFieldProperties->getPropertyValue("Content") ) continue; - xFieldProperties->setPropertyValue("Content", uno::makeAny(sFormula)); + xFieldProperties->setPropertyValue("Content", uno::Any(sFormula)); // update grab bag auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(aCellGrabBag); beans::PropertyValue aValue; aValue.Name = "CellFormulaConverted"; aValue.Value <<= sFormula; aGrabBag.push_back(aValue); - xCellProperties->setPropertyValue("CellInteropGrabBag", uno::makeAny(comphelper::containerToSequence(aGrabBag))); + xCellProperties->setPropertyValue("CellInteropGrabBag", uno::Any(comphelper::containerToSequence(aGrabBag))); } } } @@ -1514,7 +1514,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab { if (aBorderValues[i].LineStyle != table::BorderLineStyle::NONE) xFirstCell->setPropertyValue( - OUString(aBorderNames[i]), uno::makeAny(aBorderValues[i])); + OUString(aBorderNames[i]), uno::Any(aBorderValues[i])); } } } @@ -1559,11 +1559,11 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab aFrameProperties.push_back(aValue); // Applying the relative width to the frame, needs to have the table width to be 100% of the frame width - xTableProperties->setPropertyValue("RelativeWidth", uno::makeAny(sal_Int16(100))); + xTableProperties->setPropertyValue("RelativeWidth", uno::Any(sal_Int16(100))); } // A non-zero left margin would move the table out of the frame, move the frame itself instead. - xTableProperties->setPropertyValue("LeftMargin", uno::makeAny(sal_Int32(0))); + xTableProperties->setPropertyValue("LeftMargin", uno::Any(sal_Int32(0))); if (nestedTableLevel >= 2) { diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 127f9b067c4d..2d86919deca3 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -66,7 +66,7 @@ bool DomainMapperTableManager::attribute(Id nName, Value const & rValue) case NS_ooxml::LN_CT_TblLook_val: { TablePropertyMapPtr pPropMap(new TablePropertyMap()); - pPropMap->Insert(PROP_TBL_LOOK, uno::makeAny<sal_Int32>(rValue.getInt())); + pPropMap->Insert(PROP_TBL_LOOK, uno::Any(sal_Int32(rValue.getInt()))); insertTableProps(pPropMap); m_aTableLook["val"] <<= static_cast<sal_Int32>(rValue.getInt()); } @@ -99,7 +99,7 @@ bool DomainMapperTableManager::attribute(Id nName, Value const & rValue) void DomainMapperTableManager::finishTableLook() { TablePropertyMapPtr pPropMap(new TablePropertyMap()); - pPropMap->Insert(META_PROP_TABLE_LOOK, uno::makeAny(m_aTableLook.getAsConstPropertyValueList())); + pPropMap->Insert(META_PROP_TABLE_LOOK, uno::Any(m_aTableLook.getAsConstPropertyValueList())); m_aTableLook.clear(); insertTableProps(pPropMap); } @@ -211,12 +211,12 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) if ( m_nHeaderRepeat == HEADER_ROW_LIMIT_FOR_MSO_WORKAROUND ) { m_nHeaderRepeat = -1; - pPropMap->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny(sal_Int32(0))); + pPropMap->Insert( PROP_HEADER_ROW_COUNT, uno::Any(sal_Int32(0))); } else { ++m_nHeaderRepeat; - pPropMap->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny( m_nHeaderRepeat )); + pPropMap->Insert( PROP_HEADER_ROW_COUNT, uno::Any( m_nHeaderRepeat )); } insertTableProps(pPropMap); } @@ -226,7 +226,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) { // explicit tblHeader=0 in the first row must overwrite table style TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny(sal_Int32(0))); + pPropMap->Insert( PROP_HEADER_ROW_COUNT, uno::Any(sal_Int32(0))); insertTableProps(pPropMap); } m_nHeaderRepeat = -1; @@ -235,14 +235,14 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) { // Store the info that this is a header, we'll need that when we apply table styles. TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_TBL_HEADER, uno::makeAny(nIntValue)); + pPropMap->Insert( PROP_TBL_HEADER, uno::Any(nIntValue)); insertRowProps(pPropMap); } break; case NS_ooxml::LN_CT_TblPrBase_tblStyle: //table style name { TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( META_PROP_TABLE_STYLE_NAME, uno::makeAny( pValue->getString() )); + pPropMap->Insert( META_PROP_TABLE_STYLE_NAME, uno::Any( pValue->getString() )); insertTableProps(pPropMap); } break; @@ -258,7 +258,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, uno::makeAny( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Merge_restart ) ); + pMergeProps->Insert( PROP_VERTICAL_MERGE, uno::Any( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Merge_restart ) ); cellProps( pMergeProps); } break; @@ -266,7 +266,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_HORIZONTAL_MERGE, uno::makeAny( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Merge_restart )); + pMergeProps->Insert(PROP_HORIZONTAL_MERGE, uno::Any( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Merge_restart )); cellProps(pMergeProps); } break; @@ -289,17 +289,17 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) case NS_ooxml::LN_Value_ST_TextDirection_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, uno::makeAny( text::WritingMode2::TB_RL )); + pPropMap->Insert( PROP_FRM_DIRECTION, uno::Any( text::WritingMode2::TB_RL )); SAL_INFO( "writerfilter", "Have inserted textDirection " << nIntValue ); break; case NS_ooxml::LN_Value_ST_TextDirection_btLr: - pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::BT_LR )); + pPropMap->Insert( PROP_FRM_DIRECTION, uno::Any( text::WritingMode2::BT_LR )); break; case NS_ooxml::LN_Value_ST_TextDirection_lrTbV: - pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::LR_TB )); + pPropMap->Insert( PROP_FRM_DIRECTION, uno::Any( text::WritingMode2::LR_TB )); break; case NS_ooxml::LN_Value_ST_TextDirection_tbRlV: - pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::TB_RL )); + pPropMap->Insert( PROP_FRM_DIRECTION, uno::Any( text::WritingMode2::TB_RL )); break; case NS_ooxml::LN_Value_ST_TextDirection_lrTb: case NS_ooxml::LN_Value_ST_TextDirection_tbLrV: @@ -370,7 +370,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) case NS_ooxml::LN_CT_TblPrBase_bidiVisual: { TablePropertyMapPtr pPropMap(new TablePropertyMap()); - pPropMap->Insert(PROP_WRITING_MODE, uno::makeAny(sal_Int16(nIntValue ? text::WritingMode2::RL_TB : text::WritingMode2::LR_TB))); + pPropMap->Insert(PROP_WRITING_MODE, uno::Any(sal_Int16(nIntValue ? text::WritingMode2::RL_TB : text::WritingMode2::LR_TB))); insertTableProps(pPropMap); break; } @@ -730,7 +730,7 @@ void DomainMapperTableManager::endOfRowAction() } } TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) ); + pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::Any( aSeparators ) ); #ifdef DBG_UTIL TagLogger::getInstance().startElement("rowProperties"); @@ -747,7 +747,7 @@ void DomainMapperTableManager::endOfRowAction() ? oox::XML_tableRowDelete : oox::XML_tableRowInsert ); uno::Sequence<beans::PropertyValue> aTableRedlineProperties = pTrackChangesHandler->getRedlineProperties(); - pPropMap->Insert( PROP_TABLE_REDLINE_PARAMS , uno::makeAny( aTableRedlineProperties )); + pPropMap->Insert( PROP_TABLE_REDLINE_PARAMS , uno::Any( aTableRedlineProperties )); } insertRowProps(pPropMap); @@ -820,7 +820,7 @@ void DomainMapperTableManager::endOfRowAction() } TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) ); + pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::Any( aSeparators ) ); #ifdef DBG_UTIL TagLogger::getInstance().startElement("rowProperties"); pPropMap->dumpXml(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index d6fe9acc67da..5d5320163c6f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -144,7 +144,7 @@ static void lcl_linenumberingHeaderFooter( const uno::Reference<container::XName if( !xStyle.is() ) return; uno::Reference<beans::XPropertySet> xPropertySet( xStyle, uno::UNO_QUERY ); - xPropertySet->setPropertyValue( getPropertyName( PROP_PARA_LINE_NUMBER_COUNT ), uno::makeAny( nListId >= 0 ) ); + xPropertySet->setPropertyValue( getPropertyName( PROP_PARA_LINE_NUMBER_COUNT ), uno::Any( nListId >= 0 ) ); } } } @@ -156,19 +156,19 @@ static void lcl_handleDropdownField( const uno::Reference< beans::XPropertySet > return; if ( !pFFDataHandler->getName().isEmpty() ) - rxFieldProps->setPropertyValue( "Name", uno::makeAny( pFFDataHandler->getName() ) ); + rxFieldProps->setPropertyValue( "Name", uno::Any( pFFDataHandler->getName() ) ); const FFDataHandler::DropDownEntries_t& rEntries = pFFDataHandler->getDropDownEntries(); uno::Sequence< OUString > sItems( rEntries.size() ); ::std::copy( rEntries.begin(), rEntries.end(), sItems.getArray()); if ( sItems.hasElements() ) - rxFieldProps->setPropertyValue( "Items", uno::makeAny( sItems ) ); + rxFieldProps->setPropertyValue( "Items", uno::Any( sItems ) ); sal_Int32 nResult = pFFDataHandler->getDropDownResult().toInt32(); if (nResult > 0 && o3tl::make_unsigned(nResult) < sItems.size()) - rxFieldProps->setPropertyValue( "SelectedItem", uno::makeAny( std::as_const(sItems)[ nResult ] ) ); + rxFieldProps->setPropertyValue( "SelectedItem", uno::Any( std::as_const(sItems)[ nResult ] ) ); if ( !pFFDataHandler->getHelpText().isEmpty() ) - rxFieldProps->setPropertyValue( "Help", uno::makeAny( pFFDataHandler->getHelpText() ) ); + rxFieldProps->setPropertyValue( "Help", uno::Any( pFFDataHandler->getHelpText() ) ); } static void lcl_handleTextField( const uno::Reference< beans::XPropertySet >& rxFieldProps, const FFDataHandler::Pointer_t& pFFDataHandler ) @@ -177,13 +177,13 @@ static void lcl_handleTextField( const uno::Reference< beans::XPropertySet >& rx { rxFieldProps->setPropertyValue (getPropertyName(PROP_HINT), - uno::makeAny(pFFDataHandler->getStatusText())); + uno::Any(pFFDataHandler->getStatusText())); rxFieldProps->setPropertyValue (getPropertyName(PROP_HELP), - uno::makeAny(pFFDataHandler->getHelpText())); + uno::Any(pFFDataHandler->getHelpText())); rxFieldProps->setPropertyValue (getPropertyName(PROP_CONTENT), - uno::makeAny(pFFDataHandler->getTextDefault())); + uno::Any(pFFDataHandler->getTextDefault())); } } @@ -889,20 +889,20 @@ void DomainMapper_Impl::PopSdt() if (m_pSdtHelper->GetShowingPlcHdr()) { xContentControlProps->setPropertyValue("ShowingPlaceHolder", - uno::makeAny(m_pSdtHelper->GetShowingPlcHdr())); + uno::Any(m_pSdtHelper->GetShowingPlcHdr())); } if (m_pSdtHelper->getControlType() == SdtControlType::checkBox) { - xContentControlProps->setPropertyValue("Checkbox", uno::makeAny(true)); + xContentControlProps->setPropertyValue("Checkbox", uno::Any(true)); - xContentControlProps->setPropertyValue("Checked", uno::makeAny(m_pSdtHelper->GetChecked())); + xContentControlProps->setPropertyValue("Checked", uno::Any(m_pSdtHelper->GetChecked())); xContentControlProps->setPropertyValue("CheckedState", - uno::makeAny(m_pSdtHelper->GetCheckedState())); + uno::Any(m_pSdtHelper->GetCheckedState())); xContentControlProps->setPropertyValue("UncheckedState", - uno::makeAny(m_pSdtHelper->GetUncheckedState())); + uno::Any(m_pSdtHelper->GetUncheckedState())); } xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true); @@ -1365,7 +1365,7 @@ static void lcl_MoveBorderPropertiesToFrame(std::vector<beans::PropertyValue>& r aValue.Value = xTextRangeProperties->getPropertyValue(sPropertyName); rFrameProperties.push_back(aValue); if( nProperty < 4 ) - xTextRangeProperties->setPropertyValue( sPropertyName, uno::makeAny(table::BorderLine2())); + xTextRangeProperties->setPropertyValue( sPropertyName, uno::Any(table::BorderLine2())); } } catch( const uno::Exception& ) @@ -1816,7 +1816,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con nListLevel = 0; if (!bNoNumbering && nListLevel >= 0 && nListLevel < 9) - pParaContext->Insert( PROP_NUMBERING_LEVEL, uno::makeAny(nListLevel), false ); + pParaContext->Insert( PROP_NUMBERING_LEVEL, uno::Any(nListLevel), false ); auto const pList(GetListTable()->GetList(nListId)); if (pList && !pParaContext->isSet(PROP_NUMBERING_STYLE_NAME)) @@ -1824,7 +1824,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con // ListLevel 9 means Body Level/no numbering. if (bNoNumbering || nListLevel == 9) { - pParaContext->Insert(PROP_NUMBERING_STYLE_NAME, uno::makeAny(OUString()), true); + pParaContext->Insert(PROP_NUMBERING_STYLE_NAME, uno::Any(OUString()), true); pParaContext->Erase(PROP_NUMBERING_LEVEL); } else if ( !isNumberingViaRule ) @@ -1832,7 +1832,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con isNumberingViaStyle = true; // Since LO7.0/tdf#131321 fixed the loss of numbering in styles, this OUGHT to be obsolete, // but now other new/critical LO7.0 code expects it, and perhaps some corner cases still need it as well. - pParaContext->Insert(PROP_NUMBERING_STYLE_NAME, uno::makeAny(pList->GetStyleName()), true); + pParaContext->Insert(PROP_NUMBERING_STYLE_NAME, uno::Any(pList->GetStyleName()), true); } else { @@ -1842,7 +1842,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con // and the priority of the numbering-style-indents will be lowered. tdf#133000 bool bDummy; if (nListId == lcl_getListId(pEntry, GetStyleSheetTable(), bDummy)) - pParaContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny(pList->GetStyleName()), true ); + pParaContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::Any(pList->GetStyleName()), true ); } } @@ -1876,15 +1876,15 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, nListLevel, "FirstLineIndent"); const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, nListLevel, "IndentAt"); if (nFirstLineIndent != 0) - pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent), /*bOverwrite=*/false); + pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::Any(nFirstLineIndent), /*bOverwrite=*/false); if (nParaLeftMargin != 0) - pParaContext->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin), /*bOverwrite=*/false); + pParaContext->Insert(PROP_PARA_LEFT_MARGIN, uno::Any(nParaLeftMargin), /*bOverwrite=*/false); // Override right margin value with value from current style, if any if (pStyleSheetProperties && pStyleSheetProperties->isSet(PROP_PARA_RIGHT_MARGIN)) nParaRightMargin = pStyleSheetProperties->getProperty(PROP_PARA_RIGHT_MARGIN)->second.get<sal_Int32>(); - pParaContext->Insert(PROP_PARA_RIGHT_MARGIN, uno::makeAny(nParaRightMargin), /*bOverwrite=*/false); + pParaContext->Insert(PROP_PARA_RIGHT_MARGIN, uno::Any(nParaRightMargin), /*bOverwrite=*/false); } } // Paragraph style based right paragraph indentation affects not paragraph style based lists in DOCX. @@ -1899,9 +1899,9 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, nListLevel, "FirstLineIndent"); const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, nListLevel, "IndentAt"); if (nFirstLineIndent != 0) - pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent), /*bOverwrite=*/false); + pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::Any(nFirstLineIndent), /*bOverwrite=*/false); if (nParaLeftMargin != 0) - pParaContext->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin), /*bOverwrite=*/false); + pParaContext->Insert(PROP_PARA_LEFT_MARGIN, uno::Any(nParaLeftMargin), /*bOverwrite=*/false); } } @@ -1915,13 +1915,13 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if (aProp.hasValue()) pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, aProp, false); else - pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(sal_uInt32(0)), false); + pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::Any(sal_uInt32(0)), false); aProp = lcl_GetPropertyFromParaStyleSheetNoNum(PROP_PARA_LEFT_MARGIN, pEntry, m_pStyleSheetTable); if (aProp.hasValue()) pParaContext->Insert(PROP_PARA_LEFT_MARGIN, aProp, false); else - pParaContext->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(sal_uInt32(0)), false); + pParaContext->Insert(PROP_PARA_LEFT_MARGIN, uno::Any(sal_uInt32(0)), false); } } @@ -1955,11 +1955,11 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con { // export requires grabbag to match top_margin, so keep them in sync if (nBeforeAutospacing && bIsAutoSet) - pParaContext->Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( sal_Int32(0) ),true, PARA_GRAB_BAG ); + pParaContext->Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::Any( sal_Int32(0) ),true, PARA_GRAB_BAG ); nBeforeAutospacing = 0; } } - pParaContext->Insert(PROP_PARA_TOP_MARGIN, uno::makeAny(nBeforeAutospacing)); + pParaContext->Insert(PROP_PARA_TOP_MARGIN, uno::Any(nBeforeAutospacing)); } sal_Int32 nAfterAutospacing = -1; @@ -1979,7 +1979,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con } if ( nAfterAutospacing > -1 && pParaContext ) { - pParaContext->Insert(PROP_PARA_BOTTOM_MARGIN, uno::makeAny(nAfterAutospacing)); + pParaContext->Insert(PROP_PARA_BOTTOM_MARGIN, uno::Any(nAfterAutospacing)); bAppliedBottomAutospacing = bAllowAdjustments; } @@ -2099,7 +2099,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if (!charProperties.empty()) { aProperties.push_back(beans::PropertyValue("ListAutoFormat", - 0, uno::makeAny(comphelper::containerToSequence(charProperties)), beans::PropertyState_DIRECT_VALUE)); + 0, uno::Any(comphelper::containerToSequence(charProperties)), beans::PropertyState_DIRECT_VALUE)); } } if( !bIsDropCap ) @@ -2209,7 +2209,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if (bPrevParaAutoAfter) { // Previous after spacing is set to auto, set previous after space to 0. - m_xPreviousParagraph->setPropertyValue("ParaBottomMargin", uno::makeAny(static_cast<sal_Int32>(0))); + m_xPreviousParagraph->setPropertyValue("ParaBottomMargin", uno::Any(static_cast<sal_Int32>(0))); } } } @@ -2254,7 +2254,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con OUString const listId = pAbsList->MapListId(paraId); if (listId != paraId) { - m_xPreviousParagraph->setPropertyValue("ListId", uno::makeAny(listId)); + m_xPreviousParagraph->setPropertyValue("ListId", uno::Any(listId)); } } } @@ -2269,8 +2269,8 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con // TODO: Not tested variant with different levels override in different lists. // Probably m_aListOverrideApplied as a set of overridden listids is not sufficient // and we need to register level overrides separately. - m_xPreviousParagraph->setPropertyValue("ParaIsNumberingRestart", uno::makeAny(true)); - m_xPreviousParagraph->setPropertyValue("NumberingStartValue", uno::makeAny(nOverrideLevel)); + m_xPreviousParagraph->setPropertyValue("ParaIsNumberingRestart", uno::Any(true)); + m_xPreviousParagraph->setPropertyValue("NumberingStartValue", uno::Any(nOverrideLevel)); m_aListOverrideApplied.insert(nListId); } } @@ -2372,7 +2372,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if (xCur3->getString() == SAL_NEWLINE_STRING) { uno::Reference< beans::XPropertySet > xProp( xCur3, uno::UNO_QUERY ); - xProp->setPropertyValue(getPropertyName(PROP_CHAR_HIDDEN), uno::makeAny(false)); + xProp->setPropertyValue(getPropertyName(PROP_CHAR_HIDDEN), uno::Any(false)); } } } @@ -2427,7 +2427,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con { const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, GetListLevel(pEntry, pPropertyMap), "IndentAt"); if (nParaLeftMargin != 0) - xParaProps->setPropertyValue("ParaLeftMargin", uno::makeAny(nParaLeftMargin)); + xParaProps->setPropertyValue("ParaLeftMargin", uno::Any(nParaLeftMargin)); } } if ( !bRightSet ) @@ -2445,7 +2445,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con { const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, GetListLevel(pEntry, pPropertyMap), "FirstLineIndent"); if (nFirstLineIndent != 0) - xParaProps->setPropertyValue("ParaFirstLineIndent", uno::makeAny(nFirstLineIndent)); + xParaProps->setPropertyValue("ParaFirstLineIndent", uno::Any(nFirstLineIndent)); } } } @@ -2455,7 +2455,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if ( xTextRange.is() && xParaProps && m_nTableDepth > 0 ) { // tdf#128959 table paragraphs haven't got window and orphan controls - uno::Any aAny = uno::makeAny(static_cast<sal_Int8>(0)); + uno::Any aAny(static_cast<sal_Int8>(0)); xParaProps->setPropertyValue("ParaOrphans", aAny); xParaProps->setPropertyValue("ParaWidows", aAny); } @@ -2714,13 +2714,13 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share OUString aCLSID = pOLEHandler->getCLSID(); if (aCLSID.isEmpty()) xOLEProperties->setPropertyValue(getPropertyName( PROP_STREAM_NAME ), - uno::makeAny( rStreamName )); + uno::Any( rStreamName )); else - xOLEProperties->setPropertyValue("CLSID", uno::makeAny(aCLSID)); + xOLEProperties->setPropertyValue("CLSID", uno::Any(aCLSID)); OUString aDrawAspect = pOLEHandler->GetDrawAspect(); if(!aDrawAspect.isEmpty()) - xOLEProperties->setPropertyValue("DrawAspect", uno::makeAny(aDrawAspect)); + xOLEProperties->setPropertyValue("DrawAspect", uno::Any(aDrawAspect)); awt::Size aSize = pOLEHandler->getSize(); if( !aSize.Width ) @@ -2728,21 +2728,21 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share if( !aSize.Height ) aSize.Height = 1000; xOLEProperties->setPropertyValue(getPropertyName( PROP_WIDTH ), - uno::makeAny(aSize.Width)); + uno::Any(aSize.Width)); xOLEProperties->setPropertyValue(getPropertyName( PROP_HEIGHT ), - uno::makeAny(aSize.Height)); + uno::Any(aSize.Height)); OUString aVisAreaWidth = pOLEHandler->GetVisAreaWidth(); if(!aVisAreaWidth.isEmpty()) - xOLEProperties->setPropertyValue("VisibleAreaWidth", uno::makeAny(aVisAreaWidth)); + xOLEProperties->setPropertyValue("VisibleAreaWidth", uno::Any(aVisAreaWidth)); OUString aVisAreaHeight = pOLEHandler->GetVisAreaHeight(); if(!aVisAreaHeight.isEmpty()) - xOLEProperties->setPropertyValue("VisibleAreaHeight", uno::makeAny(aVisAreaHeight)); + xOLEProperties->setPropertyValue("VisibleAreaHeight", uno::Any(aVisAreaHeight)); uno::Reference< graphic::XGraphic > xGraphic = pOLEHandler->getReplacement(); xOLEProperties->setPropertyValue(getPropertyName( PROP_GRAPHIC ), - uno::makeAny(xGraphic)); + uno::Any(xGraphic)); uno::Reference<beans::XPropertySet> xReplacementProperties(pOLEHandler->getShape(), uno::UNO_QUERY); if (xReplacementProperties.is()) { @@ -2793,7 +2793,7 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share else // mimic the treatment of graphics here... it seems anchoring as character // gives a better ( visually ) result - xOLEProperties->setPropertyValue(getPropertyName( PROP_ANCHOR_TYPE ), uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) ); + xOLEProperties->setPropertyValue(getPropertyName( PROP_ANCHOR_TYPE ), uno::Any( text::TextContentAnchorType_AS_CHARACTER ) ); // remove ( if valid ) associated shape ( used for graphic replacement ) SAL_WARN_IF(m_aAnchoredStack.empty(), "writerfilter.dmapper", "no anchor stack"); if (!m_aAnchoredStack.empty()) @@ -2832,34 +2832,34 @@ void DomainMapper_Impl::appendStarMath( const Value& val ) val.getAny()); // tdf#66405: set zero margins for embedded object xStarMathProperties->setPropertyValue(getPropertyName( PROP_LEFT_MARGIN ), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); xStarMathProperties->setPropertyValue(getPropertyName( PROP_RIGHT_MARGIN ), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); xStarMathProperties->setPropertyValue(getPropertyName( PROP_TOP_MARGIN ), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); xStarMathProperties->setPropertyValue(getPropertyName( PROP_BOTTOM_MARGIN ), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); uno::Reference< uno::XInterface > xInterface( formula->getComponent(), uno::UNO_QUERY ); // set zero margins for object's component uno::Reference< beans::XPropertySet > xComponentProperties( xInterface, uno::UNO_QUERY_THROW ); xComponentProperties->setPropertyValue(getPropertyName( PROP_LEFT_MARGIN ), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); xComponentProperties->setPropertyValue(getPropertyName( PROP_RIGHT_MARGIN ), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); xComponentProperties->setPropertyValue(getPropertyName( PROP_TOP_MARGIN ), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); xComponentProperties->setPropertyValue(getPropertyName( PROP_BOTTOM_MARGIN ), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); Size size( 1000, 1000 ); if( oox::FormulaImportBase* formulaimport = dynamic_cast< oox::FormulaImportBase* >( xInterface.get())) size = formulaimport->getFormulaSize(); xStarMathProperties->setPropertyValue(getPropertyName( PROP_WIDTH ), - uno::makeAny( sal_Int32(size.Width()))); + uno::Any( sal_Int32(size.Width()))); xStarMathProperties->setPropertyValue(getPropertyName( PROP_HEIGHT ), - uno::makeAny( sal_Int32(size.Height()))); + uno::Any( sal_Int32(size.Height()))); xStarMathProperties->setPropertyValue(getPropertyName(PROP_ANCHOR_TYPE), - uno::makeAny(text::TextContentAnchorType_AS_CHARACTER)); + uno::Any(text::TextContentAnchorType_AS_CHARACTER)); // mimic the treatment of graphics here... it seems anchoring as character // gives a better ( visually ) result appendTextContent(xStarMath, uno::Sequence<beans::PropertyValue>()); @@ -2873,7 +2873,7 @@ void DomainMapper_Impl::appendStarMath( const Value& val ) void DomainMapper_Impl::adjustLastPara(sal_Int8 nAlign) { PropertyMapPtr pLastPara = GetTopContextOfType(dmapper::CONTEXT_PARAGRAPH); - pLastPara->Insert(PROP_PARA_ADJUST, uno::makeAny(nAlign), true); + pLastPara->Insert(PROP_PARA_ADJUST, uno::Any(nAlign), true); } uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter( @@ -2950,7 +2950,7 @@ void DomainMapper_Impl::fillEmptyFrameProperties(std::vector<beans::PropertyValu if (bSetAnchorToChar) rFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_ANCHOR_TYPE), text::TextContentAnchorType_AS_CHARACTER)); - uno::Any aEmptyBorder = uno::makeAny(table::BorderLine2()); + uno::Any aEmptyBorder{table::BorderLine2()}; static const std::vector<PropertyIds> aBorderIds = { PROP_BOTTOM_BORDER, PROP_LEFT_BORDER, PROP_RIGHT_BORDER, PROP_TOP_BORDER }; for (size_t i = 0; i < aBorderIds.size(); ++i) @@ -3057,12 +3057,12 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool bHeader, SectionPropertyMap::P //switch on header/footer use xPageStyle->setPropertyValue( getPropertyName(ePropIsOn), - uno::makeAny(true)); + uno::Any(true)); // If the 'Different Even & Odd Pages' flag is turned on - do not ignore it // Even if the 'Even' header/footer is blank - the flag should be imported (so it would look in LO like in Word) if (!bFirst && GetSettingsTable()->GetEvenAndOddHeaders()) - xPageStyle->setPropertyValue(getPropertyName(ePropShared), uno::makeAny(false)); + xPageStyle->setPropertyValue(getPropertyName(ePropShared), uno::Any(false)); //set the interface uno::Reference< text::XText > xText; @@ -3083,11 +3083,11 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool bHeader, SectionPropertyMap::P { bool bIsShared = false; // Turn on the headers - xPageStyle->setPropertyValue(getPropertyName(ePropIsOn), uno::makeAny(true)); + xPageStyle->setPropertyValue(getPropertyName(ePropIsOn), uno::Any(true)); // Store the state of the previous state of shared prop xPageStyle->getPropertyValue(getPropertyName(ePropShared)) >>= bIsShared; // Turn on the shared prop in order to save the headers/footers in time - xPageStyle->setPropertyValue(getPropertyName(ePropShared), uno::makeAny(false)); + xPageStyle->setPropertyValue(getPropertyName(ePropShared), uno::Any(false)); // Add the content of the headers footers to the doc uno::Reference<text::XText> xText; xPageStyle->getPropertyValue(getPropertyName(bLeft ? ePropTextLeft : ePropText)) @@ -3098,7 +3098,7 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool bHeader, SectionPropertyMap::P m_bIsNewDoc ? uno::Reference<text::XTextCursor>() : xText->createTextCursorByRange(xText->getStart()))); // Restore the original state of the shared prop after we stored the necessary values. - xPageStyle->setPropertyValue(getPropertyName(ePropShared), uno::makeAny(bIsShared)); + xPageStyle->setPropertyValue(getPropertyName(ePropShared), uno::Any(bIsShared)); } m_bDiscardHeaderFooter = false; // set only on success! } @@ -3272,9 +3272,9 @@ void DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xR if (eType != StoredRedlines::NONE) { - m_aStoredRedlines[eType].push_back( uno::makeAny(xRange) ); - m_aStoredRedlines[eType].push_back( uno::makeAny(sType) ); - m_aStoredRedlines[eType].push_back( uno::makeAny(aRedlineProperties) ); + m_aStoredRedlines[eType].push_back( uno::Any(xRange) ); + m_aStoredRedlines[eType].push_back( uno::Any(sType) ); + m_aStoredRedlines[eType].push_back( uno::Any(aRedlineProperties) ); } } catch( const uno::Exception & ) @@ -3716,7 +3716,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape m_xEmbedded.set(m_xTextFactory->createInstance("com.sun.star.text.TextEmbeddedObject"), uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xEmbeddedProperties(m_xEmbedded, uno::UNO_QUERY_THROW); xEmbeddedProperties->setPropertyValue(getPropertyName(PROP_EMBEDDED_OBJECT), xShapePropertySet->getPropertyValue(getPropertyName(PROP_EMBEDDED_OBJECT))); - xEmbeddedProperties->setPropertyValue(getPropertyName(PROP_ANCHOR_TYPE), uno::makeAny(text::TextContentAnchorType_AS_CHARACTER)); + xEmbeddedProperties->setPropertyValue(getPropertyName(PROP_ANCHOR_TYPE), uno::Any(text::TextContentAnchorType_AS_CHARACTER)); // So that the original bitmap-only shape will be replaced by the embedded object. m_aAnchoredStack.top().bToRemove = true; m_aTextAppendStack.pop(); @@ -3763,9 +3763,9 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape GraphicZOrderHelper* pZOrderHelper = m_rDMapper.graphicZOrderHelper(); sal_Int32 zOrder(0); rProp.Value >>= zOrder; - xShapePropertySet->setPropertyValue( "ZOrder", uno::makeAny(pZOrderHelper->findZOrder(zOrder))); + xShapePropertySet->setPropertyValue( "ZOrder", uno::Any(pZOrderHelper->findZOrder(zOrder))); pZOrderHelper->addItem(xShapePropertySet, zOrder); - xShapePropertySet->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::makeAny( zOrder >= 0 ) ); + xShapePropertySet->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::Any( zOrder >= 0 ) ); checkZOrderStatus = true; } else if ( rProp.Name == "TxbxHasLink" ) @@ -3784,7 +3784,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape uno::Reference<beans::XPropertySet> xPropertySet(xTextContent, uno::UNO_QUERY); // we need to re-set this value to xTextContent, then only values are preserved. - xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aGrabBag)); + xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::Any(aGrabBag)); } else if (nAnchorType == text::TextContentAnchorType_AS_CHARACTER) { @@ -3807,9 +3807,9 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape GraphicZOrderHelper* pZOrderHelper = m_rDMapper.graphicZOrderHelper(); sal_Int32 zOrder(0); rProp.Value >>= zOrder; - xShapePropertySet->setPropertyValue( "ZOrder", uno::makeAny(pZOrderHelper->findZOrder(zOrder))); + xShapePropertySet->setPropertyValue( "ZOrder", uno::Any(pZOrderHelper->findZOrder(zOrder))); pZOrderHelper->addItem(xShapePropertySet, zOrder); - xShapePropertySet->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::makeAny( zOrder >= 0 ) ); + xShapePropertySet->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::Any( zOrder >= 0 ) ); checkZOrderStatus = true; } else if ( rProp.Name == "TxbxHasLink" ) @@ -3833,7 +3833,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape uno::Sequence<beans::PropertyValue> aShapeGrabBag( comphelper::InitPropertySequence({ { "SdtEndBefore", uno::Any(true) } })); - xShapePropertySet->setPropertyValue("InteropGrabBag",uno::makeAny(aShapeGrabBag)); + xShapePropertySet->setPropertyValue("InteropGrabBag",uno::Any(aShapeGrabBag)); } } } @@ -3841,7 +3841,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape if (!IsInHeaderFooter() && !checkZOrderStatus) xProps->setPropertyValue( getPropertyName( PROP_OPAQUE ), - uno::makeAny( true ) ); + uno::Any( true ) ); } m_bParaChanged = true; getTableManager().setIsInShape(true); @@ -3861,8 +3861,8 @@ void DomainMapper_Impl::UpdateEmbeddedShapeProps(const uno::Reference< drawing:: uno::Reference<beans::XPropertySet> xEmbeddedProperties(m_xEmbedded, uno::UNO_QUERY_THROW); awt::Size aSize = xShape->getSize( ); - xEmbeddedProperties->setPropertyValue(getPropertyName(PROP_WIDTH), uno::makeAny(sal_Int32(aSize.Width))); - xEmbeddedProperties->setPropertyValue(getPropertyName(PROP_HEIGHT), uno::makeAny(sal_Int32(aSize.Height))); + xEmbeddedProperties->setPropertyValue(getPropertyName(PROP_WIDTH), uno::Any(sal_Int32(aSize.Width))); + xEmbeddedProperties->setPropertyValue(getPropertyName(PROP_HEIGHT), uno::Any(sal_Int32(aSize.Height))); } @@ -3980,7 +3980,7 @@ void DomainMapper_Impl::ClearPreviousParagraph() { uno::Reference<container::XNamed> xPreviousNumberingRules(m_xPreviousParagraph->getPropertyValue("NumberingRules"), uno::UNO_QUERY); if ( !xPreviousNumberingRules.is() || xPreviousNumberingRules->getName().isEmpty() ) - m_xPreviousParagraph->setPropertyValue("ParaBottomMargin", uno::makeAny(static_cast<sal_Int32>(0))); + m_xPreviousParagraph->setPropertyValue("ParaBottomMargin", uno::Any(static_cast<sal_Int32>(0))); } m_xPreviousParagraph.clear(); @@ -4132,7 +4132,7 @@ void DomainMapper_Impl::HandleLineBreak(const PropertyMapPtr& pPropertyMap) uno::Reference<text::XTextContent> xLineBreak( GetTextFactory()->createInstance("com.sun.star.text.LineBreak"), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak, uno::UNO_QUERY); - xLineBreakProps->setPropertyValue("Clear", uno::makeAny(*m_oLineBreakClear)); + xLineBreakProps->setPropertyValue("Clear", uno::Any(*m_oLineBreakClear)); appendTextContent(xLineBreak, pPropertyMap->GetPropertyValues()); } m_oLineBreakClear.reset(); @@ -4527,7 +4527,7 @@ void DomainMapper_Impl::SetNumberFormat( const OUString& rCommand, } xPropertySet->setPropertyValue( getPropertyName(PROP_NUMBER_FORMAT), - uno::makeAny( nKey )); + uno::Any( nKey )); } catch(const uno::Exception&) { @@ -4650,7 +4650,7 @@ void DomainMapper_Impl::ChainTextFrames() uno::Reference<beans::XPropertySet> xPropertySet(xTextContent, uno::UNO_QUERY); //The reverse chaining happens automatically, so only one direction needs to be set - xPropertySet->setPropertyValue(sChainNextName, uno::makeAny(nextFinder->first)); + xPropertySet->setPropertyValue(sChainNextName, uno::Any(nextFinder->first)); //the last item in an mso-next-textbox chain is indistinguishable from id/seq items. Now that it is handled, remove it. if( nextFinder->second.s_mso_next_textbox.isEmpty() ) @@ -4677,7 +4677,7 @@ void DomainMapper_Impl::ChainTextFrames() uno::Reference<beans::XPropertySet> xPropertySet(xTextContent, uno::UNO_QUERY); //The reverse chaining happens automatically, so only one direction needs to be set - xPropertySet->setPropertyValue(sChainNextName, uno::makeAny(rInner.first)); + xPropertySet->setPropertyValue(sChainNextName, uno::Any(rInner.first)); break ; //there cannot be more than one next frame } } @@ -4875,21 +4875,21 @@ uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(c //set the master's name xMaster->setPropertyValue( getPropertyName(PROP_NAME), - uno::makeAny(rFieldMasterName)); + uno::Any(rFieldMasterName)); } else { // set database data, based on the "databasename.tablename" of sDatabaseDataSourceName xMaster->setPropertyValue( getPropertyName(PROP_DATABASE_NAME), - uno::makeAny(sDatabaseDataSourceName.copy(0, sDatabaseDataSourceName.indexOf('.')))); + uno::Any(sDatabaseDataSourceName.copy(0, sDatabaseDataSourceName.indexOf('.')))); xMaster->setPropertyValue( getPropertyName(PROP_COMMAND_TYPE), - uno::makeAny(sal_Int32(0))); + uno::Any(sal_Int32(0))); xMaster->setPropertyValue( getPropertyName(PROP_DATATABLE_NAME), - uno::makeAny(sDatabaseDataSourceName.copy(sDatabaseDataSourceName.indexOf('.') + 1))); + uno::Any(sDatabaseDataSourceName.copy(sDatabaseDataSourceName.indexOf('.') + 1))); xMaster->setPropertyValue( getPropertyName(PROP_DATACOLUMN_NAME), - uno::makeAny(rFieldMasterName)); + uno::Any(rFieldMasterName)); } } return xMaster; @@ -5281,20 +5281,20 @@ void DomainMapper_Impl::handleFieldSet ("com.sun.star.text.FieldMaster.SetExpression", sVariable); // a set field is a string - xMaster->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::makeAny(text::SetVariableType::STRING)); + xMaster->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::Any(text::SetVariableType::STRING)); // attach the master to the field uno::Reference< text::XDependentTextField > xDependentField ( xFieldInterface, uno::UNO_QUERY_THROW ); xDependentField->attachTextFieldMaster( xMaster ); - uno::Any aAnyHint = uno::makeAny(sHint); + uno::Any aAnyHint(sHint); xFieldProperties->setPropertyValue(getPropertyName(PROP_HINT), aAnyHint); xFieldProperties->setPropertyValue(getPropertyName(PROP_CONTENT), aAnyHint); - xFieldProperties->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::makeAny(text::SetVariableType::STRING)); + xFieldProperties->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::Any(text::SetVariableType::STRING)); // Mimic MS Word behavior (hide the SET) - xFieldProperties->setPropertyValue(getPropertyName(PROP_IS_VISIBLE), uno::makeAny(false)); + xFieldProperties->setPropertyValue(getPropertyName(PROP_IS_VISIBLE), uno::Any(false)); } void DomainMapper_Impl::handleFieldAsk @@ -5314,7 +5314,7 @@ void DomainMapper_Impl::handleFieldAsk FindOrCreateFieldMaster ("com.sun.star.text.FieldMaster.SetExpression", sVariable ); // An ASK field is always a string of characters - xMaster->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::makeAny(text::SetVariableType::STRING)); + xMaster->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::Any(text::SetVariableType::STRING)); // attach the master to the field uno::Reference< text::XDependentTextField > xDependentField @@ -5323,14 +5323,14 @@ void DomainMapper_Impl::handleFieldAsk // set input flag at the field xFieldProperties->setPropertyValue( - getPropertyName(PROP_IS_INPUT), uno::makeAny( true )); + getPropertyName(PROP_IS_INPUT), uno::Any( true )); // set the prompt xFieldProperties->setPropertyValue( getPropertyName(PROP_HINT), - uno::makeAny( sHint )); - xFieldProperties->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::makeAny(text::SetVariableType::STRING)); + uno::Any( sHint )); + xFieldProperties->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::Any(text::SetVariableType::STRING)); // The ASK has no field value to display - xFieldProperties->setPropertyValue(getPropertyName(PROP_IS_VISIBLE), uno::makeAny(false)); + xFieldProperties->setPropertyValue(getPropertyName(PROP_IS_VISIBLE), uno::Any(false)); } else { @@ -5431,16 +5431,16 @@ void DomainMapper_Impl::handleFieldFormula // we don't copy the = symbol from the command OUString formula = convertFieldFormula(command.copy(1)); - xFieldProperties->setPropertyValue(getPropertyName(PROP_CONTENT), uno::makeAny(formula)); - xFieldProperties->setPropertyValue(getPropertyName(PROP_NUMBER_FORMAT), uno::makeAny(sal_Int32(0))); - xFieldProperties->setPropertyValue("IsShowFormula", uno::makeAny(false)); + xFieldProperties->setPropertyValue(getPropertyName(PROP_CONTENT), uno::Any(formula)); + xFieldProperties->setPropertyValue(getPropertyName(PROP_NUMBER_FORMAT), uno::Any(sal_Int32(0))); + xFieldProperties->setPropertyValue("IsShowFormula", uno::Any(false)); // grab-bag the original and converted formula if (hasTableManager()) { TablePropertyMapPtr pPropMap(new TablePropertyMap()); - pPropMap->Insert(PROP_CELL_FORMULA, uno::makeAny(command.copy(1)), true, CELL_GRAB_BAG); - pPropMap->Insert(PROP_CELL_FORMULA_CONVERTED, uno::makeAny(formula), true, CELL_GRAB_BAG); + pPropMap->Insert(PROP_CELL_FORMULA, uno::Any(command.copy(1)), true, CELL_GRAB_BAG); + pPropMap->Insert(PROP_CELL_FORMULA_CONVERTED, uno::Any(formula), true, CELL_GRAB_BAG); getTableManager().cellProps(pPropMap); } } @@ -5504,7 +5504,7 @@ void DomainMapper_Impl::handleRubyEQField( const FieldContextPtr& pContext) if (aInfo.nHps > 0) { double fVal = double(aInfo.nHps) / 2.; - uno::Any aVal = uno::makeAny( fVal ); + uno::Any aVal( fVal ); pRubyContext->Insert(PROP_CHAR_HEIGHT, aVal); pRubyContext->Insert(PROP_CHAR_HEIGHT_ASIAN, aVal); @@ -5515,11 +5515,11 @@ void DomainMapper_Impl::handleRubyEQField( const FieldContextPtr& pContext) if (m_pLastCharacterContext) pCharContext->InsertProps(m_pLastCharacterContext); pCharContext->InsertProps(pContext->getProperties()); - pCharContext->Insert(PROP_RUBY_TEXT, uno::makeAny( aInfo.sRubyText ) ); - pCharContext->Insert(PROP_RUBY_ADJUST, uno::makeAny(static_cast<sal_Int16>(ConversionHelper::convertRubyAlign(aInfo.nRubyAlign)))); + pCharContext->Insert(PROP_RUBY_TEXT, uno::Any( aInfo.sRubyText ) ); + pCharContext->Insert(PROP_RUBY_ADJUST, uno::Any(static_cast<sal_Int16>(ConversionHelper::convertRubyAlign(aInfo.nRubyAlign)))); if ( aInfo.nRubyAlign == NS_ooxml::LN_Value_ST_RubyAlign_rightVertical ) - pCharContext->Insert(PROP_RUBY_POSITION, uno::makeAny(css::text::RubyPosition::INTER_CHARACTER)); - pCharContext->Insert(PROP_RUBY_STYLE, uno::makeAny(aInfo.sRubyStyle)); + pCharContext->Insert(PROP_RUBY_POSITION, uno::Any(css::text::RubyPosition::INTER_CHARACTER)); + pCharContext->Insert(PROP_RUBY_STYLE, uno::Any(aInfo.sRubyStyle)); appendTextPortion(OUString(sPart2), pCharContext); } @@ -5536,12 +5536,12 @@ void DomainMapper_Impl::handleAutoNum "AutoNr"); xMaster->setPropertyValue( getPropertyName(PROP_SUB_TYPE), - uno::makeAny(text::SetVariableType::SEQUENCE)); + uno::Any(text::SetVariableType::SEQUENCE)); //apply the numbering type xFieldProperties->setPropertyValue( getPropertyName(PROP_NUMBERING_TYPE), - uno::makeAny( lcl_ParseNumberingType(pContext->GetCommand()) )); + uno::Any( lcl_ParseNumberingType(pContext->GetCommand()) )); // attach the master to the field uno::Reference< text::XDependentTextField > xDependentField ( xFieldInterface, uno::UNO_QUERY_THROW ); @@ -5555,7 +5555,7 @@ void DomainMapper_Impl::handleAuthor { if (eFieldId == FIELD_USERNAME) xFieldProperties->setPropertyValue - ( getPropertyName(PROP_FULL_NAME), uno::makeAny( true )); + ( getPropertyName(PROP_FULL_NAME), uno::Any( true )); // Always set as FIXED b/c MS Word only updates these fields via user intervention (F9) // AUTHOR of course never changes and USERNAME is easily mis-used as an original author field. @@ -5563,7 +5563,7 @@ void DomainMapper_Impl::handleAuthor { xFieldProperties->setPropertyValue( getPropertyName( PROP_IS_FIXED ), - uno::makeAny( true )); + uno::Any( true )); //PROP_CURRENT_PRESENTATION is set later anyway } } @@ -5648,7 +5648,7 @@ void DomainMapper_Impl::handleAuthor if( bIsCustomField ) { xFieldProperties->setPropertyValue( - getPropertyName(PROP_NAME), uno::makeAny(rFirstParam)); + getPropertyName(PROP_NAME), uno::Any(rFirstParam)); pContext->SetCustomField( xFieldProperties ); } else @@ -5656,12 +5656,12 @@ void DomainMapper_Impl::handleAuthor if(0 != (aDocProperties[nMap].nFlags & SET_ARABIC)) xFieldProperties->setPropertyValue( getPropertyName(PROP_NUMBERING_TYPE), - uno::makeAny( style::NumberingType::ARABIC )); + uno::Any( style::NumberingType::ARABIC )); else if(0 != (aDocProperties[nMap].nFlags & SET_DATE)) { xFieldProperties->setPropertyValue( getPropertyName(PROP_IS_DATE), - uno::makeAny( true )); + uno::Any( true )); SetNumberFormat( pContext->GetCommand(), xFieldProperties ); } } @@ -5941,19 +5941,19 @@ void DomainMapper_Impl::handleToc m_bStartTOC = true; if (xTOC.is()) - xTOC->setPropertyValue(getPropertyName( PROP_TITLE ), uno::makeAny(aTocTitle)); + xTOC->setPropertyValue(getPropertyName( PROP_TITLE ), uno::Any(aTocTitle)); if (!aBookmarkName.isEmpty()) - xTOC->setPropertyValue(getPropertyName(PROP_TOC_BOOKMARK), uno::makeAny(aBookmarkName)); + xTOC->setPropertyValue(getPropertyName(PROP_TOC_BOOKMARK), uno::Any(aBookmarkName)); if( !bTableOfFigures && xTOC.is() ) { - xTOC->setPropertyValue( getPropertyName( PROP_LEVEL ), uno::makeAny( nMaxLevel ) ); - xTOC->setPropertyValue( getPropertyName( PROP_CREATE_FROM_OUTLINE ), uno::makeAny( bFromOutline )); - xTOC->setPropertyValue( getPropertyName( PROP_CREATE_FROM_MARKS ), uno::makeAny( bFromEntries )); - xTOC->setPropertyValue( getPropertyName( PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS ), uno::makeAny( bHideTabLeaderPageNumbers )); - xTOC->setPropertyValue( getPropertyName( PROP_TAB_IN_TOC ), uno::makeAny( bIsTabEntry )); - xTOC->setPropertyValue( getPropertyName( PROP_TOC_NEW_LINE ), uno::makeAny( bNewLine )); - xTOC->setPropertyValue( getPropertyName( PROP_TOC_PARAGRAPH_OUTLINE_LEVEL ), uno::makeAny( bParagraphOutlineLevel )); + xTOC->setPropertyValue( getPropertyName( PROP_LEVEL ), uno::Any( nMaxLevel ) ); + xTOC->setPropertyValue( getPropertyName( PROP_CREATE_FROM_OUTLINE ), uno::Any( bFromOutline )); + xTOC->setPropertyValue( getPropertyName( PROP_CREATE_FROM_MARKS ), uno::Any( bFromEntries )); + xTOC->setPropertyValue( getPropertyName( PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS ), uno::Any( bHideTabLeaderPageNumbers )); + xTOC->setPropertyValue( getPropertyName( PROP_TAB_IN_TOC ), uno::Any( bIsTabEntry )); + xTOC->setPropertyValue( getPropertyName( PROP_TOC_NEW_LINE ), uno::Any( bNewLine )); + xTOC->setPropertyValue( getPropertyName( PROP_TOC_PARAGRAPH_OUTLINE_LEVEL ), uno::Any( bParagraphOutlineLevel )); if( !sTemplate.isEmpty() ) { //the string contains comma separated the names and related levels @@ -5987,10 +5987,10 @@ void DomainMapper_Impl::handleToc { rStyle = (aTOCStyleIter++)->second; } - xParaStyles->replaceByIndex(nLevel - 1, uno::makeAny(aStyles)); + xParaStyles->replaceByIndex(nLevel - 1, uno::Any(aStyles)); } } - xTOC->setPropertyValue(getPropertyName(PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES), uno::makeAny( true )); + xTOC->setPropertyValue(getPropertyName(PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES), uno::Any( true )); } if(bHyperlinks || !sChapterNoSeparator.isEmpty()) @@ -6007,7 +6007,7 @@ void DomainMapper_Impl::handleToc uno::Sequence< beans::PropertyValues > aNewLevel = lcl_createTOXLevelHyperlinks( bHyperlinks, sChapterNoSeparator, aLevel ); - xLevelFormats->replaceByIndex( nLevel, uno::makeAny( aNewLevel ) ); + xLevelFormats->replaceByIndex( nLevel, uno::Any( aNewLevel ) ); } } } @@ -6015,7 +6015,7 @@ void DomainMapper_Impl::handleToc { if (!sFigureSequence.isEmpty()) xTOC->setPropertyValue(getPropertyName(PROP_LABEL_CATEGORY), - uno::makeAny(sFigureSequence)); + uno::Any(sFigureSequence)); if ( bHyperlinks ) { @@ -6027,7 +6027,7 @@ void DomainMapper_Impl::handleToc uno::Sequence< beans::PropertyValues > aNewLevel = lcl_createTOXLevelHyperlinks( bHyperlinks, sChapterNoSeparator, aLevel ); - xLevelFormats->replaceByIndex( 1, uno::makeAny( aNewLevel ) ); + xLevelFormats->replaceByIndex( 1, uno::Any( aNewLevel ) ); } } pContext->SetTOC( xTOC ); @@ -6090,7 +6090,7 @@ void DomainMapper_Impl::handleBibliography m_bStartBibliography = true; if (xTOC.is()) - xTOC->setPropertyValue(getPropertyName( PROP_TITLE ), uno::makeAny(OUString())); + xTOC->setPropertyValue(getPropertyName( PROP_TITLE ), uno::Any(OUString())); pContext->SetTOC( xTOC ); m_bParaHadField = false; @@ -6120,19 +6120,19 @@ void DomainMapper_Impl::handleIndex OUString sValue; if (xTOC.is()) { - xTOC->setPropertyValue(getPropertyName( PROP_TITLE ), uno::makeAny(OUString())); + xTOC->setPropertyValue(getPropertyName( PROP_TITLE ), uno::Any(OUString())); if( lcl_FindInCommand( pContext->GetCommand(), 'r', sValue )) { - xTOC->setPropertyValue("IsCommaSeparated", uno::makeAny(true)); + xTOC->setPropertyValue("IsCommaSeparated", uno::Any(true)); } if( lcl_FindInCommand( pContext->GetCommand(), 'h', sValue )) { - xTOC->setPropertyValue("UseAlphabeticalSeparators", uno::makeAny(true)); + xTOC->setPropertyValue("UseAlphabeticalSeparators", uno::Any(true)); } if( !sUserIndex.isEmpty() ) { - xTOC->setPropertyValue("UserIndexName", uno::makeAny(sUserIndex)); + xTOC->setPropertyValue("UserIndexName", uno::Any(sUserIndex)); } } pContext->SetTOC( xTOC ); @@ -6149,7 +6149,7 @@ void DomainMapper_Impl::handleIndex if (xTextColumns.is()) { xTextColumns->setColumnCount( sValue.toInt32() ); - xTOC->setPropertyValue( getPropertyName( PROP_TEXT_COLUMNS ), uno::makeAny( xTextColumns ) ); + xTOC->setPropertyValue( getPropertyName( PROP_TEXT_COLUMNS ), uno::Any( xTextColumns ) ); } } } @@ -6386,17 +6386,17 @@ void DomainMapper_Impl::CloseFieldCommand() { xFieldProperties->setPropertyValue( getPropertyName(PROP_IS_FIXED), - uno::makeAny( true )); + uno::Any( true )); m_bSetDateValue = true; } else xFieldProperties->setPropertyValue( getPropertyName(PROP_IS_FIXED), - uno::makeAny( false )); + uno::Any( false )); xFieldProperties->setPropertyValue( getPropertyName(PROP_IS_DATE), - uno::makeAny( true )); + uno::Any( true )); SetNumberFormat( pContext->GetCommand(), xFieldProperties ); } break; @@ -6412,7 +6412,7 @@ void DomainMapper_Impl::CloseFieldCommand() // overwrite the Comments document property // #TODO implement the above too xFieldProperties->setPropertyValue( - getPropertyName( PROP_IS_FIXED ), uno::makeAny( false )); + getPropertyName( PROP_IS_FIXED ), uno::Any( false )); //PROP_CURRENT_PRESENTATION is set later anyway } break; @@ -6423,10 +6423,10 @@ void DomainMapper_Impl::CloseFieldCommand() if (pContext->IsFieldLocked()) { xFieldProperties->setPropertyValue( - getPropertyName(PROP_IS_FIXED), uno::makeAny( true )); + getPropertyName(PROP_IS_FIXED), uno::Any( true )); } xFieldProperties->setPropertyValue( - getPropertyName( PROP_IS_DATE ), uno::makeAny( true )); + getPropertyName( PROP_IS_DATE ), uno::Any( true )); SetNumberFormat( pContext->GetCommand(), xFieldProperties ); } break; @@ -6462,7 +6462,7 @@ void DomainMapper_Impl::CloseFieldCommand() xFieldProperties = uno::Reference< beans::XPropertySet >( xFieldInterface, uno::UNO_QUERY_THROW); - xFieldProperties->setPropertyValue(getPropertyName(PROP_CONTENT), uno::makeAny(aResult.sResult)); + xFieldProperties->setPropertyValue(getPropertyName(PROP_CONTENT), uno::Any(aResult.sResult)); } else { @@ -6488,7 +6488,7 @@ void DomainMapper_Impl::CloseFieldCommand() double dHeight = 0; if ((GetPropertyFromParaStyleSheet(PROP_CHAR_HEIGHT) >>= dHeight) && dHeight != 0) // Character escapement should be given in negative percents for subscripts. - pCharContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( sal_Int16(- 100 * nDown / dHeight) ) ); + pCharContext->Insert(PROP_CHAR_ESCAPEMENT, uno::Any( sal_Int16(- 100 * nDown / dHeight) ) ); appendTextPortion(aContent, pCharContext); } } @@ -6503,7 +6503,7 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_FILLIN : if (xFieldProperties.is()) xFieldProperties->setPropertyValue( - getPropertyName(PROP_HINT), uno::makeAny( pContext->GetCommand().getToken(1, '\"'))); + getPropertyName(PROP_HINT), uno::Any( pContext->GetCommand().getToken(1, '\"'))); break; case FIELD_FILENAME: { @@ -6511,7 +6511,7 @@ void DomainMapper_Impl::CloseFieldCommand() if (xFieldProperties.is()) xFieldProperties->setPropertyValue( getPropertyName(PROP_FILE_FORMAT), - uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME_AND_EXT )); + uno::Any( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME_AND_EXT )); } break; case FIELD_FILESIZE : break; @@ -6647,14 +6647,14 @@ void DomainMapper_Impl::CloseFieldCommand() if (!sFirstParam.isEmpty()) { xFieldProperties->setPropertyValue( - getPropertyName( PROP_IS_FIXED ), uno::makeAny( true )); + getPropertyName( PROP_IS_FIXED ), uno::Any( true )); //PROP_CURRENT_PRESENTATION is set later anyway } } break; case FIELD_LASTSAVEDBY : xFieldProperties->setPropertyValue( - getPropertyName(PROP_IS_FIXED), uno::makeAny(true)); + getPropertyName(PROP_IS_FIXED), uno::Any(true)); break; case FIELD_MACROBUTTON: { @@ -6663,14 +6663,14 @@ void DomainMapper_Impl::CloseFieldCommand() OUString sMacro = pContext->GetCommand().getToken( 0, ' ', nIndex); if (xFieldProperties.is()) xFieldProperties->setPropertyValue( - getPropertyName(PROP_MACRO_NAME), uno::makeAny( sMacro )); + getPropertyName(PROP_MACRO_NAME), uno::Any( sMacro )); //extract quick help text if(xFieldProperties.is() && pContext->GetCommand().getLength() > nIndex + 1) { xFieldProperties->setPropertyValue( getPropertyName(PROP_HINT), - uno::makeAny( pContext->GetCommand().copy( nIndex ))); + uno::Any( pContext->GetCommand().copy( nIndex ))); } } break; @@ -6697,10 +6697,10 @@ void DomainMapper_Impl::CloseFieldCommand() { xFieldProperties->setPropertyValue( getPropertyName(PROP_NUMBERING_TYPE), - uno::makeAny( lcl_ParseNumberingType(pContext->GetCommand()) )); + uno::Any( lcl_ParseNumberingType(pContext->GetCommand()) )); xFieldProperties->setPropertyValue( getPropertyName(PROP_SUB_TYPE), - uno::makeAny( text::PageNumberType_CURRENT )); + uno::Any( text::PageNumberType_CURRENT )); } break; @@ -6720,10 +6720,10 @@ void DomainMapper_Impl::CloseFieldCommand() { xFieldProperties->setPropertyValue( getPropertyName(PROP_REFERENCE_FIELD_SOURCE), - uno::makeAny( sal_Int16(text::ReferenceFieldSource::BOOKMARK)) ); + uno::Any( sal_Int16(text::ReferenceFieldSource::BOOKMARK)) ); xFieldProperties->setPropertyValue( getPropertyName(PROP_SOURCE_NAME), - uno::makeAny(sFirstParam) ); + uno::Any(sFirstParam) ); sal_Int16 nFieldPart = (bPageRef ? text::ReferenceFieldPart::PAGE : text::ReferenceFieldPart::TEXT); OUString sValue; if( lcl_FindInCommand( pContext->GetCommand(), 'p', sValue )) @@ -6747,7 +6747,7 @@ void DomainMapper_Impl::CloseFieldCommand() nFieldPart = text::ReferenceFieldPart::NUMBER_FULL_CONTEXT; } xFieldProperties->setPropertyValue( - getPropertyName( PROP_REFERENCE_FIELD_PART ), uno::makeAny( nFieldPart )); + getPropertyName( PROP_REFERENCE_FIELD_PART ), uno::Any( nFieldPart )); } else if( m_xTextFactory.is() ) { @@ -6755,8 +6755,8 @@ void DomainMapper_Impl::CloseFieldCommand() xFieldProperties.set(xFieldInterface, uno::UNO_QUERY); xFieldProperties->setPropertyValue( getPropertyName(PROP_CONTENT), - uno::makeAny(sFirstParam)); - xFieldProperties->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::makeAny(text::SetVariableType::STRING)); + uno::Any(sFirstParam)); + xFieldProperties->setPropertyValue(getPropertyName(PROP_SUB_TYPE), uno::Any(text::SetVariableType::STRING)); } } break; @@ -6778,12 +6778,12 @@ void DomainMapper_Impl::CloseFieldCommand() xMaster->setPropertyValue( getPropertyName(PROP_SUB_TYPE), - uno::makeAny(text::SetVariableType::SEQUENCE)); + uno::Any(text::SetVariableType::SEQUENCE)); // apply the numbering type xFieldProperties->setPropertyValue( getPropertyName(PROP_NUMBERING_TYPE), - uno::makeAny( lcl_ParseNumberingType(pContext->GetCommand()) )); + uno::Any( lcl_ParseNumberingType(pContext->GetCommand()) )); // attach the master to the field uno::Reference< text::XDependentTextField > xDependentField( xFieldInterface, uno::UNO_QUERY_THROW ); @@ -6803,7 +6803,7 @@ void DomainMapper_Impl::CloseFieldCommand() // an example for this one. xFieldProperties->setPropertyValue( getPropertyName(PROP_CONTENT), - uno::makeAny(sFormula)); + uno::Any(sFormula)); // Take care of the numeric formatting definition, default is Arabic sal_Int16 nNumberingType = lcl_ParseNumberingType(pContext->GetCommand()); @@ -6811,7 +6811,7 @@ void DomainMapper_Impl::CloseFieldCommand() nNumberingType = style::NumberingType::ARABIC; xFieldProperties->setPropertyValue( getPropertyName(PROP_NUMBERING_TYPE), - uno::makeAny(nNumberingType)); + uno::Any(nNumberingType)); } break; case FIELD_SET : @@ -6824,7 +6824,7 @@ void DomainMapper_Impl::CloseFieldCommand() if (!sFirstParam.isEmpty()) { xFieldProperties->setPropertyValue( - getPropertyName( PROP_IS_FIXED ), uno::makeAny( true )); + getPropertyName( PROP_IS_FIXED ), uno::Any( true )); //PROP_CURRENT_PRESENTATION is set later anyway } } @@ -6855,10 +6855,10 @@ void DomainMapper_Impl::CloseFieldCommand() xCrsr->gotoEnd(false); xText->insertString(xCrsr, sSymbol, true); uno::Reference< beans::XPropertySet > xProp( xCrsr, uno::UNO_QUERY ); - xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_CHAR_SET), uno::makeAny(awt::CharSet::SYMBOL)); + xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_CHAR_SET), uno::Any(awt::CharSet::SYMBOL)); if(bHasFont) { - uno::Any aVal = uno::makeAny( sFont ); + uno::Any aVal( sFont ); xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), aVal); xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME_ASIAN), aVal); xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME_COMPLEX), aVal); @@ -6875,7 +6875,7 @@ void DomainMapper_Impl::CloseFieldCommand() { xFieldProperties->setPropertyValue( getPropertyName(PROP_IS_FIXED), - uno::makeAny( true )); + uno::Any( true )); m_bSetDateValue = true; } SetNumberFormat( pContext->GetCommand(), xFieldProperties ); @@ -6886,7 +6886,7 @@ void DomainMapper_Impl::CloseFieldCommand() if (!sFirstParam.isEmpty()) { xFieldProperties->setPropertyValue( - getPropertyName( PROP_IS_FIXED ), uno::makeAny( true )); + getPropertyName( PROP_IS_FIXED ), uno::Any( true )); //PROP_CURRENT_PRESENTATION is set later anyway } } @@ -6926,14 +6926,14 @@ void DomainMapper_Impl::CloseFieldCommand() xTC->setPropertyValue(sUserIndex.isEmpty() ? OUString("PrimaryKey") : OUString("AlternativeText"), - uno::makeAny(sFirstParam)); + uno::Any(sFirstParam)); } sUserIndex = lcl_trim(sUserIndex); if (!sUserIndex.isEmpty()) { xTC->setPropertyValue("UserIndexName", - uno::makeAny(sUserIndex)); + uno::Any(sUserIndex)); } uno::Reference< text::XTextContent > xToInsert( xTC, uno::UNO_QUERY ); uno::Reference< text::XTextAppend > xTextAppend = m_aTextAppendStack.top().xTextAppend; @@ -6963,7 +6963,7 @@ void DomainMapper_Impl::CloseFieldCommand() uno::Sequence<beans::PropertyValue> aValues( comphelper::InitPropertySequence({ { "Identifier", uno::Any(sCmd) } })); - xTC->setPropertyValue("Fields", uno::makeAny(aValues)); + xTC->setPropertyValue("Fields", uno::Any(aValues)); } uno::Reference< text::XTextContent > xToInsert( xTC, uno::UNO_QUERY ); @@ -6986,7 +6986,7 @@ void DomainMapper_Impl::CloseFieldCommand() if (!sFirstParam.isEmpty()) { xTC->setPropertyValue(getPropertyName(PROP_ALTERNATIVE_TEXT), - uno::makeAny(sFirstParam)); + uno::Any(sFirstParam)); } OUString sValue; // \f TC entry in doc with multiple tables @@ -6999,7 +6999,7 @@ void DomainMapper_Impl::CloseFieldCommand() { sal_Int32 nLevel = sValue.toInt32(); if( !sValue.isEmpty() && nLevel >= 0 && nLevel <= 10 ) - xTC->setPropertyValue(getPropertyName(PROP_LEVEL), uno::makeAny( static_cast<sal_Int16>(nLevel) )); + xTC->setPropertyValue(getPropertyName(PROP_LEVEL), uno::Any( static_cast<sal_Int16>(nLevel) )); } // if( lcl_FindInCommand( pContext->GetCommand(), 'n', sValue )) // \n Suppress page numbers @@ -7015,7 +7015,7 @@ void DomainMapper_Impl::CloseFieldCommand() if (xFieldProperties.is()) xFieldProperties->setPropertyValue( getPropertyName(PROP_NUMBERING_TYPE), - uno::makeAny( lcl_ParseNumberingType(pContext->GetCommand()) )); + uno::Any( lcl_ParseNumberingType(pContext->GetCommand()) )); break; } @@ -7046,11 +7046,11 @@ void DomainMapper_Impl::CloseFieldCommand() // m_bForceGenericFields mode, or the export will write // the ODF_UNHANDLED string! assert(!m_bForceGenericFields || aCode.isEmpty()); - xNameCont->insertByName(ODF_CODE_PARAM, uno::makeAny(aCode)); + xNameCont->insertByName(ODF_CODE_PARAM, uno::Any(aCode)); ww::eField const id(GetWW8FieldId(sType)); if (id != ww::eNONE) { // tdf#129247 tdf#134264 set WW8 id for WW8 export - xNameCont->insertByName(ODF_ID_PARAM, uno::makeAny(OUString::number(id))); + xNameCont->insertByName(ODF_ID_PARAM, uno::Any(OUString::number(id))); } } else @@ -7172,7 +7172,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) uno::Reference< text::XDependentTextField > xDependentField( xTextField, uno::UNO_QUERY_THROW ); xDependentField->getTextFieldMaster()->setPropertyValue( getPropertyName(PROP_CONTENT), - uno::makeAny( rResult )); + uno::Any( rResult )); } else if ( m_bSetCitation ) { @@ -7215,7 +7215,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) aValues.getArray()[aValues.getLength() - 1] = propertyVal; } xFieldProperties->setPropertyValue("Fields", - uno::makeAny(aValues)); + uno::Any(aValues)); } } else if ( m_bSetDateValue ) @@ -7231,7 +7231,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) xFieldProperties->getPropertyValue( "NumberFormat" ) >>= nKey; xFieldProperties->setPropertyValue( "DateTimeValue", - uno::makeAny( lcl_dateTimeFromSerial( xFormatter->convertStringToNumber( nKey, rResult ) ) ) ); + uno::Any( lcl_dateTimeFromSerial( xFormatter->convertStringToNumber( nKey, rResult ) ) ) ); } else { @@ -7254,7 +7254,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) } xFieldProperties->setPropertyValue( getPropertyName(bHasContent && sValue.isEmpty()? PROP_CONTENT : PROP_CURRENT_PRESENTATION), - uno::makeAny( rResult )); + uno::Any( rResult )); // LO always automatically updates a DocInfo field from the File-Properties-Custom Prop // while MS Word requires the user to manually refresh the field (with F9). @@ -7275,7 +7275,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) "com.sun.star.text.TextField.DocInfo.CreateDateTime")) { // Creation time is const, don't try to update it. - xFieldProperties->setPropertyValue("IsFixed", uno::makeAny(true)); + xFieldProperties->setPropertyValue("IsFixed", uno::Any(true)); } } } @@ -7452,15 +7452,15 @@ void DomainMapper_Impl::PopFieldContext() { uno::Reference< beans::XPropertySet > xCrsrProperties( xCrsr, uno::UNO_QUERY_THROW ); xCrsrProperties->setPropertyValue(getPropertyName(PROP_HYPER_LINK_U_R_L), uno:: - makeAny(pContext->GetHyperlinkURL())); + Any(pContext->GetHyperlinkURL())); if (!pContext->GetHyperlinkTarget().isEmpty()) - xCrsrProperties->setPropertyValue("HyperLinkTarget", uno::makeAny(pContext->GetHyperlinkTarget())); + xCrsrProperties->setPropertyValue("HyperLinkTarget", uno::Any(pContext->GetHyperlinkTarget())); if (m_bStartTOC) { OUString sDisplayName("Index Link"); - xCrsrProperties->setPropertyValue("VisitedCharStyleName",uno::makeAny(sDisplayName)); - xCrsrProperties->setPropertyValue("UnvisitedCharStyleName",uno::makeAny(sDisplayName)); + xCrsrProperties->setPropertyValue("VisitedCharStyleName",uno::Any(sDisplayName)); + xCrsrProperties->setPropertyValue("UnvisitedCharStyleName",uno::Any(sDisplayName)); } else { @@ -7470,12 +7470,12 @@ void DomainMapper_Impl::PopFieldContext() { if (charStyle.isEmpty()) { - xCrsrProperties->setPropertyValue("VisitedCharStyleName", uno::makeAny(OUString("Default Style"))); - xCrsrProperties->setPropertyValue("UnvisitedCharStyleName", uno::makeAny(OUString("Default Style"))); + xCrsrProperties->setPropertyValue("VisitedCharStyleName", uno::Any(OUString("Default Style"))); + xCrsrProperties->setPropertyValue("UnvisitedCharStyleName", uno::Any(OUString("Default Style"))); } else if (charStyle.equalsIgnoreAsciiCase("Internet Link")) { - xCrsrProperties->setPropertyValue("CharStyleName", uno::makeAny(OUString("Default Style"))); + xCrsrProperties->setPropertyValue("CharStyleName", uno::Any(OUString("Default Style"))); } else { @@ -7845,7 +7845,7 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference< Properties { comphelper::SequenceAsHashMap aFrameGrabBag(xPropertySet->getPropertyValue("FrameInteropGrabBag")); aFrameGrabBag["SdtPr"] <<= m_pSdtHelper->getInteropGrabBagAndClear(); - xPropertySet->setPropertyValue("FrameInteropGrabBag", uno::makeAny(aFrameGrabBag.getAsConstPropertyValueList())); + xPropertySet->setPropertyValue("FrameInteropGrabBag", uno::Any(aFrameGrabBag.getAsConstPropertyValueList())); } } @@ -7861,7 +7861,7 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference< Properties uno::Sequence<beans::PropertyValue> aFrameGrabBag( comphelper::InitPropertySequence({ { "SdtEndBefore", uno::Any(true) } })); - xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aFrameGrabBag)); + xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::Any(aFrameGrabBag)); } } @@ -7877,8 +7877,8 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference< Properties if (eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR) { uno::Reference<beans::XPropertySet> xEmbeddedProps(m_xEmbedded, uno::UNO_QUERY); - xEmbeddedProps->setPropertyValue("AnchorType", uno::makeAny(text::TextContentAnchorType_AT_CHARACTER)); - xEmbeddedProps->setPropertyValue("IsFollowingTextFlow", uno::makeAny(m_pGraphicImport->GetLayoutInCell())); + xEmbeddedProps->setPropertyValue("AnchorType", uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xEmbeddedProps->setPropertyValue("IsFollowingTextFlow", uno::Any(m_pGraphicImport->GetLayoutInCell())); uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); xEmbeddedProps->setPropertyValue("HoriOrient", xShapeProps->getPropertyValue("HoriOrient")); xEmbeddedProps->setPropertyValue("HoriOrientPosition", xShapeProps->getPropertyValue("HoriOrientPosition")); @@ -7975,15 +7975,15 @@ void DomainMapper_Impl::SetLineNumbering( sal_Int32 nLnnMod, sal_uInt32 nLnc, sa { uno::Reference< text::XLineNumberingProperties > xLineProperties( m_xTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProperties = xLineProperties->getLineNumberingProperties(); - uno::Any aTrue( uno::makeAny( true )); + uno::Any aTrue( uno::Any( true )); xProperties->setPropertyValue( getPropertyName( PROP_IS_ON ), aTrue); xProperties->setPropertyValue( getPropertyName( PROP_COUNT_EMPTY_LINES ), aTrue ); - xProperties->setPropertyValue( getPropertyName( PROP_COUNT_LINES_IN_FRAMES ), uno::makeAny( false ) ); - xProperties->setPropertyValue( getPropertyName( PROP_INTERVAL ), uno::makeAny( static_cast< sal_Int16 >( nLnnMod ))); - xProperties->setPropertyValue( getPropertyName( PROP_DISTANCE ), uno::makeAny( ConversionHelper::convertTwipToMM100(ndxaLnn) )); - xProperties->setPropertyValue( getPropertyName( PROP_NUMBER_POSITION ), uno::makeAny( style::LineNumberPosition::LEFT)); - xProperties->setPropertyValue( getPropertyName( PROP_NUMBERING_TYPE ), uno::makeAny( style::NumberingType::ARABIC)); - xProperties->setPropertyValue( getPropertyName( PROP_RESTART_AT_EACH_PAGE ), uno::makeAny( nLnc == NS_ooxml::LN_Value_ST_LineNumberRestart_newPage )); + xProperties->setPropertyValue( getPropertyName( PROP_COUNT_LINES_IN_FRAMES ), uno::Any( false ) ); + xProperties->setPropertyValue( getPropertyName( PROP_INTERVAL ), uno::Any( static_cast< sal_Int16 >( nLnnMod ))); + xProperties->setPropertyValue( getPropertyName( PROP_DISTANCE ), uno::Any( ConversionHelper::convertTwipToMM100(ndxaLnn) )); + xProperties->setPropertyValue( getPropertyName( PROP_NUMBER_POSITION ), uno::Any( style::LineNumberPosition::LEFT)); + xProperties->setPropertyValue( getPropertyName( PROP_NUMBERING_TYPE ), uno::Any( style::NumberingType::ARABIC)); + xProperties->setPropertyValue( getPropertyName( PROP_RESTART_AT_EACH_PAGE ), uno::Any( nLnc == NS_ooxml::LN_Value_ST_LineNumberRestart_newPage )); } catch( const uno::Exception& ) {} @@ -8139,13 +8139,13 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( const OUString& sAuthor ) SAL_INFO("writerfilter.dmapper", "numberingChange not implemented"); } else - m_xAnnotationField->setPropertyValue("Author", uno::makeAny(sAuthor)); + m_xAnnotationField->setPropertyValue("Author", uno::Any(sAuthor)); } void DomainMapper_Impl::SetCurrentRedlineInitials( const OUString& sInitials ) { if (m_xAnnotationField.is()) - m_xAnnotationField->setPropertyValue("Initials", uno::makeAny(sInitials)); + m_xAnnotationField->setPropertyValue("Initials", uno::Any(sInitials)); } void DomainMapper_Impl::SetCurrentRedlineDate( const OUString& sDate ) @@ -8158,7 +8158,7 @@ void DomainMapper_Impl::SetCurrentRedlineDate( const OUString& sDate ) SAL_INFO("writerfilter.dmapper", "numberingChange not implemented"); } else - m_xAnnotationField->setPropertyValue("DateTimeValue", uno::makeAny(ConversionHelper::ConvertDateStringToDateTime(sDate))); + m_xAnnotationField->setPropertyValue("DateTimeValue", uno::Any(ConversionHelper::ConvertDateStringToDateTime(sDate))); } void DomainMapper_Impl::SetCurrentRedlineId( sal_Int32 sId ) @@ -8213,15 +8213,15 @@ void DomainMapper_Impl::ApplySettingsTable() { uno::Reference< beans::XPropertySet > xTextDefaults(m_xTextFactory->createInstance("com.sun.star.text.Defaults"), uno::UNO_QUERY_THROW ); sal_Int32 nDefTab = m_pSettingsTable->GetDefaultTabStop(); - xTextDefaults->setPropertyValue( getPropertyName( PROP_TAB_STOP_DISTANCE ), uno::makeAny(nDefTab) ); + xTextDefaults->setPropertyValue( getPropertyName( PROP_TAB_STOP_DISTANCE ), uno::Any(nDefTab) ); if (m_pSettingsTable->GetLinkStyles()) { // If linked styles are enabled, set paragraph defaults from Word's default template - xTextDefaults->setPropertyValue(getPropertyName(PROP_PARA_BOTTOM_MARGIN), uno::makeAny(ConversionHelper::convertTwipToMM100(200))); + xTextDefaults->setPropertyValue(getPropertyName(PROP_PARA_BOTTOM_MARGIN), uno::Any(ConversionHelper::convertTwipToMM100(200))); style::LineSpacing aSpacing; aSpacing.Mode = style::LineSpacingMode::PROP; aSpacing.Height = sal_Int16(115); - xTextDefaults->setPropertyValue(getPropertyName(PROP_PARA_LINE_SPACING), uno::makeAny(aSpacing)); + xTextDefaults->setPropertyValue(getPropertyName(PROP_PARA_LINE_SPACING), uno::Any(aSpacing)); } if (m_pSettingsTable->GetZoomFactor() || m_pSettingsTable->GetView()) @@ -8229,14 +8229,14 @@ void DomainMapper_Impl::ApplySettingsTable() std::vector<beans::PropertyValue> aViewProps; if (m_pSettingsTable->GetZoomFactor()) { - aViewProps.emplace_back("ZoomFactor", -1, uno::makeAny(m_pSettingsTable->GetZoomFactor()), beans::PropertyState_DIRECT_VALUE); - aViewProps.emplace_back("VisibleBottom", -1, uno::makeAny(sal_Int32(0)), beans::PropertyState_DIRECT_VALUE); + aViewProps.emplace_back("ZoomFactor", -1, uno::Any(m_pSettingsTable->GetZoomFactor()), beans::PropertyState_DIRECT_VALUE); + aViewProps.emplace_back("VisibleBottom", -1, uno::Any(sal_Int32(0)), beans::PropertyState_DIRECT_VALUE); aViewProps.emplace_back("ZoomType", -1, - uno::makeAny(m_pSettingsTable->GetZoomType()), + uno::Any(m_pSettingsTable->GetZoomType()), beans::PropertyState_DIRECT_VALUE); } uno::Reference<container::XIndexContainer> xBox = document::IndexedPropertyValues::create(m_xComponentContext); - xBox->insertByIndex(sal_Int32(0), uno::makeAny(comphelper::containerToSequence(aViewProps))); + xBox->insertByIndex(sal_Int32(0), uno::Any(comphelper::containerToSequence(aViewProps))); uno::Reference<document::XViewDataSupplier> xViewDataSupplier(m_xTextDocument, uno::UNO_QUERY); xViewDataSupplier->setViewData(xBox); } @@ -8244,30 +8244,30 @@ void DomainMapper_Impl::ApplySettingsTable() uno::Reference< beans::XPropertySet > xSettings(m_xTextFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY); if (m_pSettingsTable->GetDoNotExpandShiftReturn()) - xSettings->setPropertyValue( "DoNotJustifyLinesWithManualBreak", uno::makeAny(true) ); + xSettings->setPropertyValue( "DoNotJustifyLinesWithManualBreak", uno::Any(true) ); if (m_pSettingsTable->GetUsePrinterMetrics()) - xSettings->setPropertyValue("PrinterIndependentLayout", uno::makeAny(document::PrinterIndependentLayout::DISABLED)); + xSettings->setPropertyValue("PrinterIndependentLayout", uno::Any(document::PrinterIndependentLayout::DISABLED)); if( m_pSettingsTable->GetEmbedTrueTypeFonts()) - xSettings->setPropertyValue( getPropertyName( PROP_EMBED_FONTS ), uno::makeAny(true) ); + xSettings->setPropertyValue( getPropertyName( PROP_EMBED_FONTS ), uno::Any(true) ); if( m_pSettingsTable->GetEmbedSystemFonts()) - xSettings->setPropertyValue( getPropertyName( PROP_EMBED_SYSTEM_FONTS ), uno::makeAny(true) ); - xSettings->setPropertyValue("AddParaTableSpacing", uno::makeAny(m_pSettingsTable->GetDoNotUseHTMLParagraphAutoSpacing())); + xSettings->setPropertyValue( getPropertyName( PROP_EMBED_SYSTEM_FONTS ), uno::Any(true) ); + xSettings->setPropertyValue("AddParaTableSpacing", uno::Any(m_pSettingsTable->GetDoNotUseHTMLParagraphAutoSpacing())); if (m_pSettingsTable->GetNoLeading()) { - xSettings->setPropertyValue("AddExternalLeading", uno::makeAny(!m_pSettingsTable->GetNoLeading())); + xSettings->setPropertyValue("AddExternalLeading", uno::Any(!m_pSettingsTable->GetNoLeading())); } if( m_pSettingsTable->GetProtectForm() ) - xSettings->setPropertyValue("ProtectForm", uno::makeAny( true )); + xSettings->setPropertyValue("ProtectForm", uno::Any( true )); if( m_pSettingsTable->GetReadOnly() ) - xSettings->setPropertyValue("LoadReadonly", uno::makeAny( true )); + xSettings->setPropertyValue("LoadReadonly", uno::Any( true )); if (m_pSettingsTable->GetGutterAtTop()) { - xSettings->setPropertyValue("GutterAtTop", uno::makeAny(true)); + xSettings->setPropertyValue("GutterAtTop", uno::Any(true)); } uno::Sequence<beans::PropertyValue> aWriteProtection = m_pSettingsTable->GetWriteProtectionSettings(); if (aWriteProtection.hasElements()) - xSettings->setPropertyValue("ModifyPasswordInfo", uno::makeAny(aWriteProtection)); + xSettings->setPropertyValue("ModifyPasswordInfo", uno::Any(aWriteProtection)); } catch(const uno::Exception&) { @@ -8641,7 +8641,7 @@ bool DomainMapper_Impl::handlePreviousParagraphBorderInBetween() const // method is called). So current paragraph will get border above, but // also need to ensure, that no unexpected bottom border are remaining in previous // paragraph: since ParaIsConnectBorder=false it will be displayed in unexpected way. - m_xPreviousParagraph->setPropertyValue(getPropertyName(PROP_BOTTOM_BORDER), uno::makeAny(table::BorderLine2())); + m_xPreviousParagraph->setPropertyValue(getPropertyName(PROP_BOTTOM_BORDER), uno::Any(table::BorderLine2())); return true; } diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index f2313bdef0a6..0ce84f198aaf 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -222,18 +222,18 @@ void FormControlHelper::processField(uno::Reference<text::XFormField> const& xFo OUString sTmp = m_pFFData->getEntryMacro(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "EntryMacro", uno::makeAny(sTmp) ); + xNameCont->insertByName( "EntryMacro", uno::Any(sTmp) ); sTmp = m_pFFData->getExitMacro(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "ExitMacro", uno::makeAny(sTmp) ); + xNameCont->insertByName( "ExitMacro", uno::Any(sTmp) ); sTmp = m_pFFData->getHelpText(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Help", uno::makeAny(sTmp) ); + xNameCont->insertByName( "Help", uno::Any(sTmp) ); sTmp = m_pFFData->getStatusText(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Hint", uno::makeAny(sTmp) ); + xNameCont->insertByName( "Hint", uno::Any(sTmp) ); if (m_pImpl->m_eFieldId == FIELD_FORMTEXT ) { @@ -250,21 +250,21 @@ void FormControlHelper::processField(uno::Reference<text::XFormField> const& xFo sTmp = m_pFFData->getTextType(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Type", uno::makeAny(sTmp) ); + xNameCont->insertByName( "Type", uno::Any(sTmp) ); const sal_uInt16 nMaxLength = m_pFFData->getTextMaxLength(); if ( nMaxLength ) { - xNameCont->insertByName( "MaxLength", uno::makeAny(nMaxLength) ); + xNameCont->insertByName( "MaxLength", uno::Any(nMaxLength) ); } sTmp = m_pFFData->getTextDefault(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Content", uno::makeAny(sTmp) ); + xNameCont->insertByName( "Content", uno::Any(sTmp) ); sTmp = m_pFFData->getTextFormat(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Format", uno::makeAny(sTmp) ); + xNameCont->insertByName( "Format", uno::Any(sTmp) ); } else if (m_pImpl->m_eFieldId == FIELD_FORMCHECKBOX ) { @@ -280,17 +280,17 @@ void FormControlHelper::processField(uno::Reference<text::XFormField> const& xFo if (!rEntries.empty()) { if ( xNameCont->hasByName(ODF_FORMDROPDOWN_LISTENTRY) ) - xNameCont->replaceByName(ODF_FORMDROPDOWN_LISTENTRY, uno::makeAny(comphelper::containerToSequence(rEntries))); + xNameCont->replaceByName(ODF_FORMDROPDOWN_LISTENTRY, uno::Any(comphelper::containerToSequence(rEntries))); else - xNameCont->insertByName(ODF_FORMDROPDOWN_LISTENTRY, uno::makeAny(comphelper::containerToSequence(rEntries))); + xNameCont->insertByName(ODF_FORMDROPDOWN_LISTENTRY, uno::Any(comphelper::containerToSequence(rEntries))); sal_Int32 nResult = m_pFFData->getDropDownResult().toInt32(); if ( nResult ) { if ( xNameCont->hasByName(ODF_FORMDROPDOWN_RESULT) ) - xNameCont->replaceByName(ODF_FORMDROPDOWN_RESULT, uno::makeAny( nResult ) ); + xNameCont->replaceByName(ODF_FORMDROPDOWN_RESULT, uno::Any( nResult ) ); else - xNameCont->insertByName(ODF_FORMDROPDOWN_RESULT, uno::makeAny( nResult ) ); + xNameCont->insertByName(ODF_FORMDROPDOWN_RESULT, uno::Any( nResult ) ); } } } @@ -356,10 +356,10 @@ void FormControlHelper::insertControl(uno::Reference<text::XTextRange> const& xT uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); sal_uInt16 nTmp = sal_uInt16(text::TextContentAnchorType_AS_CHARACTER); - xShapeProps->setPropertyValue("AnchorType", uno::makeAny<sal_uInt16>(nTmp)); + xShapeProps->setPropertyValue("AnchorType", uno::Any(sal_uInt16(nTmp))); nTmp = text::VertOrientation::CENTER; - xShapeProps->setPropertyValue("VertOrient", uno::makeAny<sal_uInt16>(nTmp)); + xShapeProps->setPropertyValue("VertOrient", uno::Any(sal_uInt16(nTmp))); xShapeProps->setPropertyValue("TextRange", uno::Any(xTextRange)); diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index f1762cbfdd04..2f006bbd2e5a 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -354,34 +354,34 @@ public: void applyMargins(const uno::Reference< beans::XPropertySet >& xGraphicObjectProperties) const { - xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_LEFT_MARGIN ), uno::makeAny(nLeftMargin)); - xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_RIGHT_MARGIN ), uno::makeAny(nRightMargin)); - xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_TOP_MARGIN ), uno::makeAny(nTopMargin)); - xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_BOTTOM_MARGIN ), uno::makeAny(nBottomMargin)); + xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_LEFT_MARGIN ), uno::Any(nLeftMargin)); + xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_RIGHT_MARGIN ), uno::Any(nRightMargin)); + xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_TOP_MARGIN ), uno::Any(nTopMargin)); + xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_BOTTOM_MARGIN ), uno::Any(nBottomMargin)); } void applyPosition(const uno::Reference< beans::XPropertySet >& xGraphicObjectProperties) const { xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_HORI_ORIENT ), - uno::makeAny(nHoriOrient)); + uno::Any(nHoriOrient)); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_VERT_ORIENT ), - uno::makeAny(nVertOrient)); + uno::Any(nVertOrient)); } void applyRelativePosition(const uno::Reference< beans::XPropertySet >& xGraphicObjectProperties, bool bRelativeOnly = false) const { if (!bRelativeOnly) xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_HORI_ORIENT_POSITION), - uno::makeAny(nLeftPosition)); + uno::Any(nLeftPosition)); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_HORI_ORIENT_RELATION ), - uno::makeAny(nHoriRelation)); + uno::Any(nHoriRelation)); xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_PAGE_TOGGLE), - uno::makeAny(bPageToggle)); + uno::Any(bPageToggle)); if (!bRelativeOnly) xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_VERT_ORIENT_POSITION), - uno::makeAny(nTopPosition)); + uno::Any(nTopPosition)); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_VERT_ORIENT_RELATION ), - uno::makeAny(nVertRelation)); + uno::Any(nVertRelation)); } void applyZOrder(uno::Reference<beans::XPropertySet> const & xGraphicObjectProperties) const @@ -395,7 +395,7 @@ public: GraphicZOrderHelper* pZOrderHelper = rDomainMapper.graphicZOrderHelper(); bool bOldStyle = eGraphicImportType == GraphicImportType::IMPORT_AS_DETECTED_INLINE; xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_Z_ORDER), - uno::makeAny(pZOrderHelper->findZOrder(nZOrder, bOldStyle))); + uno::Any(pZOrderHelper->findZOrder(nZOrder, bOldStyle))); pZOrderHelper->addItem(xGraphicObjectProperties, nZOrder); } } @@ -411,9 +411,9 @@ public: xNamed->setName(rDomainMapper.GetGraphicNamingHelper().NameGraphic(sName)); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_DESCRIPTION ), - uno::makeAny( sAlternativeText )); + uno::Any( sAlternativeText )); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_TITLE ), - uno::makeAny( title )); + uno::Any( title )); } catch( const uno::Exception& ) { @@ -428,7 +428,7 @@ public: if (!sHyperlinkURL.isEmpty()) { xShapeProps->setPropertyValue( - getPropertyName(aHyperlinkProp), uno::makeAny(sHyperlinkURL)); + getPropertyName(aHyperlinkProp), uno::Any(sHyperlinkURL)); } } @@ -530,7 +530,7 @@ void GraphicImport::putPropertyToFrameGrabBag( const OUString& sPropertyName, co std::vector<beans::PropertyValue> aGrabBag(comphelper::sequenceToContainer<std::vector<beans::PropertyValue> >(aTmp)); aGrabBag.push_back(aProperty); - xSet->setPropertyValue(aGrabBagPropName, uno::makeAny(comphelper::containerToSequence(aGrabBag))); + xSet->setPropertyValue(aGrabBagPropName, uno::Any(comphelper::containerToSequence(aGrabBag))); } } @@ -842,16 +842,16 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) uno::UNO_QUERY ); awt::Size aSize = xShape->getSize( ); xGraphProps->setPropertyValue("Height", - uno::makeAny( aSize.Height ) ); + uno::Any( aSize.Height ) ); xGraphProps->setPropertyValue("Width", - uno::makeAny( aSize.Width ) ); + uno::Any( aSize.Width ) ); text::GraphicCrop aGraphicCrop( 0, 0, 0, 0 ); uno::Reference< beans::XPropertySet > xSourceGraphProps( xShape, uno::UNO_QUERY ); uno::Any aAny = xSourceGraphProps->getPropertyValue("GraphicCrop"); if(aAny >>= aGraphicCrop) { xGraphProps->setPropertyValue("GraphicCrop", - uno::makeAny( aGraphicCrop ) ); + uno::Any( aGraphicCrop ) ); } // We need to drop the shape here somehow @@ -875,12 +875,12 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) xShapeProps->setPropertyValue (getPropertyName(PROP_ANCHOR_TYPE), - uno::makeAny + uno::Any (text::TextContentAnchorType_AS_CHARACTER)); // In Word, if a shape is anchored inline, that // excludes being in the background. - xShapeProps->setPropertyValue("Opaque", uno::makeAny(true)); + xShapeProps->setPropertyValue("Opaque", uno::Any(true)); uno::Reference<lang::XServiceInfo> xServiceInfo(m_xShape, uno::UNO_QUERY_THROW); @@ -893,7 +893,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) bKeepRotation = true; xShapeProps->setPropertyValue (getPropertyName(PROP_TEXT_RANGE), - uno::makeAny + uno::Any (m_pImpl->rDomainMapper.GetCurrentTextRange())); } @@ -950,14 +950,14 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) m_xShape->setSize(aSize); if (bKeepRotation) { - xShapeProps->setPropertyValue("RotateAngle", uno::makeAny(nRotation.get())); + xShapeProps->setPropertyValue("RotateAngle", uno::Any(nRotation.get())); } m_pImpl->bIsGraphic = true; if (!m_pImpl->sAnchorId.isEmpty()) { - putPropertyToFrameGrabBag("AnchorId", uno::makeAny(m_pImpl->sAnchorId)); + putPropertyToFrameGrabBag("AnchorId", uno::Any(m_pImpl->sAnchorId)); } // Calculate mso unrotated rectangle and its center, needed below @@ -1247,8 +1247,8 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (m_pImpl->bHidden) { - xShapeProps->setPropertyValue("Visible", uno::makeAny(false)); - xShapeProps->setPropertyValue("Printable", uno::makeAny(false)); + xShapeProps->setPropertyValue("Visible", uno::Any(false)); + xShapeProps->setPropertyValue("Printable", uno::Any(false)); } // Avoid setting AnchorType for TextBoxes till SwTextBoxHelper::syncProperty() doesn't handle transition. @@ -1263,7 +1263,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (m_pImpl->bLayoutInCell && bTextBox) m_pImpl->bLayoutInCell = !m_pImpl->bCompatForcedLayoutInCell; - xShapeProps->setPropertyValue("AnchorType", uno::makeAny(eAnchorType)); + xShapeProps->setPropertyValue("AnchorType", uno::Any(eAnchorType)); if (m_pImpl->nVertRelation == text::RelOrientation::TEXT_LINE) { @@ -1280,7 +1280,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) m_pImpl->nHoriRelation = text::RelOrientation::FRAME; if(m_pImpl->rDomainMapper.IsInTable()) xShapeProps->setPropertyValue(getPropertyName(PROP_FOLLOW_TEXT_FLOW), - uno::makeAny(m_pImpl->bLayoutInCell)); + uno::Any(m_pImpl->bLayoutInCell)); //only the position orientation is handled in applyPosition() m_pImpl->applyPosition(xShapeProps); @@ -1300,7 +1300,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) xShapeProps->getPropertyValue("RotateAngle") >>= nRotation; } if (nRotation) - xShapeProps->setPropertyValue("RotateAngle", uno::makeAny(sal_Int32(0))); + xShapeProps->setPropertyValue("RotateAngle", uno::Any(sal_Int32(0))); // Position of the groupshape should be set after children have been added. // Long-term we should get rid of positioning group @@ -1314,27 +1314,27 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) awt::Point(m_pImpl->nLeftPosition, m_pImpl->nTopPosition)); if (nRotation) - xShapeProps->setPropertyValue("RotateAngle", uno::makeAny(nRotation)); + xShapeProps->setPropertyValue("RotateAngle", uno::Any(nRotation)); } m_pImpl->applyRelativePosition(xShapeProps, /*bRelativeOnly=*/true); - xShapeProps->setPropertyValue("SurroundContour", uno::makeAny(m_pImpl->bContour)); - xShapeProps->setPropertyValue("ContourOutside", uno::makeAny(m_pImpl->bContourOutside)); + xShapeProps->setPropertyValue("SurroundContour", uno::Any(m_pImpl->bContour)); + xShapeProps->setPropertyValue("ContourOutside", uno::Any(m_pImpl->bContourOutside)); m_pImpl->applyMargins(xShapeProps); - xShapeProps->setPropertyValue("Opaque", uno::makeAny(m_pImpl->bOpaque)); - xShapeProps->setPropertyValue("Surround", uno::makeAny(static_cast<sal_Int32>(m_pImpl->nWrap))); + xShapeProps->setPropertyValue("Opaque", uno::Any(m_pImpl->bOpaque)); + xShapeProps->setPropertyValue("Surround", uno::Any(static_cast<sal_Int32>(m_pImpl->nWrap))); m_pImpl->applyZOrder(xShapeProps); m_pImpl->applyName(xShapeProps); m_pImpl->applyHyperlink(xShapeProps, bUseShape); xShapeProps->setPropertyValue("AllowOverlap", - uno::makeAny(m_pImpl->bAllowOverlap)); + uno::Any(m_pImpl->bAllowOverlap)); // Get the grab-bag set by oox, merge with our one and then put it back. comphelper::SequenceAsHashMap aInteropGrabBag(xShapeProps->getPropertyValue("InteropGrabBag")); aInteropGrabBag.update(m_pImpl->getInteropGrabBag()); - xShapeProps->setPropertyValue("InteropGrabBag", uno::makeAny(aInteropGrabBag.getAsConstPropertyValueList())); + xShapeProps->setPropertyValue("InteropGrabBag", uno::Any(aInteropGrabBag.getAsConstPropertyValueList())); } else if (bUseShape && m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_INLINE) { @@ -1343,7 +1343,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) m_pImpl->applyZOrder(xShapeProps); comphelper::SequenceAsHashMap aInteropGrabBag(xShapeProps->getPropertyValue("InteropGrabBag")); aInteropGrabBag.update(m_pImpl->getInteropGrabBag()); - xShapeProps->setPropertyValue("InteropGrabBag", uno::makeAny(aInteropGrabBag.getAsConstPropertyValueList())); + xShapeProps->setPropertyValue("InteropGrabBag", uno::Any(aInteropGrabBag.getAsConstPropertyValueList())); } } } @@ -1372,7 +1372,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeWidthRelation", uno::makeAny(text::RelOrientation::FRAME)); + xPropertySet->setPropertyValue("RelativeWidthRelation", uno::Any(text::RelOrientation::FRAME)); } break; case NS_ooxml::LN_ST_SizeRelFromH_leftMargin: @@ -1383,7 +1383,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) // The size of the shape's width is going to be relative to the size of the left margin. // E.g.: (left margin = 8 && relative size = 150%) -> width of some shape = 12. uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeWidthRelation", uno::makeAny(text::RelOrientation::PAGE_LEFT)); + xPropertySet->setPropertyValue("RelativeWidthRelation", uno::Any(text::RelOrientation::PAGE_LEFT)); } break; case NS_ooxml::LN_ST_SizeRelFromH_rightMargin: @@ -1392,14 +1392,14 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) { // Same as the left margin above. uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeWidthRelation", uno::makeAny(text::RelOrientation::PAGE_RIGHT)); + xPropertySet->setPropertyValue("RelativeWidthRelation", uno::Any(text::RelOrientation::PAGE_RIGHT)); } break; case NS_ooxml::LN_ST_SizeRelFromH_page: if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeWidthRelation", uno::makeAny(text::RelOrientation::PAGE_FRAME)); + xPropertySet->setPropertyValue("RelativeWidthRelation", uno::Any(text::RelOrientation::PAGE_FRAME)); } break; default: @@ -1416,28 +1416,28 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeHeightRelation", uno::makeAny(text::RelOrientation::FRAME)); + xPropertySet->setPropertyValue("RelativeHeightRelation", uno::Any(text::RelOrientation::FRAME)); } break; case NS_ooxml::LN_ST_SizeRelFromV_page: if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeHeightRelation", uno::makeAny(text::RelOrientation::PAGE_FRAME)); + xPropertySet->setPropertyValue("RelativeHeightRelation", uno::Any(text::RelOrientation::PAGE_FRAME)); } break; case NS_ooxml::LN_ST_SizeRelFromV_topMargin: if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeHeightRelation", uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA)); + xPropertySet->setPropertyValue("RelativeHeightRelation", uno::Any(text::RelOrientation::PAGE_PRINT_AREA)); } break; case NS_ooxml::LN_ST_SizeRelFromV_bottomMargin: if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeHeightRelation", uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + xPropertySet->setPropertyValue("RelativeHeightRelation", uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); } break; default: @@ -1645,7 +1645,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) if (nTextPreRotateAngle == 0) { xPropertySet->setPropertyValue(aProperty, - uno::makeAny(nPositivePercentage)); + uno::Any(nPositivePercentage)); } } } @@ -1708,9 +1708,9 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer uno::Reference< beans::XPropertySet > xGraphicObjectProperties( m_xTextFactory->createInstance("com.sun.star.text.TextGraphicObject"), uno::UNO_QUERY_THROW); - xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_GRAPHIC), uno::makeAny(rxGraphic)); + xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_GRAPHIC), uno::Any(rxGraphic)); xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_ANCHOR_TYPE), - uno::makeAny( m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR ? + uno::Any( m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR ? text::TextContentAnchorType_AT_CHARACTER : text::TextContentAnchorType_AS_CHARACTER )); xGraphicObject.set( xGraphicObjectProperties, uno::UNO_QUERY_THROW ); @@ -1742,7 +1742,7 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer }; for(PropertyIds const & rBorderProp : aBorderProps) - xGraphicObjectProperties->setPropertyValue(getPropertyName(rBorderProp), uno::makeAny(aBorderLine)); + xGraphicObjectProperties->setPropertyValue(getPropertyName(rBorderProp), uno::Any(aBorderLine)); // setting graphic object shadow properties if (m_pImpl->bShadow) @@ -1773,16 +1773,16 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer aShadow.Location = table::ShadowLocation_TOP_LEFT; } - xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_SHADOW_FORMAT), uno::makeAny(aShadow)); + xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_SHADOW_FORMAT), uno::Any(aShadow)); } // setting properties for all types if( m_pImpl->bPositionProtected ) xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_POSITION_PROTECTED ), - uno::makeAny(true)); + uno::Any(true)); if( m_pImpl->bSizeProtected ) xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SIZE_PROTECTED ), - uno::makeAny(true)); + uno::Any(true)); sal_Int32 nWidth = - m_pImpl->nLeftPosition; if (m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR) @@ -1834,33 +1834,33 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer m_pImpl->applyRelativePosition(xGraphicObjectProperties); if( !m_pImpl->bOpaque ) { - xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::makeAny(m_pImpl->bOpaque)); + xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::Any(m_pImpl->bOpaque)); } xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SURROUND ), - uno::makeAny(static_cast<sal_Int32>(m_pImpl->nWrap))); + uno::Any(static_cast<sal_Int32>(m_pImpl->nWrap))); if( m_pImpl->rDomainMapper.IsInTable()) xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_FOLLOW_TEXT_FLOW ), - uno::makeAny(m_pImpl->bLayoutInCell)); + uno::Any(m_pImpl->bLayoutInCell)); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SURROUND_CONTOUR ), - uno::makeAny(m_pImpl->bContour)); + uno::Any(m_pImpl->bContour)); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_CONTOUR_OUTSIDE ), - uno::makeAny(m_pImpl->bContourOutside)); + uno::Any(m_pImpl->bContourOutside)); m_pImpl->applyMargins(xGraphicObjectProperties); } xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_ADJUST_CONTRAST ), - uno::makeAny(static_cast<sal_Int16>(m_pImpl->nContrast))); + uno::Any(static_cast<sal_Int16>(m_pImpl->nContrast))); xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_ADJUST_LUMINANCE ), - uno::makeAny(static_cast<sal_Int16>(m_pImpl->nBrightness))); + uno::Any(static_cast<sal_Int16>(m_pImpl->nBrightness))); if(m_pImpl->eColorMode != drawing::ColorMode_STANDARD) { xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_GRAPHIC_COLOR_MODE ), - uno::makeAny(m_pImpl->eColorMode)); + uno::Any(m_pImpl->eColorMode)); } xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_BACK_COLOR ), - uno::makeAny( GraphicImport_Impl::nFillColor )); + uno::Any( GraphicImport_Impl::nFillColor )); m_pImpl->applyZOrder(xGraphicObjectProperties); //there seems to be no way to detect the original size via _real_ API @@ -1903,7 +1903,7 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer // We should bring it to front, even if wp:anchor's behindDoc="1", // because otherwise paragraph background (if set) overlaps the graphic // TODO: if paragraph's background becomes bottommost, then remove this hack - xGraphicObjectProperties->setPropertyValue("Opaque", uno::makeAny(true)); + xGraphicObjectProperties->setPropertyValue("Opaque", uno::Any(true)); } } @@ -1912,7 +1912,7 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer { if( m_pImpl->getXSize() && m_pImpl->getYSize() ) xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_SIZE), - uno::makeAny( awt::Size( m_pImpl->getXSize(), m_pImpl->getYSize() ))); + uno::Any( awt::Size( m_pImpl->getXSize(), m_pImpl->getYSize() ))); m_pImpl->applyMargins(xGraphicObjectProperties); m_pImpl->applyName(xGraphicObjectProperties); m_pImpl->applyHyperlink(xGraphicObjectProperties, false); @@ -1924,9 +1924,9 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer if (bMirrored) { xGraphicObjectProperties->setPropertyValue("HoriMirroredOnEvenPages", - uno::makeAny(true)); + uno::Any(true)); xGraphicObjectProperties->setPropertyValue("HoriMirroredOnOddPages", - uno::makeAny(true)); + uno::Any(true)); } } } diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 1c79e0eece99..cb97f59ffdee 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -54,7 +54,7 @@ namespace writerfilter::dmapper { template <typename T> static beans::PropertyValue lcl_makePropVal(PropertyIds nNameID, T const & aValue) { - return {getPropertyName(nNameID), 0, uno::makeAny(aValue), beans::PropertyState_DIRECT_VALUE}; + return {getPropertyName(nNameID), 0, uno::Any(aValue), beans::PropertyState_DIRECT_VALUE}; } static sal_Int32 lcl_findProperty( const uno::Sequence< beans::PropertyValue >& aProps, std::u16string_view sName ) @@ -255,11 +255,11 @@ uno::Sequence<beans::PropertyValue> ListLevel::GetLevelProperties(bool bDefaults aNumberingProperties.emplace_back( getPropertyName(aProp->first), 0, aProp->second, beans::PropertyState_DIRECT_VALUE ); else if (rReadId == PROP_FIRST_LINE_INDENT && bDefaults) // Writer default is -360 twips, Word default seems to be 0. - aNumberingProperties.emplace_back("FirstLineIndent", 0, uno::makeAny(static_cast<sal_Int32>(0)), beans::PropertyState_DIRECT_VALUE); + aNumberingProperties.emplace_back("FirstLineIndent", 0, uno::Any(static_cast<sal_Int32>(0)), beans::PropertyState_DIRECT_VALUE); else if (rReadId == PROP_INDENT_AT && bDefaults) // Writer default is 720 twips, Word default seems to be 0. aNumberingProperties.emplace_back("IndentAt", 0, - uno::makeAny(static_cast<sal_Int32>(0)), + uno::Any(static_cast<sal_Int32>(0)), beans::PropertyState_DIRECT_VALUE); } @@ -537,7 +537,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, if (GetId() == nOutline) m_StyleName = "Outline"; //SwNumRule.GetOutlineRuleName() else - xStyles->insertByName(GetStyleName(GetId(), xStyles), makeAny(xStyle)); + xStyles->insertByName(GetStyleName(GetId(), xStyles), css::uno::Any(xStyle)); uno::Any oStyle = xStyles->getByName(GetStyleName()); xStyle.set( oStyle, uno::UNO_QUERY_THROW ); @@ -593,7 +593,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_POSITION_AND_SPACE_MODE), sal_Int16(text::PositionAndSpaceMode::LABEL_ALIGNMENT))); // Replace the numbering rules for the level - m_xNumRules->replaceByIndex(nLevel, uno::makeAny(comphelper::containerToSequence(aLvlProps))); + m_xNumRules->replaceByIndex(nLevel, uno::Any(comphelper::containerToSequence(aLvlProps))); // Handle the outline level here if (GetId() == nOutline && pAbsLevel && pAbsLevel->GetParaStyle()) @@ -607,7 +607,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, pParaStyle->bAssignedAsChapterNumbering = true; aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_HEADING_STYLE_NAME), pParaStyle->sConvertedStyleName)); - xOutlineRules->replaceByIndex(nLevel, uno::makeAny(comphelper::containerToSequence(aLvlProps))); + xOutlineRules->replaceByIndex(nLevel, uno::Any(comphelper::containerToSequence(aLvlProps))); } nLevel++; @@ -615,7 +615,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, // Create the numbering style for these rules OUString sNumRulesName = getPropertyName( PROP_NUMBERING_RULES ); - xStyle->setPropertyValue( sNumRulesName, uno::makeAny( m_xNumRules ) ); + xStyle->setPropertyValue( sNumRulesName, uno::Any( m_xNumRules ) ); } catch( const lang::IllegalArgumentException& ) { @@ -751,17 +751,17 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) case NS_ooxml::LN_CT_Ind_left: if ( pCurrentLvl ) pCurrentLvl->Insert( - PROP_INDENT_AT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + PROP_INDENT_AT, uno::Any( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Ind_hanging: if ( pCurrentLvl ) pCurrentLvl->Insert( - PROP_FIRST_LINE_INDENT, uno::makeAny( - ConversionHelper::convertTwipToMM100( nIntValue ) )); + PROP_FIRST_LINE_INDENT, uno::Any( - ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Ind_firstLine: if ( pCurrentLvl ) pCurrentLvl->Insert( - PROP_FIRST_LINE_INDENT, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + PROP_FIRST_LINE_INDENT, uno::Any( ConversionHelper::convertTwipToMM100( nIntValue ) )); break; case NS_ooxml::LN_CT_Lvl_tplc: //template code - unsupported case NS_ooxml::LN_CT_Lvl_tentative: //marks level as unused in the document - unsupported @@ -1016,7 +1016,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) if (ListLevel::Pointer pLevel = m_pCurrentDefinition->GetCurrentLevel()) { pLevel->Insert( - PROP_ADJUST, uno::makeAny( nValue ) ); + PROP_ADJUST, uno::Any( nValue ) ); } } } diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index 6cdde201e9f6..8a495e32fa8b 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -114,7 +114,7 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal) try { uno::Reference<beans::XPropertySet> xShapeProps(m_xShape, uno::UNO_QUERY); - xShapeProps->setPropertyValue("Opaque", uno::makeAny(false)); + xShapeProps->setPropertyValue("Opaque", uno::Any(false)); } catch( const uno::Exception& ) { @@ -176,12 +176,12 @@ void OLEHandler::lcl_sprm(Sprm & rSprm) xShapeProps->setPropertyValue( getPropertyName( PROP_SURROUND ), - uno::makeAny( static_cast<sal_Int32>(m_nWrapMode) ) ); + uno::Any( static_cast<sal_Int32>(m_nWrapMode) ) ); // Through shapes in the header or footer(that spill into the body) should be in the background. // It is just assumed that all shapes will spill into the body. if( m_rDomainMapper.IsInHeaderFooter() ) - xShapeProps->setPropertyValue("Opaque", uno::makeAny(m_nWrapMode != text::WrapTextMode_THROUGH)); + xShapeProps->setPropertyValue("Opaque", uno::Any(m_nWrapMode != text::WrapTextMode_THROUGH)); } catch( const uno::Exception& ) { diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index e6f4b4a59380..7b29266f38f4 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -180,16 +180,16 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues( bool bChar } if ( nCharGrabBag && bCharGrabBag ) - m_aValues.push_back( makePropertyValue( "CharInteropGrabBag", uno::makeAny( aCharGrabBagValues ) ) ); + m_aValues.push_back( makePropertyValue( "CharInteropGrabBag", uno::Any( aCharGrabBagValues ) ) ); if ( nParaGrabBag ) - m_aValues.push_back( makePropertyValue( "ParaInteropGrabBag", uno::makeAny( aParaGrabBagValues ) ) ); + m_aValues.push_back( makePropertyValue( "ParaInteropGrabBag", uno::Any( aParaGrabBagValues ) ) ); if ( nCellGrabBag ) - m_aValues.push_back( makePropertyValue( "CellInteropGrabBag", uno::makeAny( aCellGrabBagValues ) ) ); + m_aValues.push_back( makePropertyValue( "CellInteropGrabBag", uno::Any( aCellGrabBagValues ) ) ); if ( nRowGrabBag ) - m_aValues.push_back( makePropertyValue( "RowInteropGrabBag", uno::makeAny( aRowGrabBagValues ) ) ); + m_aValues.push_back( makePropertyValue( "RowInteropGrabBag", uno::Any( aRowGrabBagValues ) ) ); return comphelper::containerToSequence( m_aValues ); } @@ -450,23 +450,23 @@ SectionPropertyMap::SectionPropertyMap( bool bIsFirstSection ) // initialize defaults PaperInfo aLetter( PAPER_LETTER ); // page height, 1/100mm - Insert( PROP_HEIGHT, uno::makeAny( static_cast<sal_Int32>(aLetter.getHeight()) ) ); + Insert( PROP_HEIGHT, uno::Any( static_cast<sal_Int32>(aLetter.getHeight()) ) ); // page width, 1/100mm - Insert( PROP_WIDTH, uno::makeAny( static_cast<sal_Int32>(aLetter.getWidth()) ) ); + Insert( PROP_WIDTH, uno::Any( static_cast<sal_Int32>(aLetter.getWidth()) ) ); // page left margin, 1/100 mm - Insert( PROP_LEFT_MARGIN, uno::makeAny( sal_Int32(o3tl::convert(1, o3tl::Length::in, o3tl::Length::mm100)) ) ); + Insert( PROP_LEFT_MARGIN, uno::Any( sal_Int32(o3tl::convert(1, o3tl::Length::in, o3tl::Length::mm100)) ) ); // page right margin, 1/100 mm - Insert( PROP_RIGHT_MARGIN, uno::makeAny( sal_Int32(o3tl::convert(1, o3tl::Length::in, o3tl::Length::mm100)) ) ); + Insert( PROP_RIGHT_MARGIN, uno::Any( sal_Int32(o3tl::convert(1, o3tl::Length::in, o3tl::Length::mm100)) ) ); // page top margin, 1/100 mm - Insert( PROP_TOP_MARGIN, uno::makeAny( sal_Int32(o3tl::convert(1, o3tl::Length::in, o3tl::Length::mm100)) ) ); + Insert( PROP_TOP_MARGIN, uno::Any( sal_Int32(o3tl::convert(1, o3tl::Length::in, o3tl::Length::mm100)) ) ); // page bottom margin, 1/100 mm - Insert( PROP_BOTTOM_MARGIN, uno::makeAny( sal_Int32(o3tl::convert(1, o3tl::Length::in, o3tl::Length::mm100)) ) ); + Insert( PROP_BOTTOM_MARGIN, uno::Any( sal_Int32(o3tl::convert(1, o3tl::Length::in, o3tl::Length::mm100)) ) ); // page style layout - Insert( PROP_PAGE_STYLE_LAYOUT, uno::makeAny( style::PageStyleLayout_ALL ) ); - uno::Any aFalse( uno::makeAny( false ) ); + Insert( PROP_PAGE_STYLE_LAYOUT, uno::Any( style::PageStyleLayout_ALL ) ); + uno::Any aFalse( uno::Any( false ) ); Insert( PROP_GRID_DISPLAY, aFalse ); Insert( PROP_GRID_PRINT, aFalse ); - Insert( PROP_GRID_MODE, uno::makeAny( text::TextGridMode::NONE ) ); + Insert( PROP_GRID_MODE, uno::Any( text::TextGridMode::NONE ) ); if ( m_bIsFirstSection ) { @@ -496,13 +496,13 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( DomainMa // first and the follow page style will have the same name, and // insertByName() will fail. if ( xPageStyles.is() ) - xPageStyles->insertByName( m_sFirstPageStyleName, uno::makeAny( m_aFirstPageStyle ) ); + xPageStyles->insertByName( m_sFirstPageStyleName, uno::Any( m_aFirstPageStyle ) ); // Ensure that m_aFollowPageStyle has been created GetPageStyle( rDM_Impl, false ); // Chain m_aFollowPageStyle to be after m_aFirstPageStyle m_aFirstPageStyle->setPropertyValue( "FollowStyle", - uno::makeAny( m_sFollowPageStyleName ) ); + uno::Any( m_sFollowPageStyleName ) ); } else if ( !m_aFirstPageStyle.is() && xPageStyles.is() ) { @@ -518,7 +518,7 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( DomainMa m_sFollowPageStyleName = rDM_Impl.GetUnusedPageStyleName(); m_aFollowPageStyle.set( xTextFactory->createInstance( "com.sun.star.style.PageStyle" ), uno::UNO_QUERY ); - xPageStyles->insertByName( m_sFollowPageStyleName, uno::makeAny( m_aFollowPageStyle ) ); + xPageStyles->insertByName( m_sFollowPageStyleName, uno::Any( m_aFollowPageStyle ) ); } else if ( !m_aFollowPageStyle.is() && xPageStyles.is() ) { @@ -613,9 +613,9 @@ void SectionPropertyMap::ApplyBorderToPageStyles( DomainMapper_Impl& rDM_Impl, { const OUString sBorderName = getPropertyName( aBorderIds[nBorder] ); if ( xFirst.is() ) - xFirst->setPropertyValue( sBorderName, uno::makeAny( *m_oBorderLines[nBorder] ) ); + xFirst->setPropertyValue( sBorderName, uno::Any( *m_oBorderLines[nBorder] ) ); if ( xSecond.is() ) - xSecond->setPropertyValue( sBorderName, uno::makeAny( *m_oBorderLines[nBorder] ) ); + xSecond->setPropertyValue( sBorderName, uno::Any( *m_oBorderLines[nBorder] ) ); } if ( m_nBorderDistances[nBorder] >= 0 ) { @@ -635,9 +635,9 @@ void SectionPropertyMap::ApplyBorderToPageStyles( DomainMapper_Impl& rDM_Impl, { table::ShadowFormat aFormat = getShadowFromBorder( *m_oBorderLines[BORDER_RIGHT] ); if ( xFirst.is() ) - xFirst->setPropertyValue( getPropertyName( PROP_SHADOW_FORMAT ), uno::makeAny( aFormat ) ); + xFirst->setPropertyValue( getPropertyName( PROP_SHADOW_FORMAT ), uno::Any( aFormat ) ); if ( xSecond.is() ) - xSecond->setPropertyValue( getPropertyName( PROP_SHADOW_FORMAT ), uno::makeAny( aFormat ) ); + xSecond->setPropertyValue( getPropertyName( PROP_SHADOW_FORMAT ), uno::Any( aFormat ) ); } } @@ -694,7 +694,7 @@ void SectionPropertyMap::SetBorderDistance( const uno::Reference< beans::XProper // Change the margins with the border distance uno::Reference< beans::XMultiPropertySet > xMultiSet( xStyle, uno::UNO_QUERY_THROW ); uno::Sequence<OUString> aProperties { sMarginName, sBorderDistanceName }; - uno::Sequence<uno::Any> aValues { uno::makeAny( nMargin ), uno::makeAny( nDistance ) }; + uno::Sequence<uno::Any> aValues { uno::Any( nMargin ), uno::Any( nDistance ) }; xMultiSet->setPropertyValues( aProperties, aValues ); } @@ -703,7 +703,7 @@ void SectionPropertyMap::DontBalanceTextColumns() try { if ( m_xColumnContainer.is() ) - m_xColumnContainer->setPropertyValue( "DontBalanceTextColumns", uno::makeAny( true ) ); + m_xColumnContainer->setPropertyValue( "DontBalanceTextColumns", uno::Any( true ) ); } catch ( const uno::Exception& ) { @@ -743,7 +743,7 @@ void SectionPropertyMap::ApplyProtectionProperties( uno::Reference< beans::XProp if ( !xSection.is() ) xSection = rDM_Impl.appendTextSectionAfter( m_xStartingRange ); if ( xSection.is() ) - xSection->setPropertyValue( getPropertyName(PROP_IS_PROTECTED), uno::makeAny(bIsProtected) ); + xSection->setPropertyValue( getPropertyName(PROP_IS_PROTECTED), uno::Any(bIsProtected) ); } } catch ( uno::Exception& ) @@ -802,19 +802,19 @@ uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties( else { xColumns->setColumnCount( m_nColumnCount ); - xColumnPropSet->setPropertyValue( getPropertyName( PROP_AUTOMATIC_DISTANCE ), uno::makeAny( m_nColumnDistance ) ); + xColumnPropSet->setPropertyValue( getPropertyName( PROP_AUTOMATIC_DISTANCE ), uno::Any( m_nColumnDistance ) ); } if ( m_bSeparatorLineIsOn ) { - xColumnPropSet->setPropertyValue( "SeparatorLineIsOn", uno::makeAny( true ) ); - xColumnPropSet->setPropertyValue( "SeparatorLineVerticalAlignment", uno::makeAny( style::VerticalAlignment_TOP ) ); - xColumnPropSet->setPropertyValue( "SeparatorLineRelativeHeight", uno::makeAny( static_cast<sal_Int8>(100) ) ); - xColumnPropSet->setPropertyValue( "SeparatorLineColor", uno::makeAny( static_cast<sal_Int32>(COL_BLACK) ) ); + xColumnPropSet->setPropertyValue( "SeparatorLineIsOn", uno::Any( true ) ); + xColumnPropSet->setPropertyValue( "SeparatorLineVerticalAlignment", uno::Any( style::VerticalAlignment_TOP ) ); + xColumnPropSet->setPropertyValue( "SeparatorLineRelativeHeight", uno::Any( static_cast<sal_Int8>(100) ) ); + xColumnPropSet->setPropertyValue( "SeparatorLineColor", uno::Any( static_cast<sal_Int32>(COL_BLACK) ) ); // 1 twip -> 2 mm100. - xColumnPropSet->setPropertyValue( "SeparatorLineWidth", uno::makeAny( static_cast<sal_Int32>(2) ) ); + xColumnPropSet->setPropertyValue( "SeparatorLineWidth", uno::Any( static_cast<sal_Int32>(2) ) ); } - xColumnContainer->setPropertyValue( sTextColumns, uno::makeAny( xColumns ) ); + xColumnContainer->setPropertyValue( sTextColumns, uno::Any( xColumns ) ); // Set the columns to be unbalanced if that compatibility option is set or this is the last section. m_xColumnContainer = xColumnContainer; if ( rDM_Impl.GetSettingsTable()->GetNoColumnBalance() || rDM_Impl.GetIsLastSectionGroup() ) @@ -908,7 +908,7 @@ void SectionPropertyMap::CopyHeaderFooter( const DomainMapper_Impl& rDM_Impl, { uno::Reference< beans::XMultiPropertySet > xMultiSet( xStyle, uno::UNO_QUERY_THROW ); uno::Sequence<OUString> aProperties { sHeaderIsOn, sHeaderIsShared }; - uno::Sequence<uno::Any> aValues { uno::makeAny( true ), uno::makeAny( bHeaderIsShared ) }; + uno::Sequence<uno::Any> aValues { uno::Any( true ), uno::Any( bHeaderIsShared ) }; xMultiSet->setPropertyValues( aProperties, aValues ); if ( !bOmitRightHeader ) { @@ -937,7 +937,7 @@ void SectionPropertyMap::CopyHeaderFooter( const DomainMapper_Impl& rDM_Impl, uno::Reference< beans::XMultiPropertySet > xMultiSet( xStyle, uno::UNO_QUERY_THROW ); uno::Sequence<OUString> aProperties { sFooterIsOn, sFooterIsShared }; - uno::Sequence<uno::Any> aValues { uno::makeAny( true ), uno::makeAny( bFooterIsShared ) }; + uno::Sequence<uno::Any> aValues { uno::Any( true ), uno::Any( bFooterIsShared ) }; xMultiSet->setPropertyValues( aProperties, aValues ); if ( !bOmitRightFooter ) { @@ -1003,10 +1003,10 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage ) nHeaderHeight = MIN_HEAD_FOOT_HEIGHT; } - Insert(PROP_HEADER_IS_DYNAMIC_HEIGHT, uno::makeAny(m_bDynamicHeightTop)); - Insert(PROP_HEADER_DYNAMIC_SPACING, uno::makeAny(m_bDynamicHeightTop)); - Insert(PROP_HEADER_BODY_DISTANCE, uno::makeAny(nHeaderHeight - MIN_HEAD_FOOT_HEIGHT)); - Insert(PROP_HEADER_HEIGHT, uno::makeAny(nHeaderHeight)); + Insert(PROP_HEADER_IS_DYNAMIC_HEIGHT, uno::Any(m_bDynamicHeightTop)); + Insert(PROP_HEADER_DYNAMIC_SPACING, uno::Any(m_bDynamicHeightTop)); + Insert(PROP_HEADER_BODY_DISTANCE, uno::Any(nHeaderHeight - MIN_HEAD_FOOT_HEIGHT)); + Insert(PROP_HEADER_HEIGHT, uno::Any(nHeaderHeight)); // looks like PROP_HEADER_HEIGHT = height of the header + space between the header, and the body if ( m_bDynamicHeightTop ) //fixed height header -> see WW8Par6.hxx @@ -1032,10 +1032,10 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage ) nFooterHeight = MIN_HEAD_FOOT_HEIGHT; } - Insert(PROP_FOOTER_IS_DYNAMIC_HEIGHT, uno::makeAny(m_bDynamicHeightBottom)); - Insert(PROP_FOOTER_DYNAMIC_SPACING, uno::makeAny(m_bDynamicHeightBottom)); - Insert(PROP_FOOTER_BODY_DISTANCE, uno::makeAny(nFooterHeight - MIN_HEAD_FOOT_HEIGHT)); - Insert(PROP_FOOTER_HEIGHT, uno::makeAny(nFooterHeight)); + Insert(PROP_FOOTER_IS_DYNAMIC_HEIGHT, uno::Any(m_bDynamicHeightBottom)); + Insert(PROP_FOOTER_DYNAMIC_SPACING, uno::Any(m_bDynamicHeightBottom)); + Insert(PROP_FOOTER_BODY_DISTANCE, uno::Any(nFooterHeight - MIN_HEAD_FOOT_HEIGHT)); + Insert(PROP_FOOTER_HEIGHT, uno::Any(nFooterHeight)); if (m_bDynamicHeightBottom) //fixed height footer -> see WW8Par6.hxx { if (bCopyFirstToFollow && HasFooter(/*bFirstPage=*/true)) @@ -1048,8 +1048,8 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage ) } //now set the top/bottom margin for the follow page style - Insert( PROP_TOP_MARGIN, uno::makeAny( std::max<sal_Int32>(nTopMargin, 0) ) ); - Insert( PROP_BOTTOM_MARGIN, uno::makeAny( std::max<sal_Int32>(nBottomMargin, 0) ) ); + Insert( PROP_TOP_MARGIN, uno::Any( std::max<sal_Int32>(nTopMargin, 0) ) ); + Insert( PROP_BOTTOM_MARGIN, uno::Any( std::max<sal_Int32>(nBottomMargin, 0) ) ); } static uno::Reference< beans::XPropertySet > lcl_GetRangeProperties( bool bIsFirstSection, @@ -1072,19 +1072,19 @@ static uno::Reference< beans::XPropertySet > lcl_GetRangeProperties( bool bIsFir void SectionPropertyMap::HandleMarginsHeaderFooter( bool bFirstPage, DomainMapper_Impl& rDM_Impl ) { - Insert( PROP_LEFT_MARGIN, uno::makeAny( m_nLeftMargin ) ); - Insert( PROP_RIGHT_MARGIN, uno::makeAny( m_nRightMargin ) ); - Insert(PROP_GUTTER_MARGIN, uno::makeAny(m_nGutterMargin)); + Insert( PROP_LEFT_MARGIN, uno::Any( m_nLeftMargin ) ); + Insert( PROP_RIGHT_MARGIN, uno::Any( m_nRightMargin ) ); + Insert(PROP_GUTTER_MARGIN, uno::Any(m_nGutterMargin)); if ( rDM_Impl.m_oBackgroundColor ) - Insert( PROP_BACK_COLOR, uno::makeAny( *rDM_Impl.m_oBackgroundColor ) ); + Insert( PROP_BACK_COLOR, uno::Any( *rDM_Impl.m_oBackgroundColor ) ); // Check for missing footnote separator only in case there is at least // one footnote. if (rDM_Impl.m_bHasFtn && !rDM_Impl.m_bHasFtnSep) { // Set footnote line width to zero, document has no footnote separator. - Insert(PROP_FOOTNOTE_LINE_RELATIVE_WIDTH, uno::makeAny(sal_Int32(0))); + Insert(PROP_FOOTNOTE_LINE_RELATIVE_WIDTH, uno::Any(sal_Int32(0))); } if ( rDM_Impl.m_bHasFtnSep ) { @@ -1107,9 +1107,9 @@ void SectionPropertyMap::HandleMarginsHeaderFooter( bool bFirstPage, DomainMappe sal_Int16 aWritingMode(0); xStandard->getPropertyValue( getPropertyName(PROP_WRITING_MODE) ) >>= aWritingMode; if( aWritingMode == text::WritingMode2::RL_TB ) - Insert( PROP_FOOTNOTE_LINE_ADJUST, uno::makeAny( sal_Int16(text::HorizontalAdjust_RIGHT) ), false ); + Insert( PROP_FOOTNOTE_LINE_ADJUST, uno::Any( sal_Int16(text::HorizontalAdjust_RIGHT) ), false ); else - Insert( PROP_FOOTNOTE_LINE_ADJUST, uno::makeAny( sal_Int16(text::HorizontalAdjust_LEFT) ), false ); + Insert( PROP_FOOTNOTE_LINE_ADJUST, uno::Any( sal_Int16(text::HorizontalAdjust_LEFT) ), false ); } } } @@ -1251,7 +1251,7 @@ void SectionPropertyMap::InheritOrFinalizePageStyles( DomainMapper_Impl& rDM_Imp ApplyProperties_( m_aFirstPageStyle ); // Chain m_aFollowPageStyle to be after m_aFirstPageStyle - m_aFirstPageStyle->setPropertyValue( "FollowStyle", uno::makeAny( m_sFollowPageStyleName ) ); + m_aFirstPageStyle->setPropertyValue( "FollowStyle", uno::Any( m_sFollowPageStyleName ) ); } } @@ -1347,7 +1347,7 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& // Increase top spacing of the paragraph to match Word layout // behavior. nTopMargin = std::max(nTopMargin, nHeight); - xParagraph->setPropertyValue("ParaTopMargin", uno::makeAny(nTopMargin)); + xParagraph->setPropertyValue("ParaTopMargin", uno::Any(nTopMargin)); } } rAnchoredObjectAnchors.clear(); @@ -1539,7 +1539,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) // Writer is 1-based, Word is 0-based. xRangeProperties->setPropertyValue( getPropertyName(PROP_PARA_LINE_NUMBER_START_VALUE), - uno::makeAny(m_nLnnMin + 1)); + uno::Any(m_nLnnMin + 1)); } catch ( const uno::Exception& ) { @@ -1570,7 +1570,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) uno::Reference< beans::XPropertySet > xRangeProperties( lcl_GetRangeProperties( m_bIsFirstSection, rDM_Impl, m_xStartingRange ) ); if ( m_bIsFirstSection && !aName.isEmpty() && xRangeProperties.is() ) { - xRangeProperties->setPropertyValue( getPropertyName( PROP_PAGE_DESC_NAME ), uno::makeAny( aName ) ); + xRangeProperties->setPropertyValue( getPropertyName( PROP_PAGE_DESC_NAME ), uno::Any( aName ) ); } else if ((!m_bFirstPageHeaderLinkToPrevious || !m_bFirstPageFooterLinkToPrevious || @@ -1602,7 +1602,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) { // tdf#112201: do *not* use m_sFirstPageStyleName here! xElem->setPropertyValue(getPropertyName(PROP_PAGE_DESC_NAME), - uno::makeAny(m_sFollowPageStyleName)); + uno::Any(m_sFollowPageStyleName)); isFound = true; break; } @@ -1620,7 +1620,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) && bt == style::BreakType_PAGE_BEFORE) { xPSCursor->setPropertyValue(getPropertyName(PROP_PAGE_DESC_NAME), - uno::makeAny(m_sFollowPageStyleName)); + uno::Any(m_sFollowPageStyleName)); isFound = true; } else @@ -1641,7 +1641,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) uno::Reference<beans::XPropertySet> xPageStyle( rDM_Impl.GetPageStyles()->getByName(aPageDescName), uno::UNO_QUERY); xPageStyle->setPropertyValue("FollowStyle", - uno::makeAny(m_sFollowPageStyleName)); + uno::Any(m_sFollowPageStyleName)); } } } @@ -1674,7 +1674,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) //set the start value at the beginning of the document xRangeProperties.set( rDM_Impl.GetTextDocument()->getText()->getStart(), uno::UNO_QUERY_THROW ); } - xRangeProperties->setPropertyValue( getPropertyName( PROP_BREAK_TYPE ), uno::makeAny( style::BreakType_COLUMN_BEFORE ) ); + xRangeProperties->setPropertyValue( getPropertyName( PROP_BREAK_TYPE ), uno::Any( style::BreakType_COLUMN_BEFORE ) ); } catch ( const uno::Exception& ) {} } @@ -1695,7 +1695,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) if ( rDM_Impl.GetSettingsTable()->GetMirrorMarginSettings() ) { - Insert( PROP_PAGE_STYLE_LAYOUT, uno::makeAny( style::PageStyleLayout_MIRRORED ) ); + Insert( PROP_PAGE_STYLE_LAYOUT, uno::Any( style::PageStyleLayout_MIRRORED ) ); } uno::Reference< text::XTextColumns > xColumns; if ( m_nColumnCount > 1 ) @@ -1743,13 +1743,13 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) const sal_Int32 nGridLines = nTextAreaHeight / nGridLinePitch; if ( nGridLines >= 0 && nGridLines <= SAL_MAX_INT16 ) - Insert( PROP_GRID_LINES, uno::makeAny( sal_Int16(nGridLines) ) ); + Insert( PROP_GRID_LINES, uno::Any( sal_Int16(nGridLines) ) ); // PROP_GRID_MODE - Insert( PROP_GRID_MODE, uno::makeAny( static_cast<sal_Int16> (m_nGridType) ) ); + Insert( PROP_GRID_MODE, uno::Any( static_cast<sal_Int16> (m_nGridType) ) ); if ( m_nGridType == text::TextGridMode::LINES_AND_CHARS ) { - Insert( PROP_GRID_SNAP_TO_CHARS, uno::makeAny( m_bGridSnapToChars ) ); + Insert( PROP_GRID_SNAP_TO_CHARS, uno::Any( m_bGridSnapToChars ) ); } sal_Int32 nCharWidth = 423; //240 twip/ 12 pt @@ -1780,7 +1780,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) } if ( m_nPageNumberType >= 0 ) - Insert( PROP_NUMBERING_TYPE, uno::makeAny( m_nPageNumberType ) ); + Insert( PROP_NUMBERING_TYPE, uno::Any( m_nPageNumberType ) ); // #i119558#, force to set document as standard page mode, // refer to ww8 import process function "SwWW8ImplReader::SetDocumentGrid" @@ -1788,17 +1788,17 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) { uno::Reference< beans::XPropertySet > xDocProperties; xDocProperties.set( rDM_Impl.GetTextDocument(), uno::UNO_QUERY_THROW ); - Insert(PROP_GRID_STANDARD_MODE, uno::makeAny(true)); - xDocProperties->setPropertyValue("DefaultPageMode", uno::makeAny(false)); + Insert(PROP_GRID_STANDARD_MODE, uno::Any(true)); + xDocProperties->setPropertyValue("DefaultPageMode", uno::Any(false)); } catch ( const uno::Exception& ) { DBG_UNHANDLED_EXCEPTION("writerfilter.dmapper", "Exception in SectionPropertyMap::CloseSectionGroup"); } - Insert( PROP_GRID_BASE_HEIGHT, uno::makeAny( nGridLinePitch ) ); - Insert( PROP_GRID_BASE_WIDTH, uno::makeAny( nCharWidth ) ); - Insert( PROP_GRID_RUBY_HEIGHT, uno::makeAny( sal_Int32( 0 ) ) ); + Insert( PROP_GRID_BASE_HEIGHT, uno::Any( nGridLinePitch ) ); + Insert( PROP_GRID_BASE_WIDTH, uno::Any( nCharWidth ) ); + Insert( PROP_GRID_RUBY_HEIGHT, uno::Any( sal_Int32( 0 ) ) ); if ( rDM_Impl.IsNewDoc() && xFollowPageStyle.is() ) ApplyProperties_( xFollowPageStyle ); @@ -1815,7 +1815,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) if ( xColumns.is() ) xFirstPageStyle->setPropertyValue( - getPropertyName( PROP_TEXT_COLUMNS ), uno::makeAny( xColumns ) ); + getPropertyName( PROP_TEXT_COLUMNS ), uno::Any( xColumns ) ); } ApplyBorderToPageStyles( rDM_Impl, m_eBorderApply, m_eBorderOffsetFrom ); @@ -1852,16 +1852,16 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) pageProperties->getPropertyValue(rProperty.Name)); } } - evenOddStyle->setPropertyValue( "FollowStyle", uno::makeAny( *pageStyle ) ); - rDM_Impl.GetPageStyles()->insertByName( evenOddStyleName, uno::makeAny( evenOddStyle ) ); - evenOddStyle->setPropertyValue( "HeaderIsOn", uno::makeAny( false ) ); - evenOddStyle->setPropertyValue( "FooterIsOn", uno::makeAny( false ) ); + evenOddStyle->setPropertyValue( "FollowStyle", uno::Any( *pageStyle ) ); + rDM_Impl.GetPageStyles()->insertByName( evenOddStyleName, uno::Any( evenOddStyle ) ); + evenOddStyle->setPropertyValue( "HeaderIsOn", uno::Any( false ) ); + evenOddStyle->setPropertyValue( "FooterIsOn", uno::Any( false ) ); CopyHeaderFooter(rDM_Impl, pageProperties, evenOddStyle); *pageStyle = evenOddStyleName; // And use it instead of the original one (which is set as follow of this one). if ( m_nBreakType == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_evenPage) ) - evenOddStyle->setPropertyValue( getPropertyName( PROP_PAGE_STYLE_LAYOUT ), uno::makeAny( style::PageStyleLayout_LEFT ) ); + evenOddStyle->setPropertyValue( getPropertyName( PROP_PAGE_STYLE_LAYOUT ), uno::Any( style::PageStyleLayout_LEFT ) ); else if ( m_nBreakType == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_oddPage) ) - evenOddStyle->setPropertyValue( getPropertyName( PROP_PAGE_STYLE_LAYOUT ), uno::makeAny( style::PageStyleLayout_RIGHT ) ); + evenOddStyle->setPropertyValue( getPropertyName( PROP_PAGE_STYLE_LAYOUT ), uno::Any( style::PageStyleLayout_RIGHT ) ); } if (rDM_Impl.m_xAltChunkStartingRange.is()) @@ -1881,14 +1881,14 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) { xRangeProperties->setPropertyValue( getPropertyName( PROP_PAGE_DESC_NAME ), - uno::makeAny(sPageStyle) ); + uno::Any(sPageStyle) ); } if (0 <= m_nPageNumber) { sal_Int16 nPageNumber = static_cast< sal_Int16 >(m_nPageNumber); xRangeProperties->setPropertyValue(getPropertyName(PROP_PAGE_NUMBER_OFFSET), - uno::makeAny(nPageNumber)); + uno::Any(nPageNumber)); } } } diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 81e503a7f549..1ce24739752c 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -232,9 +232,9 @@ void SdtHelper::createDropDownControl() // set properties uno::Reference<beans::XPropertySet> xPropertySet(xControlModel, uno::UNO_QUERY); - xPropertySet->setPropertyValue("SelectedItem", uno::makeAny(aDefaultText)); - xPropertySet->setPropertyValue( - "Items", uno::makeAny(comphelper::containerToSequence(m_aDropDownItems))); + xPropertySet->setPropertyValue("SelectedItem", uno::Any(aDefaultText)); + xPropertySet->setPropertyValue("Items", + uno::Any(comphelper::containerToSequence(m_aDropDownItems))); // add it into document m_rDM_Impl.appendTextContent(xControlModel, uno::Sequence<beans::PropertyValue>()); @@ -250,10 +250,10 @@ void SdtHelper::createDropDownControl() // set properties uno::Reference<beans::XPropertySet> xPropertySet(xControlModel, uno::UNO_QUERY); - xPropertySet->setPropertyValue("DefaultText", uno::makeAny(aDefaultText)); - xPropertySet->setPropertyValue("Dropdown", uno::makeAny(true)); - xPropertySet->setPropertyValue( - "StringItemList", uno::makeAny(comphelper::containerToSequence(m_aDropDownItems))); + xPropertySet->setPropertyValue("DefaultText", uno::Any(aDefaultText)); + xPropertySet->setPropertyValue("Dropdown", uno::Any(true)); + xPropertySet->setPropertyValue("StringItemList", + uno::Any(comphelper::containerToSequence(m_aDropDownItems))); // add it into document createControlShape( @@ -283,14 +283,14 @@ void SdtHelper::createPlainTextControl() if (oData.has_value()) aDefaultText = *oData; - xPropertySet->setPropertyValue("Content", uno::makeAny(aDefaultText)); + xPropertySet->setPropertyValue("Content", uno::Any(aDefaultText)); // add it into document m_rDM_Impl.appendTextContent(xControlModel, uno::Sequence<beans::PropertyValue>()); // Store all unused sdt parameters from grabbag xPropertySet->setPropertyValue(UNO_NAME_MISC_OBJ_INTEROPGRABBAG, - uno::makeAny(getInteropGrabBagAndClear())); + uno::Any(getInteropGrabBagAndClear())); // clean up clear(); @@ -344,9 +344,9 @@ void SdtHelper::createDateContentControl() // Replace quotation mark used for marking static strings in date format sDateFormat = sDateFormat.replaceAll("'", "\""); - xNameCont->insertByName(ODF_FORMDATE_DATEFORMAT, uno::makeAny(sDateFormat)); + xNameCont->insertByName(ODF_FORMDATE_DATEFORMAT, uno::Any(sDateFormat)); xNameCont->insertByName(ODF_FORMDATE_DATEFORMAT_LANGUAGE, - uno::makeAny(m_sLocale.makeStringAndClear())); + uno::Any(m_sLocale.makeStringAndClear())); } OUString sFullDate = m_sDate.makeStringAndClear(); @@ -359,7 +359,7 @@ void SdtHelper::createDateContentControl() sal_Int32 nTimeSep = sFullDate.indexOf("T"); if (nTimeSep != -1) sFullDate = sFullDate.copy(0, nTimeSep); - xNameCont->insertByName(ODF_FORMDATE_CURRENTDATE, uno::makeAny(sFullDate)); + xNameCont->insertByName(ODF_FORMDATE_CURRENTDATE, uno::Any(sFullDate)); } uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(m_rDM_Impl.GetTextDocument(), @@ -370,7 +370,7 @@ void SdtHelper::createDateContentControl() // Store all unused sdt parameters from grabbag xNameCont->insertByName(UNO_NAME_MISC_OBJ_INTEROPGRABBAG, - uno::makeAny(getInteropGrabBagAndClear())); + uno::Any(getInteropGrabBagAndClear())); clear(); } @@ -386,10 +386,10 @@ void SdtHelper::createControlShape(awt::Size aSize, xControlShape->setControl(xControlModel); uno::Reference<beans::XPropertySet> xPropertySet(xControlShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("VertOrient", uno::makeAny(text::VertOrientation::CENTER)); + xPropertySet->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::CENTER)); if (rGrabBag.hasElements()) - xPropertySet->setPropertyValue(UNO_NAME_MISC_OBJ_INTEROPGRABBAG, uno::makeAny(rGrabBag)); + xPropertySet->setPropertyValue(UNO_NAME_MISC_OBJ_INTEROPGRABBAG, uno::Any(rGrabBag)); uno::Reference<text::XTextContent> xTextContent(xControlShape, uno::UNO_QUERY); m_rDM_Impl.appendTextContent(xTextContent, uno::Sequence<beans::PropertyValue>()); diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 3e6afe7b5fa1..808994454985 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -542,25 +542,25 @@ void SettingsTable::ApplyProperties(uno::Reference<text::XTextDocument> const& x uno::Reference<lang::XMultiServiceFactory> xTextFactory(xDoc, uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xDocumentSettings(xTextFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY_THROW); - xDocumentSettings->setPropertyValue("TableRowKeep", uno::makeAny(true)); + xDocumentSettings->setPropertyValue("TableRowKeep", uno::Any(true)); if (GetWordCompatibilityMode() <= 14) { - xDocumentSettings->setPropertyValue("MsWordCompMinLineHeightByFly", uno::makeAny(true)); - xDocumentSettings->setPropertyValue("TabOverMargin", uno::makeAny(true)); + xDocumentSettings->setPropertyValue("MsWordCompMinLineHeightByFly", uno::Any(true)); + xDocumentSettings->setPropertyValue("TabOverMargin", uno::Any(true)); } // Show changes value if (xDocProps.is()) { bool bHideChanges = !m_pImpl->m_bShowInsDelChanges || !m_pImpl->m_bShowMarkupChanges; - xDocProps->setPropertyValue("ShowChanges", uno::makeAny( !bHideChanges || m_pImpl->m_bShowFormattingChanges ) ); + xDocProps->setPropertyValue("ShowChanges", uno::Any( !bHideChanges || m_pImpl->m_bShowFormattingChanges ) ); } // Record changes value if (xDocProps.is()) { - xDocProps->setPropertyValue("RecordChanges", uno::makeAny( m_pImpl->m_bRecordChanges ) ); + xDocProps->setPropertyValue("RecordChanges", uno::Any( m_pImpl->m_bRecordChanges ) ); // Password protected Record changes if (m_pImpl->m_bRecordChanges && m_pImpl->m_pDocumentProtection->getRedlineProtection() && m_pImpl->m_pDocumentProtection->getEnforcement()) @@ -568,7 +568,7 @@ void SettingsTable::ApplyProperties(uno::Reference<text::XTextDocument> const& x // use dummy protection key to forbid disabling of Record changes without a notice // (extending the recent GrabBag support) TODO support password verification... css::uno::Sequence<sal_Int8> aDummyKey { 1 }; - xDocProps->setPropertyValue("RedlineProtectionKey", uno::makeAny( aDummyKey )); + xDocProps->setPropertyValue("RedlineProtectionKey", uno::Any( aDummyKey )); } } @@ -588,17 +588,17 @@ void SettingsTable::ApplyProperties(uno::Reference<text::XTextDocument> const& x if (m_pImpl->m_bAutoHyphenation && lcl_isDefault(xPropertyState, "ParaIsHyphenation")) { uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY); - xPropertySet->setPropertyValue("ParaIsHyphenation", uno::makeAny(true)); + xPropertySet->setPropertyValue("ParaIsHyphenation", uno::Any(true)); } if (m_pImpl->m_bNoHyphenateCaps) { uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY); - xPropertySet->setPropertyValue("ParaHyphenationNoCaps", uno::makeAny(true)); + xPropertySet->setPropertyValue("ParaHyphenationNoCaps", uno::Any(true)); } if (m_pImpl->m_bWidowControl && lcl_isDefault(xPropertyState, "ParaWidows") && lcl_isDefault(xPropertyState, "ParaOrphans")) { uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY); - uno::Any aAny = uno::makeAny(static_cast<sal_Int8>(2)); + uno::Any aAny(static_cast<sal_Int8>(2)); xPropertySet->setPropertyValue("ParaWidows", aAny); xPropertySet->setPropertyValue("ParaOrphans", aAny); } diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index fe5d718827f0..7b1e74358ff0 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -300,7 +300,7 @@ StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, m_bIsNewDoc(bIsNewDoc) { //set font height default to 10pt - uno::Any aVal = uno::makeAny( 10.0 ); + uno::Any aVal( 10.0 ); m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT, aVal ); m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal ); m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_COMPLEX, aVal ); @@ -692,7 +692,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) 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) ) ); + SetDefaultParaProps( PROP_PARA_TOP_MARGIN, uno::Any( sal_Int32(0) ) ); } m_pImpl->m_rDMapper.PopStyleSheetProperties(); applyDefaults( true ); @@ -714,7 +714,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) break; case NS_ooxml::LN_CT_TblPrBase_jc: //table alignment - row properties! m_pImpl->m_pCurrentEntry->pProperties->Insert( PROP_HORI_ORIENT, - uno::makeAny( ConversionHelper::convertTableJustification( nIntValue ))); + uno::Any( ConversionHelper::convertTableJustification( nIntValue ))); break; case NS_ooxml::LN_CT_TrPrBase_jc: //table alignment - row properties! break; @@ -839,7 +839,7 @@ void StyleSheetTable::lcl_entry(writerfilter::Reference<Properties>::Pointer_t r aValue.Name = "latentStyles"; aValue.Value <<= aLatentStyles; aGrabBag.push_back(aValue); - xPropertySet->setPropertyValue("InteropGrabBag", uno::makeAny(comphelper::containerToSequence(aGrabBag))); + xPropertySet->setPropertyValue("InteropGrabBag", uno::Any(comphelper::containerToSequence(aGrabBag))); } StyleSheetEntryPtr pEmptyEntry; @@ -920,7 +920,7 @@ void StyleSheetTable::ApplyNumberingStyleNameToParaStyles() uno::Reference<beans::XPropertySet> xPropertySet( xStyle, uno::UNO_QUERY_THROW ); const OUString sNumberingStyleName = m_pImpl->m_rDMapper.GetListStyleName( pStyleSheetProperties->GetListId() ); if ( !sNumberingStyleName.isEmpty() || !pStyleSheetProperties->GetListId() ) - xPropertySet->setPropertyValue( getPropertyName(PROP_NUMBERING_STYLE_NAME), uno::makeAny(sNumberingStyleName) ); + xPropertySet->setPropertyValue( getPropertyName(PROP_NUMBERING_STYLE_NAME), uno::Any(sNumberingStyleName) ); // Word 2010+ (not Word 2003, and Word 2007 is completely broken) // does something rather strange. It does not allow two paragraph styles @@ -981,7 +981,7 @@ void StyleSheetTable::ReApplyInheritedOutlineLevelFromChapterNumbering() break; uno::Reference<beans::XPropertySet> xPropertySet( xStyle, uno::UNO_QUERY_THROW ); - xPropertySet->setPropertyValue(getPropertyName(PROP_OUTLINE_LEVEL), uno::makeAny(nOutlineLevel)); + xPropertySet->setPropertyValue(getPropertyName(PROP_OUTLINE_LEVEL), uno::Any(nOutlineLevel)); } } catch( const uno::Exception& ) @@ -1058,7 +1058,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) // Numbering styles have to be inserted early, as e.g. the NumberingRules property is only available after insertion. if (bListStyle) { - xStyles->insertByName( sConvertedStyleName, uno::makeAny( xStyle ) ); + xStyles->insertByName( sConvertedStyleName, uno::Any( xStyle ) ); xStyle.set(xStyles->getByName(sConvertedStyleName), uno::UNO_QUERY_THROW); StyleSheetPropertyMap* pPropertyMap = pEntry->pProperties.get(); @@ -1075,8 +1075,8 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) comphelper::makePropertyValue( "NumberingType", style::NumberingType::NUMBER_NONE) }; - xNumberingRules->replaceByIndex(i, uno::makeAny(aLvlProps)); - xPropertySet->setPropertyValue("NumberingRules", uno::makeAny(xNumberingRules)); + xNumberingRules->replaceByIndex(i, uno::Any(aLvlProps)); + xPropertySet->setPropertyValue("NumberingRules", uno::Any(xNumberingRules)); } } } @@ -1115,7 +1115,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) sal_uInt32 nFontCount = rFontTable->size(); if( !m_pImpl->m_rDMapper.IsOOXMLImport() && nFontCount > 2 ) { - uno::Any aTwoHundredFortyTwip = uno::makeAny(12.); + uno::Any aTwoHundredFortyTwip(12.); // font size to 240 twip (12 pts) for all if not set pEntry->pProperties->Insert(PROP_CHAR_HEIGHT, aTwoHundredFortyTwip, false); @@ -1123,18 +1123,18 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) // 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, uno::makeAny( sWesternFontName ), false); + pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME, uno::Any( sWesternFontName ), false); // CJK ... apply second font const FontEntry::Pointer_t pCJKFontEntry(rFontTable->getFontEntry( 2 )); - pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME_ASIAN, uno::makeAny( pCJKFontEntry->sFontName ), false); + pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME_ASIAN, uno::Any( 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, uno::makeAny( pCTLFontEntry->sFontName ), false); + pEntry->pProperties->Insert(PROP_CHAR_FONT_NAME_COMPLEX, uno::Any( pCTLFontEntry->sFontName ), false); pEntry->pProperties->Insert(PROP_CHAR_HEIGHT_COMPLEX, aTwoHundredFortyTwip, false); } } @@ -1180,7 +1180,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) ++nLvl; beans::PropertyValue aLvlVal(getPropertyName(PROP_OUTLINE_LEVEL), 0, - uno::makeAny(nLvl), + uno::Any(nLvl), beans::PropertyState_DIRECT_VALUE); aPropValues.push_back(aLvlVal); } @@ -1296,19 +1296,19 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) if( !sParentStyle.isEmpty() && !xStyles->hasByName( sParentStyle ) ) aMissingParent.emplace_back( sParentStyle, xStyle ); - xStyles->insertByName( sConvertedStyleName, uno::makeAny( xStyle) ); + xStyles->insertByName( sConvertedStyleName, uno::Any( xStyle) ); } beans::PropertyValues aGrabBag = pEntry->GetInteropGrabBagSeq(); uno::Reference<beans::XPropertySet> xPropertySet(xStyle, uno::UNO_QUERY); if (aGrabBag.hasElements()) { - xPropertySet->setPropertyValue("StyleInteropGrabBag", uno::makeAny(aGrabBag)); + xPropertySet->setPropertyValue("StyleInteropGrabBag", uno::Any(aGrabBag)); } // Only paragraph styles support automatic updates. if (pEntry->bAutoRedefine && bParaStyle) - xPropertySet->setPropertyValue("IsAutoUpdate", uno::makeAny(true)); + xPropertySet->setPropertyValue("IsAutoUpdate", uno::Any(true)); } else if(pEntry->nStyleTypeCode == STYLE_TYPE_TABLE) { @@ -1333,7 +1333,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) try { uno::Reference<beans::XPropertySet> xPropertySet(iter.second, uno::UNO_QUERY); - xPropertySet->setPropertyValue( "FollowStyle", uno::makeAny(iter.first) ); + xPropertySet->setPropertyValue( "FollowStyle", uno::Any(iter.first) ); } catch( uno::Exception & ) {} } @@ -1345,7 +1345,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) { uno::Reference<beans::XPropertySet> xPropertySet(rLinked.second, uno::UNO_QUERY); - xPropertySet->setPropertyValue("LinkStyle", uno::makeAny(rLinked.first)); + xPropertySet->setPropertyValue("LinkStyle", uno::Any(rLinked.first)); } catch (uno::Exception&) { @@ -1365,7 +1365,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) aValue.Name = "tableStyles"; aValue.Value <<= comphelper::containerToSequence(aTableStylesVec); aGrabBag.push_back(aValue); - xPropertySet->setPropertyValue("InteropGrabBag", uno::makeAny(comphelper::containerToSequence(aGrabBag))); + xPropertySet->setPropertyValue("InteropGrabBag", uno::Any(comphelper::containerToSequence(aGrabBag))); } } } @@ -1606,11 +1606,11 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) 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))); - SetDefaultParaProps(PROP_PARA_ADJUST, uno::makeAny(sal_Int16(style::ParagraphAdjust_LEFT))); + SetDefaultParaProps(PROP_WRITING_MODE, uno::Any(sal_Int16(text::WritingMode_LR_TB))); + SetDefaultParaProps(PROP_PARA_ADJUST, uno::Any(sal_Int16(style::ParagraphAdjust_LEFT))); // Widow/Orphan -> set both to two if not already set - uno::Any aTwo = uno::makeAny(sal_Int8(2)); + uno::Any aTwo(sal_Int8(2)); SetDefaultParaProps(PROP_PARA_WIDOWS, aTwo); SetDefaultParaProps(PROP_PARA_ORPHANS, aTwo); @@ -1691,7 +1691,7 @@ OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProp TOOLS_WARN_EXCEPTION( "writerfilter", "StyleSheetTable::getOrCreateCharStyle - Style::setPropertyValue"); } } - xCharStyles->insertByName( sListLabel, uno::makeAny( xStyle) ); + xCharStyles->insertByName( sListLabel, uno::Any( xStyle) ); m_pImpl->m_aListCharStylePropertyVector.emplace_back( sListLabel, std::vector(rCharProperties) ); } catch( const uno::Exception& ) diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index 53e10529274f..c47ac7db8111 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -413,17 +413,17 @@ void TDefTableHandler::lcl_sprm(Sprm & rSprm) void TDefTableHandler::fillCellProperties( const ::tools::SvRef< TablePropertyMap >& pCellProperties ) const { if( !m_aTopBorderLines.empty() ) - pCellProperties->Insert( PROP_TOP_BORDER, uno::makeAny( m_aTopBorderLines[0] ) ); + pCellProperties->Insert( PROP_TOP_BORDER, uno::Any( m_aTopBorderLines[0] ) ); if( !m_aLeftBorderLines.empty() ) - pCellProperties->Insert( PROP_LEFT_BORDER, uno::makeAny( m_aLeftBorderLines[0] ) ); + pCellProperties->Insert( PROP_LEFT_BORDER, uno::Any( m_aLeftBorderLines[0] ) ); if( !m_aBottomBorderLines.empty() ) - pCellProperties->Insert( PROP_BOTTOM_BORDER, uno::makeAny( m_aBottomBorderLines[0] ) ); + pCellProperties->Insert( PROP_BOTTOM_BORDER, uno::Any( m_aBottomBorderLines[0] ) ); if( !m_aRightBorderLines.empty() ) - pCellProperties->Insert( PROP_RIGHT_BORDER, uno::makeAny( m_aRightBorderLines[0] ) ); + pCellProperties->Insert( PROP_RIGHT_BORDER, uno::Any( m_aRightBorderLines[0] ) ); if( !m_aInsideHBorderLines.empty() ) - pCellProperties->Insert( META_PROP_HORIZONTAL_BORDER, uno::makeAny( m_aInsideHBorderLines[0] ) ); + pCellProperties->Insert( META_PROP_HORIZONTAL_BORDER, uno::Any( m_aInsideHBorderLines[0] ) ); if( !m_aInsideVBorderLines.empty() ) - pCellProperties->Insert( META_PROP_VERTICAL_BORDER, uno::makeAny( m_aInsideVBorderLines[0] ) ); + pCellProperties->Insert( META_PROP_VERTICAL_BORDER, uno::Any( m_aInsideVBorderLines[0] ) ); } diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx index ce1d550d8e55..17fc3085d990 100644 --- a/writerfilter/source/dmapper/TableManager.cxx +++ b/writerfilter/source/dmapper/TableManager.cxx @@ -529,10 +529,10 @@ void TableManager::endRow() aBorderLine.InnerLineWidth = 0; aBorderLine.OuterLineWidth = 0; TablePropertyMapPtr pCellProperties(new TablePropertyMap); - pCellProperties->Insert(PROP_TOP_BORDER, css::uno::makeAny(aBorderLine)); - pCellProperties->Insert(PROP_LEFT_BORDER, css::uno::makeAny(aBorderLine)); - pCellProperties->Insert(PROP_BOTTOM_BORDER, css::uno::makeAny(aBorderLine)); - pCellProperties->Insert(PROP_RIGHT_BORDER, css::uno::makeAny(aBorderLine)); + pCellProperties->Insert(PROP_TOP_BORDER, css::uno::Any(aBorderLine)); + pCellProperties->Insert(PROP_LEFT_BORDER, css::uno::Any(aBorderLine)); + pCellProperties->Insert(PROP_BOTTOM_BORDER, css::uno::Any(aBorderLine)); + pCellProperties->Insert(PROP_RIGHT_BORDER, css::uno::Any(aBorderLine)); pTableData->getCurrentRow()->addCell(xRowStart, pCellProperties, /*bAddBefore=*/true); } diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 5c31f0e77367..8ea3eae5c056 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -80,8 +80,8 @@ namespace writerfilter::dmapper { pProperties->resolve(*pMeasureHandler); TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_SIZE_TYPE, uno::makeAny( pMeasureHandler->GetRowHeightSizeType() ), false); - pPropMap->Insert( PROP_HEIGHT, uno::makeAny(pMeasureHandler->getMeasureValue() )); + pPropMap->Insert( PROP_SIZE_TYPE, uno::Any( pMeasureHandler->GetRowHeightSizeType() ), false); + pPropMap->Insert( PROP_HEIGHT, uno::Any(pMeasureHandler->getMeasureValue() )); insertRowProps(pPropMap); } @@ -110,7 +110,7 @@ namespace writerfilter::dmapper { // Add the 'track changes' properties to the 'table row' via UNO. // This way - in the SW core - when it receives this - it will create a new 'Table Redline' object for that row uno::Sequence<beans::PropertyValue> aTableRedlineProperties = pTrackChangesHandler->getRedlineProperties(); - pPropMap->Insert( PROP_TABLE_REDLINE_PARAMS , uno::makeAny( aTableRedlineProperties )); + pPropMap->Insert( PROP_TABLE_REDLINE_PARAMS , uno::Any( aTableRedlineProperties )); insertRowProps(pPropMap); } } @@ -141,7 +141,7 @@ namespace writerfilter::dmapper { // Add the 'track changes' properties to the 'table row' via UNO. // This way - in the SW core - when it receives this - it will create a new 'Table Redline' object for that row uno::Sequence<beans::PropertyValue> aTableRedlineProperties = pTrackChangesHandler->getRedlineProperties(); - pPropMap->Insert( PROP_TABLE_REDLINE_PARAMS , uno::makeAny( aTableRedlineProperties )); + pPropMap->Insert( PROP_TABLE_REDLINE_PARAMS , uno::Any( aTableRedlineProperties )); cellProps(pPropMap); } } @@ -150,7 +150,7 @@ namespace writerfilter::dmapper { { //row can't break across pages if nIntValue == 1 TablePropertyMapPtr pPropMap( new TablePropertyMap ); - pPropMap->Insert( PROP_IS_SPLIT_ALLOWED, uno::makeAny( nIntValue != 1 ) ); + pPropMap->Insert( PROP_IS_SPLIT_ALLOWED, uno::Any( nIntValue != 1 ) ); insertRowProps(pPropMap); } break; @@ -164,7 +164,7 @@ namespace writerfilter::dmapper { default:; } TablePropertyMapPtr pCellPropMap( new TablePropertyMap() ); - pCellPropMap->Insert( PROP_VERT_ORIENT, uno::makeAny( nVertOrient ) ); + pCellPropMap->Insert( PROP_VERT_ORIENT, uno::Any( nVertOrient ) ); //todo: in ooxml import the value of m_ncell is wrong cellProps( pCellPropMap ); if (m_pCurrentInteropGrabBag) @@ -265,13 +265,13 @@ namespace writerfilter::dmapper { m_pCurrentInteropGrabBag->push_back(pCellMarginHandler->getInteropGrabBag()); TablePropertyMapPtr pCellProperties(new TablePropertyMap); if (pCellMarginHandler->m_bTopMarginValid) - pCellProperties->Insert(PROP_TOP_BORDER_DISTANCE, uno::makeAny(pCellMarginHandler->m_nTopMargin)); + pCellProperties->Insert(PROP_TOP_BORDER_DISTANCE, uno::Any(pCellMarginHandler->m_nTopMargin)); if (pCellMarginHandler->m_bLeftMarginValid) - pCellProperties->Insert(PROP_LEFT_BORDER_DISTANCE, uno::makeAny(pCellMarginHandler->m_nLeftMargin)); + pCellProperties->Insert(PROP_LEFT_BORDER_DISTANCE, uno::Any(pCellMarginHandler->m_nLeftMargin)); if (pCellMarginHandler->m_bBottomMarginValid) - pCellProperties->Insert(PROP_BOTTOM_BORDER_DISTANCE, uno::makeAny(pCellMarginHandler->m_nBottomMargin)); + pCellProperties->Insert(PROP_BOTTOM_BORDER_DISTANCE, uno::Any(pCellMarginHandler->m_nBottomMargin)); if (pCellMarginHandler->m_bRightMarginValid) - pCellProperties->Insert(PROP_RIGHT_BORDER_DISTANCE, uno::makeAny(pCellMarginHandler->m_nRightMargin)); + pCellProperties->Insert(PROP_RIGHT_BORDER_DISTANCE, uno::Any(pCellMarginHandler->m_nRightMargin)); cellProps(pCellProperties); } } @@ -358,7 +358,7 @@ namespace writerfilter::dmapper { if (nIntValue) { TablePropertyMapPtr pPropMap(new TablePropertyMap()); - pPropMap->Insert(PROP_CELL_HIDE_MARK, uno::makeAny(nIntValue)); + pPropMap->Insert(PROP_CELL_HIDE_MARK, uno::Any(nIntValue)); cellProps(pPropMap); } break; diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx index 001cecbd9f86..13656e169ba7 100644 --- a/writerfilter/source/dmapper/TblStylePrHandler.cxx +++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx @@ -163,7 +163,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) break; case NS_ooxml::LN_CT_TrPrBase_tblHeader: { - m_pProperties->Insert( PROP_HEADER_ROW_COUNT, uno::makeAny(sal_Int32(1))); + m_pProperties->Insert( PROP_HEADER_ROW_COUNT, uno::Any(sal_Int32(1))); beans::PropertyValue aValue; aValue.Name = "tblHeader"; aValue.Value <<= true; @@ -180,7 +180,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) pProperties->resolve(*pMeasureHandler); TablePropertyMapPtr pPropMap( new TablePropertyMap ); pPropMap->setValue( TablePropertyMap::LEFT_MARGIN, pMeasureHandler->getMeasureValue() ); - m_pProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny(pMeasureHandler->getMeasureValue()) ); + m_pProperties->Insert( PROP_LEFT_MARGIN, uno::Any(pMeasureHandler->getMeasureValue()) ); } } break; @@ -195,13 +195,13 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) m_aInteropGrabBag.push_back(pCellMarginHandler->getInteropGrabBag()); if( pCellMarginHandler->m_bTopMarginValid ) - m_pProperties->Insert( META_PROP_CELL_MAR_TOP, uno::makeAny(pCellMarginHandler->m_nTopMargin) ); + m_pProperties->Insert( META_PROP_CELL_MAR_TOP, uno::Any(pCellMarginHandler->m_nTopMargin) ); if( pCellMarginHandler->m_bBottomMarginValid ) - m_pProperties->Insert( META_PROP_CELL_MAR_BOTTOM, uno::makeAny(pCellMarginHandler->m_nBottomMargin) ); + m_pProperties->Insert( META_PROP_CELL_MAR_BOTTOM, uno::Any(pCellMarginHandler->m_nBottomMargin) ); if( pCellMarginHandler->m_bLeftMarginValid ) - m_pProperties->Insert( META_PROP_CELL_MAR_LEFT, uno::makeAny(pCellMarginHandler->m_nLeftMargin) ); + m_pProperties->Insert( META_PROP_CELL_MAR_LEFT, uno::Any(pCellMarginHandler->m_nLeftMargin) ); if( pCellMarginHandler->m_bRightMarginValid ) - m_pProperties->Insert( META_PROP_CELL_MAR_RIGHT, uno::makeAny(pCellMarginHandler->m_nRightMargin) ); + m_pProperties->Insert( META_PROP_CELL_MAR_RIGHT, uno::Any(pCellMarginHandler->m_nRightMargin) ); } } break; diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index d145c854fc80..cce02393cd5a 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -569,7 +569,7 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) case NS_ooxml::LN_CT_Shadow_algn: case NS_ooxml::LN_CT_Reflection_algn: { - uno::Any aAny = uno::makeAny(getRectAlignmentString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getRectAlignmentString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("algn", aAny); } break; @@ -578,19 +578,19 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) break; case NS_ooxml::LN_CT_TextOutlineEffect_cap: { - uno::Any aAny = uno::makeAny(getLineCapString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getLineCapString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("cap", aAny); } break; case NS_ooxml::LN_CT_TextOutlineEffect_cmpd: { - uno::Any aAny = uno::makeAny(getCompoundLineString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getCompoundLineString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("cmpd", aAny); } break; case NS_ooxml::LN_CT_TextOutlineEffect_algn: { - uno::Any aAny = uno::makeAny(getPenAlignmentString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getPenAlignmentString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("algn", aAny); } break; @@ -602,13 +602,13 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) break; case NS_ooxml::LN_CT_LinearShadeProperties_scaled: { - uno::Any aAny = uno::makeAny(getOnOffString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getOnOffString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("scaled", aAny); } break; case NS_ooxml::LN_CT_PathShadeProperties_path: { - uno::Any aAny = uno::makeAny(getPathShadeTypeString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getPathShadeTypeString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("path", aAny); } break; @@ -626,7 +626,7 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) break; case NS_ooxml::LN_CT_PresetLineDashProperties_val: { - uno::Any aAny = uno::makeAny(getPresetLineDashValString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getPresetLineDashValString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("val", aAny); } break; @@ -635,19 +635,19 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) break; case NS_ooxml::LN_CT_Camera_prst: { - uno::Any aAny = uno::makeAny(getPresetCameraTypeString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getPresetCameraTypeString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("prst", aAny); } break; case NS_ooxml::LN_CT_LightRig_rig: { - uno::Any aAny = uno::makeAny(getLightRigTypeString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getLightRigTypeString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("rig", aAny); } break; case NS_ooxml::LN_CT_LightRig_dir: { - uno::Any aAny = uno::makeAny(getLightRigDirectionString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getLightRigDirectionString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("dir", aAny); } break; @@ -668,7 +668,7 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) break; case NS_ooxml::LN_CT_Props3D_prstMaterial: { - uno::Any aAny = uno::makeAny(getPresetMaterialTypeString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getPresetMaterialTypeString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("prstMaterial", aAny); } break; @@ -680,25 +680,25 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) break; case NS_ooxml::LN_CT_Bevel_prst: { - uno::Any aAny = uno::makeAny(getBevelPresetTypeString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getBevelPresetTypeString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("prst", aAny); } break; case NS_ooxml::LN_CT_Ligatures_val: { - uno::Any aAny = uno::makeAny(getLigaturesString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getLigaturesString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("val", aAny); } break; case NS_ooxml::LN_CT_NumForm_val: { - uno::Any aAny = uno::makeAny(getNumFormString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getNumFormString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("val", aAny); } break; case NS_ooxml::LN_CT_NumSpacing_val: { - uno::Any aAny = uno::makeAny(getNumSpacingString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getNumSpacingString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("val", aAny); } break; @@ -708,7 +708,7 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) case NS_ooxml::LN_CT_StyleSet_val: case NS_ooxml::LN_CT_OnOff_val: { - uno::Any aAny = uno::makeAny(getOnOffString(sal_Int32(aValue.getInt()))); + uno::Any aAny(getOnOffString(sal_Int32(aValue.getInt()))); mpGrabBagStack->appendElement("val", aAny); } break; diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index 52930c1b0e8c..ef680155c4a3 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -101,13 +101,13 @@ sal_Bool RtfFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescripto if (m_xDstDoc.is()) // not in cppunittest? { xDocProps.set(m_xDstDoc, uno::UNO_QUERY); - xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(true)); + xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::Any(true)); } comphelper::ScopeGuard g([xDocProps] { if (xDocProps.is()) // not in cppunittest? { // note: pStream.clear calls RemoveLastParagraph() - xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(false)); + xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::Any(false)); } }); diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 5b87cb8f4e0a..f65df20f0f1f 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -157,9 +157,9 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri if (m_xDstDoc.is()) { uno::Reference<beans::XPropertySet> const xDocProps(m_xDstDoc, uno::UNO_QUERY); - xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(true)); + xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::Any(true)); comphelper::ScopeGuard g([xDocProps] { - xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(false)); + xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::Any(false)); }); utl::MediaDescriptor aMediaDesc(rDescriptor); bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault("RepairPackage", false); @@ -212,14 +212,14 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri // note: SfxObjectShell checks for WrongFormatException io::WrongFormatException wfe(lcl_GetExceptionMessage(e)); throw lang::WrappedTargetRuntimeException("", static_cast<OWeakObject*>(this), - uno::makeAny(wfe)); + uno::Any(wfe)); } catch (xml::sax::SAXException const& e) { // note: SfxObjectShell checks for WrongFormatException io::WrongFormatException wfe(lcl_GetExceptionMessage(e)); throw lang::WrappedTargetRuntimeException("", static_cast<OWeakObject*>(this), - uno::makeAny(wfe)); + uno::Any(wfe)); } catch (uno::RuntimeException const&) { @@ -304,34 +304,34 @@ void WriterFilter::setTargetDocument(const uno::Reference<lang::XComponent>& xDo uno::Reference<beans::XPropertySet> xSettings( xFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY); - xSettings->setPropertyValue("AddVerticalFrameOffsets", uno::makeAny(true)); - xSettings->setPropertyValue("UseOldNumbering", uno::makeAny(false)); - xSettings->setPropertyValue("IgnoreFirstLineIndentInNumbering", uno::makeAny(false)); - xSettings->setPropertyValue("DoNotResetParaAttrsForNumFont", uno::makeAny(false)); - xSettings->setPropertyValue("UseFormerLineSpacing", uno::makeAny(false)); - xSettings->setPropertyValue("AddParaSpacingToTableCells", uno::makeAny(true)); - xSettings->setPropertyValue("AddParaLineSpacingToTableCells", uno::makeAny(true)); - xSettings->setPropertyValue("UseFormerObjectPositioning", uno::makeAny(false)); - xSettings->setPropertyValue("ConsiderTextWrapOnObjPos", uno::makeAny(true)); - xSettings->setPropertyValue("UseFormerTextWrapping", uno::makeAny(false)); - xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", uno::makeAny(true)); - xSettings->setPropertyValue("InvertBorderSpacing", uno::makeAny(true)); - xSettings->setPropertyValue("CollapseEmptyCellPara", uno::makeAny(true)); + xSettings->setPropertyValue("AddVerticalFrameOffsets", uno::Any(true)); + xSettings->setPropertyValue("UseOldNumbering", uno::Any(false)); + xSettings->setPropertyValue("IgnoreFirstLineIndentInNumbering", uno::Any(false)); + xSettings->setPropertyValue("DoNotResetParaAttrsForNumFont", uno::Any(false)); + xSettings->setPropertyValue("UseFormerLineSpacing", uno::Any(false)); + xSettings->setPropertyValue("AddParaSpacingToTableCells", uno::Any(true)); + xSettings->setPropertyValue("AddParaLineSpacingToTableCells", uno::Any(true)); + xSettings->setPropertyValue("UseFormerObjectPositioning", uno::Any(false)); + xSettings->setPropertyValue("ConsiderTextWrapOnObjPos", uno::Any(true)); + xSettings->setPropertyValue("UseFormerTextWrapping", uno::Any(false)); + xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", uno::Any(true)); + xSettings->setPropertyValue("InvertBorderSpacing", uno::Any(true)); + xSettings->setPropertyValue("CollapseEmptyCellPara", uno::Any(true)); // tdf#142404 TabOverSpacing (new for compatibilityMode15/Word2013+) is a subset of TabOverMargin // (which applied to DOCX <= compatibilityMode14). // TabOverMargin looks at tabs beyond the normal text area, // while TabOverSpacing only refers to a tab beyond the paragraph margin. - xSettings->setPropertyValue("TabOverSpacing", uno::makeAny(true)); - xSettings->setPropertyValue("UnbreakableNumberings", uno::makeAny(true)); - - xSettings->setPropertyValue("FloattableNomargins", uno::makeAny(true)); - xSettings->setPropertyValue("ClippedPictures", uno::makeAny(true)); - xSettings->setPropertyValue("BackgroundParaOverDrawings", uno::makeAny(true)); - xSettings->setPropertyValue("TreatSingleColumnBreakAsPageBreak", uno::makeAny(true)); - xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine", uno::makeAny(true)); - xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage", uno::makeAny(true)); - xSettings->setPropertyValue("DisableOffPagePositioning", uno::makeAny(true)); - xSettings->setPropertyValue("WordLikeWrapForAsCharFlys", uno::makeAny(true)); + xSettings->setPropertyValue("TabOverSpacing", uno::Any(true)); + xSettings->setPropertyValue("UnbreakableNumberings", uno::Any(true)); + + xSettings->setPropertyValue("FloattableNomargins", uno::Any(true)); + xSettings->setPropertyValue("ClippedPictures", uno::Any(true)); + xSettings->setPropertyValue("BackgroundParaOverDrawings", uno::Any(true)); + xSettings->setPropertyValue("TreatSingleColumnBreakAsPageBreak", uno::Any(true)); + xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine", uno::Any(true)); + xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage", uno::Any(true)); + xSettings->setPropertyValue("DisableOffPagePositioning", uno::Any(true)); + xSettings->setPropertyValue("WordLikeWrapForAsCharFlys", uno::Any(true)); } void WriterFilter::setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 9feaffaf4db5..50399c3ed49f 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1765,7 +1765,7 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element ) if (mnTableDepth > 0 && xShapePropSet.is() && mbIsVMLfound) //if we had a table { xShapePropSet->setPropertyValue(dmapper::getPropertyName(dmapper::PROP_FOLLOW_TEXT_FLOW), - uno::makeAny(mbAllowInCell)); + uno::Any(mbAllowInCell)); } // Notify the dmapper that the shape is ready to use if ( !bIsPicture ) diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx index a113f59a5a97..8a2218da557e 100644 --- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx +++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx @@ -618,8 +618,7 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) uno::Reference<drawing::XShape> xShape(xGroupShape, uno::UNO_QUERY); // set default VertOrient before inserting uno::Reference<beans::XPropertySet>(xShape, uno::UNO_QUERY_THROW) - ->setPropertyValue("VertOrient", - uno::makeAny(text::VertOrientation::NONE)); + ->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::NONE)); xDrawSupplier->getDrawPage()->add(xShape); } m_pSdrImport->pushParent(xGroupShape); diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx index 463710dddfba..0ef4f21729d6 100644 --- a/writerfilter/source/rtftok/rtfdispatchflag.cxx +++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx @@ -1023,7 +1023,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) { // set default VertOrient before inserting m_aStates.top().getDrawingObject().getPropertySet()->setPropertyValue( - "VertOrient", uno::makeAny(text::VertOrientation::NONE)); + "VertOrient", uno::Any(text::VertOrientation::NONE)); xShapes->add(m_aStates.top().getDrawingObject().getShape()); } } @@ -1141,7 +1141,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) if (m_aStates.top().getDrawingObject().getPropertySet().is()) // Seems this old syntax has no way to specify a custom radius, and this is the default m_aStates.top().getDrawingObject().getPropertySet()->setPropertyValue( - "CornerRadius", uno::makeAny(sal_Int32(83))); + "CornerRadius", uno::Any(sal_Int32(83))); break; case RTFKeyword::NOWRAP: m_aStates.top().getFrame().setSprm(NS_ooxml::LN_CT_FramePr_wrap, diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 04ca8cf35b9b..662f68bbda5e 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -998,7 +998,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS // Replacement graphic is inline by default, see oox::vml::SimpleShape::implConvertAndInsert(). xPropertySet->setPropertyValue("AnchorType", - uno::makeAny(text::TextContentAnchorType_AS_CHARACTER)); + uno::Any(text::TextContentAnchorType_AS_CHARACTER)); auto pShapeValue = new RTFValue(xShape); m_aObjectAttributes.set(NS_ooxml::LN_shape, pShapeValue); @@ -2680,8 +2680,7 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState) break; // not for nested group OUString aName = rState.getDestination() == Destination::OPERATOR ? OUString("Operator") : OUString("Company"); - uno::Any aValue - = uno::makeAny(m_aStates.top().getCurrentDestinationText()->makeStringAndClear()); + uno::Any aValue(m_aStates.top().getCurrentDestinationText()->makeStringAndClear()); if (m_xDocumentProperties.is()) { uno::Reference<beans::XPropertyContainer> xUserDefinedProperties @@ -2839,15 +2838,15 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState) bool bTextFrame = xServiceInfo->supportsService("com.sun.star.text.TextFrame"); // The default is certainly not inline, but then what Word supports is just at-character. - xPropertySet->setPropertyValue( - "AnchorType", uno::makeAny(text::TextContentAnchorType_AT_CHARACTER)); + xPropertySet->setPropertyValue("AnchorType", + uno::Any(text::TextContentAnchorType_AT_CHARACTER)); if (bTextFrame) { xPropertySet->setPropertyValue("HoriOrientPosition", - uno::makeAny(rDrawing.getLeft())); + uno::Any(rDrawing.getLeft())); xPropertySet->setPropertyValue("VertOrientPosition", - uno::makeAny(rDrawing.getTop())); + uno::Any(rDrawing.getTop())); } else { @@ -2857,22 +2856,21 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState) if (rDrawing.getHasLineColor()) { - uno::Any aLineColor = uno::makeAny(sal_uInt32((rDrawing.getLineColorR() << 16) - + (rDrawing.getLineColorG() << 8) - + rDrawing.getLineColorB())); + uno::Any aLineColor(sal_uInt32((rDrawing.getLineColorR() << 16) + + (rDrawing.getLineColorG() << 8) + + rDrawing.getLineColorB())); uno::Any aLineWidth; RTFSdrImport::resolveLineColorAndWidth(bTextFrame, xPropertySet, aLineColor, aLineWidth); } if (rDrawing.getHasFillColor()) xPropertySet->setPropertyValue( - "FillColor", uno::makeAny(sal_uInt32((rDrawing.getFillColorR() << 16) - + (rDrawing.getFillColorG() << 8) - + rDrawing.getFillColorB()))); + "FillColor", uno::Any(sal_uInt32((rDrawing.getFillColorR() << 16) + + (rDrawing.getFillColorG() << 8) + + rDrawing.getFillColorB()))); else if (!bTextFrame) // If there is no fill, the Word default is 100% transparency. - xPropertySet->setPropertyValue("FillTransparence", - uno::makeAny(sal_Int32(100))); + xPropertySet->setPropertyValue("FillTransparence", uno::Any(sal_Int32(100))); RTFSdrImport::resolveFLine(xPropertySet, rDrawing.getFLine()); diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 44bbc725137c..c26cfd12f2b8 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -147,8 +147,7 @@ void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> const& xPrope if (!m_aGraphicZOrderHelpers.empty()) { writerfilter::dmapper::GraphicZOrderHelper& rHelper = m_aGraphicZOrderHelpers.top(); - xPropertySet->setPropertyValue("ZOrder", - uno::makeAny(rHelper.findZOrder(nZOrder, bOldStyle))); + xPropertySet->setPropertyValue("ZOrder", uno::Any(rHelper.findZOrder(nZOrder, bOldStyle))); rHelper.addItem(xPropertySet, nZOrder); } } @@ -175,7 +174,7 @@ void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame, if (rLineWidth.hasValue()) aBorderLine.LineWidth = rLineWidth.get<sal_Int32>(); xPropertySet->setPropertyValue(OUString::createFromAscii(pBorder), - uno::makeAny(aBorderLine)); + uno::Any(aBorderLine)); } } } @@ -184,9 +183,9 @@ void RTFSdrImport::resolveFLine(uno::Reference<beans::XPropertySet> const& xProp sal_Int32 const nFLine) { if (nFLine == 0) - xPropertySet->setPropertyValue("LineStyle", uno::makeAny(drawing::LineStyle_NONE)); + xPropertySet->setPropertyValue("LineStyle", uno::Any(drawing::LineStyle_NONE)); else - xPropertySet->setPropertyValue("LineStyle", uno::makeAny(drawing::LineStyle_SOLID)); + xPropertySet->setPropertyValue("LineStyle", uno::Any(drawing::LineStyle_SOLID)); } void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, @@ -250,26 +249,25 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY); if (!xServiceInfo->supportsService("com.sun.star.text.TextFrame")) xPropertySet->setPropertyValue( - "RotateAngle", uno::makeAny(NormAngle36000(Degree100(nRotation * -1)).get())); + "RotateAngle", uno::Any(NormAngle36000(Degree100(nRotation * -1)).get())); } if (nHoriOrient != 0 && xPropertySet.is()) - xPropertySet->setPropertyValue("HoriOrient", uno::makeAny(nHoriOrient)); + xPropertySet->setPropertyValue("HoriOrient", uno::Any(nHoriOrient)); if (nVertOrient != 0 && xPropertySet.is()) - xPropertySet->setPropertyValue("VertOrient", uno::makeAny(nVertOrient)); + xPropertySet->setPropertyValue("VertOrient", uno::Any(nVertOrient)); if (obFitShapeToText.has_value() && xPropertySet.is()) { xPropertySet->setPropertyValue( - "SizeType", - uno::makeAny(*obFitShapeToText ? text::SizeType::MIN : text::SizeType::FIX)); - xPropertySet->setPropertyValue("FrameIsAutomaticHeight", uno::makeAny(*obFitShapeToText)); + "SizeType", uno::Any(*obFitShapeToText ? text::SizeType::MIN : text::SizeType::FIX)); + xPropertySet->setPropertyValue("FrameIsAutomaticHeight", uno::Any(*obFitShapeToText)); } if (!bFilled && xPropertySet.is()) { if (m_bTextFrame) - xPropertySet->setPropertyValue("BackColorTransparency", uno::makeAny(sal_Int32(100))); + xPropertySet->setPropertyValue("BackColorTransparency", uno::Any(sal_Int32(100))); else - xPropertySet->setPropertyValue("FillStyle", uno::makeAny(drawing::FillStyle_NONE)); + xPropertySet->setPropertyValue("FillStyle", uno::Any(drawing::FillStyle_NONE)); } } @@ -346,8 +344,8 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, { o_xPropSet->setPropertyValue( "FillColor", - uno::makeAny(sal_uInt32(0xffffff))); // White in Word, kind of blue in Writer. - o_xPropSet->setPropertyValue("VertOrient", uno::makeAny(text::VertOrientation::NONE)); + uno::Any(sal_uInt32(0xffffff))); // White in Word, kind of blue in Writer. + o_xPropSet->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::NONE)); } return nType; @@ -366,9 +364,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap awt::Rectangle aViewBox; std::vector<beans::PropertyValue> aPath; // Default line color is black in Word, blue in Writer. - uno::Any aLineColor = uno::makeAny(COL_BLACK); + uno::Any aLineColor(COL_BLACK); // Default line width is 0.75 pt (26 mm100) in Word, 0 in Writer. - uno::Any aLineWidth = uno::makeAny(sal_Int32(26)); + uno::Any aLineWidth(sal_Int32(26)); sal_Int16 eWritingMode = text::WritingMode2::LR_TB; // Groupshape support std::optional<sal_Int32> oGroupLeft; @@ -418,10 +416,10 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap xNamed->setName(rProperty.second); } else - xPropertySet->setPropertyValue("Name", uno::makeAny(rProperty.second)); + xPropertySet->setPropertyValue("Name", uno::Any(rProperty.second)); } else if (rProperty.first == "wzDescription") - xPropertySet->setPropertyValue("Description", uno::makeAny(rProperty.second)); + xPropertySet->setPropertyValue("Description", uno::Any(rProperty.second)); else if (rProperty.first == "gtextUNICODE") aShapeText = rProperty.second; else if (rProperty.first == "gtextFont") @@ -599,25 +597,25 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap { if (xPropertySet.is()) xPropertySet->setPropertyValue("LeftBorderDistance", - uno::makeAny(rProperty.second.toInt32() / 360)); + uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dyTextTop") { if (xPropertySet.is()) xPropertySet->setPropertyValue("TopBorderDistance", - uno::makeAny(rProperty.second.toInt32() / 360)); + uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dxTextRight") { if (xPropertySet.is()) xPropertySet->setPropertyValue("RightBorderDistance", - uno::makeAny(rProperty.second.toInt32() / 360)); + uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dyTextBottom") { if (xPropertySet.is()) xPropertySet->setPropertyValue("BottomBorderDistance", - uno::makeAny(rProperty.second.toInt32() / 360)); + uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dxWrapDistLeft") { @@ -626,7 +624,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap new RTFValue(rProperty.second.toInt32())); else if (xPropertySet.is()) xPropertySet->setPropertyValue("LeftMargin", - uno::makeAny(rProperty.second.toInt32() / 360)); + uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dyWrapDistTop") { @@ -635,7 +633,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap new RTFValue(rProperty.second.toInt32())); else if (xPropertySet.is()) xPropertySet->setPropertyValue("TopMargin", - uno::makeAny(rProperty.second.toInt32() / 360)); + uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dxWrapDistRight") { @@ -644,7 +642,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap new RTFValue(rProperty.second.toInt32())); else if (xPropertySet.is()) xPropertySet->setPropertyValue("RightMargin", - uno::makeAny(rProperty.second.toInt32() / 360)); + uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dyWrapDistBottom") { @@ -653,7 +651,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap new RTFValue(rProperty.second.toInt32())); else if (xPropertySet.is()) xPropertySet->setPropertyValue("BottomMargin", - uno::makeAny(rProperty.second.toInt32() / 360)); + uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "fillType") { @@ -786,7 +784,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (xPropertySet.is()) { sal_Int16 const nVertOrient = text::VertOrientation::CENTER; - xPropertySet->setPropertyValue("VertOrient", uno::makeAny(nVertOrient)); + xPropertySet->setPropertyValue("VertOrient", uno::Any(nVertOrient)); } } else if (rProperty.first == "pctHR") @@ -824,7 +822,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap } if (xPropertySet.is() && text::HoriOrientation::NONE != nHoriOrient) { - xPropertySet->setPropertyValue("HoriOrient", uno::makeAny(nHoriOrient)); + xPropertySet->setPropertyValue("HoriOrient", uno::Any(nHoriOrient)); } } else if (rProperty.first == "pWrapPolygonVertices") @@ -897,11 +895,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap resolveDhgt(xPropertySet, rShape.getZ(), bOldStyle); } if (m_bTextFrame) - xPropertySet->setPropertyValue("WritingMode", uno::makeAny(eWritingMode)); + xPropertySet->setPropertyValue("WritingMode", uno::Any(eWritingMode)); else // Only Writer textframes implement text::WritingMode2. xPropertySet->setPropertyValue("TextWritingMode", - uno::makeAny(text::WritingMode(eWritingMode))); + uno::Any(text::WritingMode(eWritingMode))); } if (!m_aParents.empty() && m_aParents.top().is() && !m_bTextFrame) @@ -910,8 +908,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (nContrast == -70 && nBrightness == 70 && xPropertySet.is()) { // Map MSO 'washout' to our watermark colormode. - xPropertySet->setPropertyValue("GraphicColorMode", - uno::makeAny(drawing::ColorMode_WATERMARK)); + xPropertySet->setPropertyValue("GraphicColorMode", uno::Any(drawing::ColorMode_WATERMARK)); } if (bPib) @@ -929,7 +926,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap // Handle horizontal flip. if (obFlipH && xPropertySet.is()) - xPropertySet->setPropertyValue("IsMirrored", uno::makeAny(true)); + xPropertySet->setPropertyValue("IsMirrored", uno::Any(true)); return; } @@ -946,8 +943,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (xTextRange.is()) xTextRange->setString(aShapeText); - xPropertySet->setPropertyValue("CharFontName", uno::makeAny(aFontFamily)); - xPropertySet->setPropertyValue("CharHeight", uno::makeAny(nFontSize)); + xPropertySet->setPropertyValue("CharFontName", uno::Any(aFontFamily)); + xPropertySet->setPropertyValue("CharHeight", uno::Any(nFontSize)); } // Creating CustomShapeGeometry property @@ -974,11 +971,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (!aShapeText.isEmpty()) { uno::Sequence<beans::PropertyValue> aSequence(comphelper::InitPropertySequence({ - { "TextPath", uno::makeAny(true) }, + { "TextPath", uno::Any(true) }, })); aCustomShapeGeometry["TextPath"] <<= aSequence; - xPropertySet->setPropertyValue("TextAutoGrowHeight", uno::makeAny(false)); - xPropertySet->setPropertyValue("TextAutoGrowWidth", uno::makeAny(false)); + xPropertySet->setPropertyValue("TextAutoGrowHeight", uno::Any(false)); + xPropertySet->setPropertyValue("TextAutoGrowWidth", uno::Any(false)); bChanged = true; } @@ -986,7 +983,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap { xPropertySet->setPropertyValue( "CustomShapeGeometry", - uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList())); + uno::Any(aCustomShapeGeometry.getAsConstPropertyValueList())); } } @@ -1015,7 +1012,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap pPolygon[i] = awt::Point(static_cast<sal_Int32>(aPoint.getX()), static_cast<sal_Int32>(aPoint.getY())); } - xPropertySet->setPropertyValue("PolyPolygon", uno::makeAny(aPolyPolySequence)); + xPropertySet->setPropertyValue("PolyPolygon", uno::Any(aPolyPolySequence)); } } } @@ -1049,8 +1046,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (m_bTextFrame) { - xPropertySet->setPropertyValue("HoriOrientPosition", uno::makeAny(nLeft)); - xPropertySet->setPropertyValue("VertOrientPosition", uno::makeAny(nTop)); + xPropertySet->setPropertyValue("HoriOrientPosition", uno::Any(nLeft)); + xPropertySet->setPropertyValue("VertOrientPosition", uno::Any(nTop)); } else xShape->setPosition(awt::Point(nLeft, nTop)); @@ -1074,7 +1071,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap aCustomShapeGeometry["MirroredY"] <<= true; xPropertySet->setPropertyValue( "CustomShapeGeometry", - uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList())); + uno::Any(aCustomShapeGeometry.getAsConstPropertyValueList())); } else if (SdrObject* pObject = SdrObject::getSdrObjectFromXShape(xShape)) { @@ -1096,12 +1093,12 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (rShape.getHoriOrientRelation() != 0) xPropertySet->setPropertyValue("HoriOrientRelation", - uno::makeAny(rShape.getHoriOrientRelation())); + uno::Any(rShape.getHoriOrientRelation())); if (rShape.getVertOrientRelation() != 0) xPropertySet->setPropertyValue("VertOrientRelation", - uno::makeAny(rShape.getVertOrientRelation())); + uno::Any(rShape.getVertOrientRelation())); if (rShape.getWrap() != text::WrapTextMode::WrapTextMode_MAKE_FIXED_SIZE) - xPropertySet->setPropertyValue("Surround", uno::makeAny(rShape.getWrap())); + xPropertySet->setPropertyValue("Surround", uno::Any(rShape.getWrap())); oox::ModelObjectHelper aModelObjectHelper(m_rImport.getModelFactory()); if (aFillModel.moType.has()) { @@ -1119,19 +1116,19 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap oox::PropertySet(xShape).setProperties(aPropMap); } xPropertySet->setPropertyValue("AnchorType", - uno::makeAny(text::TextContentAnchorType_AT_CHARACTER)); - xPropertySet->setPropertyValue("Opaque", uno::makeAny(bOpaque)); + uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xPropertySet->setPropertyValue("Opaque", uno::Any(bOpaque)); if (oRelativeWidth) { - xPropertySet->setPropertyValue("RelativeWidth", uno::makeAny(*oRelativeWidth)); + xPropertySet->setPropertyValue("RelativeWidth", uno::Any(*oRelativeWidth)); xPropertySet->setPropertyValue("RelativeWidthRelation", - uno::makeAny(nRelativeWidthRelation)); + uno::Any(nRelativeWidthRelation)); } if (oRelativeHeight) { - xPropertySet->setPropertyValue("RelativeHeight", uno::makeAny(*oRelativeHeight)); + xPropertySet->setPropertyValue("RelativeHeight", uno::Any(*oRelativeHeight)); xPropertySet->setPropertyValue("RelativeHeightRelation", - uno::makeAny(nRelativeHeightRelation)); + uno::Any(nRelativeHeightRelation)); } } |