diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-25 08:43:20 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 19:33:21 +0000 |
| commit | 1249dd9f358681f61c8ec69a90ce61829601fd0b (patch) | |
| tree | b3187f00f64a9995a1df441e23a9d08bf499ce6b /scripting | |
| parent | db298f22a04e409a555d7c3ccec4c1dae91a6e1b (diff) | |
fixes for up-casting to Reference<XInterface>
Fix regressions introduced with
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking
Reference constructor to reduce code noise"
Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4)
Reviewed-on: https://gerrit.libreoffice.org/9919
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 70a82c30480e..d5f506231320 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -539,11 +539,11 @@ static OUString aResourceResolverPropName("ResourceResolver"); Reference< XInterface >* pObjects = aObjects.getArray(); for ( sal_Int32 i = 0; i < nControlCount; ++i ) { - pObjects[i] = pControls[i]; + pObjects[i] = Reference<XInterface>( pControls[i], UNO_QUERY ); } // also add the dialog control itself to the sequence - pObjects[nControlCount] = rxControl; + pObjects[nControlCount] = Reference<XInterface>( rxControl, UNO_QUERY ); Reference< XScriptEventsAttacher > xScriptEventsAttacher = new DialogEventsAttacherImpl ( m_xContext, m_xModel, rxControl, rxHandler, rxIntrospectionAccess, diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index ebb3495b156b..2ff7d59841b2 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -159,7 +159,7 @@ void StringResourceImpl::addModifyListener( const Reference< XModifyListener >& throw RuntimeException(); ::osl::MutexGuard aGuard( getMutex() ); - m_aListenerContainer.addInterface( aListener ); + m_aListenerContainer.addInterface( Reference<XInterface>( aListener, UNO_QUERY ) ); } void StringResourceImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) @@ -169,7 +169,7 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener throw RuntimeException(); ::osl::MutexGuard aGuard( getMutex() ); - m_aListenerContainer.removeInterface( aListener ); + m_aListenerContainer.removeInterface( Reference<XInterface>( aListener, UNO_QUERY ) ); } |