summaryrefslogtreecommitdiff
path: root/embedserv
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-30 14:22:53 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-31 12:56:38 +0000
commit3c971162b57bb042dc001f775b8e20ec37ecbef8 (patch)
tree49c14944b816284c05a3d20897b92a2e2a1fd2ad /embedserv
parent4530451d40470bf5359645de0c142ddf9dc329b6 (diff)
use uno::Reference::set method instead of assignment
Change-Id: I150f213ab033f5fc1b50abe4e1529292206c9feb Reviewed-on: https://gerrit.libreoffice.org/19689 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'embedserv')
-rw-r--r--embedserv/source/embed/docholder.cxx28
-rw-r--r--embedserv/source/embed/ed_ipersiststr.cxx2
2 files changed, 15 insertions, 15 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 31956a75edd4..7ee882506a59 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -293,7 +293,7 @@ HRESULT DocumentHolder::InPlaceActivate(
}
aAny <<= sal_Int32(hWndxWinParent);
- xWin = uno::Reference<awt::XWindow>(
+ xWin.set(
xToolkit->createSystemChild(
aAny,
aProcessIdent,
@@ -646,9 +646,9 @@ void DocumentHolder::DisconnectFrameDocument( sal_Bool bComplete )
if ( bComplete )
{
- m_xFrame = uno::Reference<frame::XFrame2>();
+ m_xFrame.clear();
m_pIDispatch = NULL;
- m_xDocument = uno::Reference< frame::XModel >();
+ m_xDocument.clear();
}
}
@@ -670,7 +670,7 @@ void DocumentHolder::CloseDocument()
}
m_pIDispatch = NULL;
- m_xDocument = uno::Reference< frame::XModel >();
+ m_xDocument.clear();
}
@@ -699,7 +699,7 @@ void DocumentHolder::CloseFrame()
xComp->dispose();
}
- m_xFrame = uno::Reference< frame::XFrame2 >();
+ m_xFrame.clear();
}
void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, sal_Bool bLink )
@@ -760,7 +760,7 @@ sal_Bool DocumentHolder::ExecuteSuspendCloseFrame()
{
}
- m_xFrame = uno::Reference< frame::XFrame2 >();
+ m_xFrame.clear();
}
return sal_True;
@@ -818,14 +818,14 @@ void DocumentHolder::ClearInterceptorInternally()
if ( xInterceptor.is() && m_pInterceptor )
m_pInterceptor->DisconnectDocHolder();
- m_xInterceptorLocker = uno::Reference< frame::XDispatchProviderInterceptor >();
+ m_xInterceptorLocker.clear();
m_pInterceptor = 0;
}
void DocumentHolder::ClearInterceptor()
{
::osl::MutexGuard aGuard( m_aMutex );
- m_xInterceptorLocker = uno::Reference< frame::XDispatchProviderInterceptor >();
+ m_xInterceptorLocker.clear();
m_pInterceptor = 0;
}
@@ -1236,7 +1236,7 @@ css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWin
uno::Any aAny;
aAny <<= sal_Int32(hWnd);
- xWin = uno::Reference<awt::XWindow>(
+ xWin.set(
xToolkit->createSystemChild(
aAny,
aProcessIdent,
@@ -1331,11 +1331,11 @@ void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource )
if ( m_xDocument.is() && m_xDocument == aSource.Source )
{
m_pIDispatch = NULL;
- m_xDocument = uno::Reference< frame::XModel >();
+ m_xDocument.clear();
}
if( m_xFrame.is() && m_xFrame == aSource.Source )
- m_xFrame = uno::Reference< frame::XFrame2 >();
+ m_xFrame.clear();
}
@@ -1372,15 +1372,15 @@ DocumentHolder::notifyClosing(
{
// can happen only in case of links
m_pIDispatch = NULL;
- m_xDocument = uno::Reference< frame::XModel >();
- m_xFrame = uno::Reference< frame::XFrame2 >();
+ m_xDocument.clear();
+ m_xFrame.clear();
LockedEmbedDocument_Impl aDocLock = m_xOleAccess->GetEmbedDocument();
if ( aDocLock.GetEmbedDocument() )
aDocLock.GetEmbedDocument()->OLENotifyClosing();
}
else if( m_xFrame.is() && m_xFrame == aSource.Source )
- m_xFrame = uno::Reference< frame::XFrame2 >();
+ m_xFrame.clear();
}
void SAL_CALL
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 34de2efb783f..64513b4f8c52 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -104,7 +104,7 @@ uno::Reference< io::XInputStream > createTempXInStreamFromIStream(
if ( xTempSeek.is() )
{
xTempSeek->seek ( 0 );
- xResult = uno::Reference< io::XInputStream >( xTempOut, uno::UNO_QUERY );
+ xResult.set( xTempOut, uno::UNO_QUERY );
}
}
}