diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-25 08:43:20 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-27 07:52:36 +0000 |
| commit | b0c1ad45408de8d328ce4c6d707ec7ab3b62dbc6 (patch) | |
| tree | eec5174099499774f16b50176636252cda7c17bc /sd | |
| parent | 01ee29125610a0fe4d6dcb080da09e3961f1236a (diff) | |
fixes for up-casting to Reference<XInterface>
Fix regressions introduced with
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking
Reference constructor to reduce code noise"
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4)
Conflicts:
framework/source/uifactory/menubarfactory.cxx
Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687
Reviewed-on: https://gerrit.libreoffice.org/9921
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/sdpage2.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 994727dc63ec..0b9a552d75c2 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -615,7 +615,7 @@ void SdPage::addAnnotation( const Reference< XAnnotation >& xAnnotation, int nIn if( pModel ) { pModel->SetChanged(); - NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), "OnAnnotationInserted" , xAnnotation ); + NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), "OnAnnotationInserted", Reference<XInterface>( xAnnotation, UNO_QUERY ) ); } } @@ -635,7 +635,7 @@ void SdPage::removeAnnotation( const Reference< XAnnotation >& xAnnotation ) if( pModel ) { pModel->SetChanged(); - NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), OUString( "OnAnnotationRemoved" ), xAnnotation ); + NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), "OnAnnotationRemoved", Reference<XInterface>( xAnnotation, UNO_QUERY ) ); } } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 86a188842d82..57af114bdbad 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1106,7 +1106,7 @@ OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const Reference< XModuleManager2 > xModuleManager( ModuleManager::create(xContext) ); - OUString aModuleIdentifier( xModuleManager->identify( xFrame ) ); + OUString aModuleIdentifier( xModuleManager->identify( Reference<XInterface>( xFrame, UNO_QUERY_THROW ) ) ); if( !aModuleIdentifier.isEmpty() ) { |