summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--shell/source/win32/simplemail/smplmailsuppl.cxx2
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx2
-rw-r--r--slideshow/test/demoshow.cxx3
-rw-r--r--sot/source/unoolestorage/xolesimplestorage.cxx4
-rw-r--r--starmath/source/mathmlexport.cxx16
-rw-r--r--starmath/source/mathmlimport.cxx13
6 files changed, 14 insertions, 26 deletions
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index d363712eb439..495b4bf1ff89 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -64,7 +64,7 @@ Reference<XSimpleMailClient> SAL_CALL CSmplMailSuppl::querySimpleMailClient()
if ((handle != INVALID_HANDLE_VALUE) && (handle != NULL))
{
FreeLibrary(handle);
- xSmplMailClient = Reference<XSimpleMailClient>(new CSmplMailClient());
+ xSmplMailClient.set(new CSmplMailClient());
}
return xSmplMailClient;
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 8614cfd9642e..db061ea1ba95 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1468,7 +1468,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
Shapes->add(rPolyShape);
//Retrieve shape properties
- uno::Reference< beans::XPropertySet > aXPropSet = uno::Reference< beans::XPropertySet >( rPolyShape, uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > aXPropSet( rPolyShape, uno::UNO_QUERY );
//Construct a sequence of points sequence
drawing::PointSequenceSequence aRetval;
//Create only one sequence for one polygon
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index b18efdd8c05a..9ca1a87d4c11 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -515,8 +515,7 @@ void DemoApp::Main()
try
{
uno::Reference< uno::XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext();
- xFactory = uno::Reference< lang::XMultiServiceFactory >( xCtx->getServiceManager(),
- uno::UNO_QUERY );
+ xFactory.set( xCtx->getServiceManager(), uno::UNO_QUERY );
if( xFactory.is() )
::comphelper::setProcessServiceFactory( xFactory );
}
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index ecd04950c5a8..3c180c51ed9f 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -647,8 +647,8 @@ void SAL_CALL OLESimpleStorage::dispose()
DELETEZ( m_pStorage );
DELETEZ( m_pStream );
- m_xStream = uno::Reference< io::XStream >();
- m_xTempStream = uno::Reference< io::XStream >();
+ m_xStream.clear();
+ m_xTempStream.clear();
m_bDisposed = true;
}
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 2e557a7d87c9..1749b99be7fd 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -101,8 +101,7 @@ bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
uno::Reference< lang::XComponent > xModelComp(xModel, uno::UNO_QUERY );
bool bEmbedded = false;
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
+ uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
(xTunnel->getSomething(SmModel::getUnoTunnelId()));
@@ -294,9 +293,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(
uno::Sequence< PropertyValue > aProps(0);
xFilter->filter( aProps );
- uno::Reference<lang::XUnoTunnel> xFilterTunnel;
- xFilterTunnel = uno::Reference<lang::XUnoTunnel>
- ( xFilter, uno::UNO_QUERY );
+ uno::Reference<lang::XUnoTunnel> xFilterTunnel( xFilter, uno::UNO_QUERY );
SmXMLExport *pFilter = reinterpret_cast< SmXMLExport * >(
sal::static_int_cast< sal_uIntPtr >(
xFilterTunnel->getSomething( SmXMLExport::getUnoTunnelId() )));
@@ -436,8 +433,7 @@ sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
else
{
uno::Reference <frame::XModel> xModel = GetModel();
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
+ uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
(xTunnel->getSomething(SmModel::getUnoTunnelId()));
@@ -475,8 +471,7 @@ sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
void SmXMLExport::_ExportContent()
{
uno::Reference <frame::XModel> xModel = GetModel();
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
+ uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
(xTunnel->getSomething(SmModel::getUnoTunnelId()));
SmDocShell *pDocShell = pModel ?
@@ -530,8 +525,7 @@ void SmXMLExport::GetViewSettings( Sequence < PropertyValue >& aProps)
if ( !xModel.is() )
return;
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
+ uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
(xTunnel->getSomething(SmModel::getUnoTunnelId()));
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index d8c635624c11..658b6b486878 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -95,8 +95,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
uno::Reference<task::XStatusIndicator> xStatusIndicator;
bool bEmbedded = false;
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
+ uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
(xTunnel->getSomething(SmModel::getUnoTunnelId()));
@@ -279,9 +278,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
{
xParser->parseStream( aParserInput );
- uno::Reference<lang::XUnoTunnel> xFilterTunnel;
- xFilterTunnel = uno::Reference<lang::XUnoTunnel>
- ( xFilter, uno::UNO_QUERY );
+ uno::Reference<lang::XUnoTunnel> xFilterTunnel( xFilter, uno::UNO_QUERY );
SmXMLImport *pFilter = reinterpret_cast< SmXMLImport * >(
sal::static_int_cast< sal_uIntPtr >(
xFilterTunnel->getSomething( SmXMLImport::getUnoTunnelId() )));
@@ -491,8 +488,7 @@ void SmXMLImport::endDocument()
if (NULL != (pTree = GetTree()))
{
uno::Reference <frame::XModel> xModel = GetModel();
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
+ uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
(xTunnel->getSomething(SmModel::getUnoTunnelId()));
@@ -2896,8 +2892,7 @@ void SmXMLImport::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
if ( !xModel.is() )
return;
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
+ uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
(xTunnel->getSomething(SmModel::getUnoTunnelId()));
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 13:04:30 +0000