diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 12:26:40 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 12:28:52 +0200 |
commit | 3b5345e1234d2ede54cb971ff2881719da26e6a7 (patch) | |
tree | ac784694c39b62c92f0381efc6edc0d5e386259d /extensions | |
parent | fddabddb0ad178ce6989d254c6001126d7bd23c4 (diff) |
extensions: std::auto_ptr -> std::unique_ptr
Change-Id: I2d9d2e145584013d8e94f5aea2ec7732452b240c
Diffstat (limited to 'extensions')
17 files changed, 20 insertions, 26 deletions
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index c82175f7d6a9..dd75190180d5 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -93,7 +93,7 @@ namespace logging Reference<XComponentContext> m_xContext; LogHandlerHelper m_aHandlerHelper; OUString m_sFileURL; - ::std::auto_ptr< ::osl::File > m_pFile; + ::std::unique_ptr< ::osl::File > m_pFile; FileValidity m_eFileValidity; protected: diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index b61911c66fb9..272d4e4d8157 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -95,7 +95,7 @@ namespace pcr protected: Window m_aLinesPlayground; ScrollBar m_aVScroll; - ::std::auto_ptr< InspectorHelpWindow > + ::std::unique_ptr< InspectorHelpWindow > m_pHelpWindow; ListBoxLines m_aLines; IPropertyLineListener* m_pLineListener; diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index 588a4a4129f8..e07bfa0d3808 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -42,7 +42,7 @@ namespace pcr class CellBindingPropertyHandler : public CellBindingPropertyHandler_Base { private: - ::std::auto_ptr< CellBindingHelper > m_pHelper; + ::std::unique_ptr< CellBindingHelper > m_pHelper; ::rtl::Reference< IPropertyEnumRepresentation > m_pCellExchangeConverter; public: diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 7d612b70be6d..7b9dffafd389 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -69,7 +69,7 @@ namespace pcr class ComposedPropertyUIUpdate { private: - ::std::auto_ptr< MapHandlerToUI > m_pCollectedUIs; + ::std::unique_ptr< MapHandlerToUI > m_pCollectedUIs; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > m_xDelegatorUI; oslInterlockedCount m_nSuspendCounter; diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index cfc98ef8925a..22e17deebe03 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -39,9 +39,7 @@ namespace pcr bool m_bConstructed; /// access to property meta data - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< OPropertyInfoService > m_pInfoService; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< OPropertyInfoService > m_pInfoService; protected: virtual ~DefaultFormComponentInspectorModel(); diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index 3ca187435546..d3430414d7cf 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -38,7 +38,7 @@ namespace pcr class EFormsPropertyHandler : public EFormsPropertyHandler_Base { private: - ::std::auto_ptr< EFormsHelper > m_pHelper; + ::std::unique_ptr< EFormsHelper > m_pHelper; /** current value of the Model property, if there is no binding, yet */ OUString m_sBindingLessModelName; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 34c009944660..34a2dd02f286 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -854,7 +854,7 @@ namespace pcr if ( !pFactory ) return InteractiveSelectionResult_Cancelled; - ::std::auto_ptr< VclAbstractDialog > pDialog( pFactory->CreateSvxMacroAssignDlg( + ::std::unique_ptr< VclAbstractDialog > pDialog( pFactory->CreateSvxMacroAssignDlg( PropertyHandlerHelper::getDialogParentWindow( m_xContext ), impl_getContextFrame_nothrow(), m_bIsDialogElement, diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 5eed30a9d960..a923df89bab4 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -451,7 +451,7 @@ namespace pcr class WaitCursor { private: - ::std::auto_ptr< WaitObject > m_aWaitObject; + ::std::unique_ptr< WaitObject > m_aWaitObject; public: WaitCursor( vcl::Window* _pWindow ) diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index e4fc3f01a766..94b386e7108f 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -47,12 +47,10 @@ namespace pcr FixedText* m_pExplanation; FixedText* m_pDetailLabel; FixedText* m_pMasterLabel; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< FieldLinkRow > m_aRow1; - ::std::auto_ptr< FieldLinkRow > m_aRow2; - ::std::auto_ptr< FieldLinkRow > m_aRow3; - ::std::auto_ptr< FieldLinkRow > m_aRow4; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< FieldLinkRow > m_aRow1; + ::std::unique_ptr< FieldLinkRow > m_aRow2; + ::std::unique_ptr< FieldLinkRow > m_aRow3; + ::std::unique_ptr< FieldLinkRow > m_aRow4; OKButton* m_pOK; PushButton* m_pSuggest; diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 9a2f3368729b..8dd806a574a2 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -63,7 +63,7 @@ namespace pcr sal_Int32 m_nMinHelpTextLines; sal_Int32 m_nMaxHelpTextLines; bool m_bIsReadOnly; - ::std::auto_ptr< ::cppu::IPropertyArrayHelper > + ::std::unique_ptr< ::cppu::IPropertyArrayHelper > m_pPropertyInfo; public: diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index fc08a0a51c8c..34ed5fb69e76 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -54,7 +54,7 @@ namespace pcr ,public ImplInspectorModel_PBase { protected: - ::std::auto_ptr< InspectorModelProperties > m_pProperties; + ::std::unique_ptr< InspectorModelProperties > m_pProperties; protected: virtual ~ImplInspectorModel(); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 62c73a6fe3b6..5dbe78a2bbff 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -121,7 +121,7 @@ namespace pcr PropertyHandlerMultiRepository m_aDependencyHandlers; PropertyHandlerRef m_xInteractiveHandler; - ::std::auto_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; + ::std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; /// our InspectorModel ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 725f97170870..4c7169696866 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -60,9 +60,7 @@ namespace pcr private: HandlerArray m_aSlaveHandlers; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; PropertyChangeListeners m_aPropertyListeners; bool m_bSupportedPropertiesAreKnown; PropertyBag m_aSupportedProperties; diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index 8290dff46440..3795917cc275 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.hxx @@ -55,7 +55,7 @@ namespace pcr virtual ~PropertyControlExtender(); private: - ::std::auto_ptr< PropertyControlExtender_Data > m_pData; + ::std::unique_ptr< PropertyControlExtender_Data > m_pData; }; diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index ee669ca76d93..2b1ebcd42fa9 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -94,7 +94,7 @@ namespace pcr /// type converter, needed on various occasions ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; /// access to property meta data - ::std::auto_ptr< OPropertyInfoService > m_pInfoService; + ::std::unique_ptr< OPropertyInfoService > m_pInfoService; protected: PropertyHandler( diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index 04563ced3772..a689aad8f1e4 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -70,7 +70,7 @@ namespace pcr { private: ::osl::Mutex m_aMutex; - ::std::auto_ptr< SubmissionHelper > m_pHelper; + ::std::unique_ptr< SubmissionHelper > m_pHelper; ::comphelper::OPropertyChangeMultiplexer* m_pPropChangeMultiplexer; public: diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index ff8bb26ea6c2..ce23f78dad55 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -38,7 +38,7 @@ namespace pcr class XSDValidationPropertyHandler : public XSDValidationPropertyHandler_Base { private: - ::std::auto_ptr< XSDValidationHelper > m_pHelper; + ::std::unique_ptr< XSDValidationHelper > m_pHelper; public: XSDValidationPropertyHandler( |