diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-16 12:17:44 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:20:46 +0100 |
| commit | c72fac269626cd4c2c3f62a6eed69e47b59256a4 (patch) | |
| tree | d36dd1a09731cb07254ae4a09036b2d64a59de44 /chart2/source/controller/dialogs | |
| parent | accessibility: cleanup for updated toolkit API. (diff) | |
| download | core-c72fac269626cd4c2c3f62a6eed69e47b59256a4.tar.gz core-c72fac269626cd4c2c3f62a6eed69e47b59256a4.zip | |
vclwidget: convert lots more sites to use VclPtr
seems there was a lot of shared_ptr usage floating around...
Change-Id: Icd05243170eb8493709275fc36bf986fc194b781
Diffstat (limited to 'chart2/source/controller/dialogs')
| -rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_DataEditor.cxx | 1 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/tp_ChartType.cxx | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index f8915938da4b..ce2a54e56f62 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -178,9 +178,9 @@ public: bool HasFocus() const; private: - ::boost::shared_ptr< FixedImage > m_spSymbol; - ::boost::shared_ptr< SeriesHeaderEdit > m_spSeriesName; - ::boost::shared_ptr< FixedText > m_spColorBar; + VclPtr< FixedImage > m_spSymbol; + VclPtr< SeriesHeaderEdit > m_spSeriesName; + VclPtr< FixedText > m_spColorBar; OutputDevice * m_pDevice; Link m_aChangeLink; diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 118d6f7e385c..e3cb54543465 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -107,6 +107,7 @@ void DataEditor::dispose() OSL_TRACE( "DataEditor: DTOR" ); m_pTbxData.clear(); + m_xBrwData.disposeAndClear(); ModalDialog::dispose(); } diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 296fb6d30ca6..d5eeb359c909 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -505,8 +505,8 @@ private: VclPtr<FixedText> m_pFT_LineType; VclPtr<ListBox> m_pLB_LineType; VclPtr<PushButton> m_pPB_DetailsDialog; - boost::scoped_ptr< SplinePropertiesDialog > m_pSplinePropertiesDialog; - boost::scoped_ptr< SteppedPropertiesDialog > m_pSteppedPropertiesDialog; + VclPtr< SplinePropertiesDialog > m_pSplinePropertiesDialog; + VclPtr< SteppedPropertiesDialog > m_pSteppedPropertiesDialog; }; SplineResourceGroup::SplineResourceGroup(VclBuilderContainer* pWindow) |