diff options
54 files changed, 116 insertions, 124 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index f430d3723fce..54f13e2b53b6 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -102,7 +102,6 @@ class SeriesHeaderEdit : public Edit { public: SeriesHeaderEdit( vcl::Window * pParent ); - virtual ~SeriesHeaderEdit(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; void setStartColumn( sal_Int32 nStartColumn ); @@ -122,9 +121,6 @@ SeriesHeaderEdit::SeriesHeaderEdit( vcl::Window * pParent ) : SetHelpId(HID_SCH_DATA_SERIES_LABEL); } -SeriesHeaderEdit::~SeriesHeaderEdit() -{} - void SeriesHeaderEdit::setStartColumn( sal_Int32 nStartColumn ) { m_nStartColumn = nStartColumn; @@ -457,21 +453,29 @@ DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate m_bIsDirty( false ), m_bLiveUpdate( bLiveUpdate ), m_bDataValid( true ), - m_aNumberEditField( & EditBrowseBox::GetDataWindow(), WB_NOBORDER ), - m_aTextEditField( & EditBrowseBox::GetDataWindow(), WB_NOBORDER ), - m_rNumberEditController( new ::svt::FormattedFieldCellController( & m_aNumberEditField )), - m_rTextEditController( new ::svt::EditCellController( & m_aTextEditField )) + m_aNumberEditField( new FormattedField( & EditBrowseBox::GetDataWindow(), WB_NOBORDER ) ), + m_aTextEditField( new Edit( & EditBrowseBox::GetDataWindow(), WB_NOBORDER ) ), + m_rNumberEditController( new ::svt::FormattedFieldCellController( m_aNumberEditField.get() )), + m_rTextEditController( new ::svt::EditCellController( m_aTextEditField.get() )) { double fNan; ::rtl::math::setNan( & fNan ); - m_aNumberEditField.SetDefaultValue( fNan ); - m_aNumberEditField.TreatAsNumber( true ); + m_aNumberEditField->SetDefaultValue( fNan ); + m_aNumberEditField->TreatAsNumber( true ); RenewTable(); SetClean(); } DataBrowser::~DataBrowser() { + dispose(); +} + +void DataBrowser::dispose() +{ + m_aNumberEditField.disposeAndClear(); + m_aTextEditField.disposeAndClear(); + ::svt::EditBrowseBox::dispose(); } bool DataBrowser::MayInsertRow() const @@ -777,7 +781,7 @@ bool DataBrowser::IsDataValid() { sal_uInt32 nDummy = 0; double fDummy = 0.0; - OUString aText( m_aNumberEditField.GetText()); + OUString aText( m_aNumberEditField->GetText()); if( !aText.isEmpty() && m_spNumberFormatterWrapper.get() && @@ -821,7 +825,7 @@ void DataBrowser::SetDataFromModel( Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY ))); if( m_spNumberFormatterWrapper.get() ) - m_aNumberEditField.SetFormatter( m_spNumberFormatterWrapper->getSvNumberFormatter() ); + m_aNumberEditField->SetFormatter( m_spNumberFormatterWrapper->getSvNumberFormatter() ); RenewTable(); @@ -1041,8 +1045,8 @@ bool DataBrowser::IsTabAllowed( bool bForward ) const if( CellContainsNumbers( nRow, nCol )) { - m_aNumberEditField.UseInputStringForFormatting(); - m_aNumberEditField.SetFormatKey( GetNumberFormatKey( nRow, nCol )); + m_aNumberEditField->UseInputStringForFormatting(); + m_aNumberEditField->SetFormatKey( GetNumberFormatKey( nRow, nCol )); return m_rNumberEditController; } @@ -1055,19 +1059,19 @@ void DataBrowser::InitController( if( rController == m_rTextEditController ) { OUString aText( GetCellText( nRow, nCol ) ); - m_aTextEditField.SetText( aText ); - m_aTextEditField.SetSelection( Selection( 0, aText.getLength() )); + m_aTextEditField->SetText( aText ); + m_aTextEditField->SetSelection( Selection( 0, aText.getLength() )); } else if( rController == m_rNumberEditController ) { // treat invalid and empty text as Nan - m_aNumberEditField.EnableNotANumber( true ); + m_aNumberEditField->EnableNotANumber( true ); if( ::rtl::math::isNan( GetCellNumber( nRow, nCol ))) - m_aNumberEditField.SetTextValue( OUString()); + m_aNumberEditField->SetTextValue( OUString()); else - m_aNumberEditField.SetValue( GetCellNumber( nRow, nCol ) ); - OUString aText( m_aNumberEditField.GetText()); - m_aNumberEditField.SetSelection( Selection( 0, aText.getLength())); + m_aNumberEditField->SetValue( GetCellNumber( nRow, nCol ) ); + OUString aText( m_aNumberEditField->GetText()); + m_aNumberEditField->SetSelection( Selection( 0, aText.getLength())); } else { @@ -1125,7 +1129,7 @@ bool DataBrowser::SaveModified() { sal_uInt32 nDummy = 0; double fDummy = 0.0; - OUString aText( m_aNumberEditField.GetText()); + OUString aText( m_aNumberEditField->GetText()); // an empty string is valid, if no numberformatter exists, all // values are treated as valid if( !aText.isEmpty() && pSvNumberFormatter && @@ -1135,14 +1139,14 @@ bool DataBrowser::SaveModified() } else { - double fData = m_aNumberEditField.GetValue(); + double fData = m_aNumberEditField->GetValue(); bChangeValid = m_apDataBrowserModel->setCellNumber( nCol, nRow, fData ); } } break; case DataBrowserModel::TEXTORDATE: { - OUString aText( m_aTextEditField.GetText() ); + OUString aText( m_aTextEditField->GetText() ); double fDateValue = 0.0; bChangeValid = false; if( isDateString( aText, fDateValue ) ) @@ -1153,7 +1157,7 @@ bool DataBrowser::SaveModified() break; case DataBrowserModel::TEXT: { - OUString aText( m_aTextEditField.GetText()); + OUString aText( m_aTextEditField->GetText()); bChangeValid = m_apDataBrowserModel->setCellText( nCol, nRow, aText ); } break; diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 9e72939d40cd..d0f627d90656 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -69,6 +69,7 @@ protected: public: DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate ); virtual ~DataBrowser(); + virtual void dispose() SAL_OVERRIDE; /** GetCellText returns the text at the given position @param nRow @@ -164,8 +165,8 @@ private: bool m_bLiveUpdate; bool m_bDataValid; - FormattedField m_aNumberEditField; - Edit m_aTextEditField; + VclPtr<FormattedField> m_aNumberEditField; + VclPtr<Edit> m_aTextEditField; /// note: m_aNumberEditField must precede this member! ::svt::CellControllerRef m_rNumberEditController; diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index 85c1def2c08d..c3f5e309a36b 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -47,10 +47,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTextDirectionListBox(v return new TextDirectionListBox(pParent); } -TextDirectionListBox::~TextDirectionListBox() -{ -} - } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 30d03d140def..9ef9432ded04 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -55,7 +55,13 @@ ChartTypeDialog::ChartTypeDialog( vcl::Window* pParent ChartTypeDialog::~ChartTypeDialog() { + dispose(); +} + +void ChartTypeDialog::dispose() +{ delete m_pChartTypeTabPage; + ModalDialog::dispose(); } } //namespace chart diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 9094da82cbf1..8259a1665438 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -106,10 +106,6 @@ CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< fram ActivatePage(); } -CreationWizard::~CreationWizard() -{ -} - svt::OWizardPage* CreationWizard::createPage(WizardState nState) { svt::OWizardPage* pRet = 0; diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 502579f539af..02a5578b99a0 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -95,12 +95,18 @@ DataEditor::DataEditor(vcl::Window* pParent, DataEditor::~DataEditor() { + dispose(); +} + +void DataEditor::dispose() +{ notifySystemWindow( this, m_pTbxData, ::comphelper::mem_fun( & TaskPaneList::RemoveWindow )); SvtMiscOptions aMiscOptions; aMiscOptions.RemoveListenerLink( LINK( this, DataEditor, MiscHdl ) ); OSL_TRACE( "DataEditor: DTOR" ); + ModalDialog::dispose(); } // react on click (or keypress) on toolbar icon diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index bfa90c7647be..e59c95e25624 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -159,11 +159,17 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent, DataSourceDialog::~DataSourceDialog() { + dispose(); +} + +void DataSourceDialog::dispose() +{ delete m_pRangeChooserTabePage; delete m_pDataSourceTabPage; m_nLastPageId = m_pTabControl->GetCurPageId(); delete m_pTabControl; + TabDialog::dispose(); } short DataSourceDialog::Execute() diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 2af1b5fa2073..345a6d79f150 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -81,10 +81,6 @@ SchAxisDlg::SchAxisDlg(vcl::Window* pWindow, m_pCbSecondaryZ->Enable( rInput.aPossibilityList[5] ); } -SchAxisDlg::~SchAxisDlg() -{ -} - void SchAxisDlg::getResult( InsertAxisOrGridDialogData& rOutput ) { rOutput.aExistenceList[0]=m_pCbPrimaryX->IsChecked(); @@ -100,10 +96,6 @@ SchGridDlg::SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& { } -SchGridDlg::~SchGridDlg() -{ -} - } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 83c13095025f..17c15bcb7f2e 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -34,10 +34,6 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAt Reset(); } -DataLabelsDialog::~DataLabelsDialog() -{ -} - void DataLabelsDialog::Reset() { m_apDataLabelResources->Reset(m_rInAttrs); diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 11f48f9dc9e2..5cf894f2313c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -57,10 +57,6 @@ InsertErrorBarsDialog::InsertErrorBarsDialog( m_apErrorBarResources->SetChartDocumentForRangeChoosing( xChartDocument ); } -InsertErrorBarsDialog::~InsertErrorBarsDialog() -{ -} - void InsertErrorBarsDialog::FillItemSet(SfxItemSet& rOutAttrs) { m_apErrorBarResources->FillItemSet(rOutAttrs); diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index a2ba7f3c0ca0..9d0e54ca4c42 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -44,10 +44,6 @@ NumberFormatDialog::NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet) } } -NumberFormatDialog::~NumberFormatDialog() -{ -} - SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ) { static const sal_uInt16 nWhichPairs[] = diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index a27ff0caf7f0..1aff53582645 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -30,8 +30,7 @@ namespace chart class NumberFormatDialog : public SfxSingleTabDialog { public: - NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet); - virtual ~NumberFormatDialog(); + NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet); static SfxItemSet CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ); }; diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 165b179521f5..25b87fc892d9 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -481,8 +481,14 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent, SchAttribTabDlg::~SchAttribTabDlg() { + dispose(); +} + +void SchAttribTabDlg::dispose() +{ delete m_pSymbolShapeProperties; delete m_pAutoSymbolGraphic; + SfxTabDialog::dispose(); } void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 0ff8d1b10a35..6308f587af61 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -66,11 +66,17 @@ View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference< frame::XM View3DDialog::~View3DDialog() { + dispose(); +} + +void View3DDialog::dispose() +{ delete m_pGeometry; delete m_pAppearance; delete m_pIllumination; m_nLastPageId = m_pTabControl->GetCurPageId(); + TabDialog::dispose(); } short View3DDialog::Execute() diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 1515c6b9899d..ff20319c8eb9 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -120,9 +120,6 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( initControlsFromModel(); } -ThreeD_SceneAppearance_TabPage::~ThreeD_SceneAppearance_TabPage() -{} - void ThreeD_SceneAppearance_TabPage::ActivatePage() { updateScheme(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index b674dff025dd..23749c9da5d3 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -38,7 +38,6 @@ public: vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, ControllerLockHelper & rControllerLockHelper ); - virtual ~ThreeD_SceneAppearance_TabPage(); virtual void ActivatePage() SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index d9f3ccac74e8..0428b2d892be 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -147,10 +147,6 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow m_pMFPerspective->SetAccessibleRelationLabeledBy(m_pCbxPerspective); } -ThreeD_SceneGeometry_TabPage::~ThreeD_SceneGeometry_TabPage() -{ -} - void ThreeD_SceneGeometry_TabPage::commitPendingChanges() { ControllerLockHelperGuard aGuard( m_rControllerLockHelper ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 21bc08a7ccc1..bc19444f6403 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -39,7 +39,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSceneProperties, ControllerLockHelper & rControllerLockHelper ); - virtual ~ThreeD_SceneGeometry_TabPage(); // has to be called in case the dialog was closed with OK void commitPendingChanges(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 71d0d65f40f2..defb3343ef73 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -48,10 +48,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLightButton(vcl::Windo return new LightButton(pParent); } -LightButton::~LightButton() -{ -} - void LightButton::switchLightOn(bool bOn) { if( m_bLightOn==bOn ) @@ -298,7 +294,13 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window* ThreeD_SceneIllumination_TabPage::~ThreeD_SceneIllumination_TabPage() { + dispose(); +} + +void ThreeD_SceneIllumination_TabPage::dispose() +{ delete[] m_pLightSourceInfoList; + TabPage::dispose(); } IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 5e68d8bf08e0..06e27ae02650 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -37,7 +37,6 @@ class LightButton : public ImageButton { public: LightButton( vcl::Window* pParent); - virtual ~LightButton(); void switchLightOn(bool bOn); bool isLightOn() const { return m_bLightOn;} @@ -58,6 +57,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, const XColorListRef &pColorTable ); virtual ~ThreeD_SceneIllumination_TabPage(); + virtual void dispose() SAL_OVERRIDE; private: DECL_LINK( ClickLightSourceButtonHdl, LightButton* ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 77a426f4bba3..85b6570a03b5 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -71,7 +71,15 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet } SchAxisLabelTabPage::~SchAxisLabelTabPage() -{delete m_pOrientHlp;} +{ + dispose(); +} + +void SchAxisLabelTabPage::dispose() +{ + delete m_pOrientHlp; + SfxTabPage::dispose(); +} SfxTabPage* SchAxisLabelTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) { diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 0aa09b53b823..95474b805941 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -70,6 +70,7 @@ private: public: SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SchAxisLabelTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 1ae7a691756a..2b41ab2483ab 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -313,7 +313,6 @@ class SplinePropertiesDialog : public ModalDialog { public: SplinePropertiesDialog( vcl::Window* pParent ); - virtual ~SplinePropertiesDialog(); void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines ); @@ -347,10 +346,6 @@ SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent ) m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) ); } -SplinePropertiesDialog::~SplinePropertiesDialog() -{ -} - void SplinePropertiesDialog::StateChanged( StateChangedType nType ) { Dialog::StateChanged( nType ); @@ -400,7 +395,6 @@ class SteppedPropertiesDialog : public ModalDialog { public: SteppedPropertiesDialog( vcl::Window* pParent ); - virtual ~SteppedPropertiesDialog(); void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter, bool bSteppedLines ); @@ -427,10 +421,6 @@ SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent ) SetText(SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES)); } -SteppedPropertiesDialog::~SteppedPropertiesDialog() -{ -} - void SteppedPropertiesDialog::StateChanged( StateChangedType nType ) { Dialog::StateChanged( nType ); @@ -774,6 +764,11 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent ChartTypeTabPage::~ChartTypeTabPage() { + dispose(); +} + +void ChartTypeTabPage::dispose() +{ //delete all dialog controller ::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin(); const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); @@ -790,7 +785,9 @@ ChartTypeTabPage::~ChartTypeTabPage() delete m_pGeometryResourceGroup; delete m_pSortByXValuesResourceGroup; delete m_pGL3DResourceGroup; + svt::OWizardPage::dispose(); } + ChartTypeParameter ChartTypeTabPage::getCurrentParamter() const { ChartTypeParameter aParameter; diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 486ae1540805..a8cb43c97703 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -55,6 +55,7 @@ public: ::com::sun::star::uno::XComponentContext >& xContext , bool bDoLiveUpdate, bool bShowDescription = true ); virtual ~ChartTypeTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual void initializePage() SAL_OVERRIDE; virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index ef795fa2e2ca..da3add747104 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -34,10 +34,6 @@ DataLabelsTabPage::DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rIn { } -DataLabelsTabPage::~DataLabelsTabPage() -{ -} - SfxTabPage* DataLabelsTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) { return new DataLabelsTabPage(pWindow, *rOutAttrs); diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 1bad928af04d..a976306c3f5a 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -34,7 +34,6 @@ class DataLabelsTabPage : public SfxTabPage { public: DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs); - virtual ~DataLabelsTabPage(); static SfxTabPage* Create(vcl::Window* pWindow, const SfxItemSet* rInAttrs); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 8e7416b1bdf2..0aec36a88576 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -273,9 +273,6 @@ DataSourceTabPage::DataSourceTabPage( m_pBTN_DOWN->SetAccessibleName(SCH_RESSTR(STR_BUTTON_DOWN)); } -DataSourceTabPage::~DataSourceTabPage() -{} - void DataSourceTabPage::ActivatePage() { OWizardPage::ActivatePage(); diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 1cc0439a1065..b1ad81353d9e 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -58,7 +58,6 @@ public: ChartTypeTemplateProvider* pTemplateProvider, Dialog * pParentDialog, bool bHideDescription = false ); - virtual ~DataSourceTabPage(); void commitPage(); diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 3abb60bbc5fb..c65ef3a69c63 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -39,7 +39,13 @@ SchLayoutTabPage::SchLayoutTabPage(vcl::Window* pWindow,const SfxItemSet& rInAtt SchLayoutTabPage::~SchLayoutTabPage() { + dispose(); +} + +void SchLayoutTabPage::dispose() +{ delete m_pGeometryResources; + SfxTabPage::dispose(); } SfxTabPage* SchLayoutTabPage::Create(vcl::Window* pWindow, diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index 635768fe1178..5c142c0685bf 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -30,6 +30,7 @@ class SchLayoutTabPage : public SfxTabPage public: SchLayoutTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); virtual ~SchLayoutTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index dbd0c460df28..ff9db6088675 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -44,10 +44,6 @@ PolarOptionsTabPage::PolarOptionsTabPage( vcl::Window* pWindow,const SfxItemSet& m_pAngleDial->SetLinkedField( m_pNF_StartingAngle ); } -PolarOptionsTabPage::~PolarOptionsTabPage() -{ -} - SfxTabPage* PolarOptionsTabPage::Create( vcl::Window* pWindow,const SfxItemSet* rOutAttrs ) { return new PolarOptionsTabPage( pWindow, *rOutAttrs ); diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 7d0ea5034122..4ade72189cf4 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -33,7 +33,6 @@ class PolarOptionsTabPage : public SfxTabPage public: PolarOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs ); - virtual ~PolarOptionsTabPage(); static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 00f16fd7d7ac..108aac0c77a8 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -122,10 +122,6 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent m_pEd_TimeEnd->SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); } -RangeChooserTabPage::~RangeChooserTabPage() -{ -} - void RangeChooserTabPage::ActivatePage() { OWizardPage::ActivatePage(); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 3b88a46dd845..f7a0791fd6ff 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -48,7 +48,6 @@ public: , ChartTypeTemplateProvider* pTemplateProvider , Dialog * pParentDialog , bool bHideDescription = false ); -virtual ~RangeChooserTabPage(); //RangeSelectionListenerParent virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 826eec3b08c8..4f4a986df57a 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -63,10 +63,6 @@ SchOptionTabPage::SchOptionTabPage(vcl::Window* pWindow,const SfxItemSet& rInAtt m_pRbtAxis2->SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl )); } -SchOptionTabPage::~SchOptionTabPage() -{ -} - IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl) { if( m_nAllSeriesAxisIndex == 0 ) diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index ff81b28b59c5..f11c8e5ea24a 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -31,7 +31,6 @@ class SchOptionTabPage : public SfxTabPage { public: SchOptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); - virtual ~SchOptionTabPage(); static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 32004557fdf8..45ee08762e65 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -57,7 +57,13 @@ SchAlignmentTabPage::SchAlignmentTabPage(vcl::Window* pWindow, SchAlignmentTabPage::~SchAlignmentTabPage() { + dispose(); +} + +void SchAlignmentTabPage::dispose() +{ delete m_pOrientHlp; + SfxTabPage::dispose(); } SfxTabPage* SchAlignmentTabPage::Create(vcl::Window* pParent, diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 0bd5c976b4e3..e5d2e240a153 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -43,6 +43,7 @@ private: public: SchAlignmentTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true); virtual ~SchAlignmentTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); static SfxTabPage* CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs); diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index a998056f8edf..258876b21217 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -31,10 +31,6 @@ TrendlineTabPage::TrendlineTabPage( vcl::Window* pParent, const SfxItemSet& rInA { } -TrendlineTabPage::~TrendlineTabPage() -{ -} - SfxTabPage* TrendlineTabPage::Create( vcl::Window* pParent, const SfxItemSet* rOutAttrs ) { diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index a88c858c7b9a..077cc7c64b45 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -30,7 +30,6 @@ class TrendlineTabPage : public SfxTabPage { public: TrendlineTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - virtual ~TrendlineTabPage (); static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx index bee03f2fb247..706043034916 100644 --- a/chart2/source/controller/inc/TextDirectionListBox.hxx +++ b/chart2/source/controller/inc/TextDirectionListBox.hxx @@ -32,7 +32,6 @@ class TextDirectionListBox : public svx::FrameDirectionListBox public: explicit TextDirectionListBox( vcl::Window* pParent, vcl::Window* pWindow1 = 0, vcl::Window* pWindow2 = 0 ); - virtual ~TextDirectionListBox(); }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index b67a06fd729b..008ba07b3310 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -38,6 +38,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); virtual ~ChartTypeDialog(); + virtual void dispose() SAL_OVERRIDE; private: ChartTypeTabPage* m_pChartTypeTabPage; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 95d47fd4c5ae..33ba961bc895 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -22,6 +22,7 @@ #include "TimerTriggeredControllerLock.hxx" #include "TabPageNotifiable.hxx" +#include "../dialogs/DialogModel.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> #include <svtools/roadmapwizard.hxx> @@ -36,7 +37,6 @@ namespace chart class RangeChooserTabPage; class DataSourceTabPage; class ChartTypeTemplateProvider; -class DialogModel; class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable { @@ -47,7 +47,6 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext , sal_Int32 nOnePageOnlyIndex=-1 );//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap - virtual ~CreationWizard(); bool isClosable() { /*@todo*/ return m_bIsClosable;} diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index cd21f372e9ca..4432674fe6be 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -48,6 +48,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~DataEditor(); + virtual void dispose() SAL_OVERRIDE; // Dialog virtual bool Close() SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 8b3529b9d9e1..5c6a60d72c36 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -50,6 +50,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~DataSourceDialog(); + virtual void dispose() SAL_OVERRIDE; // from Dialog (base of TabDialog) virtual short Execute() SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index bf3bf85750e7..960edffe422d 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -52,7 +52,6 @@ protected: public: SchAxisDlg(vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true); - virtual ~SchAxisDlg(); void getResult( InsertAxisOrGridDialogData& rOutput ); }; @@ -66,7 +65,6 @@ class SchGridDlg : public SchAxisDlg { public: SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput ); - virtual ~SchGridDlg(); }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index 1cbed9f9a9c0..fd269c525d13 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -23,13 +23,13 @@ #include <vcl/button.hxx> #include <svl/itemset.hxx> #include <boost/scoped_ptr.hpp> +#include "../dialogs/res_DataLabel.hxx" class SvNumberFormatter; namespace chart { -class DataLabelResources; class DataLabelsDialog : public ModalDialog { private: @@ -44,7 +44,6 @@ private: public: DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter); - virtual ~DataLabelsDialog(); void FillItemSet(SfxItemSet& rOutAttrs); }; diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index e981b718ec63..ae45a16941f5 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -36,7 +36,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument, ErrorBarResources::tErrorBarType eType ); - virtual ~InsertErrorBarsDialog(); void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 19b1bf2539c2..8ad9fc95525d 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -132,6 +132,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); virtual ~SchAttribTabDlg(); + virtual void dispose() SAL_OVERRIDE; //pSymbolShapeProperties: Properties to be set on the symbollist shapes //pAutoSymbolGraphic: Graphic to be shown if AutoSymbol gets selected diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index fdfb35463625..64228fe8ea85 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -41,6 +41,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, const XColorListRef &pColorTable ); virtual ~View3DDialog(); + virtual void dispose() SAL_OVERRIDE; // from Dialog (base of TabDialog) virtual short Execute() SAL_OVERRIDE; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index c46bab4e0b48..cec82ca81592 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -72,6 +72,11 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi ChartWindow::~ChartWindow() { + dispose(); +} + +void ChartWindow::dispose() +{ if (m_pWindowController && m_pWindowController->getModel().is()) { uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(m_pWindowController->getModel(), uno::UNO_QUERY_THROW); @@ -79,6 +84,7 @@ ChartWindow::~ChartWindow() x3DWindowProvider->update(); } delete m_pOpenGLWindow; + vcl::Window::dispose(); } void ChartWindow::clear() diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 2afa38a986d6..73be579f6d6d 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -37,6 +37,7 @@ class ChartWindow : public vcl::Window public: ChartWindow( ChartController* pController, vcl::Window* pParent, WinBits nStyle ); virtual ~ChartWindow(); + virtual void dispose() SAL_OVERRIDE; void clear(); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index ba5d165fb831..b8f0c8eae058 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -57,10 +57,6 @@ SelectorListBox::SelectorListBox( vcl::Window* pParent, WinBits nStyle ) { } -SelectorListBox::~SelectorListBox() -{ -} - void lcl_addObjectsToList( const ObjectHierarchy& rHierarchy, const ObjectHierarchy::tOID & rParent, std::vector< ListBoxEntryData >& rEntries , const sal_Int32 nHierarchyDepth, const Reference< chart2::XChartDocument >& xChartDoc ) { diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 5c3a19d0464d..cc70f8a60390 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -47,7 +47,6 @@ class SelectorListBox : public ListBox { public: SelectorListBox( vcl::Window* pParent, WinBits nStyle ); - virtual ~SelectorListBox(); virtual void Select() SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; |