diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-09 18:30:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-09 18:30:54 +0100 |
| commit | 5a5dbb31d559fb8d3cf9831863bea1f215a34f3d (patch) | |
| tree | 5cdef958f12c98975501dc81c2da968ee543e183 /svx | |
| parent | 05554bc47840659e1b9826523c100edfbc8a4ecd (diff) | |
Use rtl::Reference<CppType> instead of HardCppRef<UnoType,CppType>
Change-Id: I089b5caca5e05726105f78aeb00db1869d0a17f4
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 7d811b54fe51..cf8e50f5c997 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -848,7 +848,7 @@ namespace accessibility ::accessibility::AccessibleParaManager::WeakChild operator()( const ::accessibility::AccessibleParaManager::WeakChild& rChild ) { // retrieve hard reference from weak one - ::accessibility::AccessibleParaManager::WeakPara::HardRefType aHardRef( rChild.first.get() ); + auto aHardRef( rChild.first.get() ); if( aHardRef.is() ) { @@ -899,10 +899,10 @@ namespace accessibility void operator()( const ::accessibility::AccessibleParaManager::WeakChild& rPara ) { // retrieve hard reference from weak one - ::accessibility::AccessibleParaManager::WeakPara::HardRefType aHardRef( rPara.first.get() ); + auto aHardRef( rPara.first.get() ); if( aHardRef.is() ) - mrImpl.FireEvent(AccessibleEventId::CHILD, uno::Any(), uno::makeAny( aHardRef.getRef() ) ); + mrImpl.FireEvent(AccessibleEventId::CHILD, uno::Any(), uno::makeAny<css::uno::Reference<css::accessibility::XAccessible>>(aHardRef.get()) ); } private: @@ -1126,10 +1126,7 @@ namespace accessibility // #i61812# remember para to be removed for later notification // AFTER the new state is applied (that after the para got removed) - ::uno::Reference< XAccessible > xPara; - ::accessibility::AccessibleParaManager::WeakPara::HardRefType aHardRef( begin->first.get() ); - if( aHardRef.is() ) - xPara.set( aHardRef.getRef(), ::uno::UNO_QUERY ); + ::uno::Reference< XAccessible > xPara(begin->first.get().get()); // release everything from the remove position until the end maParaManager.Release(aFunctor.GetParaIndex(), nCurrParas); |