diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 10:24:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 09:17:34 +0000 |
| commit | 48e83f7be240cd0af5b9f1ee5b87c4d9376c102e (patch) | |
| tree | 15ccd05d11aca0461309670987ae71316a6232ca /cui/source/dialogs | |
| parent | 3422dfc1b61c15d7d3a6b0e1ee16c50457946cc0 (diff) | |
makeAny->Any in cppuhelper..cui
Change-Id: Ia54e6e9b71df68bd04c304a0bb02da8ebac74420
Reviewed-on: https://gerrit.libreoffice.org/34603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source/dialogs')
| -rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 4 | ||||
| -rw-r--r-- | cui/source/dialogs/insdlg.cxx | 14 | ||||
| -rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 12 |
3 files changed, 13 insertions, 17 deletions
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(); |