diff options
57 files changed, 103 insertions, 161 deletions
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 96e01ab05346..19b99714160c 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -112,10 +112,6 @@ OKeySet::OKeySet(const connectivity::OSQLTable& _xTable, sal_Int32& o_nRowCount) :OCacheSet(i_nMaxRows) ,m_aParameterValueForCache(_aParameterValueForCache) - ,m_pKeyColumnNames(NULL) - ,m_pColumnNames(NULL) - ,m_pParameterNames(NULL) - ,m_pForeignColumnNames(NULL) ,m_xTable(_xTable) ,m_xTableKeys(_xTableKeys) ,m_xComposer(_xComposer) @@ -151,12 +147,11 @@ void OKeySet::initColumns() m_pForeignColumnNames.reset( new SelectColumnsMetaData(bCase) ); } -SAL_WNODEPRECATED_DECLARATIONS_PUSH void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, const OUString& i_rUpdateTableName, const Reference<XDatabaseMetaData>& i_xMeta, const Reference<XNameAccess>& i_xQueryColumns, - ::std::auto_ptr<SelectColumnsMetaData>& o_pKeyColumnNames) + ::std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames) { // first ask the database itself for the best columns which can be used Sequence< OUString> aBestColumnNames; @@ -222,8 +217,6 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, } } -SAL_WNODEPRECATED_DECLARATIONS_POP - namespace { void appendOneKeyColumnClause( const OUString &tblName, const OUString &colName, const connectivity::ORowSetValue &_rValue, OUStringBuffer &o_buf ) diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 49e60fb4c162..51168cece933 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -84,12 +84,10 @@ namespace dbaccess OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching ORowSetValueVector m_aParameterValueForCache; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<SelectColumnsMetaData> m_pKeyColumnNames; // contains all key column names - ::std::auto_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names - ::std::auto_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names - ::std::auto_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<SelectColumnsMetaData> m_pKeyColumnNames; // contains all key column names + ::std::unique_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names + ::std::unique_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names + ::std::unique_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest connectivity::OSQLTable m_xTable; // reference to our table ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xTableKeys; // we need a different SQL (statement) for each different combination @@ -127,13 +125,11 @@ namespace dbaccess void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); void initColumns(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable, const OUString& i_rUpdateTableName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns, - ::std::auto_ptr<SelectColumnsMetaData>& o_pKeyColumnNames); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames); void ensureStatement( ); virtual void makeNewStatement( ); void setOneKeyColumnParameter( sal_Int32 &nPos, diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index aece21b12db2..12b3e986dd26 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -118,9 +118,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OU const OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength(); for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<SelectColumnsMetaData> pKeyColumNames(new SelectColumnsMetaData(bCase)); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<SelectColumnsMetaData> pKeyColumNames(new SelectColumnsMetaData(bCase)); findTableColumnsMatching_throw(xTables->getByName(*pTableNameIter),*pTableNameIter,xMeta,xQueryColumns,pKeyColumNames); m_pKeyColumnNames->insert(pKeyColumNames->begin(),pKeyColumNames->end()); } @@ -138,9 +136,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OU xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery()); // check for joins OUString aErrorMsg; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) ); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) ); m_aSqlIterator.setParseTree( pStatementNode.get() ); m_aSqlIterator.traverseAll(); fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions()); diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 520ddb0f7532..4509d6e41b6b 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -356,7 +356,7 @@ namespace dbaccess class ORowSetNotifier { private: - ::std::auto_ptr<ORowSetNotifierImpl> m_pImpl; + ::std::unique_ptr<ORowSetNotifierImpl> m_pImpl; ORowSetBase* m_pRowSet; // not acquired! This is not necessary because this class here is to be used on the stack within // a method of ORowSetBase (or derivees) diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 07cfa1912d01..ba588c9f569e 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -1565,9 +1565,7 @@ bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, OUString sSql = _xAnalyzer->getQuery(); OUString sErrorMsg; ::connectivity::OSQLParser aSqlParser( m_aContext ); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); if ( pSqlParseNode.get() && SQL_ISRULE(pSqlParseNode, select_statement) ) { OSQLParseNode* pTableRefCommalist = pSqlParseNode->getByRule(::connectivity::OSQLParseNode::table_ref_commalist); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index e801d1d9d5c9..15d2bea37d19 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -88,7 +88,7 @@ class OComponentDefinition :public OContentHelper OComponentDefinition(); protected: - ::std::auto_ptr< OColumns > m_pColumns; + ::std::unique_ptr< OColumns > m_pColumns; rtl::Reference<OColumnPropertyListener> m_xColumnPropertyListener; bool m_bTable; diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx index d3a1f9337d0c..017bea258ea7 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx @@ -54,7 +54,7 @@ namespace dbaccess virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ::std::auto_ptr< DocumentEventExecutor_Data > m_pData; + ::std::unique_ptr< DocumentEventExecutor_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index 0d9a5e842b7d..61a9c635bd30 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -67,7 +67,7 @@ namespace dbaccess virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ::std::auto_ptr< DocumentEvents_Data > m_pData; + ::std::unique_ptr< DocumentEvents_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 56ab94453228..e3e87047cc7d 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -31,7 +31,7 @@ struct DataSupplier_Impl; class DataSupplier : public ucbhelper::ResultSetDataSupplier { - ::std::auto_ptr<DataSupplier_Impl> m_pImpl; + ::std::unique_ptr<DataSupplier_Impl> m_pImpl; public: DataSupplier( const rtl::Reference< ODocumentContainer >& rxContent, diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index fd7d2327ec1e..e3d374e07902 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -40,7 +40,7 @@ namespace dbaccess */ class ObjectNameApproval : public IContainerApprove { - ::std::auto_ptr< ObjectNameApproval_Impl > m_pImpl; + ::std::unique_ptr< ObjectNameApproval_Impl > m_pImpl; public: enum ObjectType diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx index 02f737a7ab1c..944ba3dc2234 100644 --- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx +++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx @@ -66,7 +66,7 @@ namespace dbaccess ); private: - const ::std::auto_ptr< DatabaseDocumentRecovery_Data > m_pData; + const ::std::unique_ptr< DatabaseDocumentRecovery_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index ae12baf8ba38..e704a85ce754 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -43,7 +43,7 @@ namespace dbaccess void writeLine(); private: - ::std::auto_ptr< StorageTextOutputStream_Data > m_pData; + ::std::unique_ptr< StorageTextOutputStream_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index bc130d647c3f..4eb70978bf26 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -59,7 +59,7 @@ namespace dbaccess StorageXMLOutputStream& operator=( const StorageXMLOutputStream& ); // never implemented private: - ::std::auto_ptr< StorageXMLOutputStream_Data > m_pData; + ::std::unique_ptr< StorageXMLOutputStream_Data > m_pData; }; // StorageXMLInputStream @@ -84,7 +84,7 @@ namespace dbaccess StorageXMLInputStream& operator=( const StorageXMLInputStream& ); // never implemented private: - ::std::auto_ptr< StorageXMLInputStream_Data > m_pData; + ::std::unique_ptr< StorageXMLInputStream_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx index 0282e4f592ef..fefdc6b85f0d 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.hxx +++ b/dbaccess/source/ext/macromigration/docinteraction.hxx @@ -70,7 +70,7 @@ namespace dbmm ); private: - ::std::auto_ptr< InteractionHandler_Data > m_pData; + ::std::unique_ptr< InteractionHandler_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index b5ee3d1be704..689327e854b4 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -68,7 +68,7 @@ namespace dbmm DECL_LINK( OnStartMigration, void* ); private: - ::std::auto_ptr< MacroMigrationDialog_Data > m_pData; + ::std::unique_ptr< MacroMigrationDialog_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx index 1396162e3f79..b8e3e2ec2fc2 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.hxx +++ b/dbaccess/source/ext/macromigration/migrationengine.hxx @@ -70,7 +70,7 @@ namespace dbmm bool migrateAll(); private: - ::std::auto_ptr< MigrationEngine_Impl > m_pImpl; + ::std::unique_ptr< MigrationEngine_Impl > m_pImpl; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx index 958e5df77818..1a854e6e89f6 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.hxx +++ b/dbaccess/source/ext/macromigration/migrationlog.hxx @@ -101,7 +101,7 @@ namespace dbmm getCompleteLog() const; private: - ::std::auto_ptr< MigrationLog_Data > m_pData; + ::std::unique_ptr< MigrationLog_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx index f0c1294c6591..e7633af9e7e2 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.hxx +++ b/dbaccess/source/ext/macromigration/progresscapture.hxx @@ -55,7 +55,7 @@ namespace dbmm virtual ~ProgressCapture(); private: - ::std::auto_ptr< ProgressCapture_Data > m_pData; + ::std::unique_ptr< ProgressCapture_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx index 39a6456170e9..d20b633431d7 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.hxx +++ b/dbaccess/source/ext/macromigration/progressmixer.hxx @@ -77,7 +77,7 @@ namespace dbmm void endPhase(); private: - ::std::auto_ptr< ProgressMixer_Data > m_pData; + ::std::unique_ptr< ProgressMixer_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index ca8bf7818fcd..95812555b59f 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -91,8 +91,8 @@ class ODBExport : public SvXMLExport } }; - ::std::auto_ptr< TStringPair > m_aAutoIncrement; - ::std::auto_ptr< TDelimiter > m_aDelimiter; + ::std::unique_ptr< TStringPair > m_aAutoIncrement; + ::std::unique_ptr< TDelimiter > m_aDelimiter; ::std::vector< TypedPropertyValue > m_aDataSourceSettings; ::std::vector< XMLPropertyState > m_aCurrentPropertyStates; TPropertyStyleMap m_aAutoStyleNames; diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index 1f536de7af0f..95df3448a966 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -38,8 +38,8 @@ namespace dbaxml class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory { protected: - mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; - mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; + mutable ::std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; + mutable ::std::unique_ptr<XMLPropertyHandler> m_pTextAlignHandler; public: OPropertyHandlerFactory(); virtual ~OPropertyHandlerFactory(); diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 452fff80dc87..43bde38aaf96 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -65,18 +65,16 @@ private: TInfoSequence m_aInfoSequence; Reference< XComponent > m_xSrcDoc; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pLoginElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDatabaseDescriptionElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDataSourceInfoElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocumentsElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pQueryElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnElemTokenMap; - SAL_WNODEPRECATED_DECLARATIONS_POP + mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pLoginElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pDatabaseDescriptionElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pDataSourceInfoElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocumentsElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pQueryElemTokenMap; + mutable ::std::unique_ptr<SvXMLTokenMap> m_pColumnElemTokenMap; mutable rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index 67e58ec8e11d..a57fec42e608 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx @@ -41,7 +41,7 @@ namespace sdbtools ,public ConnectionDependentComponent { private: - ::std::auto_ptr< DataSourceMetaData_Impl > m_pImpl; + ::std::unique_ptr< DataSourceMetaData_Impl > m_pImpl; public: /** constructs the instance diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index e81e4395ff80..4b5d3211fd17 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -41,7 +41,7 @@ namespace sdbtools ,public ConnectionDependentComponent { private: - ::std::auto_ptr< ObjectNames_Impl > m_pImpl; + ::std::unique_ptr< ObjectNames_Impl > m_pImpl; public: /** constructs the instance diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index 37eecc498c2a..7976f4a2addb 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -41,7 +41,7 @@ namespace sdbtools ,public ConnectionDependentComponent { private: - ::std::auto_ptr< TableName_Impl > m_pImpl; + ::std::unique_ptr< TableName_Impl > m_pImpl; public: /** constructs the instance diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 092ee4a909b1..6eee77829d60 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -311,9 +311,7 @@ OApplicationController::~OApplicationController() osl_atomic_increment( &m_refCount ); dispose(); } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< vcl::Window> aTemp( getView() ); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< vcl::Window> aTemp( getView() ); clearView(); } @@ -451,9 +449,7 @@ bool OApplicationController::Construct(vcl::Window* _pParent) if ( !bSuccess ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< vcl::Window> aTemp( getView() ); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< vcl::Window> aTemp( getView() ); clearView(); return false; } @@ -1069,9 +1065,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa if ( !aArgs.getLength() ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( getView() )); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( getView() )); ::std::vector<SotFormatStringId> aFormatIds; getSupportedFormats(getContainer()->getElementType(),aFormatIds); const ::std::vector<SotFormatStringId>::iterator aEnd = aFormatIds.end(); @@ -1822,9 +1816,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const { if ( isStandaloneDocument || !m_pSubComponentManager->activateSubFrame( _sName, _eType, _eOpenMode, xRet ) ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< OLinkedDocumentsAccess > aHelper = getDocumentsAccess( _eType ); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< OLinkedDocumentsAccess > aHelper = getDocumentsAccess( _eType ); if ( !aHelper->isConnected() ) break; @@ -1846,9 +1838,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const if ( !xConnection.is() ) break; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< DatabaseObjectView > pDesigner; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< DatabaseObjectView > pDesigner; ::comphelper::NamedValueCollection aArguments( _rAdditionalArguments ); Any aDataSource; @@ -1932,9 +1922,7 @@ void OApplicationController::newElementWithPilot( ElementType _eType ) case E_REPORT: case E_FORM: { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); if ( aHelper->isConnected() ) { sal_Int32 nCommandType = -1; @@ -1949,9 +1937,7 @@ void OApplicationController::newElementWithPilot( ElementType _eType ) case E_QUERY: case E_TABLE: { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); if ( aHelper->isConnected() ) { if ( E_QUERY == _eType ) @@ -1982,9 +1968,7 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType, case E_FORM: case E_REPORT: { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess( _eType ); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess( _eType ); if ( !aHelper->isConnected() ) break; @@ -1995,9 +1979,7 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType, case E_QUERY: case E_TABLE: { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< DatabaseObjectView > pDesigner; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< DatabaseObjectView > pDesigner; SharedConnection xConnection( ensureConnection() ); if ( !xConnection.is() ) break; @@ -2067,10 +2049,8 @@ void OApplicationController::renameEntry() { if ( xContainer.is() ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< IObjectNameCheck > pNameChecker; - ::std::auto_ptr< OSaveAsDlg > aDialog; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< IObjectNameCheck > pNameChecker; + ::std::unique_ptr< OSaveAsDlg > aDialog; Reference<XRename> xRename; const ElementType eType = getContainer()->getElementType(); diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 2e262c67d22f..95a14572a611 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -123,7 +123,7 @@ namespace dbaui bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date bool m_bSuspended; // is true when the controller was already suspended - ::std::auto_ptr< SelectionNotifier > + ::std::unique_ptr< SelectionNotifier > m_pSelectionNotifier; typedef ::std::map< ElementType, ::std::vector< OUString > > SelectionByElementType; SelectionByElementType m_aPendingSelection; @@ -248,9 +248,9 @@ namespace dbaui /** returns the document access for the specific type @param _eType the type - @return ::std::auto_ptr<OLinkedDocumentsAccess> + @return ::std::unique_ptr<OLinkedDocumentsAccess> */ - ::std::auto_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); + ::std::unique_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); /// returns the query definitions of the active data source. ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> getQueryDefintions() const; diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index e0c111aefb41..5957ac8fea93 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -492,8 +492,7 @@ void OApplicationController::getSelectionElementNames(::std::vector< OUString>& getContainer()->getSelectionElementNames( _rNames ); } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -::std::auto_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType ) +::std::unique_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType ) { OSL_ENSURE( ( _eType == E_TABLE ) || ( _eType == E_QUERY ) || ( _eType == E_FORM ) || ( _eType == E_REPORT ), "OApplicationController::getDocumentsAccess: only forms and reports are supported here!" ); @@ -507,14 +506,12 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH OSL_ENSURE( xDocContainer.is(), "OApplicationController::getDocumentsAccess: invalid container!" ); } - ::std::auto_ptr< OLinkedDocumentsAccess > pDocuments( new OLinkedDocumentsAccess( + ::std::unique_ptr< OLinkedDocumentsAccess > pDocuments( new OLinkedDocumentsAccess( getView(), this, getORB(), xDocContainer, xConnection, getDatabaseName() ) ); return pDocuments; } -SAL_WNODEPRECATED_DECLARATIONS_POP - TransferableHelper* OApplicationController::copyObject() { try diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 24affd63da1e..95c3b63c6358 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -86,7 +86,7 @@ namespace dbaui ::svtools::ODocumentInfoPreview m_aDocumentInfo; vcl::Window* m_pTablePreview; - ::std::auto_ptr<PopupMenu> m_aMenu; + ::std::unique_ptr<PopupMenu> m_aMenu; PreviewMode m_ePreviewMode; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > m_xFrame; diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index 33e7711865e2..76bde5d2438a 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -113,7 +113,7 @@ namespace dbaui ); private: - ::std::auto_ptr< SubComponentManager_Data > m_pData; + ::std::unique_ptr< SubComponentManager_Data > m_pData; }; } // namespace dbaui diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 39943907d534..5ccaa1118f64 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <memory> + #include "unodatbr.hxx" #include "browserids.hxx" #include "listviewitems.hxx" @@ -27,7 +31,6 @@ #include "dbu_brw.hrc" #include "dbtreemodel.hxx" #include "svtools/treelistentry.hxx" -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star::frame; using namespace ::dbtools; @@ -203,7 +206,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged() } // the connection to which this entry belongs, if any - boost::scoped_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) ); + std::unique_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) ); // the images for this entry Image aImage; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 6d59880cf35b..b18678a763d4 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -298,9 +298,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing() clearTreeModel(); // clear the tree model { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<SvTreeList> aTemp(m_pTreeModel); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<SvTreeList> aTemp(m_pTreeModel); m_pTreeModel = NULL; } @@ -2147,9 +2145,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParent, const OUString& _rName, void* _pUserData, EntryType _eEntryType ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) ); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) ); Image aImage; pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage ); @@ -3298,18 +3294,15 @@ bool SbaTableQueryBrowser::ensureConnection(SvTreeListEntry* _pAnyEntry, SharedC return ensureConnection( pDSEntry, pDSData, _rConnection ); } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -::std::auto_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry ) +::std::unique_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry ) { - ::std::auto_ptr< ImageProvider > pImageProvider( new ImageProvider ); + ::std::unique_ptr< ImageProvider > pImageProvider( new ImageProvider ); SharedConnection xConnection; if ( getExistentConnectionFor( _pAnyEntry, xConnection ) ) pImageProvider.reset( new ImageProvider( xConnection ) ); return pImageProvider; } -SAL_WNODEPRECATED_DECLARATIONS_POP - bool SbaTableQueryBrowser::getExistentConnectionFor( SvTreeListEntry* _pAnyEntry, SharedConnection& _rConnection ) { SvTreeListEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent( _pAnyEntry ); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 35bf2e2f0d00..8e2b99f0c26a 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -59,7 +59,7 @@ namespace dbaui { friend class OTableListBoxControl; - ::std::auto_ptr< ::svt::ListBoxControl> m_pListCell; + ::std::unique_ptr< ::svt::ListBoxControl> m_pListCell; TTableConnectionData::value_type m_pConnData; OTableListBoxControl* m_pBoxControl; long m_nDataPos; diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 71120eca7bc1..0eb0fc5b690a 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -565,7 +565,7 @@ namespace PopupMenu* DBTreeListBox::CreateContextMenu( void ) { - ::std::auto_ptr< PopupMenu > pContextMenu; + ::std::unique_ptr< PopupMenu > pContextMenu; if ( !m_pContextMenuProvider ) return pContextMenu.release(); diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 079bb8f97830..95ced8b8190c 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -159,9 +159,7 @@ namespace dbaui aFind->second = Event.IsEnabled; if ( m_aCommandURL == aFind->first && !Event.IsEnabled ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<PopupMenu> pMenu = getMenu(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<PopupMenu> pMenu = getMenu(); sal_uInt16 nCount = pMenu->GetItemCount(); for (sal_uInt16 i = 0; i < nCount; ++i) { @@ -179,10 +177,9 @@ namespace dbaui } } } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<PopupMenu> OToolboxController::getMenu() + ::std::unique_ptr<PopupMenu> OToolboxController::getMenu() { - ::std::auto_ptr<PopupMenu> pMenu; + ::std::unique_ptr<PopupMenu> pMenu; if ( m_aStates.size() > 2 ) { pMenu.reset( new PopupMenu( ModuleRes( RID_MENU_APP_NEW ) ) ); @@ -224,7 +221,7 @@ namespace dbaui } return pMenu; } - SAL_WNODEPRECATED_DECLARATIONS_POP + Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException, std::exception) { // execute the menu @@ -232,9 +229,7 @@ namespace dbaui ::osl::MutexGuard aGuard(m_aMutex); ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<PopupMenu> pMenu = getMenu(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<PopupMenu> pMenu = getMenu(); sal_uInt16 nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN); // "cleanup" the toolbox state diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 298d7464fb87..b124fb0cdaee 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -47,7 +47,7 @@ protected: SfxItemSet* m_pOutputSet; #ifdef HAVE_ODBC_ADMINISTRATION PushButton* m_pManageDatasources; - ::std::auto_ptr< OOdbcManagement > + ::std::unique_ptr< OOdbcManagement > m_pODBCManagement; #endif diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 3c3737ee9558..36ee36dccad7 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -104,7 +104,7 @@ protected: class ProcessTerminationWait; class OOdbcManagement { - ::std::auto_ptr< ProcessTerminationWait > m_pProcessWait; + ::std::unique_ptr< ProcessTerminationWait > m_pProcessWait; Link m_aAsyncFinishCallback; public: diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 01ff6fd39af5..d4faccffed41 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -51,7 +51,7 @@ namespace dbaui ::dbtools::SQLExceptionInfo m_aExceptionInfo; OAddTableDlg* m_pAddTableDialog; - ::std::auto_ptr< AddTableDialogContext > m_pDialogContext; + ::std::unique_ptr< AddTableDialogContext > m_pDialogContext; Point m_aMinimumTableViewSize; // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 00868b542329..b7010989267e 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -28,7 +28,7 @@ namespace dbaui class ORelationController : public OJoinController { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; - ::std::auto_ptr<WaitObject> m_pWaitObject; + ::std::unique_ptr<WaitObject> m_pWaitObject; sal_uLong m_nThreadEvent; bool m_bRelationsPossible; protected: diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 3ded3cef2e91..7b0bf1651d2a 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -42,7 +42,7 @@ class ODbDataSourceAdministrationHelper; // OTableSubscriptionDialog class OTableSubscriptionDialog : public SfxSingleTabDialog, public IItemSetHelper { - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; bool m_bStopExecution; // set when the dialog should not be executed DECL_LINK( OKClickHdl, OKButton* ); diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index a342856b7aad..a003fe898e3e 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -46,7 +46,7 @@ namespace dbaui class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; bool m_bOwnConnection; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 3520485684be..108467ac78f8 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -39,7 +39,7 @@ namespace dbaui ,public IDatabaseSettingsDialog { OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; protected: virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 66989228b351..7c437d6f1ab7 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -51,7 +51,7 @@ private: typedef ::std::stack< sal_Int32 > PageStack; PageStack m_aCurrentDetailPages; // ids of all currently enabled (type-dependent) detail pages - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 0f84ea6404f4..d86e027a0092 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -56,7 +56,7 @@ class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, pub { private: OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index bdd22395f9c6..734f967e7ef8 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -61,7 +61,7 @@ class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, private: OModuleClient m_aModuleClient; - ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; OUString m_sURL; OUString m_sOldURL; diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index 2500bbc875ce..89c4a82fde6d 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -41,7 +41,7 @@ namespace dbaui ,public IObjectNameCheck { private: - std::auto_ptr< HierarchicalNameCheck_Impl > m_pImpl; + std::unique_ptr< HierarchicalNameCheck_Impl > m_pImpl; public: /** constructs a HierarchicalNameCheck instance @@ -89,7 +89,7 @@ namespace dbaui ,public IObjectNameCheck { private: - std::auto_ptr< DynamicTableOrQueryNameCheck_Impl > m_pImpl; + std::unique_ptr< DynamicTableOrQueryNameCheck_Impl > m_pImpl; public: /** constructs a DynamicTableOrQueryNameCheck instance diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx index 94e072b5b151..fe9588ee6910 100644 --- a/dbaccess/source/ui/inc/singledoccontroller.hxx +++ b/dbaccess/source/ui/inc/singledoccontroller.hxx @@ -70,7 +70,7 @@ namespace dbaui virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - ::std::auto_ptr< OSingleDocumentController_Data > m_pData; + ::std::unique_ptr< OSingleDocumentController_Data > m_pData; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index d91ec74cac56..1f4200c827ad 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -50,7 +50,7 @@ class OSQLMessageBox : public ButtonDialog FixedText m_aMessage; OUString m_sHelpURL; - ::std::auto_ptr< SQLMessageBox_Impl > m_pImpl; + ::std::unique_ptr< SQLMessageBox_Impl > m_pImpl; public: enum MessageType diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 40ab9616095b..872b02e42734 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -48,7 +48,7 @@ namespace dbaui virtual short Execute() SAL_OVERRIDE; private: - ::std::auto_ptr< OTextConnectionHelper > m_pTextConnectionHelper; + ::std::unique_ptr< OTextConnectionHelper > m_pTextConnectionHelper; OKButton *m_pOK; SfxItemSet& m_rItems; diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index 71fda672ea29..a450ac9c4cbd 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -41,7 +41,7 @@ namespace dbaui TCommandState m_aStates; sal_uInt16 m_nToolBoxId; - ::std::auto_ptr<PopupMenu> getMenu(); + ::std::unique_ptr<PopupMenu> getMenu(); public: OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index e28f3e2adff5..b051d2e5a79b 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -326,7 +326,7 @@ namespace dbaui bool getExistentConnectionFor( SvTreeListEntry* _pDSEntry, SharedConnection& _rConnection ); /** returns an image provider which works with the connection belonging to the given entry */ - ::std::auto_ptr< ImageProvider > + ::std::unique_ptr< ImageProvider > getImageProviderFor( SvTreeListEntry* _pAnyEntry ); void implAdministrate( SvTreeListEntry* _pApplyTo ); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index f773f71c3354..20654daece80 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1254,7 +1254,7 @@ sal_Int32 OQueryController::getColWidth(sal_uInt16 _nColPos) const { if ( _nColPos < m_aFieldInformation.getLength() ) { - ::std::auto_ptr<OTableFieldDesc> pField( new OTableFieldDesc()); + ::std::unique_ptr<OTableFieldDesc> pField( new OTableFieldDesc()); pField->Load( m_aFieldInformation[ _nColPos ], false ); return pField->GetColWidth(); } @@ -1892,7 +1892,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings else if ( m_bEscapeProcessing ) { OUString aErrorMsg; - ::std::auto_ptr< ::connectivity::OSQLParseNode > pNode( + ::std::unique_ptr< ::connectivity::OSQLParseNode > pNode( m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign ) ); if ( pNode.get() ) diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 1f6f0b8cdb2b..3bdb494924ca 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -236,13 +236,11 @@ namespace dbaui /** extracts the source object (table or query) described by the given descriptor, relative to m_xSourceConnection */ - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ICopyTableSourceObject > + ::std::unique_ptr< ICopyTableSourceObject > impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const; - SAL_WNODEPRECATED_DECLARATIONS_POP /** extracts the result set to copy records from, and the selection-related aspects, if any. @@ -337,10 +335,8 @@ private: // source SharedConnection m_xSourceConnection; sal_Int32 m_nCommandType; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ICopyTableSourceObject > + ::std::unique_ptr< ICopyTableSourceObject > m_pSourceObject; - SAL_WNODEPRECATED_DECLARATIONS_POP Reference< XResultSet > m_xSourceResultSet; Sequence< Any > m_aSourceSelection; bool m_bSourceSelectionBookmarks; @@ -718,8 +714,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -::std::auto_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const +::std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const { OSL_PRECOND( _rxDescriptor.is() && m_xSourceConnection.is(), "CopyTableWizard::impl_extractSourceObject_throw: illegal arguments!" ); @@ -736,7 +731,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH OSL_VERIFY( _rxDescriptor->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand ); OSL_VERIFY( _rxDescriptor->getPropertyValue( PROPERTY_COMMAND_TYPE ) >>= _out_rCommandType ); - ::std::auto_ptr< ICopyTableSourceObject > pSourceObject; + ::std::unique_ptr< ICopyTableSourceObject > pSourceObject; Reference< XNameAccess > xContainer; switch ( _out_rCommandType ) { @@ -785,8 +780,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH return pSourceObject; } -SAL_WNODEPRECATED_DECLARATIONS_POP - void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPropertySet >& i_rDescriptor ) { Reference< XPropertySetInfo > xPSI( i_rDescriptor->getPropertySetInfo(), UNO_SET_THROW ); diff --git a/include/dbaccess/controllerframe.hxx b/include/dbaccess/controllerframe.hxx index e39c63251586..7a990d0acc1c 100644 --- a/include/dbaccess/controllerframe.hxx +++ b/include/dbaccess/controllerframe.hxx @@ -64,7 +64,7 @@ namespace dbaui void frameAction( ::com::sun::star::frame::FrameAction _eAction ); private: - ::std::auto_ptr< ControllerFrame_Data > m_pData; + ::std::unique_ptr< ControllerFrame_Data > m_pData; }; diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 47292d09a7ac..b50149299f38 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -39,7 +39,7 @@ namespace dbaui protected: IController& m_rController; // the controller in where we resides in FixedLine m_aSeparator; - ::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel; + ::std::unique_ptr< ::svt::AcceleratorExecute> m_pAccel; public: ODataView( vcl::Window* pParent, diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index 02f7347ae1ef..d7087e025b97 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -56,7 +56,7 @@ namespace dbaui class DBACCESS_DLLPUBLIC DBSubComponentController : public DBSubComponentController_Base { private: - ::std::auto_ptr<DBSubComponentController_Impl> m_pImpl; + ::std::unique_ptr<DBSubComponentController_Impl> m_pImpl; private: /** forces usage of a connection which we do not own diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 4bdd59c5d9af..79169c3ff9ba 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -210,7 +210,7 @@ namespace dbaui ::comphelper::NamedValueCollection m_aInitParameters; - ::std::auto_ptr< OGenericUnoController_Data > + ::std::unique_ptr< OGenericUnoController_Data > m_pData; ODataView* m_pView; // our (VCL) "main window" |