diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-03 08:54:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-03 08:50:50 +0000 |
| commit | 83721f4365d234b62f9e3517345c8d3fda19f2c6 (patch) | |
| tree | af77c202dbdf0b969559441c724020e5d7a9da92 /basctl/source/dlged | |
| parent | 9007cc7bcaa8bc1b38c54f167349f71373f02dec (diff) | |
makeAny->Any in basctl..chart2
Change-Id: Ief1cdffbfc59ab4e35ac945d020772ff84c50d61
Reviewed-on: https://gerrit.libreoffice.org/33867
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basctl/source/dlged')
| -rw-r--r-- | basctl/source/dlged/dlged.cxx | 6 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/propbrw.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 052506d61ef4..ecdbdf540ad1 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -122,8 +122,8 @@ void DlgEditor::ShowDialog() aDecorationAny >>= bDecoration; if( !bDecoration ) { - xNewDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) ); - xNewDlgModPropSet->setPropertyValue( "Title", makeAny( OUString() ) ); + xNewDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) ); + xNewDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) ); } } catch(const UnknownPropertyException& ) @@ -792,7 +792,7 @@ void DlgEditor::Copy() memcpy( pCombinedData + 4, DialogModelBytes.getConstArray(), nDialogDataLen ); memcpy( pCombinedData + nResOffset, aResData.getConstArray(), nResDataLen ); - aSeqData[1] = Any(aCombinedData); + aSeqData[1] <<= aCombinedData; pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavorsResource, aSeqData ); } diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 7b839c3fcb34..a2ac76553099 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -1133,7 +1133,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& catch (container::NoSuchElementException const& e) { throw lang::WrappedTargetRuntimeException("", nullptr, - uno::makeAny(e)); + uno::Any(e)); } } } diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index fea4b0591b1d..c4b5d3d34756 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -122,8 +122,8 @@ void PropBrw::ImplReCreateController() // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( "DialogParentWindow", makeAny( VCLUnoHelper::GetInterface ( this ) ) ), - ::cppu::ContextEntry_Init( "ContextDocument", makeAny( m_xContextDocument ) ) + ::cppu::ContextEntry_Init( "DialogParentWindow", Any( VCLUnoHelper::GetInterface ( this ) ) ), + ::cppu::ContextEntry_Init( "ContextDocument", Any( m_xContextDocument ) ) }; Reference< XComponentContext > xInspectorContext( ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) ); @@ -296,7 +296,7 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject ) if ( m_xBrowserController.is() ) { m_xBrowserController->setPropertyValue( "IntrospectedObject", - makeAny( _rxObject ) + Any( _rxObject ) ); // set the new title according to the selected object |