summaryrefslogtreecommitdiff
path: root/xmlhelp/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-05 13:26:24 +0200
committerNoel Grandin <noel@peralex.com>2015-11-05 13:32:17 +0200
commit9e8ff13eb2405f7e3dcb4f90cb38e9e4b1da2bd5 (patch)
treeea4cd1922080d73b82a5b4bd4796d6190430f3fa /xmlhelp/source
parent281296330735158d6265e0b146b5d5301f6e610e (diff)
use uno::Reference::set method instead of assignment
Change-Id: I60e52ef2abc3107ba77e81811dfe1bffbfd77218
Diffstat (limited to 'xmlhelp/source')
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx8
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.hxx5
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultset.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.cxx3
-rw-r--r--xmlhelp/source/treeview/tvfactory.cxx6
-rw-r--r--xmlhelp/source/treeview/tvread.cxx2
6 files changed, 12 insertions, 16 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index b9e47ea5c53c..16aff94b7b8d 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -104,7 +104,7 @@ OUString Databases::expandURL( const OUString& aURL, Reference< uno::XComponentC
Reference< uri::XUriReference > uriRef;
for (;;)
{
- uriRef = Reference< uri::XUriReference >( xFac->parse( aRetURL ), UNO_QUERY );
+ uriRef.set( xFac->parse( aRetURL ), UNO_QUERY );
if ( uriRef.is() )
{
Reference < uri::XVndSunStarExpandUrl > sxUri( uriRef, UNO_QUERY );
@@ -138,7 +138,7 @@ Databases::Databases( bool showBasic,
vendVersion( "%VENDORVERSION" ),
vendShort( "%VENDORSHORT" )
{
- m_xSMgr = Reference< XMultiComponentFactory >( m_xContext->getServiceManager(), UNO_QUERY );
+ m_xSMgr.set( m_xContext->getServiceManager(), UNO_QUERY );
m_vAdd[0] = 12;
m_vAdd[1] = 15;
@@ -880,7 +880,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const OUString& jar,
if ( xIfc.is() )
{
- it->second = Reference< XHierarchicalNameAccess >( xIfc, UNO_QUERY );
+ it->second.set( xIfc, UNO_QUERY );
OSL_ENSURE( it->second.is(),
"ContentProvider::createPackage - "
@@ -1679,7 +1679,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
if ( xIfc.is() )
{
- xNA = Reference< XHierarchicalNameAccess >( xIfc, UNO_QUERY );
+ xNA.set( xIfc, UNO_QUERY );
OSL_ENSURE( xNA.is(),
"JarFileIterator::implGetJarFromPackage() - "
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index f80ebe8fa36d..cd6cf86e4092 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -118,11 +118,10 @@ namespace chelp {
// XConainerListener ( derive from XEventListener )
virtual void SAL_CALL
- disposing( const ::com::sun::star::lang::EventObject& Source )
+ disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
throw (::com::sun::star::uno::RuntimeException, std::exception) override
{
- (void)Source;
- m_xContainer = com::sun::star::uno::Reference<com::sun::star::container::XContainer>(0);
+ m_xContainer.clear();
}
virtual void SAL_CALL
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx
index 597392bf4380..64b7d5f57a64 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx
@@ -53,12 +53,12 @@ DynamicResultSet::~DynamicResultSet()
void DynamicResultSet::initStatic()
{
- m_xResultSet1 = Reference< XResultSet >( m_pFactory->createResultSet() );
+ m_xResultSet1.set( m_pFactory->createResultSet() );
}
void DynamicResultSet::initDynamic()
{
- m_xResultSet1 = Reference< XResultSet >( m_pFactory->createResultSet() );
+ m_xResultSet1.set( m_pFactory->createResultSet() );
m_xResultSet2 = m_xResultSet1;
}
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 04e53e340a4b..d7fa6883b73b 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -403,8 +403,7 @@ ResultSetBase::queryContentIdentifier(
{
OUString url = queryContentIdentifierString();
if( ! m_aIdents[m_nRow].is() && !url.isEmpty() )
- m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >(
- new ::ucbhelper::ContentIdentifier( url ) );
+ m_aIdents[m_nRow].set( new ::ucbhelper::ContentIdentifier( url ) );
return m_aIdents[m_nRow];
}
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 81881f828ca2..abb4d9b0397c 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -86,17 +86,15 @@ TVFactory::createInstance(
Reference< XInterface > SAL_CALL
TVFactory::createInstanceWithArguments(
- const OUString& ServiceSpecifier,
+ const OUString& /*ServiceSpecifier*/,
const Sequence< Any >& Arguments )
throw( Exception,
RuntimeException, std::exception )
{
- (void)ServiceSpecifier;
-
if( ! m_xHDS.is() )
{
cppu::OWeakObject* p = new TVChildTarget( m_xContext );
- m_xHDS = Reference< XInterface >( p );
+ m_xHDS.set( p );
}
Reference< XInterface > ret = m_xHDS;
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 4cb3e405f30d..28ad1522c6b7 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -1142,7 +1142,7 @@ OUString TreeFileIterator::expandURL( const OUString& aURL )
Reference< uri::XUriReference > uriRef;
for (;;)
{
- uriRef = Reference< uri::XUriReference >( xFac->parse( aRetURL ), UNO_QUERY );
+ uriRef.set( xFac->parse( aRetURL ), UNO_QUERY );
if ( uriRef.is() )
{
Reference < uri::XVndSunStarExpandUrl > sxUri( uriRef, UNO_QUERY );