From 48e83f7be240cd0af5b9f1ee5b87c4d9376c102e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 24 Feb 2017 10:24:14 +0200 Subject: makeAny->Any in cppuhelper..cui Change-Id: Ia54e6e9b71df68bd04c304a0bb02da8ebac74420 Reviewed-on: https://gerrit.libreoffice.org/34603 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cui/source/customize/acccfg.cxx | 2 +- cui/source/customize/cfg.cxx | 22 +++++++++++----------- cui/source/dialogs/hlmarkwn.cxx | 4 ++-- cui/source/dialogs/insdlg.cxx | 14 +++++++------- cui/source/dialogs/scriptdlg.cxx | 12 ++++-------- cui/source/options/connpoolconfig.cxx | 4 ++-- cui/source/options/optaboutconfig.cxx | 32 ++++++++++++++++---------------- cui/source/options/optgdlg.cxx | 18 +++++++++--------- cui/source/options/optinet2.cxx | 20 ++++++++++---------- cui/source/options/optlingu.cxx | 2 +- cui/source/options/optpath.cxx | 4 ++-- cui/source/options/optupdt.cxx | 14 +++++++------- cui/source/options/treeopt.cxx | 4 ++-- 13 files changed, 74 insertions(+), 78 deletions(-) (limited to 'cui') diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index e7578c997dcd..39172a819517 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1346,7 +1346,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void OUString sMediaType; xUIConfigProps->getPropertyValue(MEDIATYPE_PROPNAME) >>= sMediaType; if (sMediaType.isEmpty()) - xUIConfigProps->setPropertyValue(MEDIATYPE_PROPNAME, uno::makeAny(OUString("application/vnd.sun.xml.ui.configuration"))); + xUIConfigProps->setPropertyValue(MEDIATYPE_PROPNAME, uno::Any(OUString("application/vnd.sun.xml.ui.configuration"))); uno::Reference xCfgMgr2 = ui::UIConfigurationManager::create(m_xContext); xCfgMgr2->setStorage(xUIConfig); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index fa4533f20098..561ba07c7e5a 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1233,7 +1233,7 @@ void MenuSaveInData::Apply( aPropValueSeq[nIndex].Name = m_aDescriptorContainer; aPropValueSeq[nIndex].Value <<= xSubMenuBar; rMenuBar->insertByIndex( - rMenuBar->getCount(), uno::makeAny( aPropValueSeq )); + rMenuBar->getCount(), uno::Any( aPropValueSeq )); ApplyMenu( xSubMenuBar, rFactory, pEntryData ); } } @@ -1267,7 +1267,7 @@ void SaveInData::ApplyMenu( aPropValueSeq[nIndex].Value <<= xSubMenuBar; rMenuBar->insertByIndex( - rMenuBar->getCount(), uno::makeAny( aPropValueSeq )); + rMenuBar->getCount(), uno::Any( aPropValueSeq )); ApplyMenu( xSubMenuBar, rFactory, pEntry ); pEntry->SetModified( false ); @@ -1275,14 +1275,14 @@ void SaveInData::ApplyMenu( else if ( pEntry->IsSeparator() ) { rMenuBar->insertByIndex( - rMenuBar->getCount(), uno::makeAny( m_aSeparatorSeq )); + rMenuBar->getCount(), uno::Any( m_aSeparatorSeq )); } else { uno::Sequence< beans::PropertyValue > aPropValueSeq = ConvertSvxConfigEntry( m_xCommandToLabelMap, pEntry ); rMenuBar->insertByIndex( - rMenuBar->getCount(), uno::makeAny( aPropValueSeq )); + rMenuBar->getCount(), uno::Any( aPropValueSeq )); } } pMenuData->SetModified( false ); @@ -3758,7 +3758,7 @@ void ToolbarSaveInData::SetSystemStyle( { if ( aProps[ i ].Name == ITEM_DESCRIPTOR_STYLE ) { - aProps[ i ].Value = uno::makeAny( nStyle ); + aProps[ i ].Value = uno::Any( nStyle ); break; } } @@ -3767,7 +3767,7 @@ void ToolbarSaveInData::SetSystemStyle( uno::Reference< container::XNameReplace > xNameReplace( m_xPersistentWindowState, uno::UNO_QUERY ); - xNameReplace->replaceByName( rResourceURL, uno::makeAny( aProps ) ); + xNameReplace->replaceByName( rResourceURL, uno::Any( aProps ) ); } catch ( uno::Exception& ) { @@ -4163,14 +4163,14 @@ void ToolbarSaveInData::ApplyToolbar( aPropValueSeq[nIndex].Name = m_aDescriptorContainer; aPropValueSeq[nIndex].Value <<= xSubMenuBar; rToolbarBar->insertByIndex( - rToolbarBar->getCount(), uno::makeAny( aPropValueSeq )); + rToolbarBar->getCount(), uno::Any( aPropValueSeq )); ApplyToolbar( xSubMenuBar, rFactory, pEntry ); } else if ( pEntry->IsSeparator() ) { rToolbarBar->insertByIndex( - rToolbarBar->getCount(), uno::makeAny( m_aSeparatorSeq )); + rToolbarBar->getCount(), uno::Any( m_aSeparatorSeq )); } else { @@ -4178,7 +4178,7 @@ void ToolbarSaveInData::ApplyToolbar( ConvertToolbarEntry( m_xCommandToLabelMap, pEntry ); rToolbarBar->insertByIndex( - rToolbarBar->getCount(), uno::makeAny( aPropValueSeq )); + rToolbarBar->getCount(), uno::Any( aPropValueSeq )); } } } @@ -4204,7 +4204,7 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar ) { xProps->setPropertyValue( ITEM_DESCRIPTOR_UINAME, - uno::makeAny( OUString( pToolbar->GetName() ) ) ); + uno::Any( pToolbar->GetName() ) ); } try @@ -4252,7 +4252,7 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry* pToolbar ) xPropertySet->setPropertyValue( ITEM_DESCRIPTOR_UINAME, - uno::makeAny( pToolbar->GetName() ) ); + uno::Any( pToolbar->GetName() ) ); try { diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index f682c471f9fb..ce43046d61e9 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -606,8 +606,8 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void) uno::Sequence< beans::NamedValue > aSettings { - { TG_SETTING_LASTMARK, css::uno::makeAny(sLastSelectedMark) }, - { TG_SETTING_LASTPATH, css::uno::makeAny(comphelper::containerToSequence(aLastSelectedPath)) } + { TG_SETTING_LASTMARK, css::uno::Any(sLastSelectedMark) }, + { TG_SETTING_LASTPATH, css::uno::Any(comphelper::containerToSequence(aLastSelectedPath)) } }; // write diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 189193706409..d7e06887003a 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -567,17 +567,17 @@ short SfxInsertFloatingFrameDialog::Execute() else lMarginHeight = SIZE_NOT_SET; - xSet->setPropertyValue( "FrameURL", makeAny( aURL ) ); - xSet->setPropertyValue( "FrameName", makeAny( aName ) ); + xSet->setPropertyValue( "FrameURL", Any( aURL ) ); + xSet->setPropertyValue( "FrameName", Any( aName ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( "FrameIsAutoScroll", makeAny( true ) ); + xSet->setPropertyValue( "FrameIsAutoScroll", Any( true ) ); else - xSet->setPropertyValue( "FrameIsScrollingMode", makeAny( eScroll == ScrollingYes ) ); + xSet->setPropertyValue( "FrameIsScrollingMode", Any( eScroll == ScrollingYes ) ); - xSet->setPropertyValue( "FrameIsBorder", makeAny( bHasBorder ) ); - xSet->setPropertyValue( "FrameMarginWidth", makeAny( sal_Int32( lMarginWidth ) ) ); - xSet->setPropertyValue( "FrameMarginHeight", makeAny( sal_Int32( lMarginHeight ) ) ); + xSet->setPropertyValue( "FrameIsBorder", Any( bHasBorder ) ); + xSet->setPropertyValue( "FrameMarginWidth", Any( sal_Int32( lMarginWidth ) ) ); + xSet->setPropertyValue( "FrameMarginHeight", Any( sal_Int32( lMarginHeight ) ) ); if ( bIPActive ) m_xObj->changeState( embed::EmbedStates::INPLACE_ACTIVE ); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 73cc9bc312c2..ffe0f300e6ab 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -722,23 +722,19 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void ) } catch ( reflection::InvocationTargetException& ite ) { - css::uno::Any a = makeAny(ite); - ShowErrorDialog(a); + ShowErrorDialog(css::uno::Any(ite)); } catch ( provider::ScriptFrameworkErrorException& ite ) { - css::uno::Any a = makeAny(ite); - ShowErrorDialog(a); + ShowErrorDialog(css::uno::Any(ite)); } catch ( RuntimeException& re ) { - css::uno::Any a = makeAny(re); - ShowErrorDialog(a); + ShowErrorDialog(css::uno::Any(re)); } catch ( Exception& e ) { - css::uno::Any a = makeAny(e); - ShowErrorDialog(a); + ShowErrorDialog(css::uno::Any(e)); } } StoreCurrentSelection(); diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 1cbc2ca6a522..925c8468c325 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -185,9 +185,9 @@ namespace offapp aThisDriverSettings = aDriverSettings.createNode(aLoop->sName); // set the values - aThisDriverSettings.setNodeValue(getDriverNameNodeName(), makeAny(sThisDriverName)); + aThisDriverSettings.setNodeValue(getDriverNameNodeName(), Any(sThisDriverName)); aThisDriverSettings.setNodeValue(getEnableNodeName(), Any(aLoop->bEnabled)); - aThisDriverSettings.setNodeValue(getTimeoutNodeName(), makeAny(aLoop->nTimeoutSeconds)); + aThisDriverSettings.setNodeValue(getTimeoutNodeName(), Any(aLoop->nTimeoutSeconds)); } bNeedCommit = true; } diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index bacba9e98b78..99fcc3fd9393 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -483,10 +483,10 @@ Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString& beans::NamedValue aProperty; aProperty.Name = "nodepath"; - aProperty.Value = uno::makeAny( sNodePath ); + aProperty.Value <<= sNodePath; uno::Sequence< uno::Any > aArgumentList( 1 ); - aArgumentList[0] = uno::makeAny( aProperty ); + aArgumentList[0] <<= aProperty; OUString sAccessString; @@ -587,7 +587,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) OUString sPropertyType = SvTabListBox::GetEntryText( pEntry, 2 ); OUString sPropertyValue = SvTabListBox::GetEntryText( pEntry, 3 ); - std::shared_ptr< Prop_Impl > pProperty (new Prop_Impl( pUserData->sPropertyPath, sPropertyName, makeAny( sPropertyValue ) ) ); + std::shared_ptr< Prop_Impl > pProperty (new Prop_Impl( pUserData->sPropertyPath, sPropertyName, Any( sPropertyValue ) ) ); bool bSaveChanges = false; bool bOpenDialog = true; @@ -608,7 +608,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) bValue = true; } - pProperty->Value = uno::makeAny( bValue ); + pProperty->Value <<= bValue; bOpenDialog = false; bSaveChanges = true; } @@ -651,13 +651,13 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) nShort = (sal_Int16) nNumb; else throw uno::Exception(); - pProperty->Value = uno::makeAny( nShort ); + pProperty->Value <<= nShort; } else if( sPropertyType == "long" ) { sal_Int32 nLong = sNewValue.toInt32(); if( !( nLong==0 && sNewValue.getLength()!=1 ) && nLong < SAL_MAX_INT32 && nLong > SAL_MIN_INT32) - pProperty->Value = uno::makeAny( nLong ); + pProperty->Value <<= nLong; else throw uno::Exception(); } @@ -665,7 +665,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { sal_Int64 nHyper = sNewValue.toInt64(); if( !( nHyper==0 && sNewValue.getLength()!=1 ) && nHyper < SAL_MAX_INT32 && nHyper > SAL_MIN_INT32) - pProperty->Value = uno::makeAny( nHyper ); + pProperty->Value <<= nHyper; else throw uno::Exception(); } @@ -673,7 +673,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { double nDoub = sNewValue.toDouble(); if( !( nDoub ==0 && sNewValue.getLength()!=1 ) && nDoub < SAL_MAX_INT32 && nDoub > SAL_MIN_INT32) - pProperty->Value = uno::makeAny( nDoub ); + pProperty->Value <<= nDoub; else throw uno::Exception(); } @@ -681,13 +681,13 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { float nFloat = sNewValue.toFloat(); if( !( nFloat ==0 && sNewValue.getLength()!=1 ) && nFloat < SAL_MAX_INT32 && nFloat > SAL_MIN_INT32) - pProperty->Value = uno::makeAny( nFloat ); + pProperty->Value <<= nFloat; else throw uno::Exception(); } else if( sPropertyType == "string" ) { - pProperty->Value = uno::makeAny( sNewValue ); + pProperty->Value <<= sNewValue; } else if( sPropertyType == "[]short" ) { @@ -703,7 +703,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { seqShort[i] = (sal_Int16) seqStr[i].toInt32(); } - pProperty->Value = uno::makeAny( seqShort ); + pProperty->Value <<= seqShort; } else if( sPropertyType == "[]long" ) { @@ -715,7 +715,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { seqLong[i] = seqStrLong[i].toInt32(); } - pProperty->Value = uno::makeAny( seqLong ); + pProperty->Value <<= seqLong; } else if( sPropertyType == "[]hyper" ) { @@ -726,7 +726,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { seqHyper[i] = seqStrHyper[i].toInt64(); } - pProperty->Value = uno::makeAny( seqHyper ); + pProperty->Value <<= seqHyper; } else if( sPropertyType == "[]double" ) { @@ -737,7 +737,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { seqDoub[i] = seqStrDoub[i].toDouble(); } - pProperty->Value = uno::makeAny( seqDoub ); + pProperty->Value <<= seqDoub; } else if( sPropertyType == "[]float" ) { @@ -748,11 +748,11 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { seqFloat[i] = seqStrFloat[i].toFloat(); } - pProperty->Value = uno::makeAny( seqFloat ); + pProperty->Value <<= seqFloat; } else if( sPropertyType == "[]string" ) { - pProperty->Value = uno::makeAny( comphelper::containerToSequence( commaStringToSequence( sNewValue ))); + pProperty->Value <<= comphelper::containerToSequence( commaStringToSequence( sNewValue )); } else //unknown throw uno::Exception(); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 607b14072e49..1d68fa9c39c9 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -468,9 +468,9 @@ CanvasSettings::CanvasSettings() : comphelper::getProcessComponentContext())); Any propValue( - makeAny( NamedValue( + Any( NamedValue( "nodepath", - makeAny( OUString("/org.openoffice.Office.Canvas") ) ) ) ); + Any( OUString("/org.openoffice.Office.Canvas") ) ) ) ); mxForceFlagNameAccess.set( xConfigProvider->createInstanceWithArguments( @@ -478,10 +478,10 @@ CanvasSettings::CanvasSettings() : Sequence( &propValue, 1 ) ), UNO_QUERY_THROW ); - propValue = makeAny( + propValue = Any( NamedValue( "nodepath", - makeAny( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ) ) ); + Any( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ) ) ); Reference xNameAccess( xConfigProvider->createInstanceWithArguments( @@ -597,7 +597,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const if( !xNameReplace.is() ) return; - xNameReplace->replaceByName( "ForceSafeServiceImpl", makeAny(!_bEnabled) ); + xNameReplace->replaceByName( "ForceSafeServiceImpl", Any(!_bEnabled) ); Reference< XChangesBatch > xChangesBatch( mxForceFlagNameAccess, UNO_QUERY ); @@ -1170,7 +1170,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& Reference< XNameAccess > theNameAccess; // find out which locales are currently installed and add them to the listbox - theArgs[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sInstalledLocalesPath)))); + theArgs[0] = Any(NamedValue("nodepath", Any(OUString(sInstalledLocalesPath)))); theNameAccess.set( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW ); seqInstalledLanguages = theNameAccess->getElementNames(); @@ -1189,7 +1189,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& // find out whether the user has a specific locale specified Sequence< Any > theArgs2(1); - theArgs2[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sUserLocalePath)))); + theArgs2[0] = Any(NamedValue("nodepath", Any(OUString(sUserLocalePath)))); theNameAccess.set( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW ); if (theNameAccess->hasByName(sUserLocaleKey)) @@ -1370,14 +1370,14 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) css::configuration::theDefaultProvider::get( comphelper::getProcessComponentContext())); Sequence< Any > theArgs(1); - theArgs[0] = makeAny(NamedValue("nodepath", makeAny(OUString(sUserLocalePath)))); + theArgs[0] = Any(NamedValue("nodepath", Any(OUString(sUserLocalePath)))); Reference< XPropertySet >xProp( theConfigProvider->createInstanceWithArguments(sAccessUpdSrvc, theArgs ), UNO_QUERY_THROW ); if ( !m_sUserLocaleValue.equals(aLangString)) { // OSL_FAIL("UserInterface language was changed, restart."); // write new value - xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString)); + xProp->setPropertyValue(sUserLocaleKey, Any(aLangString)); Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges(); // display info SolarMutexGuard aGuard; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 3d45153fd836..9bcf188a448d 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -201,10 +201,10 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet) beans::NamedValue aProperty; aProperty.Name = "nodepath"; - aProperty.Value = makeAny( aConfigRoot ); + aProperty.Value = Any( aConfigRoot ); Sequence< Any > aArgumentList( 1 ); - aArgumentList[0] = makeAny( aProperty ); + aArgumentList[0] = Any( aProperty ); m_xConfigurationUpdateAccess = xConfigurationProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", @@ -422,49 +422,49 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* ) } xPropertySet->setPropertyValue(g_aProxyModePN, - makeAny((sal_Int32) nSelPos)); + Any((sal_Int32) nSelPos)); bModified = true; } if(m_pHttpProxyED->IsValueChangedFromSaved()) { - xPropertySet->setPropertyValue( g_aHttpProxyPN, makeAny(m_pHttpProxyED->GetText())); + xPropertySet->setPropertyValue( g_aHttpProxyPN, Any(m_pHttpProxyED->GetText())); bModified = true; } if ( m_pHttpPortED->IsValueChangedFromSaved()) { - xPropertySet->setPropertyValue( g_aHttpPortPN, makeAny(m_pHttpPortED->GetText().toInt32())); + xPropertySet->setPropertyValue( g_aHttpPortPN, Any(m_pHttpPortED->GetText().toInt32())); bModified = true; } if( m_pHttpsProxyED->IsValueChangedFromSaved() ) { - xPropertySet->setPropertyValue( g_aHttpsProxyPN, makeAny(m_pHttpsProxyED->GetText()) ); + xPropertySet->setPropertyValue( g_aHttpsProxyPN, Any(m_pHttpsProxyED->GetText()) ); bModified = true; } if ( m_pHttpsPortED->IsValueChangedFromSaved() ) { - xPropertySet->setPropertyValue( g_aHttpsPortPN, makeAny(m_pHttpsPortED->GetText().toInt32()) ); + xPropertySet->setPropertyValue( g_aHttpsPortPN, Any(m_pHttpsPortED->GetText().toInt32()) ); bModified = true; } if( m_pFtpProxyED->IsValueChangedFromSaved()) { - xPropertySet->setPropertyValue( g_aFtpProxyPN, makeAny(m_pFtpProxyED->GetText()) ); + xPropertySet->setPropertyValue( g_aFtpProxyPN, Any(m_pFtpProxyED->GetText()) ); bModified = true; } if ( m_pFtpPortED->IsValueChangedFromSaved() ) { - xPropertySet->setPropertyValue( g_aFtpPortPN, makeAny(m_pFtpPortED->GetText().toInt32())); + xPropertySet->setPropertyValue( g_aFtpPortPN, Any(m_pFtpPortED->GetText().toInt32())); bModified = true; } if ( m_pNoProxyForED->IsValueChangedFromSaved() ) { - xPropertySet->setPropertyValue( g_aNoProxyDescPN, makeAny( m_pNoProxyForED->GetText())); + xPropertySet->setPropertyValue( g_aNoProxyDescPN, Any( m_pNoProxyForED->GetText())); bModified = true; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index d1713c0885d5..84fd5090593c 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -132,7 +132,7 @@ bool KillFile_Impl( const OUString& rURL ) try { Content aCnt( rURL, uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( "delete", makeAny( true ) ); + aCnt.executeCommand( "delete", Any( true ) ); } catch( css::ucb::CommandAbortedException& ) { diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index eaf355b97c52..558e760017eb 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -817,12 +817,12 @@ void SvxPathTabPage::SetPathList( sal_Int32 nPos = 0; for ( sal_Int32 i = 0; i < nCount; ++i ) pArray[i] = _rUserPath.getToken( 0, MULTIPATH_DELIMITER, nPos ); - Any aValue = makeAny( aPathSeq ); + Any aValue( aPathSeq ); pImpl->m_xPathSettings->setPropertyValue( sCfgName + POSTFIX_USER, aValue); // then the writable path - aValue = makeAny( _rWritablePath ); + aValue <<= _rWritablePath; pImpl->m_xPathSettings->setPropertyValue( sCfgName + POSTFIX_WRITABLE, aValue); } diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 121eed77e551..d64ca5d5d6bb 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -215,7 +215,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) if( m_pAutoCheckCheckBox->IsValueChangedFromSaved() ) { bValue = m_pAutoCheckCheckBox->IsChecked(); - m_xUpdateAccess->replaceByName( "AutoCheckEnabled", uno::makeAny( bValue ) ); + m_xUpdateAccess->replaceByName( "AutoCheckEnabled", uno::Any( bValue ) ); bModified = true; } @@ -238,14 +238,14 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) if( nValue > 0 ) { - m_xUpdateAccess->replaceByName( "CheckInterval", uno::makeAny( nValue ) ); + m_xUpdateAccess->replaceByName( "CheckInterval", uno::Any( nValue ) ); bModified = true; } if( m_pAutoDownloadCheckBox->IsValueChangedFromSaved() ) { bValue = m_pAutoDownloadCheckBox->IsChecked(); - m_xUpdateAccess->replaceByName( "AutoDownloadEnabled", uno::makeAny( bValue ) ); + m_xUpdateAccess->replaceByName( "AutoDownloadEnabled", uno::Any( bValue ) ); bModified = true; } @@ -255,14 +255,14 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) && ( ! aURL.equals( sValue ) ) ) { - m_xUpdateAccess->replaceByName( "DownloadDestination", uno::makeAny( aURL ) ); + m_xUpdateAccess->replaceByName( "DownloadDestination", uno::Any( aURL ) ); bModified = true; } if( m_pExtrasCheckBox->IsValueChangedFromSaved() ) { bValue = m_pExtrasCheckBox->IsChecked(); - m_xUpdateAccess->replaceByName( "ExtendedUserAgent", uno::makeAny( bValue ) ); + m_xUpdateAccess->replaceByName( "ExtendedUserAgent", uno::Any( bValue ) ); bModified = true; } @@ -381,10 +381,10 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void) beans::NamedValue aProperty; aProperty.Name = "nodepath"; - aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") ); + aProperty.Value <<= OUString("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob"); uno::Sequence< uno::Any > aArgumentList( 1 ); - aArgumentList[0] = uno::makeAny( aProperty ); + aArgumentList[0] <<= aProperty; uno::Reference< container::XNameAccess > xNameAccess( xConfigProvider->createInstanceWithArguments( diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index a5e0dd4aadf9..aa61dea028fa 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -124,7 +124,7 @@ static char const VIEWOPT_DATANAME[] = "page data"; static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData ) { - rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( OUString( rData ) ) ); + rOpt.SetUserItem( VIEWOPT_DATANAME, Any( OUString( rData ) ) ); } static inline OUString GetViewOptUserItem( const SvtViewOptions& rOpt ) @@ -2194,7 +2194,7 @@ bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) { try { - bRet = m_xEventHdl->callHandlerMethod( m_xPage, makeAny( rAction ), "external_event" ); + bRet = m_xEventHdl->callHandlerMethod( m_xPage, Any( rAction ), "external_event" ); } catch ( Exception& ) { -- cgit