summaryrefslogtreecommitdiff
path: root/sfx2/source/control/unoctitm.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/control/unoctitm.cxx')
-rw-r--r--sfx2/source/control/unoctitm.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 8d5a5b9076..8159fc8430 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -217,8 +217,8 @@ void SfxUnoControllerItem::GetNewDispatch()
if ( !pBindings->GetDispatcher_Impl() || !pBindings->GetDispatcher_Impl()->GetFrame() )
return;
- SfxFrame *pFrame = pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame();
- SfxFrame *pParent = pFrame->GetParentFrame();
+ SfxFrame& rFrame = pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame();
+ SfxFrame *pParent = rFrame.GetParentFrame();
if ( pParent )
// parent may intercept
xDispatch = TryGetDispatch( pParent );
@@ -226,7 +226,7 @@ void SfxUnoControllerItem::GetNewDispatch()
if ( !xDispatch.is() )
{
// no interception
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pFrame->GetFrameInterface();
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = rFrame.GetFrameInterface();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY );
if ( xProv.is() )
xDispatch = xProv->queryDispatch( aCommand, ::rtl::OUString(), 0 );
@@ -250,7 +250,7 @@ void SfxUnoControllerItem::GetNewDispatch()
if ( !xDisp.is() && pFrame->HasComponent() )
{
// no interception
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pFrame->GetFrameInterface();
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pFrame->GetFrameInterface();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY );
if ( xProv.is() )
xDisp = xProv->queryDispatch( aCommand, ::rtl::OUString(), 0 );
@@ -752,11 +752,11 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
{
SfxViewFrame* pViewFrame = pDispatcher->GetFrame();
if (pViewFrame)
- xFrameRef = pViewFrame->GetFrame()->GetFrameInterface();
+ xFrameRef = pViewFrame->GetFrame().GetFrameInterface();
}
SfxAllItemSet aInternalSet( SFX_APP()->GetPool() );
if (xFrameRef.is()) // an empty set is no problem ... but an empty frame reference can be a problem !
- aInternalSet.Put( SfxUnoAnyItem( SID_FILLFRAME, css::uno::makeAny(xFrameRef) ) );
+ aInternalSet.Put( SfxUnoFrameItem( SID_FILLFRAME, xFrameRef ) );
sal_Bool bSuccess = sal_False;
sal_Bool bFailure = sal_False;