diff options
Diffstat (limited to 'forms/source/misc/InterfaceContainer.cxx')
| -rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index ac7049c08d62..2f2a9bf13636 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -916,7 +916,8 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any // approve the new object std::unique_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); - DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!" ); + DBG_ASSERT(aElementMetaData, + "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!"); { Reference< XPropertySet > xElementProps; _rNewElement >>= xElementProps; @@ -956,27 +957,30 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any // examine the new element OUString sName; - DBG_ASSERT( aElementMetaData.get()->xPropertySet.is(), "OInterfaceContainer::implReplaceByIndex: what did approveNewElement do?" ); + DBG_ASSERT(aElementMetaData->xPropertySet.is(), + "OInterfaceContainer::implReplaceByIndex: what did approveNewElement do?"); - aElementMetaData.get()->xPropertySet->getPropertyValue(PROPERTY_NAME) >>= sName; - aElementMetaData.get()->xPropertySet->addPropertyChangeListener(PROPERTY_NAME, this); + aElementMetaData->xPropertySet->getPropertyValue(PROPERTY_NAME) >>= sName; + aElementMetaData->xPropertySet->addPropertyChangeListener(PROPERTY_NAME, this); // insert the new one - m_aMap.insert( ::std::pair<const OUString, css::uno::Reference<css::uno::XInterface> >( sName, aElementMetaData.get()->xInterface ) ); - m_aItems[ _nIndex ] = aElementMetaData.get()->xInterface; + m_aMap.insert(::std::pair<const OUString, css::uno::Reference<css::uno::XInterface>>( + sName, aElementMetaData->xInterface)); + m_aItems[_nIndex] = aElementMetaData->xInterface; - aElementMetaData.get()->xChild->setParent(static_cast<XContainer*>(this)); + aElementMetaData->xChild->setParent(static_cast<XContainer*>(this)); if ( m_xEventAttacher.is() ) { m_xEventAttacher->insertEntry( _nIndex ); - m_xEventAttacher->attach( _nIndex, aElementMetaData.get()->xInterface, makeAny( aElementMetaData.get()->xPropertySet ) ); + m_xEventAttacher->attach(_nIndex, aElementMetaData->xInterface, + makeAny(aElementMetaData->xPropertySet)); } ContainerEvent aReplaceEvent; aReplaceEvent.Source = static_cast< XContainer* >( this ); aReplaceEvent.Accessor <<= _nIndex; - aReplaceEvent.Element = aElementMetaData.get()->xInterface->queryInterface( m_aElementType ); + aReplaceEvent.Element = aElementMetaData->xInterface->queryInterface(m_aElementType); aReplaceEvent.ReplacedElement = xOldElement->queryInterface( m_aElementType ); impl_replacedElement( aReplaceEvent, _rClearBeforeNotify ); @@ -1064,7 +1068,8 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An Reference< XPropertySet > xElementProps; std::unique_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); - DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!" ); + DBG_ASSERT(aElementMetaData, + "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!"); // ensure the correct name of the element try |