diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-02 14:25:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-03 12:10:52 +0200 |
| commit | 4d55513852d41ed72e945597b1f8749c14562012 (patch) | |
| tree | bedae34037b1588a69841a2725d012ac5f474c70 /xmloff | |
| parent | cbc34f69ec6363cd234ad2b1dfe09bfb531238db (diff) | |
Just use Any ctor instead of makeAny in xmloff
Change-Id: Ibefb18e5b798ccf1f9d7a5ba1524c9fb1e9bee32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133700
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff')
64 files changed, 305 insertions, 310 deletions
diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx index f908de1d6c52..d27a7339a4bc 100644 --- a/xmloff/qa/unit/draw.cxx +++ b/xmloff/qa/unit/draw.cxx @@ -153,7 +153,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testThemeExport) uno::Sequence<util::Color> aColorScheme = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb }; aMap["ColorScheme"] <<= aColorScheme; - uno::Any aTheme = uno::makeAny(aMap.getAsConstPropertyValueList()); + uno::Any aTheme(aMap.getAsConstPropertyValueList()); xMasterPage->setPropertyValue("Theme", aTheme); // Export to ODP: diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx index 1f63cbe1355a..f7744b503efc 100644 --- a/xmloff/qa/unit/style.cxx +++ b/xmloff/qa/unit/style.cxx @@ -115,7 +115,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testFontSorting) utl::TempFile aTempFile; aTempFile.EnableKillingFile(); uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({ - { "FilterName", uno::makeAny(OUString("writer8")) }, + { "FilterName", uno::Any(OUString("writer8")) }, }); xStorable->storeToURL(aTempFile.GetURL(), aStoreProps); diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx index cd9afdf08654..ba932d77b069 100644 --- a/xmloff/qa/unit/text.cxx +++ b/xmloff/qa/unit/text.cxx @@ -76,7 +76,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCommentResolved) { getComponent() = loadFromDesktop("private:factory/swriter"); uno::Sequence<beans::PropertyValue> aCommentProps = comphelper::InitPropertySequence({ - { "Text", uno::makeAny(OUString("comment")) }, + { "Text", uno::Any(OUString("comment")) }, }); dispatchCommand(getComponent(), ".uno:InsertAnnotation", aCommentProps); uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY); @@ -88,11 +88,11 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCommentResolved) uno::Reference<beans::XPropertySet> xPortion(xPortionEnum->nextElement(), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xField(xPortion->getPropertyValue("TextField"), uno::UNO_QUERY); - xField->setPropertyValue("Resolved", uno::makeAny(true)); + xField->setPropertyValue("Resolved", uno::Any(true)); uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({ - { "FilterName", uno::makeAny(OUString("writer8")) }, + { "FilterName", uno::Any(OUString("writer8")) }, }); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); @@ -129,7 +129,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testBibliographyLocalUrl) comphelper::makePropertyValue("URL", OUString("http://www.example.com/test.pdf#page=1")), comphelper::makePropertyValue("LocalURL", OUString("file:///home/me/test.pdf")), }; - xField->setPropertyValue("Fields", uno::makeAny(aFields)); + xField->setPropertyValue("Fields", uno::Any(aFields)); uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY); uno::Reference<text::XText> xText = xTextDocument->getText(); uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); @@ -200,7 +200,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testParaStyleListLevel) // When exporting that to ODT: uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({ - { "FilterName", uno::makeAny(OUString("writer8")) }, + { "FilterName", uno::Any(OUString("writer8")) }, }); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); @@ -254,7 +254,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testListId) // When storing that document as ODF: uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({ - { "FilterName", uno::makeAny(OUString("writer8")) }, + { "FilterName", uno::Any(OUString("writer8")) }, }); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); @@ -280,7 +280,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testClearingBreakExport) uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak, uno::UNO_QUERY); // SwLineBreakClear::ALL; sal_Int16 eClear = 3; - xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear)); + xLineBreakProps->setPropertyValue("Clear", uno::Any(eClear)); uno::Reference<text::XText> xText = xTextDocument->getText(); uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); xText->insertTextContent(xCursor, xLineBreak, /*bAbsorb=*/false); @@ -288,7 +288,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testClearingBreakExport) // When exporting to ODT: uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({ - { "FilterName", uno::makeAny(OUString("writer8")) }, + { "FilterName", uno::Any(OUString("writer8")) }, }); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); @@ -352,22 +352,22 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testRelativeWidth) uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xStyle(xStyleFamily->getByName("Standard"), uno::UNO_QUERY); // Body frame width is 6cm (2+2cm margin). - xStyle->setPropertyValue("Width", uno::makeAny(static_cast<sal_Int32>(10000))); + xStyle->setPropertyValue("Width", uno::Any(static_cast<sal_Int32>(10000))); uno::Reference<lang::XMultiServiceFactory> xMSF(getComponent(), uno::UNO_QUERY); uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY); uno::Reference<text::XTextContent> xTextFrame( xMSF->createInstance("com.sun.star.text.TextFrame"), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xTextFrameProps(xTextFrame, uno::UNO_QUERY); - xTextFrameProps->setPropertyValue("RelativeWidth", uno::makeAny(static_cast<sal_Int16>(50))); + xTextFrameProps->setPropertyValue("RelativeWidth", uno::Any(static_cast<sal_Int16>(50))); uno::Reference<text::XText> xText = xTextDocument->getText(); uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); xText->insertTextContent(xCursor, xTextFrame, /*bAbsorb=*/false); // Body frame width is 16cm. - xStyle->setPropertyValue("Width", uno::makeAny(static_cast<sal_Int32>(20000))); + xStyle->setPropertyValue("Width", uno::Any(static_cast<sal_Int32>(20000))); uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({ - { "FilterName", uno::makeAny(OUString("writer8")) }, + { "FilterName", uno::Any(OUString("writer8")) }, }); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); @@ -397,13 +397,13 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testContentControlExport) uno::Reference<text::XTextContent> xContentControl( xMSF->createInstance("com.sun.star.text.ContentControl"), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl, uno::UNO_QUERY); - xContentControlProps->setPropertyValue("ShowingPlaceHolder", uno::makeAny(true)); + xContentControlProps->setPropertyValue("ShowingPlaceHolder", uno::Any(true)); xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true); // When exporting to ODT: uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({ - { "FilterName", uno::makeAny(OUString("writer8")) }, + { "FilterName", uno::Any(OUString("writer8")) }, }); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); @@ -467,16 +467,16 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCheckboxContentControlExport) uno::Reference<text::XTextContent> xContentControl( xMSF->createInstance("com.sun.star.text.ContentControl"), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl, uno::UNO_QUERY); - xContentControlProps->setPropertyValue("Checkbox", uno::makeAny(true)); - xContentControlProps->setPropertyValue("Checked", uno::makeAny(true)); - xContentControlProps->setPropertyValue("CheckedState", uno::makeAny(OUString(u"☒"))); - xContentControlProps->setPropertyValue("UncheckedState", uno::makeAny(OUString(u"☐"))); + xContentControlProps->setPropertyValue("Checkbox", uno::Any(true)); + xContentControlProps->setPropertyValue("Checked", uno::Any(true)); + xContentControlProps->setPropertyValue("CheckedState", uno::Any(OUString(u"☒"))); + xContentControlProps->setPropertyValue("UncheckedState", uno::Any(OUString(u"☐"))); xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true); // When exporting to ODT: uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({ - { "FilterName", uno::makeAny(OUString("writer8")) }, + { "FilterName", uno::Any(OUString("writer8")) }, }); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index 84313c0bb49f..76050be40f71 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -101,7 +101,7 @@ void SAL_CALL ColorPropertySet::setPropertyValue( const OUString& /* aPropertyNa uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& /* PropertyName */ ) { - return uno::makeAny( m_nColor ); + return uno::Any( m_nColor ); } void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ ) @@ -147,7 +147,7 @@ void SAL_CALL ColorPropertySet::setPropertyToDefault( const OUString& PropertyNa uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropertyName ) { if( aPropertyName == g_aColorPropName ) - return uno::makeAny( m_nDefaultColor ); + return uno::Any( m_nDefaultColor ); return uno::Any(); } diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 2f312c7e21b1..ad8b187f88e2 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -173,7 +173,7 @@ Reference< drawing::XShape > SchXMLAxisContext::getTitleShape() const SAL_INFO("xmloff.chart", "Invalid axis" ); break; } - xDiaProp->setPropertyValue( aPropName, uno::makeAny(true) ); + xDiaProp->setPropertyValue( aPropName, uno::Any(true) ); xResult.set( xAxis->getAxisTitle(), uno::UNO_QUERY ); return xResult; } @@ -210,7 +210,7 @@ void SchXMLAxisContext::CreateGrid( const OUString& sAutoStyleName, bool bIsMajo SAL_INFO("xmloff.chart", "Invalid axis" ); break; } - xDiaProp->setPropertyValue( aPropName, uno::makeAny(true) ); + xDiaProp->setPropertyValue( aPropName, uno::Any(true) ); Reference< beans::XPropertySet > xGridProp; if( bIsMajor ) @@ -223,7 +223,7 @@ void SchXMLAxisContext::CreateGrid( const OUString& sAutoStyleName, bool bIsMajo { // the line color is black as default, in the model it is a light gray xGridProp->setPropertyValue("LineColor", - uno::makeAny( COL_BLACK )); + uno::Any( COL_BLACK )); if (!sAutoStyleName.isEmpty()) m_rImportHelper.FillAutoStyle(sAutoStyleName, xGridProp); } @@ -368,7 +368,7 @@ void SchXMLAxisContext::CreateAxis() } try { - xDiaProp->setPropertyValue( aPropName, uno::makeAny(true) ); + xDiaProp->setPropertyValue( aPropName, uno::Any(true) ); } catch( beans::UnknownPropertyException & ) { @@ -395,7 +395,7 @@ void SchXMLAxisContext::CreateAxis() { try { - xDiaProp->setPropertyValue("HasXAxis", uno::makeAny(true) ); + xDiaProp->setPropertyValue("HasXAxis", uno::Any(true) ); } catch( beans::UnknownPropertyException & ) { @@ -407,12 +407,12 @@ void SchXMLAxisContext::CreateAxis() if( !m_xAxisProps.is()) return; - uno::Any aTrueBool( uno::makeAny( true )); - uno::Any aFalseBool( uno::makeAny( false )); + uno::Any aTrueBool( uno::Any( true )); + uno::Any aFalseBool( uno::Any( false )); // #i109879# the line color is black as default, in the model it is a light gray m_xAxisProps->setPropertyValue("LineColor", - uno::makeAny( COL_BLACK )); + uno::Any( COL_BLACK )); m_xAxisProps->setPropertyValue("DisplayLabels", aFalseBool ); @@ -427,7 +427,7 @@ void SchXMLAxisContext::CreateAxis() m_xAxisProps->setPropertyValue("AutoOrigin", aTrueBool ); if( m_bAxisTypeImported ) - m_xAxisProps->setPropertyValue("AxisType", uno::makeAny(m_nAxisType) ); + m_xAxisProps->setPropertyValue("AxisType", uno::Any(m_nAxisType) ); if( !m_aAutoStyleName.isEmpty()) { @@ -480,7 +480,7 @@ void SchXMLAxisContext::CreateAxis() if( xNewAxisProp.is() ) { xNewAxisProp->setPropertyValue("LineStyle" - , uno::makeAny(drawing::LineStyle_NONE)); + , uno::Any(drawing::LineStyle_NONE)); } } @@ -564,7 +564,7 @@ void SchXMLAxisContext::SetAxisTitle() { try { - xTitleProp->setPropertyValue("String", uno::makeAny(m_aCurrentAxis.aTitle) ); + xTitleProp->setPropertyValue("String", uno::Any(m_aCurrentAxis.aTitle) ); } catch( beans::UnknownPropertyException & ) { @@ -703,31 +703,31 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( rChartTypeServiceName == u"com.sun.star.chart2.ScatterChartType" ) { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_VALUE) ); + , uno::Any( css::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainXScale.Origin >>= fCrossoverValue; xMainYAxisProp->setPropertyValue("CrossoverValue" - , uno::makeAny( fCrossoverValue ) ); + , uno::Any( fCrossoverValue ) ); if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainYAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_END) ); + , uno::Any( css::chart::ChartAxisLabelPosition_OUTSIDE_END) ); xMainYAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::Any( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_START) ); + , uno::Any( css::chart::ChartAxisPosition_START) ); } else { xMainYAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_START) ); + , uno::Any( css::chart::ChartAxisLabelPosition_OUTSIDE_START) ); xMainYAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::Any( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_END) ); + , uno::Any( css::chart::ChartAxisPosition_END) ); } } else @@ -735,48 +735,48 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_END) ); + , uno::Any( css::chart::ChartAxisPosition_END) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_START) ); + , uno::Any( css::chart::ChartAxisPosition_START) ); } else { xMainYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_START) ); + , uno::Any( css::chart::ChartAxisPosition_START) ); if( xSecondaryYAxisProp.is() ) xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_END) ); + , uno::Any( css::chart::ChartAxisPosition_END) ); } } chart2::ScaleData aMainYScale = xMainYAxis->getScaleData(); xMainXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_VALUE) ); + , uno::Any( css::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainYScale.Origin >>= fCrossoverValue; xMainXAxisProp->setPropertyValue("CrossoverValue" - , uno::makeAny( fCrossoverValue ) ); + , uno::Any( fCrossoverValue ) ); if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE ) { xMainXAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_END) ); + , uno::Any( css::chart::ChartAxisLabelPosition_OUTSIDE_END) ); xMainXAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::Any( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_START) ); + , uno::Any( css::chart::ChartAxisPosition_START) ); } else { xMainXAxisProp->setPropertyValue("LabelPosition" - , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_START) ); + , uno::Any( css::chart::ChartAxisLabelPosition_OUTSIDE_START) ); xMainXAxisProp->setPropertyValue("MarkPosition" - , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) ); + , uno::Any( css::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" - , uno::makeAny( css::chart::ChartAxisPosition_END) ); + , uno::Any( css::chart::ChartAxisPosition_END) ); } } } @@ -894,7 +894,7 @@ void DateScaleContext::startFastElement( sal_Int32 /*nElement*/, } if( bSetNewIncrement ) - m_xAxisProps->setPropertyValue("TimeIncrement", uno::makeAny( aIncrement ) ); + m_xAxisProps->setPropertyValue("TimeIncrement", uno::Any( aIncrement ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 31c48ba6ff9d..fb7deffd2527 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -77,7 +77,7 @@ void lcl_setRoleAtLabeledSequence( { uno::Reference< beans::XPropertySet > xProp( xValues, uno::UNO_QUERY ); if( xProp.is()) - xProp->setPropertyValue("Role", uno::makeAny( rRole )); + xProp->setPropertyValue("Role", uno::Any( rRole )); } } @@ -421,7 +421,7 @@ void SchXMLChartContext::startFastElement( sal_Int32 /*nElement*/, { xDocProp->getPropertyValue("BaseDiagram") >>= aOldChartTypeName; maChartTypeServiceName = SchXMLTools::GetNewChartTypeName( aOldChartTypeName ); - xDocProp->setPropertyValue("RefreshAddInAllowed", uno::makeAny( false) ); + xDocProp->setPropertyValue("RefreshAddInAllowed", uno::Any( false) ); } catch(const uno::Exception&) { @@ -645,15 +645,15 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( uno::Sequence< beans::PropertyValue > aArgs{ beans::PropertyValue( "CellRangeRepresentation", - -1, uno::makeAny( rRectangularRange ), + -1, uno::Any( rRectangularRange ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( "DataRowSource", - -1, uno::makeAny( eDataRowSource ), + -1, uno::Any( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( "FirstCellAsLabel", - -1, uno::makeAny( bFirstCellAsLabel ), + -1, uno::Any( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ) }; @@ -662,7 +662,7 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( aArgs.realloc( aArgs.getLength() + 1 ); aArgs.getArray()[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( "SequenceMapping", - -1, uno::makeAny( !sColTrans.isEmpty() + -1, uno::Any( !sColTrans.isEmpty() ? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) : lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ), beans::PropertyState_DIRECT_VALUE ); @@ -687,7 +687,7 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( aArgs.realloc( aArgs.getLength() + 1 ); aArgs.getArray()[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( "ChartOleObjectName", - -1, uno::makeAny( aChartOleObjectName ), + -1, uno::Any( aChartOleObjectName ), beans::PropertyState_DIRECT_VALUE ); } } @@ -699,11 +699,11 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( auto pArgs = aArgs.getArray(); pArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 2 ] = beans::PropertyValue( "HasCategories", - -1, uno::makeAny( bHasCateories ), + -1, uno::Any( bHasCateories ), beans::PropertyState_DIRECT_VALUE ); pArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue( "UseCategoriesAsX", - -1, uno::makeAny( false ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui) + -1, uno::Any( false ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui) beans::PropertyState_DIRECT_VALUE ); xNewDia->setDiagramData( xDataSource, aArgs ); @@ -835,7 +835,7 @@ void SchXMLChartContext::endFastElement(sal_Int32 ) try { if( bOlderThan2_3 && xDiaProp.is() )//for older charts the hidden cells were removed by calc on the fly - xDiaProp->setPropertyValue("IncludeHiddenCells",uno::makeAny(false)); + xDiaProp->setPropertyValue("IncludeHiddenCells",uno::Any(false)); // note: mbRowHasLabels means the first row contains labels, that means we have "column-descriptions", // (analogously mbColHasLabels means we have "row-descriptions") @@ -940,7 +940,7 @@ void SchXMLChartContext::endFastElement(sal_Int32 ) } if( xProp.is()) - xProp->setPropertyValue("RefreshAddInAllowed", uno::makeAny( true) ); + xProp->setPropertyValue("RefreshAddInAllowed", uno::Any( true) ); } void SchXMLChartContext::MergeSeriesForStockChart() @@ -1046,7 +1046,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SchXMLChartContext::cr { if( xProp.is()) { - xProp->setPropertyValue("HasMainTitle", uno::makeAny(true) ); + xProp->setPropertyValue("HasMainTitle", uno::Any(true) ); } uno::Reference< drawing::XShape > xTitleShape = xDoc->getTitle(); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), @@ -1058,7 +1058,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SchXMLChartContext::cr { if( xProp.is()) { - xProp->setPropertyValue("HasSubTitle", uno::makeAny(true) ); + xProp->setPropertyValue("HasSubTitle", uno::Any(true) ); } uno::Reference< drawing::XShape > xTitleShape = xDoc->getSubTitle(); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 992989665952..fc0a24a8e451 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2360,10 +2360,10 @@ void SchXMLExportHelper_Impl::exportAxis( if (sChartType == u"com.sun.star.chart.BarDiagram" || sChartType == u"com.sun.star.chart.StockDiagram") { if (!bShiftedCatPos) - rAxisProps->setPropertyValue("MajorOrigin", uno::makeAny(0.0)); + rAxisProps->setPropertyValue("MajorOrigin", uno::Any(0.0)); } else if (bShiftedCatPos) - rAxisProps->setPropertyValue("MajorOrigin", uno::makeAny(0.5)); + rAxisProps->setPropertyValue("MajorOrigin", uno::Any(0.5)); } lcl_exportNumberFormat( "NumberFormat", rAxisProps, mrExport ); @@ -3098,7 +3098,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( // Add service name (which is regression type) sal_Int32 nIndex = GetPropertySetMapper()->FindEntryIndex(XML_SCH_CONTEXT_SPECIAL_REGRESSION_TYPE); - XMLPropertyState property(nIndex, uno::makeAny(aService)); + XMLPropertyState property(nIndex, uno::Any(aService)); aPropertyStates.push_back(property); Reference< beans::XPropertySet > xEquationProperties; diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx index 4cc10dfe7a9e..b9e652b187bd 100644 --- a/xmloff/source/chart/SchXMLLegendContext.cxx +++ b/xmloff/source/chart/SchXMLLegendContext.cxx @@ -53,7 +53,7 @@ void SchXMLLegendContext::startFastElement( sal_Int32 /*nElement*/, { try { - xDocProp->setPropertyValue("HasLegend", uno::makeAny( true ) ); + xDocProp->setPropertyValue("HasLegend", uno::Any( true ) ); } catch(const beans::UnknownPropertyException&) { @@ -102,7 +102,7 @@ void SchXMLLegendContext::startFastElement( sal_Int32 /*nElement*/, try { bOverlay = aIter.toBoolean(); - xLegendProps->setPropertyValue("Overlay", uno::makeAny(bOverlay)); + xLegendProps->setPropertyValue("Overlay", uno::Any(bOverlay)); } catch(const beans::UnknownPropertyException&) { @@ -151,7 +151,7 @@ void SchXMLLegendContext::startFastElement( sal_Int32 /*nElement*/, } if( bHasExpansion && nLegendExpansion!= chart::ChartLegendExpansion_CUSTOM ) - xLegendProps->setPropertyValue("Expansion", uno::makeAny(nLegendExpansion) ); + xLegendProps->setPropertyValue("Expansion", uno::Any(nLegendExpansion) ); else if( bHasHeight && bHasWidth ) xLegendShape->setSize( aLegendSize ); @@ -159,7 +159,7 @@ void SchXMLLegendContext::startFastElement( sal_Int32 /*nElement*/, xLegendShape->setPosition( aLegendPos ); // the fill style has the default "none" in XML, but "solid" in the model. - xLegendProps->setPropertyValue("FillStyle", uno::makeAny( drawing::FillStyle_NONE )); + xLegendProps->setPropertyValue("FillStyle", uno::Any( drawing::FillStyle_NONE )); // set auto-styles for Legend mrImportHelper.FillAutoStyle(sAutoStyleName, xLegendProps); diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 7e0fe67602f8..7418b92fa064 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -323,7 +323,7 @@ void SchXMLPlotAreaContext::startFastElement (sal_Int32 /*nElement*/, OUString aPropName( "StartingAngle" ); uno::Any aAStartingAngle( SchXMLTools::getPropertyFromContext( aPropName, pPropStyleContext, pStylesCtxt ) ); if( !aAStartingAngle.hasValue() ) - xProp->setPropertyValue( aPropName, uno::makeAny(sal_Int32(0)) ) ; + xProp->setPropertyValue( aPropName, uno::Any(sal_Int32(0)) ) ; } } } @@ -396,7 +396,7 @@ void SchXMLPlotAreaContext::startFastElement (sal_Int32 /*nElement*/, // data yet. mxNewDoc->createInternalDataProvider( false /* bCloneExistingData */ ); if( xProp.is() && mrDataRowSource!=chart::ChartDataRowSource_COLUMNS ) - xProp->setPropertyValue("DataRowSource", uno::makeAny(mrDataRowSource) ); + xProp->setPropertyValue("DataRowSource", uno::Any(mrDataRowSource) ); } } @@ -538,7 +538,7 @@ void SchXMLPlotAreaContext::endFastElement(sal_Int32 ) try { xDiaProp->setPropertyValue("NumberOfLines", - uno::makeAny( mnNumOfLinesProp )); + uno::Any( mnNumOfLinesProp )); } catch( const uno::Exception & ) { @@ -553,7 +553,7 @@ void SchXMLPlotAreaContext::endFastElement(sal_Int32 ) try { xDiaProp->setPropertyValue("Volume", - uno::makeAny( true )); + uno::Any( true )); } catch( const uno::Exception & ) { @@ -763,7 +763,7 @@ void SchXMLDataPointContext::startFastElement (sal_Int32 /*Element*/, deletedLegendEntries.push_back(deletedLegendEntry); } deletedLegendEntries.push_back(mDataPoint.m_nPointIndex); - xSeriesProp->setPropertyValue("DeletedLegendEntries", uno::makeAny(comphelper::containerToSequence(deletedLegendEntries))); + xSeriesProp->setPropertyValue("DeletedLegendEntries", uno::Any(comphelper::containerToSequence(deletedLegendEntries))); } break; } @@ -1026,7 +1026,7 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume Reference< beans::XPropertySet > xSeqProp( xNewSequence, uno::UNO_QUERY ); - xSeqProp->setPropertyValue("Role", uno::makeAny( aRole )); + xSeqProp->setPropertyValue("Role", uno::Any( aRole )); Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); @@ -1241,12 +1241,12 @@ void SchXMLStatisticsObjectContext::startFastElement (sal_Int32 /*Element*/, uno::Reference< beans::XPropertySet > xBarProp( xFact->createInstance("com.sun.star.chart2.ErrorBar" ), uno::UNO_QUERY ); - xBarProp->setPropertyValue("ErrorBarStyle",uno::makeAny(css::chart::ErrorBarStyle::NONE)); - xBarProp->setPropertyValue("PositiveError",uno::makeAny(0.0)); - xBarProp->setPropertyValue("NegativeError",uno::makeAny(0.0)); - xBarProp->setPropertyValue("Weight",uno::makeAny(1.0)); - xBarProp->setPropertyValue("ShowPositiveError",uno::makeAny(true)); - xBarProp->setPropertyValue("ShowNegativeError",uno::makeAny(true)); + xBarProp->setPropertyValue("ErrorBarStyle",uno::Any(css::chart::ErrorBarStyle::NONE)); + xBarProp->setPropertyValue("PositiveError",uno::Any(0.0)); + xBarProp->setPropertyValue("NegativeError",uno::Any(0.0)); + xBarProp->setPropertyValue("Weight",uno::Any(1.0)); + xBarProp->setPropertyValue("ShowPositiveError",uno::Any(true)); + xBarProp->setPropertyValue("ShowNegativeError",uno::Any(true)); // first import defaults from parent style SetErrorBarStyleProperties( maSeriesStyleName, xBarProp, mrImportHelper ); diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.cxx b/xmloff/source/chart/SchXMLPropertyMappingContext.cxx index b5c17713fd09..40c3d045271e 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.cxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.cxx @@ -45,7 +45,7 @@ Reference< chart2::data::XLabeledDataSequence2 > createAndAddSequenceToSeries( c Reference< chart2::data::XDataSequence > xSeq = SchXMLTools::CreateDataSequence( rRange, xChartDoc ); Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->setPropertyValue("Role", uno::makeAny( rRole)); + xSeqProp->setPropertyValue("Role", uno::Any( rRole)); xLabeledSeq->setValues( xSeq ); Reference< chart2::data::XDataSink > xSink( xSeriesSource, uno::UNO_QUERY ); diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index aac03261fb29..16bec57fea20 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -165,15 +165,15 @@ void SchXMLEquationContext::startFastElement (sal_Int32 /*nElement*/, pPropStyleContext->FillPropertySet( xEquationProperties ); } } - xEquationProperties->setPropertyValue( "ShowEquation", uno::makeAny( bShowEquation )); - xEquationProperties->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bShowRSquare )); + xEquationProperties->setPropertyValue( "ShowEquation", uno::Any( bShowEquation )); + xEquationProperties->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( bShowRSquare )); if( bHasXPos && bHasYPos ) { chart2::RelativePosition aRelPos; aRelPos.Primary = static_cast< double >( aPosition.X ) / static_cast< double >( maChartSize.Width ); aRelPos.Secondary = static_cast< double >( aPosition.Y ) / static_cast< double >( maChartSize.Height ); - xEquationProperties->setPropertyValue( "RelativePosition", uno::makeAny( aRelPos )); + xEquationProperties->setPropertyValue( "RelativePosition", uno::Any( aRelPos )); } mrRegressionStyle.m_xEquationProperties.set( xEquationProperties ); } diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 1370b07b4ff9..56b98304870e 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -133,7 +133,7 @@ void lcl_setAutomaticSymbolSize( const uno::Reference< beans::XPropertySet >& xS aSymbolSize.Width = aSymbolSize.Height; } } - xSeriesOrPointProp->setPropertyValue("SymbolSize",uno::makeAny( aSymbolSize )); + xSeriesOrPointProp->setPropertyValue("SymbolSize",uno::Any( aSymbolSize )); } void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSeriesOrPointProp, const SvXMLImport& rImport ) @@ -150,7 +150,7 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe if( chart::ChartSymbolType::BITMAPURL==nSymbolType ) { //set special size for graphics to indicate to use the bitmap size itself - xSeriesOrPointProp->setPropertyValue("SymbolSize",uno::makeAny( awt::Size(-1,-1) )); + xSeriesOrPointProp->setPropertyValue("SymbolSize",uno::Any( awt::Size(-1,-1) )); } else { @@ -182,7 +182,7 @@ void lcl_setLinkNumberFormatToSourceIfNeeded( const uno::Reference< beans::XProp { if( bLinkToSource ) { - xPointProp->setPropertyValue("LinkNumberFormatToSource", uno::makeAny(false)); + xPointProp->setPropertyValue("LinkNumberFormatToSource", uno::Any(false)); } } } @@ -226,7 +226,7 @@ Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSerie Reference< chart2::data::XDataSequence > xSeq = SchXMLTools::CreateDataSequence( rRange, xChartDoc ); Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->setPropertyValue("Role", uno::makeAny( rRole)); + xSeqProp->setPropertyValue("Role", uno::Any( rRole)); xLabeledSeq->setValues( xSeq ); // add new sequence to data series / push to front to have the correct sequence order if charttype is changed afterwards @@ -410,19 +410,19 @@ void SchXMLSeries2Context::startFastElement (sal_Int32 /*Element*/, if (xSeriesProp.is()) { if (bHideLegend) - xSeriesProp->setPropertyValue("ShowLegendEntry", uno::makeAny(false)); + xSeriesProp->setPropertyValue("ShowLegendEntry", uno::Any(false)); if( bIsCandleStick ) { // set default color for range-line to black (before applying styles) xSeriesProp->setPropertyValue("Color", - uno::makeAny( sal_Int32( 0x000000 ))); // black + uno::Any( sal_Int32( 0x000000 ))); // black } else if ( maSeriesChartTypeName == "com.sun.star.chart2.PieChartType" ) { //@todo: this property should be saved xSeriesProp->setPropertyValue("VaryColorsByPoint", - uno::makeAny( true )); + uno::Any( true )); } } @@ -449,7 +449,7 @@ void SchXMLSeries2Context::startFastElement (sal_Int32 /*Element*/, OUString aMainRole("values-y"); if (maSeriesChartTypeName == "com.sun.star.chart2.BubbleChartType") aMainRole = "values-size"; - xSeqProp->setPropertyValue("Role", uno::makeAny(aMainRole)); + xSeqProp->setPropertyValue("Role", uno::Any(aMainRole)); } xLabeledSeq->setValues(xSequenceValues); @@ -858,7 +858,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe if( seriesStyle.mnAttachedAxis != 1 ) { xSeriesProp->setPropertyValue("Axis" - , uno::makeAny(chart::ChartAxisAssign::SECONDARY_Y) ); + , uno::Any(chart::ChartAxisAssign::SECONDARY_Y) ); } if( seriesStyle.msStyleName.isEmpty()) @@ -1038,10 +1038,10 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles uno::Reference< beans::XPropertySet > xNewSeriesProp(seriesStyle.m_xSeries,uno::UNO_QUERY); if (seriesStyle.m_xErrorXProperties.is()) - xNewSeriesProp->setPropertyValue("ErrorBarX",uno::makeAny(seriesStyle.m_xErrorXProperties)); + xNewSeriesProp->setPropertyValue("ErrorBarX",uno::Any(seriesStyle.m_xErrorXProperties)); if (seriesStyle.m_xErrorYProperties.is()) - xNewSeriesProp->setPropertyValue("ErrorBarY",uno::makeAny(seriesStyle.m_xErrorYProperties)); + xNewSeriesProp->setPropertyValue("ErrorBarY",uno::Any(seriesStyle.m_xErrorYProperties)); } try @@ -1153,7 +1153,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { //need to set this explicitly here for old files as the new api does not support this property fully anymore if( bSwitchOffLinesForScatter ) - xPointProp->setPropertyValue("Lines",uno::makeAny(false)); + xPointProp->setPropertyValue("Lines",uno::Any(false)); } catch( const uno::Exception & ) { @@ -1295,7 +1295,7 @@ void SchXMLSeries2Context::switchSeriesLinesOff( ::std::vector< DataRowPointStyl if( !xSeries.is() ) continue; - xSeries->setPropertyValue("Lines",uno::makeAny(false)); + xSeries->setPropertyValue("Lines",uno::Any(false)); } catch( uno::Exception & ) { diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 9ee4016087fe..4d99737f56f1 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -765,8 +765,8 @@ void SchXMLTableHelper::applyTableToInternalDataProvider( try { Reference< beans::XPropertySet > xProps( xChartDoc, uno::UNO_QUERY_THROW ); - xProps->setPropertyValue( "DisableDataTableDialog", uno::makeAny( true ) ); - xProps->setPropertyValue( "DisableComplexChartTypes", uno::makeAny( true ) ); + xProps->setPropertyValue( "DisableDataTableDialog", uno::Any( true ) ); + xProps->setPropertyValue( "DisableComplexChartTypes", uno::Any( true ) ); } catch ( uno::Exception& ) { diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index b6bfaab104aa..8fbf4aad7e86 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -636,7 +636,7 @@ void setXMLRangePropertyAtDataSequence( Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo()); if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName )) - xProp->setPropertyValue( aXMLRangePropName, uno::makeAny( rXMLRange )); + xProp->setPropertyValue( aXMLRangePropName, uno::Any( rXMLRange )); } catch( const uno::Exception & ) { diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index f2cdf55ce9fd..090aa2bc3263 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -326,7 +326,7 @@ void XMLSettingsExportHelper::exportSymbolDescriptors( pSymbol[XML_SYMBOL_DESCRIPTOR_CHARACTER].Name = sCharacter; pSymbol[XML_SYMBOL_DESCRIPTOR_CHARACTER].Value <<= pDescriptor->nCharacter; - xBox->insertByIndex(nIndex, uno::makeAny( aSequence )); + xBox->insertByIndex(nIndex, uno::Any( aSequence )); } exportIndexAccess( xBox, rName ); @@ -453,7 +453,7 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( pForChar[XML_FORBIDDEN_CHARACTER_BEGIN_LINE].Value <<= aChars.beginLine; pForChar[XML_FORBIDDEN_CHARACTER_END_LINE].Name = sEndLine; pForChar[XML_FORBIDDEN_CHARACTER_END_LINE].Value <<= aChars.endLine; - xBox->insertByIndex(nPos++, uno::makeAny( aSequence )); + xBox->insertByIndex(nPos++, uno::Any( aSequence )); } } diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index cc4eb39b3bd8..0e0c22d8ca07 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -550,7 +550,7 @@ SvXMLExport::~SvXMLExport() mxExportInfo->setPropertyValue(sProgressCurrent, uno::Any(nProgressCurrent)); } if (xPropertySetInfo->hasPropertyByName(sRepeat)) - mxExportInfo->setPropertyValue(sRepeat, css::uno::makeAny(mpProgressBarHelper->GetRepeat())); + mxExportInfo->setPropertyValue(sRepeat, css::uno::Any(mpProgressBarHelper->GetRepeat())); } if (mpNumExport && (mnExportFlags & (SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::STYLES))) { @@ -1094,9 +1094,9 @@ void SvXMLExport::ImplExportStyles() Sequence<sal_Int32> aStyleFamilies; Sequence<OUString> aStyleNames; mxAutoStylePool->GetRegisteredNames( aStyleFamilies, aStyleNames ); - mxExportInfo->setPropertyValue( sStyleNames, makeAny( aStyleNames ) ); + mxExportInfo->setPropertyValue( sStyleNames, Any( aStyleNames ) ); mxExportInfo->setPropertyValue( sStyleFamilies, - makeAny( aStyleFamilies ) ); + Any( aStyleFamilies ) ); } } diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 38a6be15e6cb..3d9cb9f1edb1 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -630,7 +630,7 @@ void SAL_CALL SvXMLImport::endDocument() mxImportInfo->setPropertyValue(sProgressCurrent, uno::Any(nProgressCurrent)); } if (xPropertySetInfo->hasPropertyByName(sRepeat)) - mxImportInfo->setPropertyValue(sRepeat, css::uno::makeAny(mpProgressBarHelper->GetRepeat())); + mxImportInfo->setPropertyValue(sRepeat, css::uno::Any(mpProgressBarHelper->GetRepeat())); // pProgressBarHelper is deleted in dtor } OUString sNumberStyles(XML_NUMBERSTYLES); @@ -698,7 +698,7 @@ std::optional<SvXMLNamespaceMap> SvXMLImport::processNSAttributes( { throw xml::sax::SAXException("Inconsistent ODF versions in content.xml and manifest.xml!", uno::Reference< uno::XInterface >(), - uno::makeAny( + uno::Any( packages::zip::ZipIOException("Inconsistent ODF versions in content.xml and manifest.xml!" ) ) ); } } @@ -770,7 +770,7 @@ void SAL_CALL SvXMLImport::startFastElement (sal_Int32 Element, { throw xml::sax::SAXException("Inconsistent ODF versions in content.xml and manifest.xml!", uno::Reference< uno::XInterface >(), - uno::makeAny( + uno::Any( packages::zip::ZipIOException("Inconsistent ODF versions in content.xml and manifest.xml!" ) ) ); } } @@ -1049,7 +1049,7 @@ void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen } uno::Reference<lang::XInitialization> const xInit(mxParser, uno::UNO_QUERY_THROW); - xInit->initialize( { makeAny(OUString("IgnoreMissingNSDecl")) }); + xInit->initialize( { Any(OUString("IgnoreMissingNSDecl")) }); } // XServiceInfo @@ -1669,7 +1669,7 @@ bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion ) bResult = aODFVersion == aStorVersion; else xStorProps->setPropertyValue( "Version", - uno::makeAny( aODFVersion ) ); + uno::Any( aODFVersion ) ); if ( bResult ) { diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 7bb493731f68..4f9799c48666 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -130,7 +130,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() { // OOo 1.x only supported "true" so that is the more appropriate // default for OOoXML format documents. - xDefaults->setPropertyValue("IsFollowingTextFlow", uno::makeAny(true)); + xDefaults->setPropertyValue("IsFollowingTextFlow", uno::Any(true)); } // NOTE: the only reason why it's legal to check "==" (not "<") against @@ -160,7 +160,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() { Color const nStroke( bIsAOO4 ? Color(128, 128, 128) : COL_BLACK); - xDefaults->setPropertyValue("LineColor", makeAny(nStroke)); + xDefaults->setPropertyValue("LineColor", Any(nStroke)); } Color const nFillColor( bIsAOO4 ? Color(0xCF, 0xE7, 0xF5) : Color(153, 204, 255)); @@ -169,7 +169,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() if (std::none_of(GetProperties().begin(), GetProperties().end(), XMLPropertyByIndex(nFillIndex))) { - xDefaults->setPropertyValue("FillColor", makeAny(nFillColor)); + xDefaults->setPropertyValue("FillColor", Any(nFillColor)); } if (xInfo->hasPropertyByName("FillColor2")) { @@ -178,7 +178,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() if (std::none_of(GetProperties().begin(), GetProperties().end(), XMLPropertyByIndex(nFill2Index))) { - xDefaults->setPropertyValue("FillColor2", makeAny(sal_Int32(nFillColor))); + xDefaults->setPropertyValue("FillColor2", Any(sal_Int32(nFillColor))); } } } diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 09958b7ca7f5..1b9c295d03ef 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -536,7 +536,7 @@ void XMLImageMapContext::endFastElement(sal_Int32 ) Reference < XPropertySetInfo > xInfo = xPropertySet->getPropertySetInfo(); if( xInfo.is() && xInfo->hasPropertyByName( gsImageMap ) ) - xPropertySet->setPropertyValue(gsImageMap, uno::makeAny( xImageMap ) ); + xPropertySet->setPropertyValue(gsImageMap, uno::Any( xImageMap ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index 3d7ad0e62e93..5321d55788b6 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -29,7 +29,6 @@ #include <sal/log.hxx> using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::makeAny; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::beans; using namespace css; @@ -75,7 +74,7 @@ void XMLReplacementImageContext::endFastElement(sal_Int32 ) if (xGraphic.is() && xPropSetInfo->hasPropertyByName("Graphic")) { - m_xPropSet->setPropertyValue("Graphic", uno::makeAny(xGraphic)); + m_xPropSet->setPropertyValue("Graphic", uno::Any(xGraphic)); } } diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 8a4cd27d24b5..826b4b0a04bf 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -167,7 +167,7 @@ Any AnimationsImportHelperImpl::convertTarget( const OUString& rValue ) Reference< XShape > _xShape( xRef, UNO_QUERY ); if( _xShape.is() ) - return makeAny( _xShape ); + return Any( _xShape ); Reference< XTextCursor > xTextCursor( xRef, UNO_QUERY ); if( xTextCursor.is() ) @@ -187,7 +187,7 @@ Any AnimationsImportHelperImpl::convertTarget( const OUString& rValue ) // break if start of selection is prior to end of current paragraph if( xRange.is() && (xTextRangeCompare->compareRegionEnds( xStart, xRange ) >= 0 ) ) { - return makeAny( ParagraphTarget( xShape, nParagraph ) ); + return Any( ParagraphTarget( xShape, nParagraph ) ); } nParagraph++; @@ -233,7 +233,7 @@ Any AnimationsImportHelperImpl::convertValue( XMLTokenEnum eAttributeName, const ValuePair aPair; aPair.First = convertValue( eAttributeName, rValue.copy( 0, nCommaPos ) ); aPair.Second = convertValue( eAttributeName, rValue.copy( nCommaPos+1 ) ); - return makeAny( aPair ); + return Any( aPair ); } else { @@ -248,7 +248,7 @@ Any AnimationsImportHelperImpl::convertValue( XMLTokenEnum eAttributeName, const case XML_HEIGHT: case XML_TRANSLATE: { - return makeAny( rValue ); + return Any( rValue ); } case XML_SCALE: @@ -425,7 +425,7 @@ Sequence< TimeFilterPair > AnimationsImportHelperImpl::convertTimeFilter( std::s Any AnimationsImportHelperImpl::convertPath( const OUString& rValue ) { - return makeAny( rValue ); + return Any( rValue ); } @@ -520,7 +520,7 @@ AnimationNodeContext::AnimationNodeContext( if( nPresetClass != EffectPresetClass::CUSTOM ) { Reference< XInitialization > xInit( mxNode, UNO_QUERY_THROW ); - const Any aAny( makeAny( nPresetClass ) ); + const Any aAny( nPresetClass ); Sequence< Any > aArgs( &aAny, 1 ) ; xInit->initialize( aArgs ); } @@ -662,7 +662,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: case XML_ELEMENT(SMIL_SO52, XML_ENDSYNC): { if( SvXMLUnitConverter::convertEnum( nEnum, aIter.toView(), aAnimations_EnumMap_Endsync ) ) - mxNode->setEndSync( makeAny( nEnum ) ); + mxNode->setEndSync( Any( nEnum ) ); } break; case XML_ELEMENT(PRESENTATION, XML_NODE_TYPE): @@ -671,7 +671,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: case XML_ELEMENT(PRESENTATION_OASIS, XML_NODE_TYPE): { if( SvXMLUnitConverter::convertEnum( nEnum, aIter.toView(), aAnimations_EnumMap_EffectNodeType ) ) - aUserData.emplace_back( GetXMLToken( XML_NODE_TYPE ), makeAny( nEnum ) ); + aUserData.emplace_back( GetXMLToken( XML_NODE_TYPE ), Any( nEnum ) ); } break; case XML_ELEMENT(PRESENTATION, XML_PRESET_ID): @@ -679,7 +679,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: case XML_ELEMENT(PRESENTATION_OOO, XML_PRESET_ID): case XML_ELEMENT(PRESENTATION_OASIS, XML_PRESET_ID): { - aUserData.emplace_back( GetXMLToken( XML_PRESET_ID ), makeAny( aIter.toString() ) ); + aUserData.emplace_back( GetXMLToken( XML_PRESET_ID ), Any( aIter.toString() ) ); } break; case XML_ELEMENT(PRESENTATION, XML_PRESET_SUB_TYPE): @@ -687,7 +687,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: case XML_ELEMENT(PRESENTATION_OOO, XML_PRESET_SUB_TYPE): case XML_ELEMENT(PRESENTATION_OASIS, XML_PRESET_SUB_TYPE): { - aUserData.emplace_back( GetXMLToken( XML_PRESET_SUB_TYPE ), makeAny( aIter.toString() ) ); + aUserData.emplace_back( GetXMLToken( XML_PRESET_SUB_TYPE ), Any( aIter.toString() ) ); } break; case XML_ELEMENT(PRESENTATION, XML_PRESET_CLASS): @@ -696,7 +696,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: case XML_ELEMENT(PRESENTATION_OASIS, XML_PRESET_CLASS): { if( SvXMLUnitConverter::convertEnum( nEnum, aIter.toView(), aAnimations_EnumMap_EffectPresetClass ) ) - aUserData.emplace_back( GetXMLToken( XML_PRESET_CLASS ), makeAny( nEnum ) ); + aUserData.emplace_back( GetXMLToken( XML_PRESET_CLASS ), Any( nEnum ) ); } break; case XML_ELEMENT(PRESENTATION, XML_AFTER_EFFECT): @@ -705,7 +705,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: { bool bTemp; if (::sax::Converter::convertBool( bTemp, aIter.toView() )) - aUserData.emplace_back( GetXMLToken( XML_AFTER_EFFECT ), makeAny( bTemp ) ); + aUserData.emplace_back( GetXMLToken( XML_AFTER_EFFECT ), Any( bTemp ) ); } break; case XML_ELEMENT(XLINK, XML_HREF): @@ -713,7 +713,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: if( nNodeType == AnimationNodeType::AUDIO ) { Reference< XAudio > xAudio( mxNode, UNO_QUERY_THROW ); - xAudio->setSource( makeAny(lcl_GetMediaReference(GetImport(), aIter.toString())) ); + xAudio->setSource( Any(lcl_GetMediaReference(GetImport(), aIter.toString())) ); break; } [[fallthrough]]; @@ -758,7 +758,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: case XML_ELEMENT(PRESENTATION_OOO, XML_MASTER_ELEMENT): { Reference< XAnimationNode > xMaster( GetImport().getInterfaceToIdentifierMapper().getReference( aIter.toString() ), UNO_QUERY ); - aUserData.emplace_back( GetXMLToken( XML_MASTER_ELEMENT ), makeAny( xMaster ) ); + aUserData.emplace_back( GetXMLToken( XML_MASTER_ELEMENT ), Any( xMaster ) ); } break; @@ -927,7 +927,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: { Reference< XAnimatePhysics > xAnimatePhysics( mxNode, UNO_QUERY ); if( xAnimatePhysics.is() ) - xAnimatePhysics->setStartVelocityX( makeAny(aIter.toDouble()) ); + xAnimatePhysics->setStartVelocityX( Any(aIter.toDouble()) ); } break; @@ -937,7 +937,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: { Reference< XAnimatePhysics > xAnimatePhysics( mxNode, UNO_QUERY ); if( xAnimatePhysics.is() ) - xAnimatePhysics->setStartVelocityY( makeAny(aIter.toDouble()) ); + xAnimatePhysics->setStartVelocityY( Any(aIter.toDouble()) ); } break; @@ -947,7 +947,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: { Reference< XAnimatePhysics > xAnimatePhysics( mxNode, UNO_QUERY ); if( xAnimatePhysics.is() ) - xAnimatePhysics->setDensity( makeAny(aIter.toDouble()) ); + xAnimatePhysics->setDensity( Any(aIter.toDouble()) ); } break; @@ -957,7 +957,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: { Reference< XAnimatePhysics > xAnimatePhysics( mxNode, UNO_QUERY ); if( xAnimatePhysics.is() ) - xAnimatePhysics->setBounciness( makeAny(aIter.toDouble()) ); + xAnimatePhysics->setBounciness( Any(aIter.toDouble()) ); } break; @@ -1100,7 +1100,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: case XML_ELEMENT(PRESENTATION_SO52, XML_GROUP_ID): case XML_ELEMENT(PRESENTATION_OOO, XML_GROUP_ID): { - aUserData.emplace_back( "group-id", makeAny( aIter.toInt32() ) ); + aUserData.emplace_back( "group-id", Any( aIter.toInt32() ) ); } break; @@ -1125,7 +1125,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: || IsTokenInNamespace(nToken, XML_NAMESPACE_PRESENTATION_OASIS) || IsTokenInNamespace(nToken, XML_NAMESPACE_PRESENTATION_OOO)) { - aUserData.emplace_back( SvXMLImport::getNameFromToken(aIter.getToken()), makeAny( aIter.toString() ) ); + aUserData.emplace_back( SvXMLImport::getNameFromToken(aIter.getToken()), Any( aIter.toString() ) ); } else XMLOFF_WARN_UNKNOWN("xmloff", aIter); @@ -1226,7 +1226,7 @@ Any SAL_CALL AnimationsImport::queryInterface( const Type& aType ) { if ( aType == cppu::UnoType<XAnimationNodeSupplier>::get()) { - return makeAny( Reference<XAnimationNodeSupplier>( this ) ); + return Any( Reference<XAnimationNodeSupplier>( this ) ); } else { diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 94dff040c288..ffdd3bef7222 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -547,16 +547,16 @@ void XMLAnimationsEffectContext::endFastElement(sal_Int32 ) const AnimationEffect eEffect = ImplSdXMLgetEffect( meEffect, meDirection, mnStartScale, meKind == XMLE_SHOW ); if (mbTextEffect) - xSet->setPropertyValue( gsTextEffect, makeAny( eEffect ) ); + xSet->setPropertyValue( gsTextEffect, Any( eEffect ) ); else - xSet->setPropertyValue( gsEffect, makeAny( eEffect ) ); - xSet->setPropertyValue( gsSpeed, makeAny( meSpeed ) ); + xSet->setPropertyValue( gsEffect, Any( eEffect ) ); + xSet->setPropertyValue( gsSpeed, Any( meSpeed ) ); if( eEffect == AnimationEffect_PATH && !maPathShapeId.isEmpty() ) { Reference< XShape > xPath( GetImport().getInterfaceToIdentifierMapper().getReference( maPathShapeId ), UNO_QUERY ); if( xPath.is() ) - xSet->setPropertyValue( gsAnimPath, makeAny( xPath ) ); + xSet->setPropertyValue( gsAnimPath, Any( xPath ) ); } } } diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 3cb6034193b0..50a475381203 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1610,7 +1610,7 @@ void SdXMLExport::ImpWritePresentationStyles() void SdXMLExport::ExportMeta_() { - uno::Sequence<beans::NamedValue> stats { { "ObjectCount", uno::makeAny(mnObjectCount) } }; + uno::Sequence<beans::NamedValue> stats { { "ObjectCount", uno::Any(mnObjectCount) } }; // update document statistics at the model uno::Reference<document::XDocumentPropertiesSupplier> xPropSup(GetModel(), diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 2776880934ec..6ffc7140531e 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -510,7 +510,7 @@ void SdXMLImport::SetViewSettings(const css::uno::Sequence<css::beans::PropertyV try { - xPropSet->setPropertyValue("VisibleArea", uno::makeAny( aVisArea ) ); + xPropSet->setPropertyValue("VisibleArea", uno::Any( aVisArea ) ); } catch(const css::uno::Exception&) { @@ -656,7 +656,7 @@ void SdXMLImport::NotifyContainsEmbeddedFont() { uno::Reference< beans::XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY ); if( xProps.is() ) - xProps->setPropertyValue("EmbedFonts", uno::makeAny( true ) ); + xProps->setPropertyValue("EmbedFonts", uno::Any( true ) ); } } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 9b069a07eb2c..89eceb95982c 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -415,7 +415,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap // as member, thus saving time. DBG_ASSERT(-1 != nIndex, "XMLShapeExport::collectShapeAutoStyles: could not obtain the index for our context id!"); - XMLPropertyState aNewState(nIndex, uno::makeAny(sNumberStyle)); + XMLPropertyState aNewState(nIndex, uno::Any(sNumberStyle)); aPropStates.push_back(aNewState); } } @@ -3315,10 +3315,10 @@ static void lcl_CopyStream( uno::UNO_QUERY); if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage xStreamProps->setPropertyValue("MediaType", - uno::makeAny(rMimeType)); + uno::Any(rMimeType)); xStreamProps->setPropertyValue( // turn off compression "Compressed", - uno::makeAny(false)); + uno::Any(false)); } ::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream); xOutStream->closeOutput(); diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index bfbcf180feab..930051b2aeec 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -466,7 +466,7 @@ void XMLShapeImportHelper::addShape( uno::Reference< drawing::XShape >& rShape, uno::Reference<beans::XPropertySet> xPropertySet(rShape, uno::UNO_QUERY); if (xPropertySet.is()) { - xPropertySet->setPropertyValue("HandlePathObjScale", uno::makeAny(true)); + xPropertySet->setPropertyValue("HandlePathObjScale", uno::Any(true)); } } } diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 1f869f520b79..198503eab2cd 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -196,7 +196,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, + aBookmarkName; } - xProps->setPropertyValue("BookmarkURL", uno::makeAny( sHREF ) ); + xProps->setPropertyValue("BookmarkURL", uno::Any( sHREF ) ); } } diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index c6777d015236..c37b2de99f6c 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -289,7 +289,7 @@ void SdXMLGenericPageContext::endFastElement(sal_Int32 ) static const OUStringLiteral aStrHeaderTextProp( u"HeaderText" ); if( xInfo->hasPropertyByName( aStrHeaderTextProp ) ) xSet->setPropertyValue( aStrHeaderTextProp, - makeAny( GetSdImport().GetHeaderDecl( maUseHeaderDeclName ) ) ); + Any( GetSdImport().GetHeaderDecl( maUseHeaderDeclName ) ) ); } if( !maUseFooterDeclName.isEmpty() ) @@ -297,7 +297,7 @@ void SdXMLGenericPageContext::endFastElement(sal_Int32 ) static const OUStringLiteral aStrFooterTextProp( u"FooterText" ); if( xInfo->hasPropertyByName( aStrFooterTextProp ) ) xSet->setPropertyValue( aStrFooterTextProp, - makeAny( GetSdImport().GetFooterDecl( maUseFooterDeclName ) ) ); + Any( GetSdImport().GetFooterDecl( maUseFooterDeclName ) ) ); } if( !maUseDateTimeDeclName.isEmpty() ) @@ -310,11 +310,11 @@ void SdXMLGenericPageContext::endFastElement(sal_Int32 ) const OUString aText( GetSdImport().GetDateTimeDecl( maUseDateTimeDeclName, bFixed, aDateTimeFormat ) ); xSet->setPropertyValue("IsDateTimeFixed", - makeAny( bFixed ) ); + Any( bFixed ) ); if( bFixed ) { - xSet->setPropertyValue( aStrDateTimeTextProp, makeAny( aText ) ); + xSet->setPropertyValue( aStrDateTimeTextProp, Any( aText ) ); } else if( !aDateTimeFormat.isEmpty() ) { @@ -330,7 +330,7 @@ void SdXMLGenericPageContext::endFastElement(sal_Int32 ) if( pSdNumStyle ) { xSet->setPropertyValue("DateTimeFormat", - makeAny( pSdNumStyle->GetDrawKey() ) ); + Any( pSdNumStyle->GetDrawKey() ) ); } } } @@ -391,7 +391,7 @@ void SdXMLGenericPageContext::SetStyle( OUString const & rStyleName ) const_cast<XMLPropStyleContext*>(pPropStyle)->FillPropertySet(xPropSet); if( xBackgroundSet.is() ) - xPropSet1->setPropertyValue( aBackground, uno::makeAny( xBackgroundSet ) ); + xPropSet1->setPropertyValue( aBackground, uno::Any( xBackgroundSet ) ); } } } @@ -442,7 +442,7 @@ void SdXMLGenericPageContext::SetLayout() OUString aPropName("Layout"); Reference< beans::XPropertySetInfo > xInfo( xPropSet->getPropertySetInfo() ); if( xInfo.is() && xInfo->hasPropertyByName( aPropName ) ) - xPropSet->setPropertyValue(aPropName, uno::makeAny( static_cast<sal_Int16>(nType) ) ); + xPropSet->setPropertyValue(aPropName, uno::Any( static_cast<sal_Int16>(nType) ) ); } } } diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index d0e400a8de33..9e2973403142 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -308,7 +308,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XFastAttri { try { - sal_Int32 nInternalId = mxGluePoints->insert( uno::makeAny( aGluePoint ) ); + sal_Int32 nInternalId = mxGluePoints->insert( uno::Any( aGluePoint ) ); GetImport().GetShapeImport()->addGluePointMapping( mxShape, nId, nInternalId ); } catch(const uno::Exception&) @@ -449,9 +449,9 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY); uno::Reference<beans::XPropertySetInfo> xPropertySetInfo = xPropertySet->getPropertySetInfo(); if (mnRelWidth && xPropertySetInfo->hasPropertyByName("RelativeWidth")) - xPropertySet->setPropertyValue("RelativeWidth", uno::makeAny(mnRelWidth)); + xPropertySet->setPropertyValue("RelativeWidth", uno::Any(mnRelWidth)); if (mnRelHeight && xPropertySetInfo->hasPropertyByName("RelativeHeight")) - xPropertySet->setPropertyValue("RelativeHeight", uno::makeAny(mnRelHeight)); + xPropertySet->setPropertyValue("RelativeHeight", uno::Any(mnRelHeight)); } if( !maShapeId.isEmpty() ) @@ -707,7 +707,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) uno::Reference<beans::XPropertySetInfo> xPropertySetInfo = xPropSet->getPropertySetInfo(); if (xPropertySetInfo->hasPropertyByName("TextBox")) - xPropSet->setPropertyValue("TextBox", uno::makeAny(mbTextBox)); + xPropSet->setPropertyValue("TextBox", uno::Any(mbTextBox)); // if this is an auto style, set its properties if(bAutoStyle && pDocStyle) @@ -780,7 +780,7 @@ void SdXMLShapeContext::SetThumbnail() // it at the api uno::Reference<graphic::XGraphic> xGraphic = GetImport().loadGraphicByURL(maThumbnailURL); - xPropSet->setPropertyValue("ThumbnailGraphic", uno::makeAny(xGraphic)); + xPropSet->setPropertyValue("ThumbnailGraphic", uno::Any(xGraphic)); } } catch(const uno::Exception&) @@ -965,7 +965,7 @@ void SdXMLRectShapeContext::startFastElement (sal_Int32 nElement, { try { - xPropSet->setPropertyValue("CornerRadius", uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue("CornerRadius", uno::Any( mnRadius ) ); } catch(const uno::Exception&) { @@ -1629,7 +1629,7 @@ void SdXMLTextBoxShapeContext::startFastElement (sal_Int32 nElement, { try { - xPropSet->setPropertyValue("CornerRadius", uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue("CornerRadius", uno::Any( mnRadius ) ); } catch(const uno::Exception&) { @@ -1646,7 +1646,7 @@ void SdXMLTextBoxShapeContext::startFastElement (sal_Int32 nElement, try { xPropSet->setPropertyValue("TextChainNextName", - uno::makeAny( maChainNextName ) ); + uno::Any( maChainNextName ) ); } catch(const uno::Exception&) { @@ -2190,7 +2190,7 @@ void SdXMLPageShapeContext::startFastElement (sal_Int32 nElement, uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); static const OUStringLiteral aPageNumberStr(u"PageNumber"); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(aPageNumberStr)) - xPropSet->setPropertyValue(aPageNumberStr, uno::makeAny( mnPageNumber )); + xPropSet->setPropertyValue(aPageNumberStr, uno::Any( mnPageNumber )); } SdXMLShapeContext::startFastElement(nElement, xAttrList); @@ -2238,16 +2238,16 @@ void SdXMLCaptionShapeContext::startFastElement (sal_Int32 nElement, aAny >>= bIsAutoGrowWidth; if ( bIsAutoGrowWidth ) - xProps->setPropertyValue("TextAutoGrowWidth", uno::makeAny( false ) ); + xProps->setPropertyValue("TextAutoGrowWidth", uno::Any( false ) ); } // set pos, size, shear and rotate SetTransformation(); if( xProps.is() ) - xProps->setPropertyValue("CaptionPoint", uno::makeAny( maCaptionPoint ) ); + xProps->setPropertyValue("CaptionPoint", uno::Any( maCaptionPoint ) ); if ( bIsAutoGrowWidth ) - xProps->setPropertyValue("TextAutoGrowWidth", uno::makeAny( true ) ); + xProps->setPropertyValue("TextAutoGrowWidth", uno::Any( true ) ); if(mnRadius) { @@ -2256,7 +2256,7 @@ void SdXMLCaptionShapeContext::startFastElement (sal_Int32 nElement, { try { - xPropSet->setPropertyValue("CornerRadius", uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue("CornerRadius", uno::Any( mnRadius ) ); } catch(const uno::Exception&) { @@ -2350,7 +2350,7 @@ void SdXMLGraphicObjectShapeContext::startFastElement (sal_Int32 nElement, uno::Reference< beans::XPropertySetInfo > xPropsInfo( xPropset->getPropertySetInfo() ); if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) - xPropset->setPropertyValue("IsEmptyPresentationObject", css::uno::makeAny( mbIsPlaceholder ) ); + xPropset->setPropertyValue("IsEmptyPresentationObject", css::uno::Any( mbIsPlaceholder ) ); if( !mbIsPlaceholder ) { @@ -2359,7 +2359,7 @@ void SdXMLGraphicObjectShapeContext::startFastElement (sal_Int32 nElement, uno::Reference<graphic::XGraphic> xGraphic = GetImport().loadGraphicByURL(maURL); if (xGraphic.is()) { - xPropset->setPropertyValue("Graphic", uno::makeAny(xGraphic)); + xPropset->setPropertyValue("Graphic", uno::Any(xGraphic)); } } } @@ -2395,7 +2395,7 @@ void SdXMLGraphicObjectShapeContext::endFastElement(sal_Int32 nElement) uno::Reference<beans::XPropertySet> xProperties(mxShape, uno::UNO_QUERY); if (xProperties.is()) { - xProperties->setPropertyValue("Graphic", uno::makeAny(xGraphic)); + xProperties->setPropertyValue("Graphic", uno::Any(xGraphic)); } } } @@ -2626,13 +2626,13 @@ void SdXMLObjectShapeContext::startFastElement (sal_Int32 /*nElement*/, aPersistName = aPersistName.copy( sURL.getLength() ); xProps->setPropertyValue("PersistName", - uno::makeAny( aPersistName ) ); + uno::Any( aPersistName ) ); } else { // this is OOo link object xProps->setPropertyValue("LinkURL", - uno::makeAny( aPersistName ) ); + uno::Any( aPersistName ) ); } } } @@ -2660,8 +2660,8 @@ void SdXMLObjectShapeContext::endFastElement(sal_Int32 nElement) if( xProps.is() ) { - xProps->setPropertyValue("FillStyle", uno::makeAny(drawing::FillStyle_NONE)); - xProps->setPropertyValue("LineStyle", uno::makeAny(drawing::LineStyle_NONE)); + xProps->setPropertyValue("FillStyle", uno::Any(drawing::FillStyle_NONE)); + xProps->setPropertyValue("LineStyle", uno::Any(drawing::LineStyle_NONE)); } } @@ -2674,7 +2674,7 @@ void SdXMLObjectShapeContext::endFastElement(sal_Int32 nElement) uno::Reference< beans::XPropertySet > xProps(mxShape, uno::UNO_QUERY); if( xProps.is() ) - xProps->setPropertyValue("PersistName", uno::makeAny( aPersistName ) ); + xProps->setPropertyValue("PersistName", uno::Any( aPersistName ) ); } SdXMLShapeContext::endFastElement(nElement); @@ -2718,7 +2718,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SdXMLObjectShapeContex uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY); if( xPropSet.is() ) { - xPropSet->setPropertyValue("CLSID", uno::makeAny( maCLSID ) ); + xPropSet->setPropertyValue("CLSID", uno::Any( maCLSID ) ); uno::Reference< lang::XComponent > xComp; xPropSet->getPropertyValue("Model") >>= xComp; @@ -3009,9 +3009,9 @@ void SdXMLPluginShapeContext::endFastElement(sal_Int32 nElement) else { // in case we have a media object - xProps->setPropertyValue( "MediaURL", uno::makeAny(maHref)); + xProps->setPropertyValue( "MediaURL", uno::Any(maHref)); - xProps->setPropertyValue("MediaMimeType", uno::makeAny(maMimeType) ); + xProps->setPropertyValue("MediaMimeType", uno::Any(maMimeType) ); for( const auto& rParam : std::as_const(maParams) ) { @@ -3022,21 +3022,21 @@ void SdXMLPluginShapeContext::endFastElement(sal_Int32 nElement) OUString aValueStr; rParam.Value >>= aValueStr; xProps->setPropertyValue("Loop", - uno::makeAny( aValueStr == "true" ) ); + uno::Any( aValueStr == "true" ) ); } else if( rName == "Mute" ) { OUString aValueStr; rParam.Value >>= aValueStr; xProps->setPropertyValue("Mute", - uno::makeAny( aValueStr == "true" ) ); + uno::Any( aValueStr == "true" ) ); } else if( rName == "VolumeDB" ) { OUString aValueStr; rParam.Value >>= aValueStr; xProps->setPropertyValue("VolumeDB", - uno::makeAny( static_cast< sal_Int16 >( aValueStr.toInt32() ) ) ); + uno::Any( static_cast< sal_Int16 >( aValueStr.toInt32() ) ) ); } else if( rName == "Zoom" ) { @@ -3064,7 +3064,7 @@ void SdXMLPluginShapeContext::endFastElement(sal_Int32 nElement) else eZoomLevel = media::ZoomLevel_NOT_AVAILABLE; - xProps->setPropertyValue("Zoom", uno::makeAny( eZoomLevel ) ); + xProps->setPropertyValue("Zoom", uno::Any( eZoomLevel ) ); } } } diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index e6d41e3cf003..4befbb00815c 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1084,7 +1084,7 @@ void SdXMLStylesContext::endFastElement(sal_Int32 ) uno::Reference< beans::XPropertySetInfo > xInfoSetInfo( xInfoSet->getPropertySetInfo() ); if( xInfoSetInfo->hasPropertyByName("PageLayouts") ) - xInfoSet->setPropertyValue("PageLayouts", uno::makeAny( getPageLayouts() ) ); + xInfoSet->setPropertyValue("PageLayouts", uno::Any( getPageLayouts() ) ); } } @@ -1347,7 +1347,7 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co const SvXMLStyleContext* pStyle = GetStyle(a); if (const SdXMLPresentationPageLayoutContext* pContext = dynamic_cast<const SdXMLPresentationPageLayoutContext*>(pStyle)) { - xLayouts->insertByName(pStyle->GetName(), uno::makeAny(static_cast<sal_Int32>(pContext->GetTypeId()))); + xLayouts->insertByName(pStyle->GetName(), uno::Any(static_cast<sal_Int32>(pContext->GetTypeId()))); } } @@ -1507,7 +1507,7 @@ XMLThemeContext::XMLThemeContext(SvXMLImport& rImport, XMLThemeContext::~XMLThemeContext() { - uno::Any aTheme = uno::makeAny(m_aTheme.getAsConstPropertyValueList()); + uno::Any aTheme(m_aTheme.getAsConstPropertyValueList()); m_xMasterPage->setPropertyValue("Theme", aTheme); } diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index bfcad5b55c0b..19f247aae122 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -208,7 +208,7 @@ namespace xmloff } if (m_xParentContainer.is()) - m_xParentContainer->insertByName(m_sName, makeAny(m_xElement)); + m_xParentContainer->insertByName(m_sName, Any(m_xElement)); LEAVE_LOG_CONTEXT( ); } @@ -1287,9 +1287,9 @@ namespace xmloff if ( m_xInfo.is() ) { if ( m_xInfo->hasPropertyByName( PROPERTY_SPIN_INCREMENT ) ) - m_xElement->setPropertyValue( PROPERTY_SPIN_INCREMENT, makeAny( m_nStepSizeValue ) ); + m_xElement->setPropertyValue( PROPERTY_SPIN_INCREMENT, Any( m_nStepSizeValue ) ); else if ( m_xInfo->hasPropertyByName( PROPERTY_LINE_INCREMENT ) ) - m_xElement->setPropertyValue( PROPERTY_LINE_INCREMENT, makeAny( m_nStepSizeValue ) ); + m_xElement->setPropertyValue( PROPERTY_LINE_INCREMENT, Any( m_nStepSizeValue ) ); } } @@ -1403,7 +1403,7 @@ namespace xmloff bHasRichTextProperty = m_xInfo->hasPropertyByName( PROPERTY_RICH_TEXT ); OSL_ENSURE( bHasRichTextProperty, "OTextLikeImport::EndElement: text:p, but no rich text control?" ); if ( bHasRichTextProperty ) - m_xElement->setPropertyValue( PROPERTY_RICH_TEXT, makeAny( true ) ); + m_xElement->setPropertyValue( PROPERTY_RICH_TEXT, Any( true ) ); // Note that we do *not* set the RichText property (in case our element has one) to sal_False here // since this is the default of this property, anyway. } @@ -2053,9 +2053,9 @@ namespace xmloff sValue = _rImport.GetAbsoluteReference(sValue); INetURLObject aURL(sValue); if ( aURL.GetProtocol() == INetProtocol::File ) - _xElement->setPropertyValue(PROPERTY_DATASOURCENAME,makeAny(sValue)); + _xElement->setPropertyValue(PROPERTY_DATASOURCENAME,Any(sValue)); else - _xElement->setPropertyValue(PROPERTY_URL,makeAny(sValue)); // the url is the "sdbc:" string + _xElement->setPropertyValue(PROPERTY_URL,Any(sValue)); // the url is the "sdbc:" string break; } else diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index 721796ffb509..25548fb0a66f 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -65,20 +65,20 @@ namespace xmloff auto pMappedEvent = rMappedEvent.getArray(); // ... the type - pMappedEvent[0] = PropertyValue(EVENT_TYPE, -1, makeAny(rEvent.ScriptType), PropertyState_DIRECT_VALUE); + pMappedEvent[0] = PropertyValue(EVENT_TYPE, -1, Any(rEvent.ScriptType), PropertyState_DIRECT_VALUE); // and the macro name - pMappedEvent[1] = PropertyValue(EVENT_LOCALMACRONAME, -1, makeAny(sLocalMacroName), PropertyState_DIRECT_VALUE); + pMappedEvent[1] = PropertyValue(EVENT_LOCALMACRONAME, -1, Any(sLocalMacroName), PropertyState_DIRECT_VALUE); // the library if ( !sLibrary.isEmpty() ) - pMappedEvent[2] = PropertyValue(EVENT_LIBRARY, -1, makeAny(sLibrary), PropertyState_DIRECT_VALUE); + pMappedEvent[2] = PropertyValue(EVENT_LIBRARY, -1, Any(sLibrary), PropertyState_DIRECT_VALUE); } else { - rMappedEvent = { PropertyValue(EVENT_TYPE, -1, makeAny(rEvent.ScriptType), PropertyState_DIRECT_VALUE), + rMappedEvent = { PropertyValue(EVENT_TYPE, -1, Any(rEvent.ScriptType), PropertyState_DIRECT_VALUE), // and the macro name - PropertyValue(EVENT_SCRIPTURL, -1, makeAny(rEvent.ScriptCode), PropertyState_DIRECT_VALUE) }; + PropertyValue(EVENT_SCRIPTURL, -1, Any(rEvent.ScriptCode), PropertyState_DIRECT_VALUE) }; } } } @@ -97,7 +97,7 @@ namespace xmloff "There is no element named " + _rName, static_cast< ::cppu::OWeakObject* >(this)); - return makeAny(aPos->second); + return Any(aPos->second); } Sequence< OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 7dd17785071a..e9220fd79954 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -113,7 +113,7 @@ bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescr Any aAddress; return doConvertAddressRepresentations( PROPERTY_FILE_REPRESENTATION, - makeAny( _rAddressDescription ), + Any( _rAddressDescription ), PROPERTY_ADDRESS, aAddress, false @@ -127,7 +127,7 @@ bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescr Any aAddress; return doConvertAddressRepresentations( PROPERTY_FILE_REPRESENTATION, - makeAny( _rAddressDescription ), + Any( _rAddressDescription ), PROPERTY_ADDRESS, aAddress, true @@ -150,7 +150,7 @@ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAdd xBinding.set(createDocumentDependentInstance( _bUseIntegerBinding ? OUString(SERVICE_LISTINDEXCELLBINDING) : OUString(SERVICE_CELLVALUEBINDING), PROPERTY_BOUND_CELL, - makeAny( aAddress ) + Any( aAddress ) ), css::uno::UNO_QUERY); return xBinding; @@ -168,7 +168,7 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr xSource.set(createDocumentDependentInstance( SERVICE_CELLRANGELISTSOURCE, PROPERTY_LIST_CELL_RANGE, - makeAny( aRangeAddress ) + Any( aRangeAddress ) ), css::uno::UNO_QUERY); return xSource; @@ -189,7 +189,7 @@ OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference xBindingProps->getPropertyValue( PROPERTY_BOUND_CELL ) >>= aAddress; Any aStringAddress; - doConvertAddressRepresentations( PROPERTY_ADDRESS, makeAny( aAddress ), + doConvertAddressRepresentations( PROPERTY_ADDRESS, Any( aAddress ), PROPERTY_FILE_REPRESENTATION, aStringAddress, false ); aStringAddress >>= sAddress; @@ -218,7 +218,7 @@ OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Refere xSourceProps->getPropertyValue( PROPERTY_LIST_CELL_RANGE ) >>= aRangeAddress; Any aStringAddress; - doConvertAddressRepresentations( PROPERTY_ADDRESS, makeAny( aRangeAddress ), + doConvertAddressRepresentations( PROPERTY_ADDRESS, Any( aRangeAddress ), PROPERTY_FILE_REPRESENTATION, aStringAddress, true ); aStringAddress >>= sAddress; } diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index e0a75861be58..1dfaadd61c0a 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx @@ -33,7 +33,6 @@ namespace xmloff { using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; using ::com::sun::star::util::DateTime; using ::com::sun::star::util::Date; @@ -79,7 +78,7 @@ namespace xmloff aDate = ::Date(nVCLDate).GetUNODate(); } - const Any aPropertyValue( makeAny( aDate ) ); + const Any aPropertyValue( aDate ); OSL_ENSURE( o_propertyValues.size() == 1, "VCLDateHandler::getPropertyValues: date strings represent exactly one property - not more, not less!" ); for ( auto& prop : o_propertyValues ) diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index d873006479a5..6a8c2cba1a90 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -33,7 +33,6 @@ namespace xmloff { using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; using ::com::sun::star::util::Duration; using ::com::sun::star::util::Time; @@ -82,7 +81,7 @@ namespace xmloff aTime = ::tools::Time(nVCLTime).GetUNOTime(); } - const Any aPropertyValue( makeAny( aTime ) ); + const Any aPropertyValue( aTime ); OSL_ENSURE( o_propertyValues.size() == 1, "VCLTimeHandler::getPropertyValues: time strings represent exactly one property - not more, not less!" ); for ( auto& prop : o_propertyValues ) diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index dc2d3221ad11..87c3b5b4056f 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -582,7 +582,7 @@ namespace xmloff // TODO: move this to the ctor OSL_ENSURE ( -1 != nStyleMapIndex, "OFormLayerXMLExport_Impl::collectGridColumnStylesAndIds: could not obtain the index for our context id!"); - XMLPropertyState aNumberStyleState( nStyleMapIndex, makeAny( sColumnNumberStyle ) ); + XMLPropertyState aNumberStyleState( nStyleMapIndex, Any( sColumnNumberStyle ) ); aPropertyStates.push_back( aNumberStyleState ); } diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index b879ed8518e3..e5d2c62af828 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -261,7 +261,7 @@ void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert OSL_ENSURE(-1 != nFormatKey, "OFormLayerXMLImport_Impl::applyControlNumberStyle: could not obtain a format key!"); // set the format on the control model - _rxControlModel->setPropertyValue(PROPERTY_FORMATKEY, makeAny(nFormatKey)); + _rxControlModel->setPropertyValue(PROPERTY_FORMATKEY, Any(nFormatKey)); } } catch(const Exception&) @@ -402,7 +402,7 @@ void OFormLayerXMLImport_Impl::endPage() xCurrentReferring = lookupControlId(sCurrentReferring); if (xCurrentReferring.is()) // if this condition fails, this is an error, but lookupControlId should have asserted this ... - xCurrentReferring->setPropertyValue( PROPERTY_CONTROLLABEL, makeAny( rReferences.first ) ); + xCurrentReferring->setPropertyValue( PROPERTY_CONTROLLABEL, Any( rReferences.first ) ); nPrevSep = nSeparator; } diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index fac520564838..07f2682d27a5 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -83,7 +83,7 @@ namespace xmloff // set the property if (_rxPropInfo->hasPropertyByName(_rPropName)) { - _rxProps->setPropertyValue(_rPropName, makeAny(bValue)); + _rxProps->setPropertyValue(_rPropName, Any(bValue)); } } diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 24f35dbed58a..79637d7430a1 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -95,7 +95,7 @@ namespace xmloff assert(bSuccess); (void)bSuccess; for (T const & i : std::as_const(anySeq)) { - OUString sValue(implConvertAny(makeAny(i))); + OUString sValue(implConvertAny(Any(i))); AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue ); SvXMLElementExport aValueTag( m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index 457e2da4bff0..912073011c39 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -307,7 +307,7 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const& i_rBuildId, const uno: uno::Reference< beans::XPropertySetInfo > xSetInfo( xImportInfo->getPropertySetInfo()); if( xSetInfo.is() && xSetInfo->hasPropertyByName( aPropName ) ) - xImportInfo->setPropertyValue( aPropName, uno::makeAny( sBuildId ) ); + xImportInfo->setPropertyValue( aPropName, uno::Any( sBuildId ) ); } } catch(const uno::Exception&) diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index d07caf9fa852..874c87509302 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -383,7 +383,7 @@ void PageStyleContext::FillPropertySet_PageStyle( if (!isFullSize) { SAL_INFO("xmloff.style", "FillPropertySet_PageStyle: Heuristically resetting BackgroundFullSize"); - xPropSet->setPropertyValue("BackgroundFullSize", uno::makeAny(isFullSize)); + xPropSet->setPropertyValue("BackgroundFullSize", uno::Any(isFullSize)); } } diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index bffdfad796a5..543b3670fe0f 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -632,7 +632,7 @@ OUString XMLFontAutoStylePool::embedFontFile(OUString const & fileUrl, OUString outputStream.set( storage->openStreamElement( name, ::embed::ElementModes::WRITE ), UNO_QUERY_THROW ); uno::Reference < beans::XPropertySet > propertySet( outputStream, uno::UNO_QUERY ); assert( propertySet.is()); - propertySet->setPropertyValue( "MediaType", uno::makeAny( OUString( "application/x-font-ttf" ))); // TODO + propertySet->setPropertyValue( "MediaType", uno::Any( OUString( "application/x-font-ttf" ))); // TODO for(;;) { sal_Int8 buffer[ 4096 ]; diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 9239f41b6837..aae787d491c6 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -537,7 +537,7 @@ void XMLPropStyleContext::Finish( bool bOverwrite ) if ( xPropSetInfo->hasPropertyByName( "Hidden" ) ) { - xPropSet->setPropertyValue( "Hidden", uno::makeAny( IsHidden( ) ) ); + xPropSet->setPropertyValue( "Hidden", uno::Any( IsHidden( ) ) ); } } diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index 2f5af33b4eb1..36bc1037cbaa 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -219,7 +219,7 @@ bool XMLBoolFalsePropHdl::importXML( const OUString&, Any&, const SvXMLUnitConve bool XMLBoolFalsePropHdl::exportXML( OUString& rStrExpValue, const Any& /*rValue*/, const SvXMLUnitConverter& rCnv) const { - return XMLBoolPropHdl::exportXML( rStrExpValue, makeAny( false ), rCnv ); + return XMLBoolPropHdl::exportXML( rStrExpValue, Any( false ), rCnv ); } diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 8f40530a2a53..78fba23d09a9 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -980,7 +980,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite ) } if ( xPropSetInfo->hasPropertyByName( "Hidden" ) ) - xPropSet->setPropertyValue( "Hidden", uno::makeAny( IsHidden( ) ) ); + xPropSet->setPropertyValue( "Hidden", uno::Any( IsHidden( ) ) ); if( rName != GetName() ) GetImport().AddStyleDisplayName( XmlStyleFamily::TEXT_LIST, diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 27a803b42a0b..dcb8200576dc 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -1287,7 +1287,7 @@ void XMLTextFrameContext_Impl::SetTitle( const OUString& rTitle ) Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); if( xPropSetInfo->hasPropertyByName( "Title" ) ) { - xPropSet->setPropertyValue( "Title", makeAny( rTitle ) ); + xPropSet->setPropertyValue( "Title", Any( rTitle ) ); } } } @@ -1299,7 +1299,7 @@ void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc ) Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); if( xPropSetInfo->hasPropertyByName( "Description" ) ) { - xPropSet->setPropertyValue( "Description", makeAny( rDesc ) ); + xPropSet->setPropertyValue( "Description", Any( rDesc ) ); } } } diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 0e643bede23c..f9584cc81d23 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -294,7 +294,7 @@ void XMLTextMasterPageContext::Finish( bool bOverwrite ) if ( xPropSetInfo->hasPropertyByName( "Hidden" ) ) { - xPropSet->setPropertyValue( "Hidden", uno::makeAny( IsHidden( ) ) ); + xPropSet->setPropertyValue( "Hidden", uno::Any( IsHidden( ) ) ); } } diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index ffcfad1d1d23..43a9a2d34485 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -2767,7 +2767,7 @@ void XMLDdeFieldImportContext::endFastElement(sal_Int32 ) Any aAny = xFieldMasterNameAccess->getByName(sMasterName); aAny >>= xMaster; //apply the content to the master - xMaster->setPropertyValue( sPropertyContent, uno::makeAny( GetContent())); + xMaster->setPropertyValue( sPropertyContent, uno::Any( GetContent())); // master exists: create text field and attach Reference<XPropertySet> xField; OUString sFieldName = OUString::Concat(sAPI_textfield_prefix) + sAPI_dde; @@ -3297,16 +3297,16 @@ void XMLAnnotationImportContext::PrepareField( { // import (possibly empty) author OUString sAuthor( aAuthorBuffer.makeStringAndClear() ); - xPropertySet->setPropertyValue(sAPI_author, makeAny(sAuthor)); + xPropertySet->setPropertyValue(sAPI_author, Any(sAuthor)); // import (possibly empty) initials OUString sInitials( aInitialsBuffer.makeStringAndClear() ); - xPropertySet->setPropertyValue("Initials", makeAny(sInitials)); + xPropertySet->setPropertyValue("Initials", Any(sInitials)); //import resolved flag bool bTmp(false); (void)::sax::Converter::convertBool(bTmp, aResolved); - xPropertySet->setPropertyValue("Resolved", makeAny(bTmp)); + xPropertySet->setPropertyValue("Resolved", Any(bTmp)); util::DateTime aDateTime; if (::sax::Converter::parseDateTime(aDateTime, @@ -3320,7 +3320,7 @@ void XMLAnnotationImportContext::PrepareField( xPropertySet->setPropertyValue(sPropertyDate, makeAny(aDate)); */ // why is there no UNO_NAME_DATE_TIME, but only UNO_NAME_DATE_TIME_VALUE? - xPropertySet->setPropertyValue(sAPI_date_time_value, makeAny(aDateTime)); + xPropertySet->setPropertyValue(sAPI_date_time_value, Any(aDateTime)); } OUString sBuffer = aTextBuffer.makeStringAndClear(); @@ -3329,11 +3329,11 @@ void XMLAnnotationImportContext::PrepareField( // delete last paragraph mark (if necessary) if (char(0x0a) == sBuffer[sBuffer.getLength()-1]) sBuffer = sBuffer.copy(0, sBuffer.getLength()-1); - xPropertySet->setPropertyValue(sAPI_content, makeAny(sBuffer)); + xPropertySet->setPropertyValue(sAPI_content, Any(sBuffer)); } if (!aName.isEmpty()) - xPropertySet->setPropertyValue(sAPI_name, makeAny(aName)); + xPropertySet->setPropertyValue(sAPI_name, Any(aName)); } diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index d8a90667b97d..079e8df8d82d 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1053,7 +1053,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( xPropSetInfo->hasPropertyByName( rPropName ) && rStyles->hasByName( sStyleName ) ) { - xPropSet->setPropertyValue( rPropName, makeAny(sStyleName) ); + xPropSet->setPropertyValue( rPropName, Any(sStyleName) ); } else sStyleName.clear(); @@ -1156,7 +1156,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( try { xPropSet->setPropertyValue( - s_NumberingRules, makeAny(xNewNumRules) ); + s_NumberingRules, Any(xNewNumRules) ); } catch(const Exception&) { @@ -1180,7 +1180,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( if (xPropSetInfo->hasPropertyByName(s_ParaIsNumberingRestart)) { xPropSet->setPropertyValue(s_ParaIsNumberingRestart, - makeAny(true) ); + Any(true) ); } pListBlock->ResetRestartNumbering(); } @@ -1189,14 +1189,14 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( xPropSetInfo->hasPropertyByName(s_NumberingStartValue)) { xPropSet->setPropertyValue(s_NumberingStartValue, - makeAny(nStartValue)); + Any(nStartValue)); } if (xPropSetInfo->hasPropertyByName(s_PropNameListId)) { if (!sListId.isEmpty()) { xPropSet->setPropertyValue(s_PropNameListId, - makeAny(sListId) ); + Any(sListId) ); } } @@ -1262,7 +1262,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( m_xImpl->m_xPageStyles->hasByName( sDisplayName))) { xPropSet->setPropertyValue(s_PageDescName, - makeAny(sDisplayName)); + Any(sDisplayName)); } } if( bPara && !pStyle->GetDropCapStyleName().isEmpty() && @@ -1275,7 +1275,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( if (m_xImpl->m_xTextStyles->hasByName(sDisplayName) && xPropSetInfo->hasPropertyByName("DropCapCharStyleName")) { - xPropSet->setPropertyValue("DropCapCharStyleName", makeAny(sDisplayName)); + xPropSet->setPropertyValue("DropCapCharStyleName", Any(sDisplayName)); } } @@ -1301,7 +1301,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( // set field value (the combined character string) xTmp->setPropertyValue("Content", - makeAny(rCursor->getString())); + Any(rCursor->getString())); // insert the field over it's original text Reference<XTextContent> xTextContent(xTmp, UNO_QUERY); @@ -1364,7 +1364,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( if ( nCurrentOutlineLevelInheritedFromParagraphStyle != nOutlineLevel ) { xPropSet->setPropertyValue( s_OutlineLevel, - makeAny( static_cast<sal_Int16>(nOutlineLevel) ) ); + Any( static_cast<sal_Int16>(nOutlineLevel) ) ); } } if (!bOutlineContentVisible) @@ -1376,7 +1376,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( auto pGrabBag = aGrabBag.getArray(); pGrabBag[length].Name = "OutlineContentVisibleAttr"; pGrabBag[length].Value <<= bool(bOutlineContentVisible); - xPropSet->setPropertyValue("ParaInteropGrabBag", uno::makeAny(aGrabBag)); + xPropSet->setPropertyValue("ParaInteropGrabBag", uno::Any(aGrabBag)); } // RFE: inserting headings into text documents (#i70748#) if ( bApplyOutlineLevelAsListLevel ) @@ -1387,7 +1387,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( nNumLevel != (nOutlineLevel - 1) ) { xPropSet->setPropertyValue( s_NumberingLevel, - makeAny( static_cast<sal_Int8>(nOutlineLevel - 1) ) ); + Any( static_cast<sal_Int8>(nOutlineLevel - 1) ) ); } } /* Correction: (#i69629#) @@ -1434,9 +1434,9 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( { // heading not in a list --> apply outline style xPropSet->setPropertyValue( s_NumberingRules, - makeAny(m_xImpl->m_xChapterNumbering) ); + Any(m_xImpl->m_xChapterNumbering) ); xPropSet->setPropertyValue( s_NumberingLevel, - makeAny(static_cast<sal_Int8>(nOutlineLevel - 1))); + Any(static_cast<sal_Int8>(nOutlineLevel - 1))); } } } @@ -1447,7 +1447,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( if ( nCurrentOutlineLevelInheritedFromParagraphStyle != 0 ) { xPropSet->setPropertyValue(s_OutlineLevel, - makeAny( sal_Int16(0) )); + Any( sal_Int16(0) )); } } } @@ -1606,7 +1606,7 @@ void XMLTextImportHelper::SetOutlineStyles( bool bSetEmptyLevels ) { pProps->Value <<= sChosenStyles[i]; m_xImpl->m_xChapterNumbering->replaceByIndex(i, - makeAny( aProps )); + Any( aProps )); } } @@ -1635,17 +1635,17 @@ void XMLTextImportHelper::SetHyperlink( if (!xPropSetInfo.is() || !xPropSetInfo->hasPropertyByName(s_HyperLinkURL)) return; - xPropSet->setPropertyValue(s_HyperLinkURL, makeAny(rHRef)); + xPropSet->setPropertyValue(s_HyperLinkURL, Any(rHRef)); if (xPropSetInfo->hasPropertyByName(s_HyperLinkName)) { - xPropSet->setPropertyValue(s_HyperLinkName, makeAny(rName)); + xPropSet->setPropertyValue(s_HyperLinkName, Any(rName)); } if (xPropSetInfo->hasPropertyByName(s_HyperLinkTarget)) { xPropSet->setPropertyValue(s_HyperLinkTarget, - makeAny(rTargetFrameName)); + Any(rTargetFrameName)); } if ( (pEvents != nullptr) && @@ -1663,7 +1663,7 @@ void XMLTextImportHelper::SetHyperlink( pEvents->SetEvents(xReplace); // put events - xPropSet->setPropertyValue(s_HyperLinkEvents, makeAny(xReplace)); + xPropSet->setPropertyValue(s_HyperLinkEvents, Any(xReplace)); } } @@ -1678,7 +1678,7 @@ void XMLTextImportHelper::SetHyperlink( m_xImpl->m_xTextStyles->hasByName(sDisplayName)) { xPropSet->setPropertyValue(s_UnvisitedCharStyleName, - makeAny(sDisplayName)); + Any(sDisplayName)); } sDisplayName = @@ -1689,7 +1689,7 @@ void XMLTextImportHelper::SetHyperlink( m_xImpl->m_xTextStyles->hasByName(sDisplayName)) { xPropSet->setPropertyValue(s_VisitedCharStyleName, - makeAny(sDisplayName)); + Any(sDisplayName)); } } @@ -1710,7 +1710,7 @@ void XMLTextImportHelper::SetRuby( return; // the ruby text - xPropSet->setPropertyValue(sRubyText, makeAny(rText)); + xPropSet->setPropertyValue(sRubyText, Any(rText)); // the ruby style (ruby-adjust) if (!rStyleName.isEmpty() && m_xImpl->m_xAutoStyles.is()) @@ -1733,7 +1733,7 @@ void XMLTextImportHelper::SetRuby( if( (!sDisplayName.isEmpty()) && m_xImpl->m_xTextStyles->hasByName( sDisplayName )) { - xPropSet->setPropertyValue("RubyCharStyleName", makeAny(sDisplayName)); + xPropSet->setPropertyValue("RubyCharStyleName", Any(sDisplayName)); } } } @@ -2179,7 +2179,7 @@ void XMLTextImportHelper::ConnectFrameChains( && m_xImpl->m_xTextFrames->hasByName(sNextFrmName)) { rFrmPropSet->setPropertyValue("ChainNextName", - makeAny(sNextFrmName)); + Any(sNextFrmName)); } else { @@ -2201,7 +2201,7 @@ void XMLTextImportHelper::ConnectFrameChains( { // The previous frame must exist, because it existing than // inserting the entry - rFrmPropSet->setPropertyValue("ChainPrevName", makeAny(*i)); + rFrmPropSet->setPropertyValue("ChainPrevName", Any(*i)); i = m_xImpl->m_xPrevFrmNames->erase(i); j = m_xImpl->m_xNextFrmNames->erase(j); @@ -2424,7 +2424,7 @@ void XMLTextImportHelper::MapCrossRefHeadingFieldsHorribly() { continue; } - xField->setPropertyValue("SourceName", uno::makeAny(iter->second)); + xField->setPropertyValue("SourceName", uno::Any(iter->second)); } } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 9b82dad50ee9..e1d98201834a 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1280,7 +1280,7 @@ XMLTextParagraphExport::XMLTextParagraphExport( sal_Int32 nIndex = xTextPropMapper->getPropertySetMapper()->FindEntryIndex( "", XML_NAMESPACE_STYLE, GetXMLToken(XML_TEXT_COMBINE)); - pFieldExport.reset( new XMLTextFieldExport( rExp, std::make_unique<XMLPropertyState>( nIndex, uno::makeAny(true) ) ) ); + pFieldExport.reset( new XMLTextFieldExport( rExp, std::make_unique<XMLPropertyState>( nIndex, uno::Any(true) ) ) ); PushNewTextListsHelper(); } @@ -2595,7 +2595,7 @@ XMLShapeExportFlags XMLTextParagraphExport::addTextFrameAttributes( { XMLAnchorTypePropHdl aAnchorTypeHdl; OUString sTmp; - aAnchorTypeHdl.exportXML( sTmp, uno::makeAny(eAnchor), + aAnchorTypeHdl.exportXML( sTmp, uno::Any(eAnchor), GetExport().GetMM100UnitConverter() ); GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, sTmp ); } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 4c2ff08703c7..3641d7e1af20 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -1028,7 +1028,7 @@ void XMLIndexMarkImportContext_Impl::ProcessAttribute( case XML_ELEMENT(TEXT, XML_ALPHABETICAL_INDEX_MARK): if ( aIter.getToken() == XML_ELEMENT(TEXT, XML_STRING_VALUE) ) { - rPropSet->setPropertyValue("AlternativeText", uno::makeAny(aIter.toString())); + rPropSet->setPropertyValue("AlternativeText", uno::Any(aIter.toString())); } // else: ignore! break; @@ -1154,7 +1154,7 @@ void XMLTOCMarkImportContext_Impl::ProcessAttribute( && nTmp < GetImport().GetTextImport()-> GetChapterNumbering()->getCount() ) { - rPropSet->setPropertyValue("Level", uno::makeAny(static_cast<sal_Int16>(nTmp - 1))); + rPropSet->setPropertyValue("Level", uno::Any(static_cast<sal_Int16>(nTmp - 1))); } // else: value out of range -> ignore break; @@ -1200,7 +1200,7 @@ void XMLUserIndexMarkImportContext_Impl::ProcessAttribute( switch (aIter.getToken()) { case XML_ELEMENT(TEXT, XML_INDEX_NAME): - rPropSet->setPropertyValue("UserIndexName", uno::makeAny(aIter.toString())); + rPropSet->setPropertyValue("UserIndexName", uno::Any(aIter.toString())); break; case XML_ELEMENT(TEXT, XML_OUTLINE_LEVEL): { @@ -1210,7 +1210,7 @@ void XMLUserIndexMarkImportContext_Impl::ProcessAttribute( nTmp, aIter.toView(), 0, GetImport().GetTextImport()->GetChapterNumbering()->getCount())) { - rPropSet->setPropertyValue("Level", uno::makeAny(static_cast<sal_Int16>(nTmp - 1))); + rPropSet->setPropertyValue("Level", uno::Any(static_cast<sal_Int16>(nTmp - 1))); } // else: value out of range -> ignore break; @@ -1256,19 +1256,19 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute( switch (aIter.getToken()) { case XML_ELEMENT(TEXT, XML_KEY1): - rPropSet->setPropertyValue("PrimaryKey", uno::makeAny(aIter.toString())); + rPropSet->setPropertyValue("PrimaryKey", uno::Any(aIter.toString())); break; case XML_ELEMENT(TEXT, XML_KEY2): - rPropSet->setPropertyValue("SecondaryKey", uno::makeAny(aIter.toString())); + rPropSet->setPropertyValue("SecondaryKey", uno::Any(aIter.toString())); break; case XML_ELEMENT(TEXT, XML_KEY1_PHONETIC): - rPropSet->setPropertyValue("PrimaryKeyReading", uno::makeAny(aIter.toString())); + rPropSet->setPropertyValue("PrimaryKeyReading", uno::Any(aIter.toString())); break; case XML_ELEMENT(TEXT, XML_KEY2_PHONETIC): - rPropSet->setPropertyValue("SecondaryKeyReading", uno::makeAny(aIter.toString())); + rPropSet->setPropertyValue("SecondaryKeyReading", uno::Any(aIter.toString())); break; case XML_ELEMENT(TEXT, XML_STRING_VALUE_PHONETIC): - rPropSet->setPropertyValue("TextReading", uno::makeAny(aIter.toString())); + rPropSet->setPropertyValue("TextReading", uno::Any(aIter.toString())); break; case XML_ELEMENT(TEXT, XML_MAIN_ENTRY): { @@ -1278,7 +1278,7 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute( if (::sax::Converter::convertBool(bTmp, aIter.toView())) bMainEntry = bTmp; - rPropSet->setPropertyValue("IsMainEntry", uno::makeAny(bMainEntry)); + rPropSet->setPropertyValue("IsMainEntry", uno::Any(bMainEntry)); break; } default: @@ -1791,7 +1791,7 @@ void XMLParaContext::endFastElement(sal_Int32 ) hasPropertyByName(sNumberingIsNumber)) { xPropSet->setPropertyValue - (sNumberingIsNumber, makeAny( false ) ); + (sNumberingIsNumber, Any( false ) ); } } if (bIsRestart) @@ -1804,14 +1804,14 @@ void XMLParaContext::endFastElement(sal_Int32 ) hasPropertyByName(sParaIsNumberingRestart)) { xPropSet->setPropertyValue - (sParaIsNumberingRestart, makeAny(true)); + (sParaIsNumberingRestart, Any(true)); } if (xPropSet->getPropertySetInfo()-> hasPropertyByName(sNumberingStartValue)) { xPropSet->setPropertyValue - (sNumberingStartValue, makeAny(nStartValue)); + (sNumberingStartValue, Any(nStartValue)); } } diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 85db00df1901..f64199e05227 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -447,7 +447,7 @@ void XMLTextStyleContext::FillPropertySet( if ( xInfo->hasPropertyByName( sAutoProp ) ) { - rPropSet->setPropertyValue( sAutoProp, makeAny(GetAutoName()) ); + rPropSet->setPropertyValue( sAutoProp, Any(GetAutoName()) ); } else { @@ -493,7 +493,7 @@ void XMLTextStyleContext::FillPropertySet( SAL_WARN_IF( !rPropSet->getPropertySetInfo()->hasPropertyByName( sIsSplitAllowed ), "xmloff", "property missing?" ); rPropSet->setPropertyValue( sIsSplitAllowed, - (aContextIDs[1].nIndex == -1) ? makeAny( false ) : GetProperties()[aContextIDs[1].nIndex].maValue ); + (aContextIDs[1].nIndex == -1) ? Any( false ) : GetProperties()[aContextIDs[1].nIndex].maValue ); } if(IsDefaultStyle() && XmlStyleFamily::TABLE_TABLE == GetFamily()) @@ -503,7 +503,7 @@ void XMLTextStyleContext::FillPropertySet( rPropSet->setPropertyValue( sCollapsingBorders, (aContextIDs[2].nIndex == -1) - ? makeAny( false ) + ? Any( false ) : GetProperties()[aContextIDs[2].nIndex].maValue ); } diff --git a/xmloff/source/text/xmlcontentcontrolcontext.cxx b/xmloff/source/text/xmlcontentcontrolcontext.cxx index 61fa609e0185..885090da5330 100644 --- a/xmloff/source/text/xmlcontentcontrolcontext.cxx +++ b/xmloff/source/text/xmlcontentcontrolcontext.cxx @@ -123,24 +123,24 @@ void XMLContentControlContext::endFastElement(sal_Int32) if (m_bShowingPlaceHolder) { - xPropertySet->setPropertyValue("ShowingPlaceHolder", uno::makeAny(m_bShowingPlaceHolder)); + xPropertySet->setPropertyValue("ShowingPlaceHolder", uno::Any(m_bShowingPlaceHolder)); } if (m_bCheckbox) { - xPropertySet->setPropertyValue("Checkbox", uno::makeAny(m_bCheckbox)); + xPropertySet->setPropertyValue("Checkbox", uno::Any(m_bCheckbox)); } if (m_bChecked) { - xPropertySet->setPropertyValue("Checked", uno::makeAny(m_bChecked)); + xPropertySet->setPropertyValue("Checked", uno::Any(m_bChecked)); } if (!m_aCheckedState.isEmpty()) { - xPropertySet->setPropertyValue("CheckedState", uno::makeAny(m_aCheckedState)); + xPropertySet->setPropertyValue("CheckedState", uno::Any(m_aCheckedState)); } if (!m_aUncheckedState.isEmpty()) { - xPropertySet->setPropertyValue("UncheckedState", uno::makeAny(m_aUncheckedState)); + xPropertySet->setPropertyValue("UncheckedState", uno::Any(m_aUncheckedState)); } } diff --git a/xmloff/source/text/xmllinebreakcontext.cxx b/xmloff/source/text/xmllinebreakcontext.cxx index 97d8c918b356..52bf7920e4b9 100644 --- a/xmloff/source/text/xmllinebreakcontext.cxx +++ b/xmloff/source/text/xmllinebreakcontext.cxx @@ -50,7 +50,7 @@ void SvXMLLineBreakContext::startFastElement( if (SvXMLUnitConverter::convertEnum(eClear, aClear, pXML_LineBreakClear_Enum)) { uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak, uno::UNO_QUERY); - xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear)); + xLineBreakProps->setPropertyValue("Clear", uno::Any(eClear)); } m_rHelper.InsertTextContent(xLineBreak); diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index e6b5cff99c0b..12fe384a579e 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1440,7 +1440,7 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( Sequence < sal_Int8 > aKey; ::comphelper::Base64::decode( aKey, rAttrList->getValueByIndex( i ) ); - rPropSet->setPropertyValue( aPropName, makeAny( aKey ) ); + rPropSet->setPropertyValue( aPropName, Any( aKey ) ); } else { diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 3a4516dd621a..7a74d2ab4f61 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1521,7 +1521,7 @@ void XMLConfigItemTContext_Impl::EndElement() { Sequence < sal_Int8 > aKey; ::comphelper::Base64::decode( aKey, m_aContent ); - rPropSet->setPropertyValue( aPropName, makeAny( aKey ) ); + rPropSet->setPropertyValue( aPropName, Any( aKey ) ); } } } diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index 2f44f1cd1f6e..2785ad9e9aaf 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -46,7 +46,6 @@ using com::sun::star::uno::Reference; using com::sun::star::uno::Exception; using com::sun::star::uno::Any; -using com::sun::star::uno::makeAny; using namespace com::sun::star; using com::sun::star::util::Duration; using com::sun::star::xml::sax::XFastAttributeList; @@ -104,21 +103,21 @@ typedef Any (*convert_t)( const OUString& ); static Any xforms_string( const OUString& rValue ) { - return makeAny( rValue ); + return Any( rValue ); } static Any xforms_int32( const OUString& rValue ) { sal_Int32 nValue; bool bSuccess = ::sax::Converter::convertNumber( nValue, rValue ); - return bSuccess ? makeAny( nValue ) : Any(); + return bSuccess ? Any( nValue ) : Any(); } static Any xforms_int16( const OUString& rValue ) { sal_Int32 nValue; bool bSuccess = ::sax::Converter::convertNumber( nValue, rValue ); - return bSuccess ? makeAny( static_cast<sal_Int16>( nValue ) ) : Any(); + return bSuccess ? Any( static_cast<sal_Int16>( nValue ) ) : Any(); } static Any xforms_whitespace( const OUString& rValue ) @@ -137,7 +136,7 @@ static Any xforms_double( const OUString& rValue ) { double fValue; bool bSuccess = ::sax::Converter::convertDouble( fValue, rValue ); - return bSuccess ? makeAny( fValue ) : Any(); + return bSuccess ? Any( fValue ) : Any(); } static Any xforms_date( const OUString& rValue ) @@ -165,7 +164,7 @@ static Any xforms_dateTime( const OUString& rValue ) { util::DateTime aDateTime; bool const bSuccess = ::sax::Converter::parseDateTime(aDateTime, rValue); - return bSuccess ? makeAny( aDateTime ) : Any(); + return bSuccess ? Any( aDateTime ) : Any(); } static Any xforms_time( const OUString& rValue ) diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index 45a03d4fb455..9c799d53f322 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -36,7 +36,7 @@ #include <sal/log.hxx> using com::sun::star::uno::Reference; -using com::sun::star::uno::makeAny; +using com::sun::star::uno::Any; using com::sun::star::uno::UNO_QUERY; using com::sun::star::container::XNameContainer; using com::sun::star::xml::sax::XFastAttributeList; @@ -56,7 +56,7 @@ XFormsBindContext::XFormsBindContext( // attach binding to model mxBinding = mxModel->createBinding(); SAL_WARN_IF( !mxBinding.is(), "xmloff", "can't create binding" ); - mxModel->getBindings()->insert( makeAny( mxBinding ) ); + mxModel->getBindings()->insert( Any( mxBinding ) ); } void XFormsBindContext::HandleAttribute( const sax_fastparser::FastAttributeList::FastAttributeIter & aIter ) @@ -141,9 +141,9 @@ static void lcl_fillNamespaceContainer( { // insert prefix (use replace if already known) if( xContainer->hasByName( sPrefix ) ) - xContainer->replaceByName( sPrefix, makeAny( sNamespace ) ); + xContainer->replaceByName( sPrefix, Any( sNamespace ) ); else - xContainer->insertByName( sPrefix, makeAny( sNamespace ) ); + xContainer->insertByName( sPrefix, Any( sNamespace ) ); } // proceed to next diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index 66a5f1b149ba..37d56a94ab75 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -37,7 +37,7 @@ using com::sun::star::uno::Reference; -using com::sun::star::uno::makeAny; +using com::sun::star::uno::Any; using com::sun::star::uno::Sequence; using com::sun::star::xforms::XModel2; using com::sun::star::beans::PropertyValue; @@ -117,7 +117,7 @@ void XFormsInstanceContext::endFastElement(sal_Int32 ) pSequence[2].Name = "URL"; pSequence[2].Value <<= msURL; - mxModel->getInstances()->insert( makeAny( aSequence ) ); + mxModel->getInstances()->insert( Any( aSequence ) ); } void XFormsInstanceContext::endUnknownElement(const OUString & /*Namespace*/, const OUString & /*Name*/) @@ -131,7 +131,7 @@ void XFormsInstanceContext::endUnknownElement(const OUString & /*Namespace*/, co pSequence[2].Name = "URL"; pSequence[2].Value <<= msURL; - mxModel->getInstances()->insert( makeAny( aSequence ) ); + mxModel->getInstances()->insert( Any( aSequence ) ); } void XFormsInstanceContext::HandleAttribute(const sax_fastparser::FastAttributeList::FastAttributeIter & aIter ) diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index e5720d459d85..479909fb5496 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -55,7 +55,7 @@ void XFormsModelContext::HandleAttribute(const sax_fastparser::FastAttributeList switch( aIter.getToken() & TOKEN_MASK) { case XML_ID: - mxModel->setPropertyValue( "ID", makeAny( aIter.toString() ) ); + mxModel->setPropertyValue( "ID", Any( aIter.toString() ) ); break; case XML_SCHEMA: GetImport().SetError( XMLERROR_XFORMS_NO_SCHEMA_SUPPORT ); diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index 83eb8cb3699d..2e57d5f43feb 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -50,7 +50,7 @@ XFormsSubmissionContext::XFormsSubmissionContext( SAL_WARN_IF( !xModel.is(), "xmloff", "need model" ); mxSubmission = xModel->createSubmission().get(); SAL_WARN_IF( !mxSubmission.is(), "xmloff", "can't create submission" ); - xModel->getSubmissions()->insert( makeAny( mxSubmission ) ); + xModel->getSubmissions()->insert( Any( mxSubmission ) ); } namespace { diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 556ade35edef..d8345275cf7a 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -51,7 +51,6 @@ using com::sun::star::xforms::XDataTypeRepository; using com::sun::star::xforms::Model; using com::sun::star::xforms::XModel2; using com::sun::star::container::XNameContainer; -using com::sun::star::uno::makeAny; using com::sun::star::uno::Any; using com::sun::star::uno::Exception; @@ -80,7 +79,7 @@ void xforms_addXFormsModel( { OUString sName; xModel->getPropertyValue("ID") >>= sName; - xForms->insertByName( sName, makeAny( xModel ) ); + xForms->insertByName( sName, Any( xModel ) ); bSuccess = true; } } diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx index 7b65079c2520..ba66e985b50a 100644 --- a/xmloff/source/xforms/xformsapi.hxx +++ b/xmloff/source/xforms/xformsapi.hxx @@ -54,7 +54,7 @@ inline void xforms_setValue( const OUString& rName, const T& aValue ) { - xforms_setValueAny( xPropSet, rName, css::uno::makeAny( aValue ) ); + xforms_setValueAny( xPropSet, rName, css::uno::Any( aValue ) ); } template<> inline void xforms_setValue( diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index b8708429d9a2..363a8f6741d5 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -279,7 +279,7 @@ void exportXFormsBinding( SvXMLExport& rExport, // if we don't have a name yet, generate one on the fly sal_Int64 nId = reinterpret_cast<sal_uInt64>( xBinding.get() ); sName = "bind_" + OUString::number( nId , 16 ); - xBinding->setPropertyValue( "BindingID", makeAny(sName)); + xBinding->setPropertyValue( "BindingID", Any(sName)); } } @@ -785,7 +785,7 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop Sequence<PropertyValue> aModelSettings{ comphelper::makePropertyValue( sExternalData, xModelProps->getPropertyValue(sExternalData)) }; - xModelSettings->insertByName( modelName, makeAny( aModelSettings ) ); + xModelSettings->insertByName( modelName, Any( aModelSettings ) ); } if ( xModelSettings->hasElements() ) |