From d54a72a40852e206d78ab4c57a6898cfae39b8d0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 24 Sep 2014 18:50:37 +0200 Subject: dbaccess: std::auto_ptr -> std::unique_ptr Change-Id: I2b27aaf589fcbe4da1680f624a57be7ae62b0dc5 --- 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 +- 14 files changed, 15 insertions(+), 15 deletions(-) (limited to 'dbaccess/source/ui/inc') 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 m_pWaitObject; + ::std::unique_ptr 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 m_pImpl; + ::std::unique_ptr 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 m_pImpl; + ::std::unique_ptr 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 m_pImpl; + ::std::unique_ptr 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 m_pImpl; + ::std::unique_ptr m_pImpl; bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing bool m_bUIEnabled : 1; /// if the UI is enabled, false otherwise. Cannot be switched back to , once it is 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 m_pImpl; + ::std::unique_ptr 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 m_pImpl; + ::std::unique_ptr 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 getMenu(); + ::std::unique_ptr 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 ); -- cgit