diff options
Diffstat (limited to 'chart2/source/controller/inc')
15 files changed, 30 insertions, 32 deletions
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 8034aa769a9b..eae2f7105c55 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -36,9 +36,9 @@ #include <cppuhelper/interfacecontainer.hxx> #include <unotools/accessiblestatesethelper.hxx> -#include <vector> #include <map> -#include <boost/shared_ptr.hpp> +#include <memory> +#include <vector> #include "MutexContainer.hxx" @@ -70,7 +70,7 @@ struct AccessibleElementInfo ::com::sun::star::uno::WeakReference< ::com::sun::star::awt::XWindow > m_xWindow; - ::boost::shared_ptr< ObjectHierarchy > m_spObjectHierarchy; + std::shared_ptr< ObjectHierarchy > m_spObjectHierarchy; AccessibleBase * m_pParent; SdrView* m_pSdrView; diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 049347f3297b..940c6092d853 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace accessibility { @@ -128,7 +128,7 @@ private: // members ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > m_xParent; - ::boost::shared_ptr< ObjectHierarchy > m_spObjectHierarchy; + std::shared_ptr< ObjectHierarchy > m_spObjectHierarchy; AccessibleUniqueId m_aCurrentSelectionOID; SdrView* m_pSdrView; ::accessibility::IAccessibleViewForwarder* m_pViewForwarder; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index cca42182e702..826deee540cd 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -52,7 +52,6 @@ #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> #include <memory> -#include <boost/shared_ptr.hpp> #include <set> class SdrModel; @@ -514,7 +513,7 @@ private: VclPtr<ChartWindow> m_pChartWindow; css::uno::Reference<css::awt::XWindow> m_xViewWindow; css::uno::Reference<css::uno::XInterface> m_xChartView; - ::boost::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper; + std::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper; DrawViewWrapper* m_pDrawViewWrapper; Selection m_aSelection; @@ -527,15 +526,15 @@ private: bool m_bConnectingToView; ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; - ::std::unique_ptr< UndoGuard > m_pTextActionUndoGuard; + std::unique_ptr< UndoGuard > m_pTextActionUndoGuard; /// needed for dispatching URLs in FeatureStateEvents mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute; + std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute; CommandDispatchContainer m_aDispatchContainer; - ::std::unique_ptr< DropTargetHelper > m_apDropTargetHelper; + std::unique_ptr< DropTargetHelper > m_apDropTargetHelper; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerEventBroadcaster > m_xLayoutManagerEventBroadcaster; @@ -654,7 +653,7 @@ private: const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); bool impl_DragDataPoint( const OUString & rCID, double fOffset ); - static ::std::set< OUString > impl_getAvailableCommands(); + static std::set< OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For parameters see diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 60467da74edc..691171b5ace2 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -33,7 +33,7 @@ #include <unotools/eventlisteneradapter.hxx> #include <comphelper/uno3.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> namespace chart { @@ -203,7 +203,7 @@ private: //methods void impl_resetAddIn(); private: //member - ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; + std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator; diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index a9ad61ade11f..c7ef55effe87 100644 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -27,8 +27,8 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> class SdrModel; @@ -64,7 +64,7 @@ protected: throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: - ::boost::shared_ptr< ItemConverter > m_spGraphicConverter; + std::shared_ptr< ItemConverter > m_spGraphicConverter; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; }; diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index 4abfa57f4efb..f851eec4db7f 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -24,8 +24,8 @@ #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> class SdrModel; @@ -61,7 +61,7 @@ protected: throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: - ::boost::shared_ptr< ItemConverter > m_spGraphicConverter; + std::shared_ptr< ItemConverter > m_spGraphicConverter; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveContainer > m_xCurveContainer; }; diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index c3250375791d..2eeebf0fa707 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -23,7 +23,7 @@ #include <vcl/timer.hxx> #include <com/sun/star/frame/XModel.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace chart { @@ -40,7 +40,7 @@ public: private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - boost::scoped_ptr< ControllerLockGuardUNO > m_apControllerLockGuard; + std::unique_ptr< ControllerLockGuardUNO > m_apControllerLockGuard; AutoTimer m_aTimer; DECL_LINK_TYPED( TimerTimeout, Timer*, void ); diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 22e156a10154..cc17758c3215 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace chart { @@ -36,7 +36,7 @@ struct TitleDialogData ::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList; ::com::sun::star::uno::Sequence< sal_Bool > aExistenceList; ::com::sun::star::uno::Sequence< OUString > aTextList; - boost::scoped_ptr< ReferenceSizeProvider > apReferenceSizeProvider; + std::unique_ptr< ReferenceSizeProvider > apReferenceSizeProvider; TitleDialogData(ReferenceSizeProvider* pReferenzeSizeProvider = NULL); diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 18fd8de97e22..0c383f5a1a10 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace chart { @@ -74,7 +74,7 @@ private: bool m_bIsClosable; sal_Int32 m_nOnePageOnlyIndex;//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap ChartTypeTemplateProvider* m_pTemplateProvider; - boost::scoped_ptr<DialogModel> m_pDialogModel; + std::unique_ptr<DialogModel> m_pDialogModel; WizardState m_nFirstState; WizardState m_nLastState; diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index ac8d322fb049..eb49d9238edd 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATAEDITOR_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATAEDITOR_HXX -#include <boost/scoped_ptr.hpp> #include <svl/lstner.hxx> #include <svtools/stdctrl.hxx> #include <vcl/toolbox.hxx> diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index fd269c525d13..4d0d4b173d37 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -22,7 +22,7 @@ #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <svl/itemset.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include "../dialogs/res_DataLabel.hxx" class SvNumberFormatter; @@ -36,7 +36,7 @@ private: // OKButton m_aBtnOK; // CancelButton m_aBtnCancel; // HelpButton m_aBtnHelp; - boost::scoped_ptr < DataLabelResources > m_apDataLabelResources; + std::unique_ptr < DataLabelResources > m_apDataLabelResources; const SfxItemSet& m_rInAttrs; diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index ae45a16941f5..7721c8d7bcc3 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -52,7 +52,7 @@ public: private: const SfxItemSet & rInAttrs; - boost::scoped_ptr< ErrorBarResources > m_apErrorBarResources; + std::unique_ptr< ErrorBarResources > m_apErrorBarResources; }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index acfc45344e68..ab5a024410de 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -22,7 +22,7 @@ #include <vcl/dialog.hxx> #include <sfx2/basedlgs.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -34,7 +34,7 @@ namespace chart class SchLegendDlg : public ModalDialog { private: - boost::scoped_ptr < LegendPositionResources > m_xLegendPositionResources; + std::unique_ptr < LegendPositionResources > m_xLegendPositionResources; public: SchLegendDlg( vcl::Window* pParent, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index 510b35563676..258fd220b9da 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -22,14 +22,14 @@ #include "res_Titles.hxx" #include <vcl/dialog.hxx> #include <vcl/button.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace chart { class SchTitleDlg : public ModalDialog { private: - boost::scoped_ptr< TitleResources > m_xTitleResources; + std::unique_ptr< TitleResources > m_xTitleResources; public: SchTitleDlg( vcl::Window* pParent, const TitleDialogData& rInput ); diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index efbfc8a11506..76a36f2e2175 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -117,7 +117,7 @@ private: double m_fMinusValue; VclPtr<Dialog> m_pParentDialog; - boost::scoped_ptr< RangeSelectionHelper > m_apRangeSelectionHelper; + std::unique_ptr< RangeSelectionHelper > m_apRangeSelectionHelper; VclPtr<Edit> m_pCurrentRangeChoosingField; bool m_bHasInternalDataProvider; bool m_bEnableDataTableDialog; |