diff options
30 files changed, 47 insertions, 47 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 8b64e65647d7..8b086b71119b 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -205,8 +205,8 @@ Bridge::Bridge( } void Bridge::start() { - rtl::Reference< Reader > r(new Reader(this)); - rtl::Reference< Writer > w(new Writer(this)); + rtl::Reference r(new Reader(this)); + rtl::Reference w(new Writer(this)); { osl::MutexGuard g(mutex_); assert( diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 85f68d8915be..39e1689c5b68 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -267,7 +267,7 @@ namespace cairocanvas clip_cairo_from_dev(*mpVirtualDevice); - rtl::Reference< TextLayout > pTextLayout( new TextLayout(text, textDirection, 0, CanvasFont::Reference(dynamic_cast< CanvasFont* >( xFont.get() )), mpSurfaceProvider) ); + rtl::Reference pTextLayout( new TextLayout(text, textDirection, 0, CanvasFont::Reference(dynamic_cast< CanvasFont* >( xFont.get() )), mpSurfaceProvider) ); pTextLayout->draw(mpCairo, *mpVirtualDevice, aOutpos, viewState, renderState); } diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index eb0cfefbba11..b268726b4db3 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -391,7 +391,7 @@ SAL_IMPLEMENT_MAIN() // now); a welcome clean-up would be to make TypeEmitter work on // unoidl::Entity directly like the other codemakers: css::uno::Reference< container::XSet > xSet( xTDmgr, UNO_QUERY_THROW ); - rtl::Reference< unoidl::Manager > unoidlMgr(new unoidl::Manager); + rtl::Reference unoidlMgr(new unoidl::Manager); std::vector< rtl::Reference< unoidl::Provider > > unoidlMandatoryProvs; for (vector< OUString >::iterator i(extra_registries.begin()); i != extra_registries.end(); ++i) diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx index 927183918b1a..b1769eda87a6 100644 --- a/codemaker/source/cppumaker/cppumaker.cxx +++ b/codemaker/source/cppumaker/cppumaker.cxx @@ -43,7 +43,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { return EXIT_FAILURE; } - rtl::Reference< TypeManager > typeMgr(new TypeManager); + rtl::Reference typeMgr(new TypeManager); for (const OString& f :options.getExtraInputFiles()) { typeMgr->loadProvider(convertToFileUrl(f), false); diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx index 2f0a1d71f34e..3a35be56a39b 100644 --- a/codemaker/source/javamaker/javamaker.cxx +++ b/codemaker/source/javamaker/javamaker.cxx @@ -43,7 +43,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { return EXIT_FAILURE; } - rtl::Reference< TypeManager > typeMgr(new TypeManager); + rtl::Reference typeMgr(new TypeManager); for (const OString& i : options.getExtraInputFiles()) { typeMgr->loadProvider(convertToFileUrl(i), false); diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index f98fa730f58c..367d84a6cbe1 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -359,14 +359,14 @@ void Test::testListener() // test with no props. { - rtl::Reference<comphelper::ConfigurationListener> xListener( + rtl::Reference xListener( new comphelper::ConfigurationListener(aRandomPath)); xListener->dispose(); } // test some changes { - rtl::Reference<comphelper::ConfigurationListener> xListener( + rtl::Reference xListener( new comphelper::ConfigurationListener(aRandomPath)); comphelper::ConfigurationListenerProperty<bool> aSetting(xListener, "AutoRedraw"); diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 90d95ec87759..1f07df1b3d87 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -1119,7 +1119,7 @@ void Access::insertByName( aName, static_cast<cppu::OWeakObject *>(this), 0); } checkValue(aElement, TYPE_ANY, true); - rtl::Reference< ChildAccess > child( + rtl::Reference child( new ChildAccess( components_, getRootAccess(), this, aName, new PropertyNode( @@ -1508,7 +1508,7 @@ void Access::insertLocalizedValueChild( LocalizedPropertyNode * locprop = static_cast< LocalizedPropertyNode * >( getNode().get()); checkValue(value, locprop->getStaticType(), locprop->isNillable()); - rtl::Reference< ChildAccess > child( + rtl::Reference child( new ChildAccess( components_, getRootAccess(), this, name, new LocalizedValueNode(Data::NO_LAYER, value))); @@ -1932,7 +1932,7 @@ rtl::Reference< ChildAccess > Access::getModifiedChild( rtl::Reference< ChildAccess > Access::createUnmodifiedChild( const OUString &name, const rtl::Reference< Node > &node) { - rtl::Reference< ChildAccess > child( + rtl::Reference child( new ChildAccess(components_, getRootAccess(), this, name, node)); cachedChildren_[name] = child.get(); return child; diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index f093e9f684bc..1adcadafdb77 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -259,7 +259,7 @@ Service::createInstanceWithArguments( } osl::MutexGuard guard(*lock_); Components & components = Components::getSingleton(context_); - rtl::Reference< RootAccess > root( + rtl::Reference root( new RootAccess(components, nodepath, locale, update)); if (root->isValue()) { throw css::uno::Exception( diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx index a24359fdb664..6eb2d5902db3 100644 --- a/configmgr/source/data.cxx +++ b/configmgr/source/data.cxx @@ -300,7 +300,7 @@ NodeMap & Data::getComponents() const { Additions * Data::addExtensionXcuAdditions( OUString const & url, int layer) { - rtl::Reference< ExtensionXcu > item(new ExtensionXcu); + rtl::Reference item(new ExtensionXcu); ExtensionXcuAdditions::iterator i( extensionXcuAdditions_.emplace( url, rtl::Reference< ExtensionXcu >()).first); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index e84494bb8f3d..b23ec40e3204 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2332,7 +2332,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn) { OUString sTempName = createTempFile(); - rtl::Reference<ODbaseTable> xNewTable(new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection))); + rtl::Reference xNewTable(new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection))); xNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(sTempName)); { Reference<XAppend> xAppend(xNewTable->getColumns(),UNO_QUERY); @@ -2390,7 +2390,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos) { OUString sTempName = createTempFile(); - rtl::Reference<ODbaseTable> xNewTable(new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection))); + rtl::Reference xNewTable(new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection))); xNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(sTempName)); { Reference<XAppend> xAppend(xNewTable->getColumns(),UNO_QUERY); diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 5ae4a49952df..63f78e36805c 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -173,7 +173,7 @@ Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery() { clearCachedResultSet(); - ::rtl::Reference< OResultSet > pResult( new OResultSet( this, m_pSQLIterator ) ); + ::rtl::Reference pResult( new OResultSet( this, m_pSQLIterator ) ); initializeResultSet( pResult.get() ); pResult->executeQuery(); diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index 7a767ccdbe7c..b385538d8da0 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -484,7 +484,7 @@ SQLHANDLE OConnection::createStatementHandle() sal_Int32 nMaxStatements = getMetaData()->getMaxStatements(); if(nMaxStatements && nMaxStatements <= m_nStatementCount) { - rtl::Reference<OConnection> xConnection(new OConnection(m_pDriverHandleCopy,m_xDriver.get())); + rtl::Reference xConnection(new OConnection(m_pDriverHandleCopy,m_xDriver.get())); xConnection->Construct(m_sURL,getConnectionInfo()); xConnectionTemp = xConnection; bNew = true; diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 0e08f785ab26..806a312668e3 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -103,7 +103,7 @@ OParseColumn::OParseColumn( const OUString& Name, const Reference< XDatabaseMetaData >& _rxDBMetaData,const Reference< XNameAccess>& i_xQueryColumns ) { sal_Int32 nColumnCount = _rxResMetaData->getColumnCount(); - ::rtl::Reference< OSQLColumns > aReturn( new OSQLColumns ); aReturn->get().reserve( nColumnCount ); + ::rtl::Reference aReturn( new OSQLColumns ); aReturn->get().reserve( nColumnCount ); StringMap aColumnMap; for ( sal_Int32 i = 1; i <= nColumnCount; ++i ) diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 872750c3cc80..eaec3f9ef6b1 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -306,7 +306,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu // parameters not to be included in the traversal return; - ::rtl::Reference< OSQLColumns > pSubQueryParameterColumns( new OSQLColumns() ); + ::rtl::Reference pSubQueryParameterColumns( new OSQLColumns() ); // get the command and the EscapeProcessing properties from the sub query OUString sSubQueryCommand; diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 2490e1c1e50c..81c6a91643a2 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -179,7 +179,7 @@ namespace cppu_threadpool } } - rtl::Reference< ORequestThread > pThread( + rtl::Reference pThread( new ORequestThread( this, pQueue , aThreadId, bAsynchron) ); return pThread->launch(); } diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index cff87436ce2c..4e0d3a9258bd 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -270,16 +270,16 @@ void Test::testEmpty2( OUString("any")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} - rtl::Reference< BoundListener > boundListener1(new BoundListener); + rtl::Reference boundListener1(new BoundListener); empty2p->addPropertyChangeListener(OUString(), boundListener1.get()); empty2p->addPropertyChangeListener(OUString(), boundListener1.get()); - rtl::Reference< BoundListener > boundListener2(new BoundListener); + rtl::Reference boundListener2(new BoundListener); empty2p->removePropertyChangeListener( OUString(), boundListener2.get()); - rtl::Reference< VetoListener > vetoListener1(new VetoListener); + rtl::Reference vetoListener1(new VetoListener); empty2p->addVetoableChangeListener(OUString(), vetoListener1.get()); empty2p->addVetoableChangeListener(OUString(), vetoListener1.get()); - rtl::Reference< VetoListener > vetoListener2(new VetoListener); + rtl::Reference vetoListener2(new VetoListener); empty2p->addVetoableChangeListener(OUString(), vetoListener2.get()); empty2p->removeVetoableChangeListener(OUString(), vetoListener2.get()); css::uno::Reference< css::beans::XFastPropertySet > empty2f( diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index fe971f0c139d..c2d69990bf24 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -53,10 +53,10 @@ cppu::defaultBootstrap_InitialComponentContext(OUString const & iniUri) throw css::uno::DeploymentException( "Cannot open uno ini " + iniUri); } - rtl::Reference< cppuhelper::ServiceManager > smgr( + rtl::Reference smgr( new cppuhelper::ServiceManager); smgr->init(getBootstrapVariable(bs, "UNO_SERVICES")); - rtl::Reference< cppuhelper::TypeManager > tmgr(new cppuhelper::TypeManager); + rtl::Reference tmgr(new cppuhelper::TypeManager); tmgr->init(getBootstrapVariable(bs, "UNO_TYPES")); std::vector< cppu::ContextEntry_Init > context_values; context_values.push_back( diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 52686ba92045..e10d51f50326 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -809,7 +809,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rK aValue.setSigned(m_aSignedFlags[parameterName.second.nPosition-1]); if ( (_rInsertRow->get())[parameterName.second.nPosition] != aValue ) { - rtl::Reference<ORowSetValueVector> aCopy( + rtl::Reference aCopy( new ORowSetValueVector(*m_aParameterValueForCache)); (aCopy->get())[i] = (_rInsertRow->get())[parameterName.second.nPosition]; m_aUpdatedParameter[i_nBookmark] = aCopy; diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index a9536a4e789b..dea302029dce 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -99,7 +99,7 @@ rtl::Reference<OQueryContainer> OQueryContainer::create( , const Reference< XComponentContext >& _rxORB, ::dbtools::WarningsContainer* _pWarnings) { - rtl::Reference<OQueryContainer> c( + rtl::Reference c( new OQueryContainer( _rxCommandDefinitions, _rxConn, _rxORB, _pWarnings)); c->init(); diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index afa0d2ce9756..0e1e4bfa9285 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -238,7 +238,7 @@ Sequence< OUString > ODatabaseContext::getSupportedServiceNames( ) Reference< XInterface > ODatabaseContext::impl_createNewDataSource() { - ::rtl::Reference<ODatabaseModelImpl> pImpl( new ODatabaseModelImpl( m_aContext, *this ) ); + ::rtl::Reference pImpl( new ODatabaseModelImpl( m_aContext, *this ) ); Reference< XDataSource > xDataSource( pImpl->getOrCreateDataSource() ); return xDataSource.get(); diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 4eb8613d683c..37cec2057799 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -2198,7 +2198,7 @@ com_sun_star_comp_dba_ODatabaseDocument(css::uno::XComponentContext* context, xDBContextTunnel->getSomething( dbaccess::ODatabaseContext::getUnoTunnelImplementationId())); - rtl::Reference<dbaccess::ODatabaseModelImpl> pImpl( + rtl::Reference pImpl( new dbaccess::ODatabaseModelImpl(context, *pContext)); css::uno::Reference<XInterface> inst(pImpl->createNewModel_deliverOwnership()); inst->acquire(); diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index 7566a935f101..0881fd3a01a0 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -226,7 +226,7 @@ void OContainerMediator::notifyElementCreated( const OUString& _sName, const Ref DBG_UNHANDLED_EXCEPTION("dbaccess"); } - ::rtl::Reference< OPropertyForward > pForward( new OPropertyForward( _xDest, m_xSettings, _sName, aPropertyList ) ); + ::rtl::Reference pForward( new OPropertyForward( _xDest, m_xSettings, _sName, aPropertyList ) ); m_aForwardList[ _sName ] = pForward; } diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index 8ab5c1f12017..093fbd63befe 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -81,8 +81,8 @@ namespace dbaccess { Reference< XInteractionRequestStringResolver > xStringResolver = InteractionRequestStringResolver::create(_rContext); - ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rError ) ); - ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove ); + ::rtl::Reference pRequest( new ::comphelper::OInteractionRequest( _rError ) ); + ::rtl::Reference pApprove( new ::comphelper::OInteractionApprove ); pRequest->addContinuation( pApprove.get() ); Optional< OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() ); if ( aMessage.IsPresent ) diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index 90c1ccc7f77c..a899c77debf4 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -538,7 +538,7 @@ namespace dbaccess if ( xDocDefinition.is() ) { Reference< XController > xController( m_xDocumentUI, UNO_QUERY_THROW ); - rtl::Reference< SubComponentLoader >( new SubComponentLoader( xController, xDocDefinition ) ); + rtl::Reference( new SubComponentLoader( xController, xDocDefinition ) ); } return xSubComponent; @@ -591,7 +591,7 @@ namespace dbaccess } Reference< XController > xController( m_xDocumentUI, UNO_QUERY_THROW ); - rtl::Reference< SubComponentLoader >( new SubComponentLoader( xController, xSubComponent ) ); + rtl::Reference( new SubComponentLoader( xController, xSubComponent ) ); return xSubComponent; } diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 8b37b2256043..031c91e497f3 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -77,9 +77,9 @@ namespace dbmm _rDocumentName ); - ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( makeAny( aRequest ) ) ); - ::rtl::Reference< ::comphelper::OInteractionPassword > pPassword( new ::comphelper::OInteractionPassword( _io_rPassword ) ); - ::rtl::Reference< ::comphelper::OInteractionAbort > pAbort( new ::comphelper::OInteractionAbort ); + ::rtl::Reference pRequest( new ::comphelper::OInteractionRequest( makeAny( aRequest ) ) ); + ::rtl::Reference pPassword( new ::comphelper::OInteractionPassword( _io_rPassword ) ); + ::rtl::Reference pAbort( new ::comphelper::OInteractionAbort ); pRequest->addContinuation( pPassword.get() ); pRequest->addContinuation( pAbort.get() ); @@ -96,8 +96,8 @@ namespace dbmm void InteractionHandler::reportError( const Any& _rError ) { - ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rError ) ); - ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove ); + ::rtl::Reference pRequest( new ::comphelper::OInteractionRequest( _rError ) ); + ::rtl::Reference pApprove( new ::comphelper::OInteractionApprove ); pRequest->addContinuation( pApprove.get() ); m_pData->xHandler->handle( pRequest.get() ); diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index c6ab355c5c72..80df6c2a1826 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -1028,7 +1028,7 @@ namespace dbmm m_rProgress.startObject( sObjectName, OUString(), DEFAULT_DOC_PROGRESS_RANGE ); // load the document - rtl::Reference< ProgressCapture > pStatusIndicator( new ProgressCapture( sObjectName, m_rProgress ) ); + rtl::Reference pStatusIndicator( new ProgressCapture( sObjectName, m_rProgress ) ); SubDocument aSubDocument( _rDocument ); OpenDocResult eResult = lcl_loadSubDocument_nothrow( aSubDocument, pStatusIndicator.get(), m_rLogger ); if ( eResult != eOpenedDoc ) diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index bb1b82e70cc8..391707a43c9b 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -942,8 +942,8 @@ namespace Reference< XInteractionHandler > xHandler( aArgs.getOrDefault( "InteractionHandler", Reference< XInteractionHandler >() ) ); if ( xHandler.is() ) { - rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rException ) ); - rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove ); + rtl::Reference pRequest( new ::comphelper::OInteractionRequest( _rException ) ); + rtl::Reference pApprove( new ::comphelper::OInteractionApprove ); pRequest->addContinuation( pApprove.get() ); try diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 2dea88533bfe..7689022016fa 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void) if (!xPopupController.is()) return; - rtl::Reference<VCLXPopupMenu> xPopupMenu(new VCLXPopupMenu); + rtl::Reference xPopupMenu(new VCLXPopupMenu); xPopupController->setPopupMenu(xPopupMenu.get()); VclPtr<PopupMenu> aMenu(static_cast<PopupMenu*>(xPopupMenu->GetMenu())); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 43b6ecb1fa0e..921130037653 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -485,7 +485,7 @@ VclPtr<PopupMenu> DBTreeListBox::CreateContextMenu() if ( !m_xMenuController.is() ) return nullptr; - rtl::Reference<VCLXPopupMenu> xPopupMenu( new VCLXPopupMenu ); + rtl::Reference xPopupMenu( new VCLXPopupMenu ); m_xMenuController->setPopupMenu( xPopupMenu.get() ); VclPtr<PopupMenu> pContextMenu( static_cast< PopupMenu* >( xPopupMenu->GetMenu() ) ); pContextMenu->AddEventListener( LINK( this, DBTreeListBox, MenuEventListener ) ); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index d68357b21dc4..0f28db2f1f6d 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -878,8 +878,8 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl, Button*, void) OUString sMsg(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY)); SQLContext aError; aError.Message = sMsg; - ::rtl::Reference< ::comphelper::OInteractionRequest > xRequest( new ::comphelper::OInteractionRequest( makeAny( aError ) ) ); - ::rtl::Reference< ::comphelper::OInteractionApprove > xYes = new ::comphelper::OInteractionApprove; + ::rtl::Reference xRequest( new ::comphelper::OInteractionRequest( makeAny( aError ) ) ); + ::rtl::Reference xYes = new ::comphelper::OInteractionApprove; xRequest->addContinuation( xYes.get() ); xRequest->addContinuation( new ::comphelper::OInteractionDisapprove ); ::rtl::Reference< ::comphelper::OInteractionAbort > xAbort = new ::comphelper::OInteractionAbort; |