comphelper/source/container/enumerablemap.cxx | 15 +-- comphelper/source/misc/anycompare.cxx | 6 - comphelper/source/property/MasterPropertySet.cxx | 10 +- comphelper/source/property/opropertybag.hxx | 2 connectivity/source/commontools/sqlerror.cxx | 2 connectivity/source/drivers/mozab/MConnection.hxx | 2 connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx | 2 connectivity/source/resource/sharedresources.cxx | 2 connectivity/source/simpledbt/dbtfactory.cxx | 6 - connectivity/source/simpledbt/dbtfactory.hxx | 2 dbaccess/source/core/api/KeySet.cxx | 9 -- dbaccess/source/core/api/KeySet.hxx | 14 +-- dbaccess/source/core/api/OptimisticSet.cxx | 8 - dbaccess/source/core/api/RowSetBase.hxx | 2 dbaccess/source/core/api/RowSetCache.cxx | 4 dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 2 dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 2 dbaccess/source/core/dataaccess/documentevents.hxx | 2 dbaccess/source/core/dataaccess/myucp_datasupplier.hxx | 2 dbaccess/source/core/inc/objectnameapproval.hxx | 2 dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 2 dbaccess/source/core/recovery/storagetextstream.hxx | 2 dbaccess/source/core/recovery/storagexmlstream.hxx | 4 dbaccess/source/ext/macromigration/docinteraction.hxx | 2 dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 2 dbaccess/source/ext/macromigration/migrationengine.hxx | 2 dbaccess/source/ext/macromigration/migrationlog.hxx | 2 dbaccess/source/ext/macromigration/progresscapture.hxx | 2 dbaccess/source/ext/macromigration/progressmixer.hxx | 2 dbaccess/source/filter/xml/xmlExport.hxx | 4 dbaccess/source/filter/xml/xmlHelper.hxx | 4 dbaccess/source/filter/xml/xmlfilter.hxx | 22 ++--- dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 2 dbaccess/source/sdbtools/connection/objectnames.hxx | 2 dbaccess/source/sdbtools/connection/tablename.hxx | 2 dbaccess/source/ui/app/AppController.cxx | 42 ++-------- dbaccess/source/ui/app/AppController.hxx | 6 - dbaccess/source/ui/app/AppControllerDnD.cxx | 7 - dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 dbaccess/source/ui/app/subcomponentmanager.hxx | 2 dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 7 + dbaccess/source/ui/browser/unodatbr.cxx | 15 --- dbaccess/source/ui/control/RelationControl.cxx | 2 dbaccess/source/ui/control/dbtreelistbox.cxx | 2 dbaccess/source/ui/control/toolboxcontroller.cxx | 15 +-- dbaccess/source/ui/dlg/dsselect.hxx | 2 dbaccess/source/ui/dlg/odbcconfig.hxx | 2 dbaccess/source/ui/inc/JoinController.hxx | 2 dbaccess/source/ui/inc/RelationController.hxx | 2 dbaccess/source/ui/inc/TablesSingleDlg.hxx | 2 dbaccess/source/ui/inc/UserAdminDlg.hxx | 2 dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 2 dbaccess/source/ui/inc/dbadmin.hxx | 2 dbaccess/source/ui/inc/dbwiz.hxx | 2 dbaccess/source/ui/inc/dbwizsetup.hxx | 2 dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 4 dbaccess/source/ui/inc/singledoccontroller.hxx | 2 dbaccess/source/ui/inc/sqlmessage.hxx | 2 dbaccess/source/ui/inc/textconnectionsettings.hxx | 2 dbaccess/source/ui/inc/toolboxcontroller.hxx | 2 dbaccess/source/ui/inc/unodatbr.hxx | 2 dbaccess/source/ui/querydesign/querycontroller.cxx | 4 dbaccess/source/ui/uno/copytablewizard.cxx | 15 --- extensions/source/propctrlr/eformshelper.cxx | 8 - extensions/source/propctrlr/propertyhandler.cxx | 6 - include/canvas/propertysethelper.hxx | 2 include/comphelper/anycompare.hxx | 2 include/comphelper/listenernotification.hxx | 6 - include/comphelper/namedvaluecollection.hxx | 2 include/comphelper/officeresourcebundle.hxx | 2 include/comphelper/propertybag.hxx | 2 include/connectivity/TTableHelper.hxx | 2 include/connectivity/dbmetadata.hxx | 2 include/connectivity/formattedcolumnvalue.hxx | 2 include/connectivity/paramwrapper.hxx | 2 include/connectivity/sdbcx/VCollection.hxx | 2 include/connectivity/sqliterator.hxx | 2 include/connectivity/sqlparse.hxx | 2 include/connectivity/statementcomposer.hxx | 2 include/connectivity/virtualdbtools.hxx | 2 include/dbaccess/controllerframe.hxx | 2 include/dbaccess/dataview.hxx | 2 include/dbaccess/dbsubcomponentcontroller.hxx | 2 include/dbaccess/genericcontroller.hxx | 2 include/svx/dbtoolsclient.hxx | 2 svx/source/fmcomp/gridcell.cxx | 4 svx/source/form/dbtoolsclient.cxx | 6 - svx/source/inc/gridcell.hxx | 6 - toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2 89 files changed, 153 insertions(+), 228 deletions(-)
New commits: commit d54a72a40852e206d78ab4c57a6898cfae39b8d0 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Sep 24 18:50:37 2014 +0200 dbaccess: std::auto_ptr -> std::unique_ptr Change-Id: I2b27aaf589fcbe4da1680f624a57be7ae62b0dc5 diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 96e01ab..19b9971 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 49e60fb..51168ce 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 aece21b..12b3e98 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 520ddb0..4509d6e 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 07cfa19..ba588c9 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 e801d1d..15d2bea 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 d3a1f93..017bea2 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 0d9a5e8..61a9c63 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 56ab944..e3e8704 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 fd7d232..e3d374e 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 02f737a..944ba3d 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 ae12baf..e704a85 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 bc130d6..4eb7097 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 0282e4f..fefdc6b 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 b5ee3d1..689327e 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 1396162..b8e3e2e 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 958e5df77..1a854e6 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 f0c1294..e7633af 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 39a6456..d20b633 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 ca8bf78..9581255 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 1f536de..95df344 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 452fff8..43bde38 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 67e58ec..a57fec4 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 e81e439..4b5d321 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 37eecc4..7976f4a 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 092ee4a..6eee778 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 2e262c6..95a1457 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 e0c111a..5957ac8 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 24affd6..95c3b63 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 33e7711..76bde5d 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 3994390..5ccaa11 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 6d59880..b18678a 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 35bf2e2..8e2b99f 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 71120ec..0eb0fc5 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 079bb8f..95ced8b 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 298d746..b124fb0 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 3c3737e..36ee36d 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 01ff6fd..d4faccf 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 00868b5..b701098 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 3ded3ce..7b0bf16 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 a342856..a003fe8 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 3520485..108467a 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 6698922..7c437d6 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 0f84ea6..d86e027 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 bdd2239..734f967 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 2500bbc..89c4a82 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 94e072b..fe9588e 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 d91ec74..1f4200c 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 40ab961..872b02e 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 71fda67..a450ac9 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 e28f3e2..b051d2e 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 f773f71..20654da 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 1f6f0b8..3bdb494 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 e39c632..7a990d0 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 47292d0..b501492 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 02f7347..d7087e0 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 4bdd59c..79169c3 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" commit 43c47c610556b0bbd4f22c317d6e58c543109c12 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Sep 24 18:15:42 2014 +0200 connectivity: std::auto_ptr -> std::unique_ptr Change-Id: I796dc05d1846f140a56b5a6f14a69a239324ae5b diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 1894f35..39e46db 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -90,7 +90,7 @@ namespace connectivity private: ::osl::Mutex m_aMutex; Reference<XComponentContext> m_aContext; - ::std::auto_ptr< ::comphelper::OfficeResourceBundle > m_pResources; + ::std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources; bool m_bAttemptedInit; }; diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 7501e97..6241318 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -103,7 +103,7 @@ namespace connectivity // an operation MozabDriver* m_pDriver; // Pointer to the owning // driver object - ::std::auto_ptr< ConnectionImplData > m_pImplData; + ::std::unique_ptr< ConnectionImplData > m_pImplData; // This is to be able to hold a boost::shared_ptr. If we would hold it as member, it would // not compile the mozillasrc directory, since this directory is compiled without RTTI support // and boost seems to require RTTI on some platforms. diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx index 7e66763..ab020ed 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx @@ -58,7 +58,7 @@ namespace connectivity { namespace mozab { virtual ~MLdapAttributeMap(); private: - ::std::auto_ptr< AttributeMap_Data > m_pData; + ::std::unique_ptr< AttributeMap_Data > m_pData; }; diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index ea28d48..c3c0896 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -46,7 +46,7 @@ namespace connectivity static oslInterlockedCount s_nClients; private: - ::std::auto_ptr< ::comphelper::OfficeResourceBundle > + ::std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResourceBundle; public: diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx index dfd5535..cead9fa 100644 --- a/connectivity/source/simpledbt/dbtfactory.cxx +++ b/connectivity/source/simpledbt/dbtfactory.cxx @@ -73,15 +73,13 @@ namespace connectivity } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue( + ::std::unique_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) { - ::std::auto_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rxContext, _rxRowSet, _rxColumn ) ); + ::std::unique_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rxContext, _rxRowSet, _rxColumn ) ); return pValue; } - SAL_WNODEPRECATED_DECLARATIONS_POP ::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XComponentContext >& rxContext, const IParseContext* _pContext) const diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx index 4ba0fe5..7631606 100644 --- a/connectivity/source/simpledbt/dbtfactory.hxx +++ b/connectivity/source/simpledbt/dbtfactory.hxx @@ -52,7 +52,7 @@ namespace connectivity virtual ::rtl::Reference< simple::IDataAccessTools > getDataAccessTools() SAL_OVERRIDE; - virtual ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( + virtual ::std::unique_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index a125222..43d5fd7 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -81,7 +81,7 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OTableHelper : public OTable_TYPEDEF { - ::std::auto_ptr<OTableHelperImpl> m_pImpl; + ::std::unique_ptr<OTableHelperImpl> m_pImpl; void refreshPrimaryKeys(TStringVector& _rKeys); void refreshForeignKeys(TStringVector& _rKeys); diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index 7d7e3bf..148763d 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -49,7 +49,7 @@ namespace dbtools class OOO_DLLPUBLIC_DBTOOLS DatabaseMetaData { private: - ::std::auto_ptr< DatabaseMetaData_Impl > m_pImpl; + ::std::unique_ptr< DatabaseMetaData_Impl > m_pImpl; public: DatabaseMetaData(); diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 85f7ec5..085233d 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -97,7 +97,7 @@ namespace dbtools virtual OUString getFormattedValue() const; private: - ::std::auto_ptr< FormattedColumnValue_Data > m_pData; + ::std::unique_ptr< FormattedColumnValue_Data > m_pData; }; diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 60ff2cc..c38f5a6 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -72,7 +72,7 @@ namespace param /// the component taking the value ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xValueDestination; /// helper for implementing XPropertySetInfo - ::std::auto_ptr< ::cppu::OPropertyArrayHelper > m_pInfoHelper; + ::std::unique_ptr< ::cppu::OPropertyArrayHelper > m_pInfoHelper; public: diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index 95ef85e..7573b5a 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -92,7 +92,7 @@ namespace connectivity public OCollectionBase { protected: - ::std::auto_ptr<IObjectCollection> m_pElements; + ::std::unique_ptr<IObjectCollection> m_pElements; ::cppu::OInterfaceContainerHelper m_aContainerListeners; ::cppu::OInterfaceContainerHelper m_aRefreshListeners; diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index ef792db..785c821 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -67,7 +67,7 @@ namespace connectivity ::rtl::Reference<OSQLColumns> m_aOrderColumns; // the order by columns ::rtl::Reference<OSQLColumns> m_aCreateColumns; // the columns for Create table clause - ::std::auto_ptr< OSQLParseTreeIteratorImpl > m_pImpl; + ::std::unique_ptr< OSQLParseTreeIteratorImpl > m_pImpl; void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const OUString& _aColumnName, OUString& _aTableRange, const OUString& _rColumnAlias); // inserts a table into the map diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index 5afe259..8240be5 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -151,7 +151,7 @@ namespace connectivity // information on the current parse action const IParseContext* m_pContext; OSQLParseNode* m_pParseTree; // result from parsing - ::std::auto_ptr< OSQLParser_Data > + ::std::unique_ptr< OSQLParser_Data > m_pData; OUString m_sFieldName; // current field name for a predicate OUString m_sErrorMessage;// current error msg diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index 39ead84..d53f390 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -41,7 +41,7 @@ namespace dbtools */ class OOO_DLLPUBLIC_DBTOOLS StatementComposer : public ::boost::noncopyable { - ::std::auto_ptr< StatementComposer_Data > m_pData; + ::std::unique_ptr< StatementComposer_Data > m_pData; public: /** constructs an instance diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx index 26dc62e..7735f51 100644 --- a/include/connectivity/virtualdbtools.hxx +++ b/include/connectivity/virtualdbtools.hxx @@ -347,7 +347,7 @@ namespace connectivity /// creates a helper which can be used to access the static methods in dbtools.hxx virtual ::rtl::Reference< IDataAccessTools > getDataAccessTools() = 0; - virtual ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( + virtual ::std::unique_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx index 6064e35..7888b0a 100644 --- a/include/svx/dbtoolsclient.hxx +++ b/include/svx/dbtoolsclient.hxx @@ -158,7 +158,7 @@ namespace svxform DBToolsObjectFactory(); virtual ~DBToolsObjectFactory(); - ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( + ::std::unique_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( const css::uno::Reference<css::uno::XComponentContext>& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 9feb232..fd140a8 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1793,9 +1793,7 @@ OUString DbPatternField::impl_formatText( const OUString& _rText ) OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { bool bIsForPaint = _rxField != m_rColumn.GetField(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::dbtools::FormattedColumnValue >& rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::dbtools::FormattedColumnValue >& rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter; if ( !rpFormatter.get() ) { diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index c5b6d05..766877a 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -317,16 +317,14 @@ namespace svxform } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue( + ::std::unique_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue( const Reference<XComponentContext>& _rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& _rxColumn ) { - ::std::auto_ptr< ::dbtools::FormattedColumnValue > pValue; + ::std::unique_ptr< ::dbtools::FormattedColumnValue > pValue; if ( ensureLoaded() ) pValue = getFactory()->createFormattedColumnValue( _rContext, _rxRowSet, _rxColumn ); return pValue; } - SAL_WNODEPRECATED_DECLARATIONS_POP } // namespace svxform diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 2746fa6..2051498 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -544,10 +544,8 @@ private: OUString impl_formatText(const OUString& _rText); private: - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; - ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pPaintFormatter; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; + ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pPaintFormatter; css::uno::Reference<css::uno::XComponentContext> m_xContext; }; commit c91dec0dad6b0da5bfe15d0597bfc069df26f343 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Sep 24 17:48:49 2014 +0200 comphelper: std::auto_ptr -> std::unique_ptr Change-Id: I364d6252f470dcc6d71a191f1249e95ca1f284ce diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 7dc2df1..763e31f 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -39,9 +39,10 @@ #include <typelib/typedescription.hxx> #include <map> -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> +#include <utility> +#include <boost/noncopyable.hpp> namespace comphelper { @@ -93,8 +94,8 @@ namespace comphelper { Type m_aKeyType; Type m_aValueType; - ::std::auto_ptr< KeyedValues > m_pValues; - ::boost::shared_ptr< IKeyPredicateLess > m_pKeyCompare; + ::std::unique_ptr< KeyedValues > m_pValues; + ::std::shared_ptr< IKeyPredicateLess > m_pKeyCompare; bool m_bMutable; MapListeners m_aModListeners; @@ -333,7 +334,7 @@ namespace comphelper private: // since we share our mutex with the main map, we need to keep it alive as long as we live Reference< XInterface > m_xKeepMapAlive; - ::std::auto_ptr< MapData > m_pMapDataCopy; + ::std::unique_ptr< MapData > m_pMapDataCopy; MapEnumerator m_aEnumerator; }; @@ -388,14 +389,14 @@ namespace comphelper throw IllegalTypeException("Unsupported value type.", *this ); // create the comparator for the KeyType, and throw if the type is not supported - ::std::auto_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, NULL ) ); + ::std::unique_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, NULL ) ); if ( !pComparator.get() ) throw IllegalTypeException("Unsupported key type.", *this ); // init members m_aData.m_aKeyType = aKeyType; m_aData.m_aValueType = aValueType; - m_aData.m_pKeyCompare = pComparator; + m_aData.m_pKeyCompare = std::move(pComparator); m_aData.m_pValues.reset( new KeyedValues( *m_aData.m_pKeyCompare ) ); m_aData.m_bMutable = bMutable; diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx index 3d7d3f2..e4f038d 100644 --- a/comphelper/source/misc/anycompare.cxx +++ b/comphelper/source/misc/anycompare.cxx @@ -176,11 +176,9 @@ namespace comphelper }; - ::std::auto_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator ) + ::std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< IKeyPredicateLess > pComparator; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< IKeyPredicateLess > pComparator; switch ( i_type.getTypeClass() ) { case TypeClass_CHAR: diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index a4fa976..6cb5abf 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -45,7 +45,7 @@ AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : mpGuardArray(new bo AutoOGuardArray::~AutoOGuardArray() { - //!! release auto_ptr's and thus the mutexes locks + //!! release scoped_ptr's and thus the mutexes locks delete [] mpGuardArray; } @@ -216,9 +216,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& const OUString * pString = aPropertyNames.getConstArray(); PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter; - //!! have an auto_ptr to an array of OGuards in order to have the + //!! have a scoped_ptr to an array of OGuards in order to have the //!! allocated memory properly freed (exception safe!). - //!! Since the array itself has auto_ptrs as members we have to use a + //!! Since the array itself has scoped_ptrs as members we have to use a //!! helper class 'AutoOGuardArray' in order to have //!! the acquired locks properly released. AutoOGuardArray aOGuardArray( nCount ); @@ -281,9 +281,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O const OUString * pString = aPropertyNames.getConstArray(); PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter; - //!! have an auto_ptr to an array of OGuards in order to have the + //!! have an scoped_ptr to an array of OGuards in order to have the //!! allocated memory properly freed (exception safe!). - //!! Since the array itself has auto_ptrs as members we have to use a + //!! Since the array itself has scoped_ptrs as members we have to use a //!! helper class 'AutoOGuardArray' in order to have //!! the acquired locks properly released. AutoOGuardArray aOGuardArray( nCount ); diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 9cabfa0..7211748 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -77,7 +77,7 @@ namespace comphelper { private: /// our IPropertyArrayHelper implementation - ::std::auto_ptr< ::cppu::OPropertyArrayHelper > + ::std::unique_ptr< ::cppu::OPropertyArrayHelper > m_pArrayHelper; ::comphelper::PropertyBag m_aDynamicProperties; diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 99a432c..5afa158 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -243,9 +243,7 @@ namespace pcr { if ( !_bDoListen ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator(); while ( pListenerIterator->hasMoreElements() ) { PropertyEventTranslation* pTranslator = dynamic_cast< PropertyEventTranslation* >( pListenerIterator->next() ); @@ -279,9 +277,7 @@ namespace pcr } else { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator(); while ( pListenerIterator->hasMoreElements() ) { Reference< XPropertyChangeListener > xListener( pListenerIterator->next(), UNO_QUERY ); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 862ab4b..6ac121a 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -78,10 +78,8 @@ namespace pcr return; // remove all old property change listeners - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator(); - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator(); + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed while ( removeListener->hasMoreElements() ) removePropertyChangeListener( static_cast< XPropertyChangeListener* >( removeListener->next() ) ); OSL_ENSURE( m_aPropertyListeners.empty(), "PropertyHandler::inspect: derived classes are expected to forward the removePropertyChangeListener call to their base class (me)!" ); diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx index 263531b..9216b48 100644 --- a/include/comphelper/anycompare.hxx +++ b/include/comphelper/anycompare.hxx @@ -204,7 +204,7 @@ namespace comphelper a default implementation of IKeyPredicateLess, which is able to compare values of the given type. If no such default implementation is known for the given type, then <NULL/> is returned. */ - ::std::auto_ptr< IKeyPredicateLess > COMPHELPER_DLLPUBLIC + ::std::unique_ptr< IKeyPredicateLess > COMPHELPER_DLLPUBLIC getStandardLessPredicate( ::com::sun::star::uno::Type const & i_type, ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index 38409ea..a2b6d35 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -84,13 +84,11 @@ namespace comphelper /** creates an iterator for looping through all registered listeners */ - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > createIterator() + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > createIterator() { - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) ); + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) ); return pIterator; } - SAL_WNODEPRECATED_DECLARATIONS_POP protected: OListenerContainer( ::osl::Mutex& _rMutex ); diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index bcd7ab7..0889654 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -45,7 +45,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC NamedValueCollection { private: - ::std::auto_ptr< NamedValueCollection_Impl > m_pImpl; + ::std::unique_ptr< NamedValueCollection_Impl > m_pImpl; public: NamedValueCollection(); diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx index f893fbb..1a40551 100644 --- a/include/comphelper/officeresourcebundle.hxx +++ b/include/comphelper/officeresourcebundle.hxx @@ -41,7 +41,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OfficeResourceBundle { private: - ::std::auto_ptr< ResourceBundle_Impl > m_pImpl; + ::std::unique_ptr< ResourceBundle_Impl > m_pImpl; public: /** constructs a resource bundle with the resource bundle given as 8-bit ASCII name diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx index 573f0ef..484246a 100644 --- a/include/comphelper/propertybag.hxx +++ b/include/comphelper/propertybag.hxx @@ -42,7 +42,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC PropertyBag : protected OPropertyContainerHelper { private: - ::std::auto_ptr< PropertyBag_Impl > m_pImpl; + ::std::unique_ptr< PropertyBag_Impl > m_pImpl; public: PropertyBag(); diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 30b28c5..1aab3bc 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -559,7 +559,7 @@ private: } // get predicate object - ::std::auto_ptr< ::comphelper::IKeyPredicateLess > const pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) ); + ::std::unique_ptr< ::comphelper::IKeyPredicateLess > const pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) ); ENSURE_OR_RETURN_FALSE( pPredicate.get(), "SortableGridDataModel::impl_reIndex_nothrow: no sortable data found!" ); // then sort commit 5de8a127cd1790d37d5af83153b8103468eca6ce Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Sep 24 16:41:40 2014 +0200 canvas: std::auto_ptr -> std::unique_ptr Change-Id: I1b58132c3155d59c78ef3e2414129319ee5e9fcd diff --git a/include/canvas/propertysethelper.hxx b/include/canvas/propertysethelper.hxx index b90d9ef..dada480 100644 --- a/include/canvas/propertysethelper.hxx +++ b/include/canvas/propertysethelper.hxx @@ -142,7 +142,7 @@ namespace canvas const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ); private: - std::auto_ptr<MapType> mpMap; + std::unique_ptr<MapType> mpMap; InputMap maMapEntries; }; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits