vclwidget: only call dispose() once

by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.

Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 698e78b..e6c680e 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -196,7 +196,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl

MediaControl::~MediaControl()
{
    dispose();
    disposeOnce();
}

void MediaControl::dispose()
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index deccd8f..6f1108a 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -75,7 +75,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W

MediaFloater::~MediaFloater()
{
    dispose();
    disposeOnce();
}

void MediaFloater::dispose()
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index c43f682..8646e4d 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -171,7 +171,7 @@ MediaWindowImpl::MediaWindowImpl( vcl::Window* pParent, MediaWindow* pMediaWindo

MediaWindowImpl::~MediaWindowImpl()
{
    dispose();
    disposeOnce();
}

void MediaWindowImpl::dispose()
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index cbb50ba..615aed4 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -82,7 +82,7 @@ DocListenerBox::DocListenerBox( vcl::Window* pParent )

DocListenerBox::~DocListenerBox()
{
    dispose();
    disposeOnce();
}

void DocListenerBox::dispose()
@@ -156,7 +156,7 @@ LibBox::LibBox( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFr

LibBox::~LibBox()
{
    dispose();
    disposeOnce();
}

void LibBox::dispose()
@@ -386,7 +386,7 @@ LanguageBox::LanguageBox( vcl::Window* pParent ) :

LanguageBox::~LanguageBox()
{
    dispose();
    disposeOnce();
}

void LanguageBox::dispose()
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 33ddae4..152fe61 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -227,7 +227,7 @@ SbModuleRef ModulWindow::XModule()

ModulWindow::~ModulWindow()
{
    dispose();
    disposeOnce();
}

void ModulWindow::dispose()
@@ -1477,7 +1477,7 @@ ModulWindowLayout::ModulWindowLayout (vcl::Window* pParent, ObjectCatalog& rObje

ModulWindowLayout::~ModulWindowLayout()
{
    dispose();
    disposeOnce();
}

void ModulWindowLayout::dispose()
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index f405491..d943cec 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -250,7 +250,7 @@ EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) :

EditorWindow::~EditorWindow()
{
    dispose();
    disposeOnce();
}

void EditorWindow::dispose()
@@ -1674,7 +1674,7 @@ WatchWindow::WatchWindow (Layout* pParent) :

WatchWindow::~WatchWindow()
{
    dispose();
    disposeOnce();
}

void WatchWindow::dispose()
@@ -1924,7 +1924,7 @@ StackWindow::StackWindow (Layout* pParent) :

StackWindow::~StackWindow()
{
    dispose();
    disposeOnce();
}

void StackWindow::dispose()
@@ -2060,7 +2060,7 @@ ComplexEditorWindow::ComplexEditorWindow( ModulWindow* pParent ) :

ComplexEditorWindow::~ComplexEditorWindow()
{
    dispose();
    disposeOnce();
}

void ComplexEditorWindow::dispose()
@@ -2169,7 +2169,7 @@ WatchTreeListBox::WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits )

WatchTreeListBox::~WatchTreeListBox()
{
    dispose();
    disposeOnce();
}

void WatchTreeListBox::dispose()
@@ -2687,7 +2687,7 @@ pCodeCompleteWindow( pPar )

CodeCompleteListBox::~CodeCompleteListBox()
{
    dispose();
    disposeOnce();
}

void CodeCompleteListBox::dispose()
@@ -2869,7 +2869,7 @@ pListBox( new CodeCompleteListBox(this) )

CodeCompleteWindow::~CodeCompleteWindow()
{
    dispose();
    disposeOnce();
}

void CodeCompleteWindow::dispose()
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 4735f12..c6957e3 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1408,7 +1408,7 @@ DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rOb

DialogWindowLayout::~DialogWindowLayout()
{
    dispose();
    disposeOnce();
}

void DialogWindowLayout::dispose()
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index feb01c0..79ebd6d 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -206,7 +206,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTreeListBox(vcl::Windo

TreeListBox::~TreeListBox ()
{
    dispose();
    disposeOnce();
}

void TreeListBox::dispose()
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 7e0bfea..da7e393 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -55,7 +55,7 @@ BaseWindow::BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, c

BaseWindow::~BaseWindow()
{
    dispose();
    disposeOnce();
}

void BaseWindow::dispose()
@@ -283,7 +283,7 @@ DockingWindow::DockingWindow (Layout* pParent) :

DockingWindow::~DockingWindow()
{
    dispose();
    disposeOnce();
}

void DockingWindow::dispose()
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 321f68b..366cc7b 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -108,7 +108,7 @@ BreakPointDialog::BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkPn

BreakPointDialog::~BreakPointDialog()
{
    dispose();
    disposeOnce();
}

void BreakPointDialog::dispose()
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 14a3b54..c475ab4 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -55,7 +55,7 @@ Layout::Layout (vcl::Window* pParent) :

Layout::~Layout()
{
    dispose();
    disposeOnce();
}

void Layout::dispose()
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 97c1fd9..a2f01ee 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -27,7 +27,7 @@ LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin

LineNumberWindow::~LineNumberWindow()
{
    dispose();
    disposeOnce();
}

void LineNumberWindow::dispose()
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 104d365..49b155a 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -112,7 +112,7 @@ MacroChooser::MacroChooser( vcl::Window* pParnt, bool bCreateEntries )

MacroChooser::~MacroChooser()
{
    dispose();
    disposeOnce();
}

void MacroChooser::dispose()
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 9174328..6309b88 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -161,7 +161,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCheckBox(vcl::Window *

CheckBox::~CheckBox()
{
    dispose();
    disposeOnce();
}

void CheckBox::dispose()
@@ -394,7 +394,7 @@ NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode,

NewObjectDialog::~NewObjectDialog()
{
    dispose();
    disposeOnce();
}

void NewObjectDialog::dispose()
@@ -417,7 +417,7 @@ GotoLineDialog::GotoLineDialog(vcl::Window * pParent )

GotoLineDialog::~GotoLineDialog()
{
    dispose();
    disposeOnce();
}

void GotoLineDialog::dispose()
@@ -463,7 +463,7 @@ ExportDialog::ExportDialog(vcl::Window * pParent)

ExportDialog::~ExportDialog()
{
    dispose();
    disposeOnce();
}

void ExportDialog::dispose()
@@ -520,7 +520,7 @@ LibPage::LibPage(vcl::Window * pParent)

LibPage::~LibPage()
{
    dispose();
    disposeOnce();
}

void LibPage::dispose()
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index d80dbc1..43967f6 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -486,7 +486,7 @@ OrganizeDialog::OrganizeDialog(vcl::Window* pParent, sal_Int16 tabId,

OrganizeDialog::~OrganizeDialog()
{
    dispose();
    disposeOnce();
}

void OrganizeDialog::dispose()
@@ -600,7 +600,7 @@ ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nM

ObjectPage::~ObjectPage()
{
    dispose();
    disposeOnce();
}

void ObjectPage::dispose()
@@ -945,7 +945,7 @@ LibDialog::LibDialog( vcl::Window* pParent )

LibDialog::~LibDialog()
{
    dispose();
    disposeOnce();
}

void LibDialog::dispose()
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 8c29c63..e0dc705 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -69,7 +69,7 @@ ObjectCatalog::ObjectCatalog (vcl::Window* pParent) :

ObjectCatalog::~ObjectCatalog()
{
    dispose();
    disposeOnce();
}

void ObjectCatalog::dispose()
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index cb0ec81..27be747 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -75,7 +75,7 @@ ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, boost::shared_p

ManageLanguageDialog::~ManageLanguageDialog()
{
    dispose();
    disposeOnce();
}

void ManageLanguageDialog::dispose()
@@ -259,7 +259,7 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, boost::

SetDefaultLanguageDialog::~SetDefaultLanguageDialog()
{
    dispose();
    disposeOnce();
}

void SetDefaultLanguageDialog::dispose()
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index caf5cab..5f89f26 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -190,7 +190,7 @@ void PropBrw::ImplReCreateController()

PropBrw::~PropBrw()
{
    dispose();
    disposeOnce();
}

void PropBrw::dispose()
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 7399389..94d0693 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -46,7 +46,7 @@ class SvRTLInputBox : public ModalDialog
public:
    SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle,
        const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 );
    virtual ~SvRTLInputBox() { dispose(); }
    virtual ~SvRTLInputBox() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE;
    OUString GetText() const SAL_OVERRIDE { return aText; }
};
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 831dee35..297c970 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -74,7 +74,7 @@ class SbiInputDialog : public ModalDialog {
    DECL_LINK( Cancel, vcl::Window * );
public:
    SbiInputDialog( vcl::Window*, const OUString& );
    virtual ~SbiInputDialog() { dispose(); }
    virtual ~SbiInputDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE;
    const OUString& GetInput() { return aText; }
};
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 54f13e2b..f891593 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -468,7 +468,7 @@ DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate

DataBrowser::~DataBrowser()
{
    dispose();
    disposeOnce();
}

void DataBrowser::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 0da5875..57a0580 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -55,7 +55,7 @@ ChartTypeDialog::ChartTypeDialog( vcl::Window* pParent

ChartTypeDialog::~ChartTypeDialog()
{
    dispose();
    disposeOnce();
}

void ChartTypeDialog::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 5230792..118d6f7 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -95,7 +95,7 @@ DataEditor::DataEditor(vcl::Window* pParent,

DataEditor::~DataEditor()
{
    dispose();
    disposeOnce();
}

void DataEditor::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index cdd34e1..e285487 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -159,7 +159,7 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent,

DataSourceDialog::~DataSourceDialog()
{
    dispose();
    disposeOnce();
}

void DataSourceDialog::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 670979a..4ef5044 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -83,7 +83,7 @@ SchAxisDlg::SchAxisDlg(vcl::Window* pWindow,

SchAxisDlg::~SchAxisDlg()
{
    dispose();
    disposeOnce();
}

void SchAxisDlg::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 0a563e2..92c6cb6 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -481,7 +481,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,

SchAttribTabDlg::~SchAttribTabDlg()
{
    dispose();
    disposeOnce();
}

void SchAttribTabDlg::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index b3e97fb..13b5605 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -66,7 +66,7 @@ View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference< frame::XM

View3DDialog::~View3DDialog()
{
    dispose();
    disposeOnce();
}

void View3DDialog::dispose()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index d25e226..7c866ee 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -122,7 +122,7 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(

ThreeD_SceneAppearance_TabPage::~ThreeD_SceneAppearance_TabPage()
{
    dispose();
    disposeOnce();
}

void ThreeD_SceneAppearance_TabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index b1f4dba..e3988f9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -149,7 +149,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow

ThreeD_SceneGeometry_TabPage::~ThreeD_SceneGeometry_TabPage()
{
    dispose();
    disposeOnce();
}

void ThreeD_SceneGeometry_TabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index a4683a5..6f3805f 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -294,7 +294,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window*

ThreeD_SceneIllumination_TabPage::~ThreeD_SceneIllumination_TabPage()
{
    dispose();
    disposeOnce();
}

void ThreeD_SceneIllumination_TabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 06d810b..7b9baed 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -72,7 +72,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet

SchAxisLabelTabPage::~SchAxisLabelTabPage()
{
    dispose();
    disposeOnce();
}

void SchAxisLabelTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 0d33af2..1807af7 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -86,7 +86,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(vcl::Window* pWindow,const SfxItemSet

AxisPositionsTabPage::~AxisPositionsTabPage()
{
    dispose();
    disposeOnce();
}

void AxisPositionsTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 7618ef7..296fb6d 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -313,7 +313,7 @@ class SplinePropertiesDialog : public ModalDialog
{
public:
    SplinePropertiesDialog( vcl::Window* pParent );
    virtual ~SplinePropertiesDialog() { dispose(); }
    virtual ~SplinePropertiesDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE;

    void fillControls( const ChartTypeParameter& rParameter );
@@ -406,7 +406,7 @@ class SteppedPropertiesDialog : public ModalDialog
{
public:
    SteppedPropertiesDialog( vcl::Window* pParent );
    virtual ~SteppedPropertiesDialog() { dispose(); }
    virtual ~SteppedPropertiesDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE;

    void fillControls( const ChartTypeParameter& rParameter );
@@ -786,7 +786,7 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent

ChartTypeTabPage::~ChartTypeTabPage()
{
    dispose();
    disposeOnce();
}

void ChartTypeTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index f59465a..954245a 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -275,7 +275,7 @@ DataSourceTabPage::DataSourceTabPage(

DataSourceTabPage::~DataSourceTabPage()
{
    dispose();
    disposeOnce();
}

void DataSourceTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 31aef92..36df837 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -43,7 +43,7 @@ SchLegendPosTabPage::SchLegendPosTabPage(vcl::Window* pWindow, const SfxItemSet&

SchLegendPosTabPage::~SchLegendPosTabPage()
{
    dispose();
    disposeOnce();
}

void SchLegendPosTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index dc8e84c..dac67a6 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -39,7 +39,7 @@ SchLayoutTabPage::SchLayoutTabPage(vcl::Window* pWindow,const SfxItemSet& rInAtt

SchLayoutTabPage::~SchLayoutTabPage()
{
    dispose();
    disposeOnce();
}

void SchLayoutTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 00fc6fe..394c953 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -46,7 +46,7 @@ PolarOptionsTabPage::PolarOptionsTabPage( vcl::Window* pWindow,const SfxItemSet&

PolarOptionsTabPage::~PolarOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void PolarOptionsTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 700c3e0..81b7d2c 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -124,7 +124,7 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent

RangeChooserTabPage::~RangeChooserTabPage()
{
    dispose();
    disposeOnce();
}

void RangeChooserTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 9db6bda..3803d59 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -124,7 +124,7 @@ ScaleTabPage::ScaleTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) :

ScaleTabPage::~ScaleTabPage()
{
    dispose();
    disposeOnce();
}

void ScaleTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 0a5b504..350aad5 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -65,7 +65,7 @@ SchOptionTabPage::SchOptionTabPage(vcl::Window* pWindow,const SfxItemSet& rInAtt

SchOptionTabPage::~SchOptionTabPage()
{
    dispose();
    disposeOnce();
}

void SchOptionTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index c69eb46..47c8966 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -57,7 +57,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(vcl::Window* pWindow,

SchAlignmentTabPage::~SchAlignmentTabPage()
{
    dispose();
    disposeOnce();
}

void SchAlignmentTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 23986e1..8c40e6d 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -59,7 +59,7 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent

TitlesAndObjectsTabPage::~TitlesAndObjectsTabPage()
{
    dispose();
    disposeOnce();
}

void TitlesAndObjectsTabPage::dispose()
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index ff544bd..743745c 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -72,7 +72,7 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi

ChartWindow::~ChartWindow()
{
    dispose();
    disposeOnce();
}

void ChartWindow::dispose()
diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx
index ba7da08..4189024 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -162,13 +162,18 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD
    if (pCompoundStatement && pCompoundStatement->size() == 1) {
        const CXXMemberCallExpr *pCallExpr = dyn_cast<CXXMemberCallExpr>(*pCompoundStatement->body_begin());
        if (pCallExpr) {
            ok = true;
            if( const FunctionDecl* func = pCallExpr->getDirectCallee()) {
                if( func->getNumParams() == 0 && func->getIdentifier() != NULL
                    && ( func->getName() == "disposeOnce" )) {
                    ok = true;
                }
            }
        }
    }
    if (!ok) {
        report(
            DiagnosticsEngine::Warning,
            "vcl::Window subclass should have nothing in it's destructor but a call to dispose().",
            "vcl::Window subclass should have nothing in it's destructor but a call to disposeOnce().",
            pCXXDestructorDecl->getLocStart())
          << pCXXDestructorDecl->getSourceRange();
        return true;
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 82e314ed..93a1d2a 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -674,7 +674,7 @@ void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry,

SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl()
{
    dispose();
    disposeOnce();
}

void SfxAccCfgTabListBox_Impl::dispose()
@@ -811,7 +811,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const 

SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
{
    dispose();
    disposeOnce();
}

void SfxAcceleratorConfigPage::dispose()
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 3d0462f..434dc20 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1397,7 +1397,7 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(vcl::Window* pParent, SvxConfigPage

SvxMenuEntriesListBox::~SvxMenuEntriesListBox()
{
    dispose();
    disposeOnce();
}

void SvxMenuEntriesListBox::dispose()
@@ -1555,7 +1555,7 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)

SvxConfigPage::~SvxConfigPage()
{
    dispose();
    disposeOnce();
}

void SvxConfigPage::dispose()
@@ -2245,7 +2245,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe

SvxMenuConfigPage::~SvxMenuConfigPage()
{
    dispose();
    disposeOnce();
}

// Populates the Menu combo box
@@ -2696,7 +2696,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(

SvxMainMenuOrganizerDialog::~SvxMainMenuOrganizerDialog()
{
    dispose();
    disposeOnce();
}

void SvxMainMenuOrganizerDialog::dispose()
@@ -2966,7 +2966,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe

SvxToolbarConfigPage::~SvxToolbarConfigPage()
{
    dispose();
    disposeOnce();
}

void SvxToolbarConfigPage::dispose()
@@ -4574,7 +4574,7 @@ SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(vcl::Window* pParent, SvxTool

SvxToolbarEntriesListBox::~SvxToolbarEntriesListBox()
{
    dispose();
    disposeOnce();
}

void SvxToolbarEntriesListBox::dispose()
@@ -4768,7 +4768,7 @@ SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& r

SvxNewToolbarDialog::~SvxNewToolbarDialog()
{
    dispose();
    disposeOnce();
}

void SvxNewToolbarDialog::dispose()
@@ -4981,7 +4981,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,

SvxIconSelectorDialog::~SvxIconSelectorDialog()
{
    dispose();
    disposeOnce();
}

void SvxIconSelectorDialog::dispose()
@@ -5453,7 +5453,7 @@ SvxIconChangeDialog::SvxIconChangeDialog(

SvxIconChangeDialog::~SvxIconChangeDialog()
{
    dispose();
    disposeOnce();
}

void SvxIconChangeDialog::dispose()
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 0f399fd..875b71b 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -276,7 +276,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigFunctionListB

SfxConfigFunctionListBox::~SfxConfigFunctionListBox()
{
    dispose();
    disposeOnce();
}

void SfxConfigFunctionListBox::dispose()
@@ -429,7 +429,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigGroupListBox(

SfxConfigGroupListBox::~SfxConfigGroupListBox()
{
    dispose();
    disposeOnce();
}

void SfxConfigGroupListBox::dispose()
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 3ab1816f..20e00de 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -103,7 +103,7 @@ void SvxEventConfigPage::LateInit( const uno::Reference< frame::XFrame >& _rxFra

SvxEventConfigPage::~SvxEventConfigPage()
{
    dispose();
    disposeOnce();
}

void SvxEventConfigPage::dispose()
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 656a241..76b3c8a 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -141,7 +141,7 @@ MacroEventListBox::MacroEventListBox( vcl::Window* pParent, WinBits nStyle )

MacroEventListBox::~MacroEventListBox()
{
    dispose();
    disposeOnce();
}

void MacroEventListBox::dispose()
@@ -238,7 +238,7 @@ _SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID,

_SvxMacroTabPage::~_SvxMacroTabPage()
{
   dispose();
    disposeOnce();
}

void _SvxMacroTabPage::dispose()
@@ -890,7 +890,7 @@ AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUStr

AssignComponentDialog::~AssignComponentDialog()
{
    dispose();
    disposeOnce();
}

void AssignComponentDialog::dispose()
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 3aefef3..0256b62 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -99,7 +99,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigFunctionListB

SvxConfigFunctionListBox::~SvxConfigFunctionListBox()
{
    dispose();
    disposeOnce();
}

void SvxConfigFunctionListBox::dispose()
@@ -233,7 +233,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigGroupListBox(

SvxConfigGroupListBox::~SvxConfigGroupListBox()
{
    dispose();
    disposeOnce();
}

void SvxConfigGroupListBox::dispose()
@@ -921,7 +921,7 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog(

SvxScriptSelectorDialog::~SvxScriptSelectorDialog()
{
    dispose();
    disposeOnce();
}

void SvxScriptSelectorDialog::dispose()
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index ac8aca0..b960bc1 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -246,7 +246,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,

SpellDialog::~SpellDialog()
{
    dispose();
    disposeOnce();
}

void SpellDialog::dispose()
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index f146e69..cfbdd3c 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -100,7 +100,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent)

AboutDialog::~AboutDialog()
{
    dispose();
    disposeOnce();
}

void AboutDialog::dispose()
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index ad1f3e0..4cb968d 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -360,7 +360,7 @@ ColorFieldControl::ColorFieldControl( vcl::Window* pParent, const WinBits& nStyl

ColorFieldControl::~ColorFieldControl()
{
    dispose();
    disposeOnce();
}

void ColorFieldControl::dispose()
@@ -753,7 +753,7 @@ ColorSliderControl::ColorSliderControl( vcl::Window* pParent, const WinBits& nSt

ColorSliderControl::~ColorSliderControl()
{
    dispose();
    disposeOnce();
}

void ColorSliderControl::dispose()
@@ -973,7 +973,7 @@ class ColorPickerDialog : public ModalDialog
{
public:
    ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode );
    virtual ~ColorPickerDialog() { dispose(); }
    virtual ~ColorPickerDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE;

    void update_color( sal_uInt16 n = UPDATE_ALL );
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 44f03fe..9b95589 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -102,7 +102,7 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte

SvxCharacterMap::~SvxCharacterMap()
{
    dispose();
    disposeOnce();
}

void SvxCharacterMap::dispose()
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 7e3a767..38a0f16 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -160,7 +160,7 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialTex

FmSearchDialog::~FmSearchDialog()
{
    dispose();
    disposeOnce();
}

void FmSearchDialog::dispose()
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 87e8a6ae..b0640f8 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -217,7 +217,7 @@ SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStar

SearchProgress::~SearchProgress()
{
    dispose();
    disposeOnce();
}

void SearchProgress::dispose()
@@ -360,7 +360,7 @@ TakeProgress::TakeProgress(vcl::Window* pWindow)

TakeProgress::~TakeProgress()
{
    dispose();
    disposeOnce();
}

void TakeProgress::dispose()
@@ -471,7 +471,7 @@ ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm)

ActualizeProgress::~ActualizeProgress()
{
    dispose();
    disposeOnce();
}

void ActualizeProgress::dispose()
@@ -551,7 +551,7 @@ TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle)

TitleDialog::~TitleDialog()
{
    dispose();
    disposeOnce();
}

void TitleDialog::dispose()
@@ -583,7 +583,7 @@ GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm )

GalleryIdDialog::~GalleryIdDialog()
{
    dispose();
    disposeOnce();
}

void GalleryIdDialog::dispose()
@@ -677,7 +677,7 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItem

TPGalleryThemeGeneral::~TPGalleryThemeGeneral()
{
    dispose();
    disposeOnce();
}

void TPGalleryThemeGeneral::dispose()
@@ -831,7 +831,7 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh

TPGalleryThemeProperties::~TPGalleryThemeProperties()
{
    dispose();
    disposeOnce();
}

void TPGalleryThemeProperties::dispose()
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 6fd0cf7..9e84ce3 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -155,7 +155,7 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,

GraphicFilterDialog::~GraphicFilterDialog()
{
    dispose();
    disposeOnce();
}

void GraphicFilterDialog::dispose()
@@ -216,7 +216,7 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r

GraphicFilterMosaic::~GraphicFilterMosaic()
{
    dispose();
    disposeOnce();
}

void GraphicFilterMosaic::dispose()
@@ -280,7 +280,7 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r

GraphicFilterSmooth::~GraphicFilterSmooth()
{
    dispose();
    disposeOnce();
}

void GraphicFilterSmooth::dispose()
@@ -338,7 +338,7 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi

GraphicFilterSolarize::~GraphicFilterSolarize()
{
    dispose();
    disposeOnce();
}

void GraphicFilterSolarize::dispose()
@@ -400,7 +400,7 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr

GraphicFilterSepia::~GraphicFilterSepia()
{
    dispose();
    disposeOnce();
}

void GraphicFilterSepia::dispose()
@@ -453,7 +453,7 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG

GraphicFilterPoster::~GraphicFilterPoster()
{
    dispose();
    disposeOnce();
}

void GraphicFilterPoster::dispose()
@@ -526,7 +526,7 @@ GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent,

GraphicFilterEmboss::~GraphicFilterEmboss()
{
    dispose();
    disposeOnce();
}

void GraphicFilterEmboss::dispose()
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 99f8dadd..ab3f23f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -157,7 +157,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)

SvxHpLinkDlg::~SvxHpLinkDlg ()
{
    dispose();
    disposeOnce();
}

void SvxHpLinkDlg::dispose()
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index d86558b..98e059a 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -75,7 +75,7 @@ URLDlg::URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlt

URLDlg::~URLDlg()
{
    dispose();
    disposeOnce();
}

void URLDlg::dispose()
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index 1670025..b54de7f 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -43,7 +43,7 @@ FmInputRecordNoDialog::FmInputRecordNoDialog(vcl::Window * pParent)

FmInputRecordNoDialog::~FmInputRecordNoDialog()
{
    dispose();
    disposeOnce();
}

void FmInputRecordNoDialog::dispose()
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 3aa778f..7745404 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -47,7 +47,7 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const

SvxNameDialog::~SvxNameDialog()
{
    dispose();
    disposeOnce();
}

void SvxNameDialog::dispose()
@@ -88,7 +88,7 @@ SvxObjectNameDialog::SvxObjectNameDialog(

SvxObjectNameDialog::~SvxObjectNameDialog()
{
    dispose();
    disposeOnce();
}

void SvxObjectNameDialog::dispose()
@@ -133,7 +133,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(

SvxObjectTitleDescDialog::~SvxObjectTitleDescDialog()
{
    dispose();
    disposeOnce();
}

void SvxObjectTitleDescDialog::dispose()
@@ -175,7 +175,7 @@ SvxMessDialog::SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const

SvxMessDialog::~SvxMessDialog()
{
    dispose();
    disposeOnce();
}

void SvxMessDialog::dispose()
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 273bffa..0652c8b 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -338,7 +338,7 @@ namespace svx

    SuggestionSet::~SuggestionSet()
    {
        dispose();
        disposeOnce();
    }

    void SuggestionSet::dispose()
@@ -395,7 +395,7 @@ namespace svx

    SuggestionDisplay::~SuggestionDisplay()
    {
        dispose();
        disposeOnce();
    }

    void SuggestionDisplay::dispose()
@@ -607,7 +607,7 @@ namespace svx

    HangulHanjaConversionDialog::~HangulHanjaConversionDialog()
    {
        dispose();
        disposeOnce();
    }

    void HangulHanjaConversionDialog::dispose()
@@ -1163,7 +1163,7 @@ namespace svx

    HangulHanjaOptionsDialog::~HangulHanjaOptionsDialog()
    {
        dispose();
        disposeOnce();
    }

    void HangulHanjaOptionsDialog::dispose()
@@ -1239,7 +1239,7 @@ namespace svx

    HangulHanjaNewDictDialog::~HangulHanjaNewDictDialog()
    {
        dispose();
        disposeOnce();
    }

    void HangulHanjaNewDictDialog::dispose()
@@ -1426,7 +1426,7 @@ namespace svx

    SuggestionEdit::~SuggestionEdit()
    {
        dispose();
        disposeOnce();
    }

    void SuggestionEdit::dispose()
@@ -1845,7 +1845,7 @@ namespace svx

    HangulHanjaEditDictDialog::~HangulHanjaEditDictDialog()
    {
        dispose();
        disposeOnce();
    }

    void HangulHanjaEditDictDialog::dispose()
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index a02ff7d..f08098b 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -129,7 +129,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia

SvxHyperlinkNewDocTp::~SvxHyperlinkNewDocTp ()
{
    dispose();
    disposeOnce();
}

void SvxHyperlinkNewDocTp::dispose()
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 0a3f269..df6f179 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -73,7 +73,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p

SvxHyperlinkDocTp::~SvxHyperlinkDocTp()
{
    dispose();
    disposeOnce();
}

void SvxHyperlinkDocTp::dispose()
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 61760d7..7077dbd 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -83,7 +83,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,

SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp()
{
    dispose();
    disposeOnce();
}

void SvxHyperlinkInternetTp::dispose()
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 6e1da44..160e56d 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -68,7 +68,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*

SvxHyperlinkMailTp::~SvxHyperlinkMailTp()
{
    dispose();
    disposeOnce();
}

void SvxHyperlinkMailTp::dispose()
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index bfe9c67..80b8690 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -74,7 +74,7 @@ SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle)

SvxHlmarkTreeLBox::~SvxHlmarkTreeLBox()
{
    dispose();
    disposeOnce();
}

void SvxHlmarkTreeLBox::dispose()
@@ -161,7 +161,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )

SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd()
{
    dispose();
    disposeOnce();
}

void SvxHlinkDlgMarkWnd::dispose()
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 6d5d3a9..072dedd 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -107,7 +107,7 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( vcl::Window *pParent,

SvxHyperlinkTabPageBase::~SvxHyperlinkTabPageBase()
{
    dispose();
    disposeOnce();
}

void SvxHyperlinkTabPageBase::dispose()
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 8c4ea99..e124a43 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -514,7 +514,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(

SvxHyphenWordDialog::~SvxHyphenWordDialog()
{
    dispose();
    disposeOnce();
}

void SvxHyphenWordDialog::dispose()
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 712d78f..cb80961 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -54,7 +54,7 @@ IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID,

IconChoicePage::~IconChoicePage()
{
    dispose();
    disposeOnce();
}

void IconChoicePage::dispose()
@@ -215,7 +215,7 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,

IconChoiceDialog ::~IconChoiceDialog ()
{
    dispose();
    disposeOnce();
}

void IconChoiceDialog::dispose()
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index db3bf1f..0b24ea2 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -193,7 +193,7 @@ SvInsertOleDlg::SvInsertOleDlg

SvInsertOleDlg::~SvInsertOleDlg()
{
    dispose();
    disposeOnce();
}

void SvInsertOleDlg::dispose()
@@ -413,7 +413,7 @@ SvInsertPlugInDialog::SvInsertPlugInDialog(vcl::Window* pParent,

SvInsertPlugInDialog::~SvInsertPlugInDialog()
{
    dispose();
    disposeOnce();
}

void SvInsertPlugInDialog::dispose()
@@ -517,7 +517,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent

SfxInsertFloatingFrameDialog::~SfxInsertFloatingFrameDialog()
{
    dispose();
    disposeOnce();
}

void SfxInsertFloatingFrameDialog::dispose()
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 75e8573..2451ad9 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -47,7 +47,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString&

SvxInsRowColDlg::~SvxInsRowColDlg()
{
    dispose();
    disposeOnce();
}

void SvxInsRowColDlg::dispose()
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 68a9c19..e9811ab 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -145,7 +145,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b

SvBaseLinksDlg::~SvBaseLinksDlg()
{
    dispose();
    disposeOnce();
}

void SvBaseLinksDlg::dispose()
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 72979c4..72f627b 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -224,7 +224,7 @@ SvxPathSelectDialog::SvxPathSelectDialog(vcl::Window* pParent)

SvxMultiPathDialog::~SvxMultiPathDialog()
{
    dispose();
    disposeOnce();
}

void SvxMultiPathDialog::dispose()
@@ -247,7 +247,7 @@ void SvxMultiPathDialog::dispose()

SvxPathSelectDialog::~SvxPathSelectDialog()
{
    dispose();
    disposeOnce();
}

void SvxPathSelectDialog::dispose()
diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index 3c2cba5..d659368 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -30,7 +30,7 @@ SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent )

SvxNewTableDialog::~SvxNewTableDialog()
{
    dispose();
    disposeOnce();
}

void SvxNewTableDialog::dispose()
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index ad4e26b..5d161ae 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -153,7 +153,7 @@ PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(

PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog()
{
    dispose();
    disposeOnce();
}

void PasswordToOpenModifyDialog::dispose()
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index f7ae839..ff6263a 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -54,7 +54,7 @@ SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent )

SvPasteObjectDialog::~SvPasteObjectDialog()
{
    dispose();
    disposeOnce();
}

void SvPasteObjectDialog::dispose()
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 175d889..c1e43e1 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -124,7 +124,7 @@ SvxPostItDialog::SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSe

SvxPostItDialog::~SvxPostItDialog()
{
    dispose();
    disposeOnce();
}

void SvxPostItDialog::dispose()
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index a5db7a2..0d01e90 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -101,7 +101,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSFTreeListBox(vcl::Win

SFTreeListBox::~SFTreeListBox()
{
    dispose();
    disposeOnce();
}

void SFTreeListBox::dispose()
@@ -445,7 +445,7 @@ CuiInputDialog::CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode )

CuiInputDialog::~CuiInputDialog()
{
    dispose();
    disposeOnce();
}

void CuiInputDialog::dispose()
@@ -504,7 +504,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& la

SvxScriptOrgDialog::~SvxScriptOrgDialog()
{
    dispose();
    disposeOnce();
}

void SvxScriptOrgDialog::dispose()
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index a58c941..4c86ac4 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -41,7 +41,7 @@ FmShowColsDialog::FmShowColsDialog(vcl::Window* pParent)

FmShowColsDialog::~FmShowColsDialog()
{
    dispose();
    disposeOnce();
}

void FmShowColsDialog::dispose()
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 171ea3a..c412265 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -55,7 +55,7 @@ SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical,

SvxSplitTableDlg::~SvxSplitTableDlg()
{
    dispose();
    disposeOnce();
}

void SvxSplitTableDlg::dispose()
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 4d15413..4497601 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -64,7 +64,7 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItem

SvxSearchFormatDialog::~SvxSearchFormatDialog()
{
    dispose();
    disposeOnce();
}

void SvxSearchFormatDialog::dispose()
@@ -180,7 +180,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,

SvxSearchAttributeDialog::~SvxSearchAttributeDialog()
{
    dispose();
    disposeOnce();
}

void SvxSearchAttributeDialog::dispose()
@@ -261,7 +261,7 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog

SvxSearchSimilarityDialog::~SvxSearchSimilarityDialog()
{
    dispose();
    disposeOnce();
}

void SvxSearchSimilarityDialog::dispose()
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 8a47ac5..953bbc7 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -68,7 +68,7 @@ LookUpComboBox::LookUpComboBox(vcl::Window *pParent)

LookUpComboBox::~LookUpComboBox()
{
    dispose();
    disposeOnce();
}

void LookUpComboBox::dispose()
@@ -109,7 +109,7 @@ ReplaceEdit::ReplaceEdit(vcl::Window *pParent)

ReplaceEdit::~ReplaceEdit()
{
    dispose();
    disposeOnce();
}

void ReplaceEdit::dispose()
@@ -193,7 +193,7 @@ void ThesaurusAlternativesCtrl::init(SvxThesaurusDialog *pDialog)

ThesaurusAlternativesCtrl::~ThesaurusAlternativesCtrl()
{
    dispose();
    disposeOnce();
}

void ThesaurusAlternativesCtrl::dispose()
@@ -540,7 +540,7 @@ SvxThesaurusDialog::SvxThesaurusDialog(

SvxThesaurusDialog::~SvxThesaurusDialog()
{
    dispose();
    disposeOnce();
}

void SvxThesaurusDialog::dispose()
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 451de55..9dc2a8b 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -290,7 +290,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )

SvxZoomDialog::~SvxZoomDialog()
{
    dispose();
    disposeOnce();
}

void SvxZoomDialog::dispose()
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index d8137095..7ce1711 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -144,7 +144,7 @@ OUString CertPathDialog::getDirectory() const

CertPathDialog::~CertPathDialog()
{
    dispose();
    disposeOnce();
}

void CertPathDialog::dispose()
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index ecb9963..a8ae9c6 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -327,7 +327,7 @@ namespace offapp

    ConnectionPoolOptionsPage::~ConnectionPoolOptionsPage()
    {
        dispose();
        disposeOnce();
    }

    void ConnectionPoolOptionsPage::dispose()
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index a911a1e..805c8da 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -62,7 +62,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent,

SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog()
{
    dispose();
    disposeOnce();
}

void SvxJSearchOptionsDialog::dispose()
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index d9822ac..e719b47 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -163,7 +163,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons

DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
{
    dispose();
    disposeOnce();
}

void DbRegistrationOptionsPage::dispose()
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 74e8742..7fbe477 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -72,7 +72,7 @@ namespace svx

    ODocumentLinkDialog::~ODocumentLinkDialog()
    {
        dispose();
        disposeOnce();
    }

    void ODocumentLinkDialog::dispose()
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index a19a889..ae6a02c 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -138,7 +138,7 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF

SvxFontSubstTabPage::~SvxFontSubstTabPage()
{
    dispose();
    disposeOnce();
}

void SvxFontSubstTabPage::dispose()
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 02d8184..2e8be40 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -166,7 +166,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI

CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
{
    dispose();
    disposeOnce();
}

void CuiAboutConfigTabPage::dispose()
@@ -494,7 +494,7 @@ CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow,

CuiAboutConfigValueDialog::~CuiAboutConfigValueDialog()
{
    dispose();
    disposeOnce();
}

void CuiAboutConfigValueDialog::dispose()
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 61354e1..d6b78b8 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -58,7 +58,7 @@ SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pPar

SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SvxAccessibilityOptionsTabPage::dispose()
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 49b50157..fb2dc01 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -151,7 +151,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& 

SvxAsianLayoutPage::~SvxAsianLayoutPage()
{
    dispose();
    disposeOnce();
}

void SvxAsianLayoutPage::dispose()
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 1be3582..fdc362a 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -47,7 +47,7 @@ SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxI

SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage()
{
    dispose();
    disposeOnce();
}

void SvxBasicIDEOptionsPage::dispose()
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 7cb85b4..9ca96f9 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -83,7 +83,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxIt

SvxDefaultColorOptPage::~SvxDefaultColorOptPage()
{
    dispose();
    disposeOnce();
}

void SvxDefaultColorOptPage::dispose()
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 08d7d90..bce0bfb 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -174,7 +174,7 @@ class ColorConfigWindow_Impl
{
public:
    ColorConfigWindow_Impl(vcl::Window* pParent);
    virtual ~ColorConfigWindow_Impl() { dispose(); }
    virtual ~ColorConfigWindow_Impl() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE;

public:
@@ -915,7 +915,7 @@ void ColorConfigCtrl_Impl::InitHeaderBar(const OUString &rOn, const OUString &rU

ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
{
    dispose();
    disposeOnce();
}

void ColorConfigCtrl_Impl::dispose()
@@ -1067,7 +1067,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(

SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SvxColorOptionsTabPage::dispose()
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 40203d8..ab25dfd1 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -59,7 +59,7 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rS

SvxCTLOptionsPage::~SvxCTLOptionsPage()
{
    dispose();
    disposeOnce();
}

void SvxCTLOptionsPage::dispose()
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index d48e9a5..0239009 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -119,7 +119,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent,

SvxNewDictionaryDialog::~SvxNewDictionaryDialog()
{
    dispose();
    disposeOnce();
}

void SvxNewDictionaryDialog::dispose()
@@ -346,7 +346,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(

SvxEditDictionaryDialog::~SvxEditDictionaryDialog()
{
    dispose();
    disposeOnce();
}

void SvxEditDictionaryDialog::dispose()
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 65953a8..29b1eac 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -56,7 +56,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& r

OfaMSFilterTabPage::~OfaMSFilterTabPage()
{
    dispose();
    disposeOnce();
}

void OfaMSFilterTabPage::dispose()
@@ -178,7 +178,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet

OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
{
    dispose();
    disposeOnce();
}

void OfaMSFilterTabPage2::dispose()
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index dabfc6b..ceb7c2f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -309,7 +309,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)

OfaMiscTabPage::~OfaMiscTabPage()
{
    dispose();
    disposeOnce();
}

void OfaMiscTabPage::dispose()
@@ -703,7 +703,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)

OfaViewTabPage::~OfaViewTabPage()
{
    dispose();
    disposeOnce();
}

void OfaViewTabPage::dispose()
@@ -1248,7 +1248,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&

OfaLanguagesTabPage::~OfaLanguagesTabPage()
{
    dispose();
    disposeOnce();
}

void OfaLanguagesTabPage::dispose()
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 9d6afd3..5986df3 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -221,7 +221,7 @@ SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCo

SvxGeneralTabPage::~SvxGeneralTabPage()
{
    dispose();
    disposeOnce();
}

void SvxGeneralTabPage::dispose()
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 34d7fff..8860af6 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -86,7 +86,7 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )

OfaHtmlTabPage::~OfaHtmlTabPage()
{
    dispose();
    disposeOnce();
}

void OfaHtmlTabPage::dispose()
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 490b41c..f92b13c3 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -217,7 +217,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)

SvxProxyTabPage::~SvxProxyTabPage()
{
    dispose();
    disposeOnce();
}

void SvxProxyTabPage::dispose()
@@ -649,7 +649,7 @@ SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& r

SvxSecurityTabPage::~SvxSecurityTabPage()
{
    dispose();
    disposeOnce();
}

void SvxSecurityTabPage::dispose()
@@ -1011,7 +1011,7 @@ SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet)

SvxEMailTabPage::~SvxEMailTabPage()
{
    dispose();
    disposeOnce();
}

void SvxEMailTabPage::dispose()
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 7cd9977..7a2334a 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -202,7 +202,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& 

SvxJavaOptionsPage::~SvxJavaOptionsPage()
{
    dispose();
    disposeOnce();
}

void SvxJavaOptionsPage::dispose()
@@ -823,7 +823,7 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) :

SvxJavaParameterDlg::~SvxJavaParameterDlg()
{
    dispose();
    disposeOnce();
}

void SvxJavaParameterDlg::dispose()
@@ -962,7 +962,7 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent)

SvxJavaClassPathDlg::~SvxJavaClassPathDlg()
{
    dispose();
    disposeOnce();
}

void SvxJavaClassPathDlg::dispose()
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 263405d..4b1696f 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -57,7 +57,7 @@ SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxIte

SvxJSearchOptionsPage::~SvxJSearchOptionsPage()
{
    dispose();
    disposeOnce();
}

void SvxJSearchOptionsPage::dispose()
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 9c357e6..53b3051 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -364,7 +364,7 @@ public:
            get(m_pBreakNF, "wordlength");
        }
    }
    virtual ~OptionsBreakSet() { dispose(); }
    virtual ~OptionsBreakSet() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        m_pBeforeFrame.clear();
@@ -1131,7 +1131,7 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet )

SvxLinguTabPage::~SvxLinguTabPage()
{
    dispose();
    disposeOnce();
}

void SvxLinguTabPage::dispose()
@@ -1918,7 +1918,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rD

SvxEditModulesDlg::~SvxEditModulesDlg()
{
    dispose();
    disposeOnce();
}

void SvxEditModulesDlg::dispose()
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 79a86d9..0dc00ee 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -143,7 +143,7 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSe

OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
{
    dispose();
    disposeOnce();
}

void OfaMemoryOptionsPage::dispose()
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index bd8c784..4454823 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -119,7 +119,7 @@ void SvxOpenCLTabPage::dispose()

SvxOpenCLTabPage::~SvxOpenCLTabPage()
{
    dispose();
    disposeOnce();
}

void SvxOpenCLTabPage::dispose()
@@ -232,7 +232,7 @@ public:
    DECL_LINK(EditModifiedHdl, Edit*);

    ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag);
    virtual ~ListEntryDialog() { dispose(); }
    virtual ~ListEntryDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        mpOS.clear();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 39e94a0..8b1e967 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -247,7 +247,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)

SvxPathTabPage::~SvxPathTabPage()
{
    dispose();
    disposeOnce();
}

void SvxPathTabPage::dispose()
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 8da1a6c..a8a9280 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -199,7 +199,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet

SfxSaveTabPage::~SfxSaveTabPage()
{
    dispose();
    disposeOnce();
}

void SvxSaveTabPage::dispose()
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 30eb718..536e444 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -84,7 +84,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxIt

SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage()
{
    dispose();
    disposeOnce();
}

void SvxOnlineUpdateTabPage::dispose()
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index e6d73e4..a232cea 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -94,7 +94,7 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent )

SelectPersonaDialog::~SelectPersonaDialog()
{
    dispose();
    disposeOnce();
}

void SelectPersonaDialog::dispose()
@@ -312,7 +312,7 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons

SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
{
    dispose();
    disposeOnce();
}

void SvxPersonalizationTabPage::dispose()
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index 5071769..aea7fd2 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -74,7 +74,7 @@ SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOp

SecurityOptionsDialog::~SecurityOptionsDialog()
{
    dispose();
    disposeOnce();
}

void SecurityOptionsDialog::dispose()
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e45cbc8..6262d24 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -552,7 +552,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const OUString

OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
{
   dispose();
    disposeOnce();
}

void OfaTreeOptionsDialog::dispose()
@@ -2168,7 +2168,7 @@ ExtensionsTabPage::ExtensionsTabPage(

ExtensionsTabPage::~ExtensionsTabPage()
{
    dispose();
    disposeOnce();
}

void ExtensionsTabPage::dispose()
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index d114fe9..f6d6cd5 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -142,7 +142,7 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent)

WebConnectionInfoDialog::~WebConnectionInfoDialog()
{
    dispose();
    disposeOnce();
}

void WebConnectionInfoDialog::dispose()
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index ada97c5..9c0f52d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -250,7 +250,7 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor

AlignmentTabPage::~AlignmentTabPage()
{
    dispose();
    disposeOnce();
}

void AlignmentTabPage::dispose()
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 346fc8b..49bf4d5 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -139,7 +139,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )

OfaAutoCorrDlg::~OfaAutoCorrDlg()
{
    dispose();
    disposeOnce();
}

void OfaAutoCorrDlg::dispose()
@@ -206,7 +206,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxIt

OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage()
{
    dispose();
    disposeOnce();
}

void OfaAutocorrOptionsPage::dispose()
@@ -312,7 +312,7 @@ public:
    {
        get(m_pPrcntMF, "margin");
    }
    virtual ~OfaAutoFmtPrcntSet() { dispose(); }
    virtual ~OfaAutoFmtPrcntSet() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { m_pPrcntMF.clear(); ModalDialog::dispose(); }

    MetricField& GetPrcntFld()
@@ -495,7 +495,7 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(OUString& rTxt, sal_uInt16

OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
{
    dispose();
    disposeOnce();
}

void OfaSwAutoFmtOptionsPage::dispose()
@@ -934,7 +934,7 @@ void OfaAutocorrReplacePage::Resize()

OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
{
    dispose();
    disposeOnce();
}

void OfaAutocorrReplacePage::dispose()
@@ -1452,7 +1452,7 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItem

OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
{
    dispose();
    disposeOnce();
}

void OfaAutocorrExceptPage::dispose()
@@ -1885,7 +1885,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet)

OfaQuoteTabPage::~OfaQuoteTabPage()
{
    dispose();
    disposeOnce();
}

void OfaQuoteTabPage::dispose()
@@ -2231,7 +2231,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent,

OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage()
{
    dispose();
    disposeOnce();
}

void OfaAutoCompleteTabPage::dispose()
@@ -2424,7 +2424,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const

OfaAutoCompleteTabPage::AutoCompleteMultiListBox::~AutoCompleteMultiListBox()
{
    dispose();
    disposeOnce();
}

void OfaAutoCompleteTabPage::AutoCompleteMultiListBox::dispose()
@@ -2496,7 +2496,7 @@ OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( vcl::Window* pParent,

OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void OfaSmartTagOptionsTabPage::dispose()
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 0771bcd..13d7a2d8 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -231,7 +231,7 @@ void BackgroundPreviewImpl::setBmp(bool bBmp)

BackgroundPreviewImpl::~BackgroundPreviewImpl()
{
    dispose();
    disposeOnce();
}

void BackgroundPreviewImpl::dispose()
@@ -429,7 +429,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe

SvxBackgroundTabPage::~SvxBackgroundTabPage()
{
    dispose();
    disposeOnce();
}

void SvxBackgroundTabPage::dispose()
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 4078833..8fbd975 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -336,7 +336,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore

SvxBorderTabPage::~SvxBorderTabPage()
{
    dispose();
    disposeOnce();
}

void SvxBorderTabPage::dispose()
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 37c9634..7e86557 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -185,7 +185,7 @@ SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const

SvxCharBasePage::~SvxCharBasePage()
{
    dispose();
    disposeOnce();
}

void SvxCharBasePage::dispose()
@@ -379,7 +379,7 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet

SvxCharNamePage::~SvxCharNamePage()
{
    dispose();
    disposeOnce();
}

void SvxCharNamePage::dispose()
@@ -1378,7 +1378,7 @@ SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& 

SvxCharEffectsPage::~SvxCharEffectsPage()
{
    dispose();
    disposeOnce();
}

void SvxCharEffectsPage::dispose()
@@ -2651,7 +2651,7 @@ SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet

SvxCharPositionPage::~SvxCharPositionPage()
{
    dispose();
    disposeOnce();
}

void SvxCharPositionPage::dispose()
@@ -3410,7 +3410,7 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet&

SvxCharTwoLinesPage::~SvxCharTwoLinesPage()
{
    dispose();
    disposeOnce();
}

void SvxCharTwoLinesPage::dispose()
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index de8cce5..fdde385 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -133,7 +133,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI

SvxConnectionPage::~SvxConnectionPage()
{
    dispose();
    disposeOnce();
}

void SvxConnectionPage::dispose()
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index c82c33f..3a001d1 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -43,7 +43,7 @@ SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent,

SvxDistributeDialog::~SvxDistributeDialog()
{
    dispose();
    disposeOnce();
}

void SvxDistributeDialog::dispose()
@@ -81,7 +81,7 @@ SvxDistributePage::SvxDistributePage(vcl::Window* pWindow,

SvxDistributePage::~SvxDistributePage()
{
    dispose();
    disposeOnce();
}

void SvxDistributePage::dispose()
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index a1294a5..4687eff 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -127,7 +127,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )

SvxGrfCropPage::~SvxGrfCropPage()
{
    dispose();
    disposeOnce();
}

void SvxGrfCropPage::dispose()
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 1f9c31d..b2ffa26 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -140,7 +140,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn

SvxCaptionTabPage::~SvxCaptionTabPage()
{
    dispose();
    disposeOnce();
}

void SvxCaptionTabPage::dispose()
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 4bc1917..17a3930 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -143,7 +143,7 @@ _SfxMacroTabPage::_SfxMacroTabPage(vcl::Window* pParent, const SfxItemSet& rAttr

_SfxMacroTabPage::~_SfxMacroTabPage()
{
    dispose();
    disposeOnce();
}

void _SfxMacroTabPage::dispose()
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index ee178dc..05f690c 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -150,7 +150,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs

SvxMeasurePage::~SvxMeasurePage()
{
    dispose();
    disposeOnce();
}

void SvxMeasurePage::dispose()
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 9b8b85b..15edecd 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -282,7 +282,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent,

SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
{
    dispose();
    disposeOnce();
}


diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 3c0c619..640ba9c 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -219,7 +219,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent,

SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
{
    dispose();
    disposeOnce();
}

void SvxSingleNumPickTabPage::dispose()
@@ -389,7 +389,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent,

SvxBulletPickTabPage::~SvxBulletPickTabPage()
{
    dispose();
    disposeOnce();
}

void SvxBulletPickTabPage::dispose()
@@ -595,7 +595,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent,

SvxNumPickTabPage::~SvxNumPickTabPage()
{
    dispose();
    disposeOnce();
}

void SvxNumPickTabPage::dispose()
@@ -845,7 +845,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,

SvxBitmapPickTabPage::~SvxBitmapPickTabPage()
{
    dispose();
    disposeOnce();
}

void SvxBitmapPickTabPage::dispose()
@@ -1162,7 +1162,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,

SvxNumOptionsTabPage::~SvxNumOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SvxNumOptionsTabPage::dispose()
@@ -2764,7 +2764,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,

SvxNumPositionTabPage::~SvxNumPositionTabPage()
{
    dispose();
    disposeOnce();
}

void SvxNumPositionTabPage::dispose()
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index fb67d8b..520332a 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -366,7 +366,7 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr 

SvxPageDescPage::~SvxPageDescPage()
{
    dispose();
    disposeOnce();
}

void SvxPageDescPage::dispose()
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index d8ecede..7bff769 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -656,7 +656,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent,  const Sfx

SvxStdParagraphTabPage::~SvxStdParagraphTabPage()
{
    dispose();
    disposeOnce();
}

void SvxStdParagraphTabPage::dispose()
@@ -1041,7 +1041,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet

SvxParaAlignTabPage::~SvxParaAlignTabPage()
{
    dispose();
    disposeOnce();
}

void SvxParaAlignTabPage::dispose()
@@ -1945,7 +1945,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxI

SvxExtParagraphTabPage::~SvxExtParagraphTabPage()
{
    dispose();
    disposeOnce();
}

void SvxExtParagraphTabPage::dispose()
@@ -2181,7 +2181,7 @@ SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet )

SvxAsianTabPage::~SvxAsianTabPage()
{
    dispose();
    disposeOnce();
}

void SvxAsianTabPage::dispose()
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index d9c26b4..bbe6bcb 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -590,7 +590,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet&

SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage()
{
    dispose();
    disposeOnce();
}

void SvxSwPosSizeTabPage::dispose()
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 3820ea8..5659120 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -50,10 +50,10 @@ public:
        , nTabStyle(0)
    {
    }
    virtual ~TabWin_Impl() { dispose(); }
    virtual ~TabWin_Impl() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { mpPage.clear(); vcl::Window::dispose(); }

    virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
    virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;

    void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; }
    void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; }
@@ -189,7 +189,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet

SvxTabulatorTabPage::~SvxTabulatorTabPage()
{
    dispose();
    disposeOnce();
}

void SvxTabulatorTabPage::dispose()
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 45d48ec..05bc698 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -124,7 +124,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemS

SvxTextAnimationPage::~SvxTextAnimationPage()
{
    dispose();
    disposeOnce();
}

void SvxTextAnimationPage::dispose()
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index de0eeab..6345e45 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -98,7 +98,7 @@ SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttr

SvxTextAttrPage::~SvxTextAttrPage()
{
    dispose();
    disposeOnce();
}

void SvxTextAttrPage::dispose()
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 9f13a52..7c2090d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -120,7 +120,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl)

SvxTransparenceTabPage::~SvxTransparenceTabPage()
{
    dispose();
    disposeOnce();
}

void SvxTransparenceTabPage::dispose()
@@ -797,7 +797,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs

SvxAreaTabPage::~SvxAreaTabPage()
{
    dispose();
    disposeOnce();
}

void SvxAreaTabPage::dispose()
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 59e1b8b..5fb5b01 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -122,7 +122,7 @@ SvxBitmapTabPage::SvxBitmapTabPage(  vcl::Window* pParent, const SfxItemSet& rIn

SvxBitmapTabPage::~SvxBitmapTabPage()
{
    dispose();
    disposeOnce();
}

void SvxBitmapTabPage::dispose()
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index b9c73e4..4b83e77 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -397,7 +397,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr

SvxColorTabPage::~SvxColorTabPage()
{
    dispose();
    disposeOnce();
}

void SvxColorTabPage::dispose()
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 4713c93..064c023 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -141,7 +141,7 @@ SvxGradientTabPage::SvxGradientTabPage

SvxGradientTabPage::~SvxGradientTabPage()
{
    dispose();
    disposeOnce();
}

void SvxGradientTabPage::dispose()
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 2022fed..1a2f42b 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -139,7 +139,7 @@ SvxHatchTabPage::SvxHatchTabPage

SvxHatchTabPage::~SvxHatchTabPage()
{
    dispose();
    disposeOnce();
}

void SvxHatchTabPage::dispose()
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 8bc7abd..26e5c44 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -230,7 +230,7 @@ void SvxLineTabPage::ShowSymbolControls(bool bOn)

SvxLineTabPage::~SvxLineTabPage()
{
    dispose();
    disposeOnce();
}

void SvxLineTabPage::dispose()
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 0d84db3..df5c921 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -156,7 +156,7 @@ SvxLineDefTabPage::SvxLineDefTabPage

SvxLineDefTabPage::~SvxLineDefTabPage()
{
    dispose();
    disposeOnce();
}

void SvxLineDefTabPage::dispose()
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 4163b57..6d36cfe 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -107,7 +107,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage

SvxLineEndDefTabPage::~SvxLineEndDefTabPage()
{
    dispose();
    disposeOnce();
}

void SvxLineEndDefTabPage::dispose()
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 6b3f38e..945f8f0 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -167,7 +167,7 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA

SvxShadowTabPage::~SvxShadowTabPage()
{
    dispose();
    disposeOnce();
}

void SvxShadowTabPage::dispose()
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 31a5bbb..e820692 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -199,7 +199,7 @@ SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr

SvxAngleTabPage::~SvxAngleTabPage()
{
    dispose();
    disposeOnce();
}

void SvxAngleTabPage::dispose()
@@ -441,7 +441,7 @@ SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr

SvxSlantTabPage::~SvxSlantTabPage()
{
    dispose();
    disposeOnce();
}

void SvxSlantTabPage::dispose()
@@ -670,7 +670,7 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxIt

SvxPositionSizeTabPage::~SvxPositionSizeTabPage()
{
    dispose();
    disposeOnce();
}

void SvxPositionSizeTabPage::dispose()
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 2e82219..65f033b 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -69,7 +69,7 @@ namespace dbmm

    PreparationPage::~PreparationPage()
    {
        dispose();
        disposeOnce();
    }

    void PreparationPage::dispose()
@@ -106,7 +106,7 @@ namespace dbmm

    SaveDBDocPage::~SaveDBDocPage()
    {
        dispose();
        disposeOnce();
    }

    void SaveDBDocPage::dispose()
@@ -196,7 +196,7 @@ namespace dbmm

    ProgressPage::~ProgressPage()
    {
        dispose();
        disposeOnce();
    }

    void ProgressPage::dispose()
@@ -293,7 +293,7 @@ namespace dbmm

    ResultPage::~ResultPage()
    {
        dispose();
        disposeOnce();
    }

    void ResultPage::dispose()
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 4e090e9..5c0189f 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -226,7 +226,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo

OAppDetailPageHelper::~OAppDetailPageHelper()
{
    dispose();
    disposeOnce();
}

void OAppDetailPageHelper::dispose()
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index d68b8a3..2d51155 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -364,7 +364,7 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai

OTasksWindow::~OTasksWindow()
{
    dispose();
    disposeOnce();
}

void OTasksWindow::dispose()
@@ -566,7 +566,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe

OApplicationDetailView::~OApplicationDetailView()
{
    dispose();
    disposeOnce();
}

void OApplicationDetailView::dispose()
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 0345aea..a4b7d02 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -62,7 +62,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)

OApplicationIconControl::~OApplicationIconControl()
{
    dispose();
    disposeOnce();
}

void OApplicationIconControl::dispose()
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 90b9b4d..8a337c6 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -53,7 +53,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorde

OApplicationSwapWindow::~OApplicationSwapWindow()
{
    dispose();
    disposeOnce();
}

void OApplicationSwapWindow::dispose()
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index c6686f2..d347023 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -47,7 +47,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n

OTitleWindow::~OTitleWindow()
{
    dispose();
    disposeOnce();
}

void OTitleWindow::dispose()
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index a9382f4..356b2eb 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -86,7 +86,7 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev

OAppBorderWindow::~OAppBorderWindow()
{
    dispose();
    disposeOnce();
}

void OAppBorderWindow::dispose()
@@ -208,7 +208,7 @@ OApplicationView::OApplicationView( vcl::Window* pParent

OApplicationView::~OApplicationView()
{
    dispose();
    disposeOnce();
}

void OApplicationView::dispose()
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 92ee3e21..07db066 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -117,7 +117,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont

UnoDataBrowserView::~UnoDataBrowserView()
{
    dispose();
    disposeOnce();
}

void UnoDataBrowserView::dispose()
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 5e617a1..0e8f397 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -78,7 +78,7 @@ namespace dbaui

    ODataView::~ODataView()
    {
        dispose();
        disposeOnce();
    }

    void ODataView::dispose()
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index d80dc3d..ad337c8 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -46,7 +46,7 @@ DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits)

DBTreeView::~DBTreeView()
{
    dispose();
    disposeOnce();
}

void DBTreeView::dispose()
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 77492e6..9b9d8c8 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -717,7 +717,7 @@ SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM,

SbaGridControl::~SbaGridControl()
{
    dispose();
    disposeOnce();
}

void SbaGridControl::dispose()
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 9de7ee2..02110126 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -159,7 +159,7 @@ void OFieldDescControl::Contruct()

OFieldDescControl::~OFieldDescControl()
{
    dispose();
    disposeOnce();
}

void OFieldDescControl::dispose()
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 77ac1b6..79ea40c 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -71,7 +71,7 @@ OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits)

OTableGrantControl::~OTableGrantControl()
{
    dispose();
    disposeOnce();
}

void OTableGrantControl::dispose()
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 3201f5e..5644fbb 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -39,7 +39,7 @@ OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pP

OSplitterView::~OSplitterView()
{
    dispose();
    disposeOnce();
}

void OSplitterView::dispose()
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 4fd8c02..56197ff 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -40,7 +40,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConnectionURLEdit(vcl:

OConnectionURLEdit::~OConnectionURLEdit()
{
    dispose();
    disposeOnce();
}

void OConnectionURLEdit::dispose()
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 8aee700..b0398b8 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -84,7 +84,7 @@ void DBTreeListBox::init()

DBTreeListBox::~DBTreeListBox()
{
    dispose();
    disposeOnce();
}

void DBTreeListBox::dispose()
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index fe88aa1..ddd50aa 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -37,7 +37,7 @@ OMarkableTreeListBox::OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinSt

OMarkableTreeListBox::~OMarkableTreeListBox()
{
    dispose();
    disposeOnce();
}

void OMarkableTreeListBox::dispose()
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 9d2c870a..9048294 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -105,7 +105,7 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent,  WinBits nWinStyle ) :

OSqlEdit::~OSqlEdit()
{
    dispose();
    disposeOnce();
}

void OSqlEdit::dispose()
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index ed64086..d174133 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -93,7 +93,7 @@ OCollectionView::OCollectionView( vcl::Window * pParent

OCollectionView::~OCollectionView()
{
    dispose();
    disposeOnce();
}

void OCollectionView::dispose()
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 2f2e8f3..4c65ae5 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -109,7 +109,7 @@ namespace dbaui

    OConnectionHelper::~OConnectionHelper()
    {
        dispose();
        disposeOnce();
    }

    void OConnectionHelper::dispose()
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 1a2a7be..d9aafa2 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -111,7 +111,7 @@ namespace dbaui

    OConnectionTabPage::~OConnectionTabPage()
    {
        dispose();
        disposeOnce();
    }

    void OConnectionTabPage::dispose()
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 0d9dd54..4199794 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -121,7 +121,7 @@ namespace dbaui

    OConnectionTabPageSetup::~OConnectionTabPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OConnectionTabPageSetup::dispose()
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 57356b6..ab31641 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;

    OTextConnectionPageSetup::~OTextConnectionPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OTextConnectionPageSetup::dispose()
@@ -158,7 +158,7 @@ using namespace ::com::sun::star;

    OLDAPConnectionPageSetup::~OLDAPConnectionPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OLDAPConnectionPageSetup::dispose()
@@ -261,7 +261,7 @@ using namespace ::com::sun::star;

    OMySQLIntroPageSetup::~OMySQLIntroPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OMySQLIntroPageSetup::dispose()
@@ -334,7 +334,7 @@ using namespace ::com::sun::star;

    MySQLNativeSetupPage::~MySQLNativeSetupPage()
    {
        dispose();
        disposeOnce();
    }

    void MySQLNativeSetupPage::dispose()
@@ -433,7 +433,7 @@ using namespace ::com::sun::star;

    OGeneralSpecialJDBCConnectionPageSetup::~OGeneralSpecialJDBCConnectionPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OGeneralSpecialJDBCConnectionPageSetup::dispose()
@@ -597,7 +597,7 @@ using namespace ::com::sun::star;

    OJDBCConnectionPageSetup::~OJDBCConnectionPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OJDBCConnectionPageSetup::dispose()
@@ -715,7 +715,7 @@ using namespace ::com::sun::star;

    OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OSpreadSheetConnectionPageSetup::dispose()
@@ -770,7 +770,7 @@ using namespace ::com::sun::star;

    OAuthentificationPageSetup::~OAuthentificationPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OAuthentificationPageSetup::dispose()
@@ -850,7 +850,7 @@ using namespace ::com::sun::star;

    OFinalDBPageSetup::~OFinalDBPageSetup()
    {
        dispose();
        disposeOnce();
    }

    void OFinalDBPageSetup::dispose()
diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
index 716c895..7182276 100644
--- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
+++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
@@ -30,7 +30,7 @@ QueryPropertiesDialog::QueryPropertiesDialog(

QueryPropertiesDialog::~QueryPropertiesDialog()
{
    dispose();
    disposeOnce();
}

void QueryPropertiesDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 9a27bd7..5091399 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -90,7 +90,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,

ORelationDialog::~ORelationDialog()
{
    dispose();
    disposeOnce();
}

void ORelationDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index 1494864..6957d26 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -61,7 +61,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(vcl::Window* pParent

OTableSubscriptionDialog::~OTableSubscriptionDialog()
{
    dispose();
    disposeOnce();
}

void OTableSubscriptionDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index cc2079d..5c8b4b3 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -153,7 +153,7 @@ namespace dbaui

    OTextConnectionHelper::~OTextConnectionHelper()
    {
        dispose();
        disposeOnce();
    }

    void OTextConnectionHelper::dispose()
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 23621cc..bd282d7 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -62,7 +62,7 @@ class OPasswordDialog : public ModalDialog

public:
    OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName);
    virtual ~OPasswordDialog() { dispose(); }
    virtual ~OPasswordDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        m_pUser.clear();
@@ -141,7 +141,7 @@ OUserAdmin::OUserAdmin(vcl::Window* pParent,const SfxItemSet& _rAttrSet)

OUserAdmin::~OUserAdmin()
{
    dispose();
    disposeOnce();
}

void OUserAdmin::dispose()
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index fbfa3b5..57f8c8e 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -73,7 +73,7 @@ namespace dbaui

    OUserAdminDlg::~OUserAdminDlg()
    {
        dispose();
        disposeOnce();
    }

    void OUserAdminDlg::dispose()
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 08e7be8..a4ff866 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -170,7 +170,7 @@ namespace dbaui

    MySQLNativeSettings::~MySQLNativeSettings()
    {
        dispose();
        disposeOnce();
    }

    void MySQLNativeSettings::dispose()
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 27d83e5..1b42d45 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -362,7 +362,7 @@ OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rCont

OAddTableDlg::~OAddTableDlg()
{
    dispose();
    disposeOnce();
}

void OAddTableDlg::dispose()
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 859decf..2a4d704 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -134,7 +134,7 @@ namespace dbaui

    SpecialSettingsPage::~SpecialSettingsPage()
    {
        dispose();
        disposeOnce();
    }

    void SpecialSettingsPage::dispose()
@@ -343,7 +343,7 @@ namespace dbaui

    GeneratedValuesPage::~GeneratedValuesPage()
    {
        dispose();
        disposeOnce();
    }

    void GeneratedValuesPage::dispose()
@@ -444,7 +444,7 @@ namespace dbaui

    AdvancedSettingsDialog::~AdvancedSettingsDialog()
    {
        dispose();
        disposeOnce();
    }

    void AdvancedSettingsDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index a496945..a68a19b 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -66,7 +66,7 @@ ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent

ODbAdminDialog::~ODbAdminDialog()
{
    dispose();
    disposeOnce();
}

void ODbAdminDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 223f5a1..f767f4e 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -78,7 +78,7 @@ ODbaseIndexDialog::ODbaseIndexDialog(vcl::Window * pParent, const OUString& aDat

ODbaseIndexDialog::~ODbaseIndexDialog()
{
    dispose();
    disposeOnce();
}

void ODbaseIndexDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 346128c..a4f0eca4 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -102,7 +102,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent

ODbTypeWizDialog::~ODbTypeWizDialog()
{
    dispose();
    disposeOnce();
}

void ODbTypeWizDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index b255353..07c7418 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -264,7 +264,7 @@ OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const

ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup()
{
    dispose();
    disposeOnce();
}

void ODbTypeWizDialogSetup::dispose()
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 21d386d..206a1cd 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -97,7 +97,7 @@ namespace dbaui

    OCommonBehaviourTabPage::~OCommonBehaviourTabPage()
    {
        dispose();
        disposeOnce();
    }

    void OCommonBehaviourTabPage::dispose()
@@ -195,7 +195,7 @@ namespace dbaui

    ODbaseDetailsPage::~ODbaseDetailsPage()
    {
        dispose();
        disposeOnce();
    }

    void ODbaseDetailsPage::dispose()
@@ -283,7 +283,7 @@ namespace dbaui

    OOdbcDetailsPage::~OOdbcDetailsPage()
    {
        dispose();
        disposeOnce();
    }

    void OOdbcDetailsPage::dispose()
@@ -332,7 +332,7 @@ namespace dbaui

    OUserDriverDetailsPage::~OUserDriverDetailsPage()
    {
        dispose();
        disposeOnce();
    }

    void OUserDriverDetailsPage::dispose()
@@ -454,7 +454,7 @@ namespace dbaui

    OGeneralSpecialJDBCDetailsPage::~OGeneralSpecialJDBCDetailsPage()
    {
        dispose();
        disposeOnce();
    }

    void OGeneralSpecialJDBCDetailsPage::dispose()
@@ -573,7 +573,7 @@ namespace dbaui

    MySQLNativePage::~MySQLNativePage()
    {
        dispose();
        disposeOnce();
    }

    void MySQLNativePage::dispose()
@@ -679,7 +679,7 @@ namespace dbaui

    OLDAPDetailsPage::~OLDAPDetailsPage()
    {
        dispose();
        disposeOnce();
    }

    void OLDAPDetailsPage::dispose()
@@ -757,7 +757,7 @@ namespace dbaui

    OTextDetailsPage::~OTextDetailsPage()
    {
        dispose();
        disposeOnce();
    }

    void OTextDetailsPage::dispose()
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 1f001bd..32c9270e 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -76,7 +76,7 @@ namespace dbaui

    DirectSQLDialog::~DirectSQLDialog()
    {
        dispose();
        disposeOnce();
    }

    void DirectSQLDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 6d09dcb..1ca5043 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -52,7 +52,7 @@ SbaSbAttrDlg::SbaSbAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs,

SbaSbAttrDlg::~SbaSbAttrDlg()
{
    dispose();
    disposeOnce();
}

void SbaSbAttrDlg::dispose()
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 6daba84..46bbbac 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -285,7 +285,7 @@ OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent,

OSaveAsDlg::~OSaveAsDlg()
{
    dispose();
    disposeOnce();
}

void OSaveAsDlg::dispose()
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index b3e3375..6c254a4 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -53,7 +53,7 @@ DlgSize::DlgSize( vcl::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nA

DlgSize::~DlgSize()
{
    dispose();
    disposeOnce();
}

void DlgSize::dispose()
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 739504d..950903d 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -72,7 +72,7 @@ ODatasourceSelectDialog::ODatasourceSelectDialog(vcl::Window* _pParent, const St

ODatasourceSelectDialog::~ODatasourceSelectDialog()
{
    dispose();
    disposeOnce();
}

void ODatasourceSelectDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 323b302..2451eac 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -76,7 +76,7 @@ namespace dbaui

    OGeneralPage::~OGeneralPage()
    {
        dispose();
        disposeOnce();
    }

    void OGeneralPage::dispose()
@@ -547,7 +547,7 @@ namespace dbaui

    OGeneralPageWizard::~OGeneralPageWizard()
    {
        dispose();
        disposeOnce();
    }

    void OGeneralPageWizard::dispose()
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index c534142..dc2c7dd 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -311,7 +311,7 @@ namespace dbaui

    DbaIndexDialog::~DbaIndexDialog( )
    {
        dispose();
        disposeOnce();
    }

    void DbaIndexDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 36d39547..f99b65e3 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -110,7 +110,7 @@ namespace dbaui

    IndexFieldsControl::~IndexFieldsControl()
    {
        dispose();
        disposeOnce();
    }

    void IndexFieldsControl::dispose()
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 6e5c5aa..c042504 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -113,7 +113,7 @@ namespace dbaui

    OParameterDialog::~OParameterDialog()
    {
        dispose();
        disposeOnce();
    }

    void OParameterDialog::dispose()
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 9f5ef85..a86bd63 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -192,7 +192,7 @@ DlgFilterCrit::DlgFilterCrit(vcl::Window * pParent,

DlgFilterCrit::~DlgFilterCrit()
{
    dispose();
    disposeOnce();
}

void DlgFilterCrit::dispose()
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 5d7314f..410598b 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -127,7 +127,7 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent,

DlgOrderCrit::~DlgOrderCrit()
{
    dispose();
    disposeOnce();
}

void DlgOrderCrit::dispose()
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index f4cbea7..49377e7 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -302,7 +302,7 @@ class OExceptionChainDialog : public ModalDialog

public:
    OExceptionChainDialog( vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions );
    virtual ~OExceptionChainDialog() { dispose(); }
    virtual ~OExceptionChainDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        m_pExceptionList.clear();
@@ -699,7 +699,7 @@ OSQLMessageBox::OSQLMessageBox( vcl::Window* _pParent, const OUString& _rTitle, 

OSQLMessageBox::~OSQLMessageBox()
{
    dispose();
    disposeOnce();
}

void OSQLMessageBox::dispose()
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 7e452f1..7ee4607 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -99,7 +99,7 @@ namespace dbaui

    OTableSubscriptionPage::~OTableSubscriptionPage()
    {
        dispose();
        disposeOnce();
    }

    void OTableSubscriptionPage::dispose()
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index 3a5583a..77c515e 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -41,7 +41,7 @@ namespace dbaui

    TextConnectionSettingsDialog::~TextConnectionSettingsDialog()
    {
        dispose();
        disposeOnce();
    }

    void TextConnectionSettingsDialog::dispose()
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 4b5aac2..9d7c72d 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -105,7 +105,7 @@ OCopyTable::OCopyTable(vcl::Window * pParent)

OCopyTable::~OCopyTable()
{
    dispose();
    disposeOnce();
}

void OCopyTable::dispose()
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index f3d4a2d..d9ca01b 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -52,7 +52,7 @@ OWizardPage::OWizardPage(vcl::Window* pParent, const OString& rID, const OUStrin

OWizardPage::~OWizardPage()
{
    dispose();
    disposeOnce();
}

void OWizardPage::dispose()
@@ -92,7 +92,7 @@ OWizColumnSelect::OWizColumnSelect( vcl::Window* pParent)

OWizColumnSelect::~OWizColumnSelect()
{
    dispose();
    disposeOnce();
}

void OWizColumnSelect::dispose()
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 68b5b59..19db7a2 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -686,7 +686,7 @@ void OCopyTableWizard::construct()

OCopyTableWizard::~OCopyTableWizard()
{
    dispose();
    disposeOnce();
}

void OCopyTableWizard::dispose()
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 2707ed7..46c7634 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -74,7 +74,7 @@ OWizNameMatching::OWizNameMatching( vcl::Window* pParent)

OWizNameMatching::~OWizNameMatching()
{
    dispose();
    disposeOnce();
}

void OWizNameMatching::dispose()
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index bcc5386..cf9bc11 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -50,7 +50,7 @@ OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* 

OWizTypeSelectControl::~OWizTypeSelectControl()
{
    dispose();
    disposeOnce();
}

void OWizTypeSelectControl::dispose()
@@ -260,7 +260,7 @@ OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream )

OWizTypeSelect::~OWizTypeSelect()
{
    dispose();
    disposeOnce();
}

void OWizTypeSelect::dispose()
@@ -363,7 +363,7 @@ IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ )

OWizTypeSelectList::~OWizTypeSelectList()
{
    dispose();
    disposeOnce();
}

void OWizTypeSelectList::dispose()
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index af7ef4e..cb5d413 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -180,7 +180,7 @@ namespace dbaui
    }
    OTableConnection::~OTableConnection()
    {
        dispose();
        disposeOnce();
    }
    void OTableConnection::dispose()
    {
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index d9c0734c..673bcc7 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -61,7 +61,7 @@ OJoinDesignView::OJoinDesignView(vcl::Window* _pParent, OJoinController& _rContr

OJoinDesignView::~OJoinDesignView()
{
    dispose();
    disposeOnce();
}

void OJoinDesignView::dispose()
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 70adb51..ca539c8 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -89,7 +89,7 @@ OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParen

OScrollWindowHelper::~OScrollWindowHelper()
{
    dispose();
    disposeOnce();
}

void OScrollWindowHelper::dispose()
@@ -181,7 +181,7 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView )

OJoinTableView::~OJoinTableView()
{
    dispose();
    disposeOnce();
}

void OJoinTableView::dispose()
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 378afe6..eb00162 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2517,7 +2517,7 @@ OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent,

OQueryDesignView::~OQueryDesignView()
{
    dispose();
    disposeOnce();
}

void OQueryDesignView::dispose()
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 06f619e..cb86ac7 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -52,7 +52,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)

OQueryTextView::~OQueryTextView()
{
    dispose();
    disposeOnce();
}

void OQueryTextView::dispose()
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 368f5c4..275afd3 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -153,7 +153,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent )

OSelectionBrowseBox::~OSelectionBrowseBox()
{
    dispose();
    disposeOnce();
}

void OSelectionBrowseBox::dispose()
@@ -250,7 +250,7 @@ namespace
        virtual void Select() SAL_OVERRIDE;
    public:
        OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent);
        virtual ~OSelectionBrwBoxHeader() { dispose(); }
        virtual ~OSelectionBrwBoxHeader() { disposeOnce(); }
        virtual void dispose() SAL_OVERRIDE { m_pBrowseBox.clear(); ::svt::EditBrowserHeader::dispose(); }
    };
    OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent)
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index e194989..7e60b20d 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -99,7 +99,7 @@ OTableWindow::OTableWindow( vcl::Window* pParent, const TTableWindowData::value_

OTableWindow::~OTableWindow()
{
    dispose();
    disposeOnce();
}

void OTableWindow::dispose()
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 9e71cdc..2453bd2 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -68,7 +68,7 @@ void OTableWindowListBox::dragFinished( )

OTableWindowListBox::~OTableWindowListBox()
{
    dispose();
    disposeOnce();
}

void OTableWindowListBox::dispose()
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 8f7b9b8..a0fba53 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -55,7 +55,7 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) :

OTableWindowTitle::~OTableWindowTitle()
{
    dispose();
    disposeOnce();
}

void OTableWindowTitle::dispose()
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 06255d0..28f1c2d 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -56,7 +56,7 @@ namespace dbaui
    }
    OQueryContainerWindow::~OQueryContainerWindow()
    {
        dispose();
        disposeOnce();
    }
    void OQueryContainerWindow::dispose()
    {
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index b6c6bd65..798fcae 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -139,7 +139,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,

DlgQryJoin::~DlgQryJoin()
{
    dispose();
    disposeOnce();
}

void DlgQryJoin::dispose()
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index d7820ad..75b0c79 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -73,7 +73,7 @@ ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignVie

ORelationTableView::~ORelationTableView()
{
    dispose();
    disposeOnce();
}

void ORelationTableView::dispose()
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index b4899e7..4d7e83d 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -38,7 +38,7 @@ OFieldDescGenWin::OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* p

OFieldDescGenWin::~OFieldDescGenWin()
{
    dispose();
    disposeOnce();
}

void OFieldDescGenWin::dispose()
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index a02b527..00773e4 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -253,7 +253,7 @@ void OTableEditorCtrl::ClearModified()

OTableEditorCtrl::~OTableEditorCtrl()
{
    dispose();
    disposeOnce();
}

void OTableEditorCtrl::dispose()
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 80594e6..7916d6d 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -38,7 +38,7 @@ OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) :

OTableDesignHelpBar::~OTableDesignHelpBar()
{
    dispose();
    disposeOnce();
}

void OTableDesignHelpBar::dispose()
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 065d8dd..fd64b0f 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -62,7 +62,7 @@ OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB

OTableBorderWindow::~OTableBorderWindow()
{
    dispose();
    disposeOnce();
}

void OTableBorderWindow::dispose()
@@ -189,7 +189,7 @@ OTableDesignView::OTableDesignView( vcl::Window* pParent,

OTableDesignView::~OTableDesignView()
{
    dispose();
    disposeOnce();
}

void OTableDesignView::dispose()
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 54ae896..58b1d31 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -66,7 +66,7 @@ OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent)

OTableFieldDescWin::~OTableFieldDescWin()
{
    dispose();
    disposeOnce();
}

void OTableFieldDescWin::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index f93712e..56db76b 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -52,7 +52,7 @@ DependencyDialog::DependencyDialog(

DependencyDialog::~DependencyDialog()
{
    dispose();
    disposeOnce();
}

void DependencyDialog::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e450383..ad92ddd8 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -203,7 +203,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Wi

ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
{
    dispose();
    disposeOnce();
}

void ExtBoxWithBtns_Impl::dispose()
@@ -724,7 +724,7 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager)

ExtMgrDialog::~ExtMgrDialog()
{
    dispose();
    disposeOnce();
}

void ExtMgrDialog::dispose()
@@ -1222,7 +1222,7 @@ UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionMan

UpdateRequiredDialog::~UpdateRequiredDialog()
{
    dispose();
    disposeOnce();
}

void UpdateRequiredDialog::dispose()
@@ -1610,7 +1610,7 @@ ShowLicenseDialog::ShowLicenseDialog( vcl::Window * pParent,

ShowLicenseDialog::~ShowLicenseDialog()
{
    dispose();
    disposeOnce();
}

void ShowLicenseDialog::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 0432d5d..6eef818 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -239,7 +239,7 @@ void ExtensionBox_Impl::Init()

ExtensionBox_Impl::~ExtensionBox_Impl()
{
    dispose();
    disposeOnce();
}

void ExtensionBox_Impl::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 01af7a6..a7372e2 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -564,7 +564,7 @@ UpdateDialog::UpdateDialog(

UpdateDialog::~UpdateDialog()
{
    dispose();
    disposeOnce();
}

void UpdateDialog::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 5c8ab0c..583e609 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -239,7 +239,7 @@ UpdateInstallDialog::UpdateInstallDialog(

UpdateInstallDialog::~UpdateInstallDialog()
{
    dispose();
    disposeOnce();
}

void UpdateInstallDialog::dispose()
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 840b90b..c971419 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -99,7 +99,7 @@ struct LicenseDialogImpl : public ModalDialog
        css::uno::Reference< css::uno::XComponentContext > const & xContext,
        const OUString & sExtensionName,
        const OUString & sLicenseText);
    virtual ~LicenseDialogImpl() { dispose(); }
    virtual ~LicenseDialogImpl() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE;

    virtual void Activate() SAL_OVERRIDE;
@@ -138,7 +138,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Windo

LicenseView::~LicenseView()
{
    dispose();
    disposeOnce();
}

void LicenseView::dispose()
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index a946013..d0eba20 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -155,7 +155,7 @@ SplashScreen::SplashScreen()

SplashScreen::~SplashScreen()
{
    dispose();
    disposeOnce();
}

void SplashScreen::dispose()
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 136cb67..bb9e12a 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -64,7 +64,7 @@ namespace abp

    FinalPage::~FinalPage()
    {
        dispose();
        disposeOnce();
    }

    void FinalPage::dispose()
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index dd11939..57bb822 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -36,7 +36,7 @@ namespace abp
    }
    AdminDialogInvokationPage::~AdminDialogInvokationPage()
    {
        dispose();
        disposeOnce();
    }
    void AdminDialogInvokationPage::dispose()
    {
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 1e4ca7a5..9ad8a3b 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -39,7 +39,7 @@ namespace abp

    FieldMappingPage::~FieldMappingPage()
    {
        dispose();
        disposeOnce();
    }

    void FieldMappingPage::dispose()
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index d85423b..537ef7b 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -43,7 +43,7 @@ namespace abp

    TableSelectionPage::~TableSelectionPage()
    {
        dispose();
        disposeOnce();
    }

    void TableSelectionPage::dispose()
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 813b546..576aba0 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -151,7 +151,7 @@ namespace abp

    TypeSelectionPage::~TypeSelectionPage()
    {
        dispose();
        disposeOnce();
    }

    void TypeSelectionPage::dispose()
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 87abe11..d26dad0 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -109,7 +109,7 @@ namespace bib

    BibGridwin::~BibGridwin()
    {
        dispose();
        disposeOnce();
    }

    void BibGridwin::dispose()
@@ -203,7 +203,7 @@ namespace bib

    BibBeamer::~BibBeamer()
    {
        dispose();
        disposeOnce();
    }

    void BibBeamer::dispose()
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 34af38e..31547c0 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -86,7 +86,7 @@ BibWindowContainer::BibWindowContainer( vcl::Window* pParent, BibShortCutHandler

BibWindowContainer::~BibWindowContainer()
{
    dispose();
    disposeOnce();
}

void BibWindowContainer::dispose()
@@ -130,7 +130,7 @@ BibBookContainer::BibBookContainer(vcl::Window* pParent, WinBits nStyle):

BibBookContainer::~BibBookContainer()
{
    dispose();
    disposeOnce();
}

void BibBookContainer::dispose()
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index f00d4276..33e4816 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -61,7 +61,7 @@ namespace bib

    BibView::~BibView()
    {
        dispose();
        disposeOnce();
    }

    void BibView::dispose()
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 818eea9..b72083c 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -378,7 +378,7 @@ MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMa

MappingDialog_Impl::~MappingDialog_Impl()
{
    dispose();
    disposeOnce();
}

void MappingDialog_Impl::dispose()
@@ -520,7 +520,7 @@ IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/)

DBChangeDialog_Impl::~DBChangeDialog_Impl()
{
    dispose();
    disposeOnce();
}

void DBChangeDialog_Impl::dispose()
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index a8af717..ac7c50d 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -366,7 +366,7 @@ BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan):

BibGeneralPage::~BibGeneralPage()
{
    dispose();
    disposeOnce();
}

void BibGeneralPage::dispose()
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 477e1af..4dbc001 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -235,7 +235,7 @@ BibToolBar::BibToolBar(vcl::Window* pParent, Link aLink, WinBits nStyle):

BibToolBar::~BibToolBar()
{
    dispose();
    disposeOnce();
}

void BibToolBar::dispose()
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 6416a23..5c73060 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -79,7 +79,7 @@ namespace dbp

    OTableSelectionPage::~OTableSelectionPage()
    {
        dispose();
        disposeOnce();
    }

    void OTableSelectionPage::dispose()
@@ -398,7 +398,7 @@ namespace dbp

    OMaybeListSelectionPage::~OMaybeListSelectionPage()
    {
        dispose();
        disposeOnce();
    }

    void OMaybeListSelectionPage::dispose()
@@ -481,7 +481,7 @@ namespace dbp

    ODBFieldPage::~ODBFieldPage()
    {
        dispose();
        disposeOnce();
    }

    void ODBFieldPage::dispose()
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index da84b94..9128bbb 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -86,7 +86,7 @@ namespace dbp

    OControlWizardPage::~OControlWizardPage()
    {
        dispose();
        disposeOnce();
    }

    void OControlWizardPage::dispose()
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index aadc8f8..8332ed0 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -320,7 +320,7 @@ namespace dbp

    OGridFieldsSelection::~OGridFieldsSelection()
    {
        dispose();
        disposeOnce();
    }

    void OGridFieldsSelection::dispose()
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 1c5ac97..0eb66b7 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -214,7 +214,7 @@ namespace dbp

    ORadioSelectionPage::~ORadioSelectionPage()
    {
        dispose();
        disposeOnce();
    }

    void ORadioSelectionPage::dispose()
@@ -356,7 +356,7 @@ namespace dbp

    ODefaultFieldSelectionPage::~ODefaultFieldSelectionPage()
    {
        dispose();
        disposeOnce();
    }

    void ODefaultFieldSelectionPage::dispose()
@@ -415,7 +415,7 @@ namespace dbp

    OOptionValuesPage::~OOptionValuesPage()
    {
        dispose();
        disposeOnce();
    }

    void OOptionValuesPage::dispose()
@@ -524,7 +524,7 @@ namespace dbp

    OFinalizeGBWPage::~OFinalizeGBWPage()
    {
        dispose();
        disposeOnce();
    }

    void OFinalizeGBWPage::dispose()
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 473a386..155e1b2 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -287,7 +287,7 @@ namespace dbp

    OContentTableSelection::~OContentTableSelection()
    {
        dispose();
        disposeOnce();
    }

    void OContentTableSelection::dispose()
@@ -381,7 +381,7 @@ namespace dbp

    OContentFieldSelection::~OContentFieldSelection()
    {
        dispose();
        disposeOnce();
    }

    void OContentFieldSelection::dispose()
@@ -463,7 +463,7 @@ namespace dbp

    OLinkFieldsPage::~OLinkFieldsPage()
    {
        dispose();
        disposeOnce();
    }

    void OLinkFieldsPage::dispose()
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index dba10a1..001576a 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -373,7 +373,7 @@ namespace pcr

    OBrowserListBox::~OBrowserListBox()
    {
        dispose();
        disposeOnce();
    }

    void OBrowserListBox::dispose()
diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx
index 2dc6ef6..f143b60 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -45,7 +45,7 @@ namespace pcr

    OBrowserPage::~OBrowserPage()
    {
        dispose();
        disposeOnce();
    }

    void OBrowserPage::dispose()
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index dcf1181..b256447 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -54,7 +54,7 @@ namespace pcr

    OPropertyBrowserView::~OPropertyBrowserView()
    {
        dispose();
        disposeOnce();
    }

    void OPropertyBrowserView::dispose()
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 31011bf7..91ed73b 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -109,7 +109,7 @@ namespace pcr

    FieldLinkRow::~FieldLinkRow()
    {
        dispose();
        disposeOnce();
    }

    void FieldLinkRow::dispose()
@@ -206,7 +206,7 @@ namespace pcr

    FormLinkDialog::~FormLinkDialog( )
    {
        dispose();
        disposeOnce();
    }

    void FormLinkDialog::dispose( )
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 822b9e6..98324df 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -48,7 +48,7 @@ namespace pcr

    InspectorHelpWindow::~InspectorHelpWindow()
    {
        dispose();
        disposeOnce();
    }

    void InspectorHelpWindow::dispose()
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index b8a92d9..9b2bbed 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -50,7 +50,7 @@ namespace pcr

    ListSelectionDialog::~ListSelectionDialog()
    {
        dispose();
        disposeOnce();
    }

    void ListSelectionDialog::dispose()
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 9a78105..50f85e2 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -69,7 +69,7 @@ namespace pcr

    NewDataTypeDialog::~NewDataTypeDialog()
    {
        dispose();
        disposeOnce();
    }

    void NewDataTypeDialog::dispose()
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 5005787..d906601 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -62,7 +62,7 @@ namespace pcr

    OPropertyEditor::~OPropertyEditor()
    {
        dispose();
        disposeOnce();
    }

    void OPropertyEditor::dispose()
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index fcc538e..bfcf4b4 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -145,7 +145,7 @@ namespace pcr

    OSelectLabelDialog::~OSelectLabelDialog()
    {
        dispose();
        disposeOnce();
    }

    void OSelectLabelDialog::dispose()
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index f78da9b..f3cc6a2 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -984,7 +984,7 @@ namespace pcr

    OMultilineFloatingEdit::~OMultilineFloatingEdit()
    {
        dispose();
        disposeOnce();
    }

    void OMultilineFloatingEdit::dispose()
@@ -1072,7 +1072,7 @@ namespace pcr

    DropDownEditControl::~DropDownEditControl()
    {
        dispose();
        disposeOnce();
    }

    void DropDownEditControl::dispose()
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 52ec5c8..7bd3624 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -118,7 +118,7 @@ namespace pcr

    TabOrderDialog::~TabOrderDialog()
    {
        dispose();
        disposeOnce();
    }

    void TabOrderDialog::dispose()
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index e99ffb5..c0cce3d 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -215,7 +215,7 @@ GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, vcl::Win

GridDialog::~GridDialog()
{
    dispose();
    disposeOnce();
}

void GridDialog::dispose()
@@ -229,7 +229,7 @@ void GridDialog::dispose()

GridWindow::~GridWindow()
{
    dispose();
    disposeOnce();
}

void GridWindow::dispose()
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 6f977ef..08ba735 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -61,7 +61,7 @@ public:
        , mbIsDragging(false)
    {
    }
    virtual ~ScanPreview() { dispose(); }
    virtual ~ScanPreview() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        mpParentDialog.clear();
@@ -245,7 +245,7 @@ SaneDlg::SaneDlg( vcl::Window* pParent, Sane& rSane, bool bScanEnabled ) :

SaneDlg::~SaneDlg()
{
    dispose();
    disposeOnce();
}

void SaneDlg::dispose()
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx
index 1a6a698..bbe0bfb 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -60,7 +60,7 @@ ImpSWFDialog::ImpSWFDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFi

ImpSWFDialog::~ImpSWFDialog()
{
    dispose();
    disposeOnce();
}

void ImpSWFDialog::dispose()
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 6350aa8..c3e6fa1 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl)

ImpPDFTabDialog::~ImpPDFTabDialog()
{
    dispose();
    disposeOnce();
}

void ImpPDFTabDialog::dispose()
@@ -552,7 +552,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* pParent, const SfxItemSe

ImpPDFTabGeneralPage::~ImpPDFTabGeneralPage()
{
    dispose();
    disposeOnce();
}

void ImpPDFTabGeneralPage::dispose()
@@ -882,7 +882,7 @@ ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(vcl::Window* pParent, const SfxItemSet&

ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage()
{
    dispose();
    disposeOnce();
}

void ImpPDFTabOpnFtrPage::dispose()
@@ -1057,7 +1057,7 @@ ImpPDFTabViewerPage::ImpPDFTabViewerPage( vcl::Window* pParent,

ImpPDFTabViewerPage::~ImpPDFTabViewerPage()
{
    dispose();
    disposeOnce();
}

void ImpPDFTabViewerPage::dispose()
@@ -1171,7 +1171,7 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(vcl::Window* i_pParent, const SfxIt

ImpPDFTabSecurityPage::~ImpPDFTabSecurityPage()
{
    dispose();
    disposeOnce();
}

void ImpPDFTabSecurityPage::dispose()
@@ -1417,7 +1417,7 @@ ImpPDFTabLinksPage::ImpPDFTabLinksPage( vcl::Window* pParent,

ImpPDFTabLinksPage::~ImpPDFTabLinksPage()
{
    dispose();
    disposeOnce();
}

void ImpPDFTabLinksPage::dispose()
@@ -1622,7 +1622,7 @@ ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rE

ImplErrorDialog::~ImplErrorDialog()
{
    dispose();
    disposeOnce();
}

void ImplErrorDialog::dispose()
@@ -1667,7 +1667,7 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage(vcl::Window* pParent, const SfxItemSe

ImpPDFTabSigningPage::~ImpPDFTabSigningPage()
{
    dispose();
    disposeOnce();
}

void ImpPDFTabSigningPage::dispose()
diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx
index 228598b..c142178 100644
--- a/filter/source/svg/impsvgdialog.cxx
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -94,7 +94,7 @@ ImpSVGDialog::ImpSVGDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFi

ImpSVGDialog::~ImpSVGDialog()
{
    dispose();
    disposeOnce();
}

void ImpSVGDialog::dispose()
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index a6761a5..795b97a 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -105,7 +105,7 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent,

XMLFilterSettingsDialog::~XMLFilterSettingsDialog()
{
    dispose();
    disposeOnce();
}

void XMLFilterSettingsDialog::dispose()
@@ -1416,7 +1416,7 @@ Size SvxPathControl::GetOptimalSize() const

SvxPathControl::~SvxPathControl()
{
    dispose();
    disposeOnce();
}

void SvxPathControl::dispose()
@@ -1472,7 +1472,7 @@ XMLFilterListBox::XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl

XMLFilterListBox::~XMLFilterListBox()
{
    dispose();
    disposeOnce();
}

void XMLFilterListBox::dispose()
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 2b351e2..79409c7 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -75,7 +75,7 @@ XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr,

XMLFilterTabDialog::~XMLFilterTabDialog()
{
    dispose();
    disposeOnce();
}

void XMLFilterTabDialog::dispose()
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index 3b509e4..3f4d285 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -44,7 +44,7 @@ XMLFilterTabPageBasic::XMLFilterTabPageBasic(vcl::Window* pParent)

XMLFilterTabPageBasic::~XMLFilterTabPageBasic()
{
    dispose();
    disposeOnce();
}

void XMLFilterTabPageBasic::dispose()
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index e9d0de2..717463b 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -58,7 +58,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( vcl::Window* pParent) :

XMLFilterTabPageXSLT::~XMLFilterTabPageXSLT()
{
    dispose();
    disposeOnce();
}

void XMLFilterTabPageXSLT::dispose()
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 364a048..2563cad 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -178,7 +178,7 @@ XMLFilterTestDialog::XMLFilterTestDialog(vcl::Window* pParent,

XMLFilterTestDialog::~XMLFilterTestDialog()
{
    dispose();
    disposeOnce();
}

void XMLFilterTestDialog::dispose()
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 69f3f03..d728620 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -59,7 +59,7 @@ namespace frm

    RichTextControl::~RichTextControl( )
    {
        dispose();
        disposeOnce();
    }

    void RichTextControl::dispose()
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 41405bb..af7bf5d 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -147,7 +147,7 @@ namespace frm

    NavigationToolBar::~NavigationToolBar( )
    {
        dispose();
        disposeOnce();
    }

    void NavigationToolBar::dispose()
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 123d586..886cab4 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -93,7 +93,7 @@ FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManage

FuncPage::~FuncPage()
{
    dispose();
    disposeOnce();
}

void FuncPage::dispose()
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 7093e0f..c6747f9 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -44,7 +44,7 @@ ArgEdit::ArgEdit( vcl::Window* pParent, WinBits nBits )

ArgEdit::~ArgEdit()
{
    dispose();
    disposeOnce();
}

void ArgEdit::dispose()
@@ -374,7 +374,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEditBox(vcl::Window *p

EditBox::~EditBox()
{
    dispose();
    disposeOnce();
}

void EditBox::dispose()
@@ -498,7 +498,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *p

RefEdit::~RefEdit()
{
    dispose();
    disposeOnce();
}

void RefEdit::dispose()
@@ -607,7 +607,7 @@ RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :

RefButton::~RefButton()
{
    dispose();
    disposeOnce();
}

void RefButton::dispose()
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 45f540b..539661b 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -221,7 +221,7 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i )

ParaWin::~ParaWin()
{
    dispose();
    disposeOnce();
}

void ParaWin::dispose()
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 55d851f..eb39a60 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -105,7 +105,7 @@ StructPage::StructPage(vcl::Window* pParent):

StructPage::~StructPage()
{
    dispose();
    disposeOnce();
}

void StructPage::dispose()
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index e609952..e795d53 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -43,7 +43,7 @@ PlacesListBox_Impl::PlacesListBox_Impl( PlacesListBox* pParent, const OUString& 

PlacesListBox_Impl::~PlacesListBox_Impl( )
{
    dispose();
    disposeOnce();
}

void PlacesListBox_Impl::dispose()
@@ -88,7 +88,7 @@ PlacesListBox::PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, con

PlacesListBox::~PlacesListBox( )
{
    dispose();
    disposeOnce();
}

void PlacesListBox::dispose()
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6c275e7..b1c1412 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -359,7 +359,7 @@ public:
        , _pSplitter(NULL)
    {
    }
    virtual ~CustomContainer() { dispose(); }
    virtual ~CustomContainer() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        _pFileView.clear();
@@ -411,7 +411,7 @@ public:

SvtFileDialog::~SvtFileDialog()
{
    dispose();
    disposeOnce();
}

void SvtFileDialog::dispose()
@@ -2850,7 +2850,7 @@ QueryFolderNameDialog::QueryFolderNameDialog(vcl::Window* _pParent,

QueryFolderNameDialog::~QueryFolderNameDialog()
{
    dispose();
    disposeOnce();
}

void QueryFolderNameDialog::dispose()
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 4a99899..99cf5b0 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -106,7 +106,7 @@ SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFi

SvtFileDialogURLSelector::~SvtFileDialogURLSelector()
{
    dispose();
    disposeOnce();
}

void SvtFileDialogURLSelector::dispose()
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 37e0c22..03062b8 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -81,7 +81,7 @@ FwkTabPage::FwkTabPage(

FwkTabPage::~FwkTabPage()
{
    dispose();
    disposeOnce();
}

void FwkTabPage::dispose()
@@ -193,7 +193,7 @@ FwkTabWindow::FwkTabWindow( vcl::Window* pParent )

FwkTabWindow::~FwkTabWindow()
{
    dispose();
    disposeOnce();
}

void FwkTabWindow::dispose()
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 84c8fcd..adb08e3 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -77,7 +77,7 @@ ComboBoxControl::ComboBoxControl( vcl::Window* pParent, WinBits nStyle, IComboBo

ComboBoxControl::~ComboBoxControl()
{
    dispose();
    disposeOnce();
}

void ComboBoxControl::dispose()
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 12e8dff..a8e5ba6 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -74,7 +74,7 @@ ListBoxControl::ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxLi

ListBoxControl::~ListBoxControl()
{
    dispose();
    disposeOnce();
}

void ListBoxControl::dispose()
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index a75aaa3..a586e9f 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -73,7 +73,7 @@ EditControl::EditControl( vcl::Window* pParent, WinBits nStyle, IEditListener* p

EditControl::~EditControl()
{
    dispose();
    disposeOnce();
}

void EditControl::dispose()
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 629e254..f3eb2c0 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -85,7 +85,7 @@ SpinfieldControl::SpinfieldControl( vcl::Window* pParent, WinBits nStyle, ISpinf

SpinfieldControl::~SpinfieldControl()
{
    dispose();
    disposeOnce();
}

void SpinfieldControl::dispose()
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 359dac6..6e6b04f 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -560,7 +560,7 @@ class VCL_DLLPUBLIC VclScrolledWindow : public VclBin
{
public:
    VclScrolledWindow(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL);
    virtual ~VclScrolledWindow() { dispose(); }
    virtual ~VclScrolledWindow() { disposeOnce(); }
    void dispose() SAL_OVERRIDE { m_pVScroll.disposeAndClear(); m_pHScroll.disposeAndClear(); m_aScrollBarBox.clear(); VclBin::dispose(); }
    virtual vcl::Window *get_child() SAL_OVERRIDE;
    virtual const vcl::Window *get_child() const SAL_OVERRIDE;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index cb178d2..8744c29 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -519,6 +519,8 @@ protected:

    /** This is intended to be used to clear any locally held references to other Window-subclass objects */
    virtual void                        dispose();
    /* call the dispose() method if we have not already been disposed */
    void                                disposeOnce();

    SAL_DLLPRIVATE void                 ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData );

diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 42df27d..f7cab90 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -531,7 +531,7 @@ void SAL_CALL OConnection::close()
        MutexGuard aGuard(m_aMutex);
        checkDisposed(OConnection_BASE::rBHelper.bDisposed);
    }
    dispose();
    disposeOnce();
}

// XWarningsSupplier
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index ec75001..632cf80 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -615,7 +615,7 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exc
        mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
    }

    dispose();
    disposeOnce();
}

sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std::exception)
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index 9bd069c..c7cfdea 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -138,7 +138,7 @@ void SAL_CALL OCommonStatement::close()
        MutexGuard aGuard(m_aMutex);
        checkDisposed(rBHelper.bDisposed);
    }
    dispose();
    disposeOnce();
}

void SAL_CALL OStatement::clearBatch()
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index 0530fed..2c535c9 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
@@ -318,7 +318,7 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
        checkDisposed(OConnection_BASE::rBHelper.bDisposed);

    }
    dispose();
    disposeOnce();
}

// XWarningsSupplier
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
index c4847fe..ba512780 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
@@ -410,7 +410,7 @@ void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
        checkDisposed(OResultSet_BASE::rBHelper.bDisposed);

    }
    dispose();
    disposeOnce();
}


diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
index bc84cc4..57ac764 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
@@ -133,7 +133,7 @@ void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
        checkDisposed(OStatement_BASE::rBHelper.bDisposed);

    }
    dispose();
    disposeOnce();
}


diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 0a36669..7fdfaea 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -114,7 +114,7 @@ OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent )

OAddFieldWindowListBox::~OAddFieldWindowListBox()
{
    dispose();
    disposeOnce();
}

void OAddFieldWindowListBox::dispose()
@@ -216,7 +216,7 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent

OAddFieldWindow::~OAddFieldWindow()
{
    dispose();
    disposeOnce();
}

void OAddFieldWindow::dispose()
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index c537b0a..ddd8ea1 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -130,7 +130,7 @@ namespace rptui

    ConditionalFormattingDialog::~ConditionalFormattingDialog()
    {
        dispose();
        disposeOnce();
    }

    void ConditionalFormattingDialog::dispose()
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index bc60825..dacc9ce 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -156,7 +156,7 @@ OColorPopup::OColorPopup(vcl::Window* _pParent,Condition* _pCondition)

OColorPopup::~OColorPopup()
{
    dispose();
    disposeOnce();
}

void OColorPopup::dispose()
@@ -309,7 +309,7 @@ sal_uInt16 Condition::mapToolbarItemToSlotId(sal_uInt16 nItemId) const

Condition::~Condition()
{
    dispose();
    disposeOnce();
}

void Condition::dispose()
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index b768e17..caad1e3 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -113,7 +113,7 @@ ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent

ODateTimeDialog::~ODateTimeDialog()
{
    dispose();
    disposeOnce();
}

void ODateTimeDialog::dispose()
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index c59d778..1c78e8a 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -87,7 +87,7 @@ void FormulaDialog::fill()

FormulaDialog::~FormulaDialog()
{
    dispose();
    disposeOnce();
}

void FormulaDialog::dispose()
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 2b51436..b80b81d 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -214,7 +214,7 @@ OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentD

OFieldExpressionControl::~OFieldExpressionControl()
{
    dispose();
    disposeOnce();
}


@@ -1010,7 +1010,7 @@ OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window* _pParent, bool _bReadOnl

OGroupsSortingDialog::~OGroupsSortingDialog()
{
    dispose();
    disposeOnce();
}

void OGroupsSortingDialog::dispose()
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index bef13a2..fb898fe 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -256,7 +256,7 @@ NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rControll

NavigatorTree::~NavigatorTree()
{
    dispose();
    disposeOnce();
}

void NavigatorTree::dispose()
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index 08672e1..f7a799a 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -63,7 +63,7 @@ OPageNumberDialog::OPageNumberDialog( vcl::Window* _pParent

OPageNumberDialog::~OPageNumberDialog()
{
    dispose();
    disposeOnce();
}

void OPageNumberDialog::dispose()
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index e85da83..c0ebffb 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -48,6 +48,7 @@ namespace rptui
    public:
        OColorListener(vcl::Window* _pParent,const OUString& _sColorEntry);
        virtual ~OColorListener();
        virtual void dispose() SAL_OVERRIDE;

        using Window::Notify;
        // SfxListener
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index 8bbd52d..abe0708 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -40,7 +40,13 @@ OColorListener::OColorListener(vcl::Window* _pParent ,const OUString& _sColorEnt

OColorListener::~OColorListener()
{
    disposeOnce();
}

void OColorListener::dispose()
{
    EndListening(m_aExtendedColorConfig);
    vcl::Window::dispose();
}

void OColorListener::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint)
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index bcf3890..9d15fa3 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -62,7 +62,7 @@ class OTaskWindow : public vcl::Window
    VclPtr<PropBrw> m_pPropWin;
public:
    OTaskWindow(vcl::Window* _pParent) : Window(_pParent),m_pPropWin(NULL){}
    virtual ~OTaskWindow() { dispose(); }
    virtual ~OTaskWindow() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { m_pPropWin.clear(); vcl::Window::dispose(); }

    inline void setPropertyBrowser(PropBrw* _pPropWin)
@@ -127,7 +127,7 @@ ODesignView::ODesignView(   vcl::Window* pParent,

ODesignView::~ODesignView()
{
    dispose();
    disposeOnce();
}

void ODesignView::dispose()
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index b4716cb..22a1d98 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -111,7 +111,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re

OReportSection::~OReportSection()
{
    dispose();
    disposeOnce();
}

void OReportSection::dispose()
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 10b69e7..25097bf 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -85,7 +85,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView)

OReportWindow::~OReportWindow()
{
    dispose();
    disposeOnce();
}

void OReportWindow::dispose()
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 6641ad2..7185223 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -69,7 +69,7 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)

OScrollWindowHelper::~OScrollWindowHelper()
{
    dispose();
    disposeOnce();
}

void OScrollWindowHelper::dispose()
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 8edd746..37a2287 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -100,7 +100,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep

OSectionWindow::~OSectionWindow()
{
    dispose();
    disposeOnce();
}

void OSectionWindow::dispose()
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 1ada64e..06ae171 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -80,7 +80,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry

OStartMarker::~OStartMarker()
{
    dispose();
    disposeOnce();
}

void OStartMarker::dispose()
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 9ca2c79..b8e159fd 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -185,7 +185,7 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)

OViewsWindow::~OViewsWindow()
{
    dispose();
    disposeOnce();
}

void OViewsWindow::dispose()
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index ef019a7..426c612 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -185,7 +185,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare

PropBrw::~PropBrw()
{
    dispose();
    disposeOnce();
}

void PropBrw::dispose()
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 16f3017..6a7467d 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -118,7 +118,7 @@ ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog(

ScAnalysisOfVarianceDialog::~ScAnalysisOfVarianceDialog()
{
    dispose();
    disposeOnce();
}

void ScAnalysisOfVarianceDialog::dispose()
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index 5980b04..9acf9ed 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -38,7 +38,7 @@ ScExponentialSmoothingDialog::ScExponentialSmoothingDialog(

ScExponentialSmoothingDialog::~ScExponentialSmoothingDialog()
{
    dispose();
    disposeOnce();
}

void ScExponentialSmoothingDialog::dispose()
diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
index 780434d..8514dfc 100644
--- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
@@ -38,7 +38,7 @@ ScMovingAverageDialog::ScMovingAverageDialog(

ScMovingAverageDialog::~ScMovingAverageDialog()
{
    dispose();
    disposeOnce();
}

void ScMovingAverageDialog::dispose()
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 8bc496b..5583760 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -83,7 +83,7 @@ ScRandomNumberGeneratorDialog::ScRandomNumberGeneratorDialog(

ScRandomNumberGeneratorDialog::~ScRandomNumberGeneratorDialog()
{
    dispose();
    disposeOnce();
}

void ScRandomNumberGeneratorDialog::dispose()
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 4d1e7a5..f985adb 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -62,7 +62,7 @@ ScSamplingDialog::ScSamplingDialog(

ScSamplingDialog::~ScSamplingDialog()
{
    dispose();
    disposeOnce();
}

void ScSamplingDialog::dispose()
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index a799364..8e2fa67 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -88,7 +88,7 @@ ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog(

ScStatisticsInputOutputDialog::~ScStatisticsInputOutputDialog()
{
    dispose();
    disposeOnce();
}

void ScStatisticsInputOutputDialog::dispose()
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 9edd025..8dc5ade 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -66,7 +66,7 @@ ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(

ScStatisticsTwoVariableDialog::~ScStatisticsTwoVariableDialog()
{
    dispose();
    disposeOnce();
}

void ScStatisticsTwoVariableDialog::dispose()
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index f04a482..c7c2ba7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -259,7 +259,7 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) :

ScInputWindow::~ScInputWindow()
{
    dispose();
    disposeOnce();
}

void ScInputWindow::dispose()
@@ -932,7 +932,7 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh)

ScInputBarGroup::~ScInputBarGroup()
{
    dispose();
    disposeOnce();
}

void ScInputBarGroup::dispose()
@@ -1499,7 +1499,7 @@ ScTextWnd::ScTextWnd( vcl::Window* pParent, ScTabViewShell* pViewSh )

ScTextWnd::~ScTextWnd()
{
    dispose();
    disposeOnce();
}

void ScTextWnd::dispose()
@@ -2096,7 +2096,7 @@ ScPosWnd::ScPosWnd( vcl::Window* pParent ) :

ScPosWnd::~ScPosWnd()
{
    dispose();
    disposeOnce();
}

void ScPosWnd::dispose()
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 90453a8..83590dc 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -61,7 +61,7 @@ ScTabPageProtection::ScTabPageProtection(vcl::Window* pParent, const SfxItemSet&

ScTabPageProtection::~ScTabPageProtection()
{
    dispose();
    disposeOnce();
}

void ScTabPageProtection::dispose()
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 80c513f..c350bd7 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -97,7 +97,7 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(vcl::Window* pParent, ScDocument* pDo

ScMenuFloatingWindow::~ScMenuFloatingWindow()
{
    dispose();
    disposeOnce();
}

void ScMenuFloatingWindow::dispose()
@@ -857,7 +857,7 @@ ScCheckListMenuWindow::CancelButton::CancelButton(ScCheckListMenuWindow* pParent

ScCheckListMenuWindow::CancelButton::~CancelButton()
{
    dispose();
    disposeOnce();
}

void ScCheckListMenuWindow::CancelButton::dispose()
@@ -908,7 +908,7 @@ ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* p

ScCheckListMenuWindow::~ScCheckListMenuWindow()
{
    dispose();
    disposeOnce();
}

void ScCheckListMenuWindow::dispose()
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 3b8cf87..3b525ed 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -233,7 +233,7 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, const ::com::sun::star::

ScZoomSliderWnd::~ScZoomSliderWnd()
{
    dispose();
    disposeOnce();
}

void ScZoomSliderWnd::dispose()
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index daaa3bd..e59a6e2 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -125,7 +125,7 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBar

ScDataBarSettingsDlg::~ScDataBarSettingsDlg()
{
    dispose();
    disposeOnce();
}

void ScDataBarSettingsDlg::dispose()
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index f058aab..b43d19c 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -49,7 +49,7 @@ ScCondFormatList::ScCondFormatList(vcl::Window* pParent, WinBits nStyle)

ScCondFormatList::~ScCondFormatList()
{
    dispose();
    disposeOnce();
}

void ScCondFormatList::dispose()
@@ -447,7 +447,7 @@ ScCondFormatDlg::ScCondFormatDlg(vcl::Window* pParent, ScDocument* pDoc,

ScCondFormatDlg::~ScCondFormatDlg()
{
    dispose();
    disposeOnce();
}

void ScCondFormatDlg::dispose()
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 2b18941..49db670 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -63,7 +63,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, const S

ScCondFrmtEntry::~ScCondFrmtEntry()
{
    dispose();
    disposeOnce();
}

void ScCondFrmtEntry::dispose()
@@ -246,7 +246,7 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pD

ScConditionFrmtEntry::~ScConditionFrmtEntry()
{
    dispose();
    disposeOnce();
}

void ScConditionFrmtEntry::dispose()
@@ -616,7 +616,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, 

ScFormulaFrmtEntry::~ScFormulaFrmtEntry()
{
    dispose();
    disposeOnce();
}

void ScFormulaFrmtEntry::dispose()
@@ -812,7 +812,7 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument

ScColorScale2FrmtEntry::~ScColorScale2FrmtEntry()
{
    dispose();
    disposeOnce();
}

void ScColorScale2FrmtEntry::dispose()
@@ -990,7 +990,7 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument

ScColorScale3FrmtEntry::~ScColorScale3FrmtEntry()
{
    dispose();
    disposeOnce();
}

void ScColorScale3FrmtEntry::dispose()
@@ -1228,7 +1228,7 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, 

ScDataBarFrmtEntry::~ScDataBarFrmtEntry()
{
    dispose();
    disposeOnce();
}

void ScDataBarFrmtEntry::dispose()
@@ -1364,7 +1364,7 @@ ScDateFrmtEntry::ScDateFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const 

ScDateFrmtEntry::~ScDateFrmtEntry()
{
    dispose();
    disposeOnce();
}

void ScDateFrmtEntry::dispose()
@@ -1503,7 +1503,7 @@ ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( vcl::Window* pParent, ScIconSetT

ScIconSetFrmtDataEntry::~ScIconSetFrmtDataEntry()
{
    dispose();
    disposeOnce();
}

void ScIconSetFrmtDataEntry::dispose()
@@ -1590,7 +1590,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, 

ScIconSetFrmtEntry::~ScIconSetFrmtEntry()
{
    dispose();
    disposeOnce();
}

void ScIconSetFrmtEntry::dispose()
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index de5749a..b3491b7 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -133,7 +133,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument*

ScCondFormatManagerDlg::~ScCondFormatManagerDlg()
{
    dispose();
    disposeOnce();
}

void ScCondFormatManagerDlg::dispose()
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 4c1a1d0..6858d5df 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -185,7 +185,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(

ScPivotLayoutDialog::~ScPivotLayoutDialog()
{
    dispose();
    disposeOnce();
}

void ScPivotLayoutDialog::dispose()
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index 34b5fc8..cb97b43 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -29,7 +29,7 @@ ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBi

ScPivotLayoutTreeListBase::~ScPivotLayoutTreeListBase()
{
    dispose();
    disposeOnce();
}

void ScPivotLayoutTreeListBase::dispose()
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 48a1875..1b84ae6 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -105,7 +105,7 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::W

ScConsolidateDlg::~ScConsolidateDlg()
{
    dispose();
    disposeOnce();
}

void ScConsolidateDlg::dispose()
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index 4985577..72a4377 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -74,7 +74,7 @@ ScCsvControl::ScCsvControl( vcl::Window* pParent, const ScCsvLayoutData& rData, 

ScCsvControl::~ScCsvControl()
{
    dispose();
    disposeOnce();
}

void ScCsvControl::dispose()
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 03ad25d..eb23e5d 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -85,7 +85,7 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) :

ScCsvGrid::~ScCsvGrid()
{
    dispose();
    disposeOnce();
}

void ScCsvGrid::dispose()
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 1d2187f..b464c87 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -101,7 +101,7 @@ ScCsvRuler::ScCsvRuler( ScCsvControl& rParent ) :

ScCsvRuler::~ScCsvRuler()
{
    dispose();
    disposeOnce();
}

void ScCsvRuler::dispose()
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index c44b331..37fc651 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -56,7 +56,7 @@ ScCsvTableBox::ScCsvTableBox( vcl::Window* pParent, WinBits nBits ) :

ScCsvTableBox::~ScCsvTableBox()
{
    dispose();
    disposeOnce();
}

void ScCsvTableBox::dispose()
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 5b8674d..dd39bf0 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -84,7 +84,7 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( vcl::Window* pParent ) :

ScDataPilotDatabaseDlg::~ScDataPilotDatabaseDlg()
{
    dispose();
    disposeOnce();
}

void ScDataPilotDatabaseDlg::dispose()
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index d2869f35..35407ad 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -53,7 +53,7 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bE

ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
{
    dispose();
    disposeOnce();
}

void ScDataPilotSourceTypeDlg::dispose()
@@ -126,7 +126,7 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( vcl::Window* pParent,

ScDataPilotServiceDlg::~ScDataPilotServiceDlg()
{
    dispose();
    disposeOnce();
}

void ScDataPilotServiceDlg::dispose()
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index f78153e..3883e23 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -158,7 +158,7 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPar

ScDbNameDlg::~ScDbNameDlg()
{
    dispose();
    disposeOnce();
}

void ScDbNameDlg::dispose()
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index e584ef6..7bbb0fd 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -175,7 +175,7 @@ ScDPNumGroupDlg::ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& 

ScDPNumGroupDlg::~ScDPNumGroupDlg()
{
    dispose();
    disposeOnce();
}

void ScDPNumGroupDlg::dispose()
@@ -279,7 +279,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( vcl::Window* pParent,

ScDPDateGroupDlg::~ScDPDateGroupDlg()
{
    dispose();
    disposeOnce();
}

void ScDPDateGroupDlg::dispose()
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 3ef4c4f..e3584d5 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -160,7 +160,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPar

ScFilterDlg::~ScFilterDlg()
{
    dispose();
    disposeOnce();
}

void ScFilterDlg::dispose()
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index eb5ade6..18f2072 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -83,7 +83,7 @@ ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgS

ScPivotFilterDlg::~ScPivotFilterDlg()
{
    dispose();
    disposeOnce();
}

void ScPivotFilterDlg::dispose()
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index a505986..55a4fd4 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -216,7 +216,7 @@ ScDPFunctionDlg::ScDPFunctionDlg(

ScDPFunctionDlg::~ScDPFunctionDlg()
{
    dispose();
    disposeOnce();
}

void ScDPFunctionDlg::dispose()
@@ -452,7 +452,7 @@ ScDPSubtotalDlg::ScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj,

ScDPSubtotalDlg::~ScDPSubtotalDlg()
{
    dispose();
    disposeOnce();
}

void ScDPSubtotalDlg::dispose()
@@ -584,7 +584,7 @@ ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj

ScDPSubtotalOptDlg::~ScDPSubtotalOptDlg()
{
    dispose();
    disposeOnce();
}

void ScDPSubtotalOptDlg::dispose()
@@ -866,7 +866,7 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, 

ScDPShowDetailDlg::~ScDPShowDetailDlg()
{
    dispose();
    disposeOnce();
}

void ScDPShowDetailDlg::dispose()
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index c2d65c5..bbe8b6c 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -110,7 +110,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName,

ScNewScenarioDlg::~ScNewScenarioDlg()
{
    dispose();
    disposeOnce();
}

void ScNewScenarioDlg::dispose()
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 3a6428a..1ac8ca8 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -464,7 +464,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa

ScImportAsciiDlg::~ScImportAsciiDlg()
{
    dispose();
    disposeOnce();
}

void ScImportAsciiDlg::dispose()
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index bcc2eb9..9a7c59c 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -240,7 +240,7 @@ ScImportOptionsDlg::ScImportOptionsDlg(

ScImportOptionsDlg::~ScImportOptionsDlg()
{
    dispose();
    disposeOnce();
}

void ScImportOptionsDlg::dispose()
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index a78b6de..028963d 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -97,7 +97,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vc

ScSpecialFilterDlg::~ScSpecialFilterDlg()
{
    dispose();
    disposeOnce();
}

void ScSpecialFilterDlg::dispose()
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 0934193..4702a06 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -52,7 +52,7 @@ ScSortWarningDlg::ScSortWarningDlg(vcl::Window* pParent,

ScSortWarningDlg::~ScSortWarningDlg()
{
    dispose();
    disposeOnce();
}

void ScSortWarningDlg::dispose()
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index b34356d..45132c0 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -38,7 +38,7 @@ ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)

ScSubTotalDlg::~ScSubTotalDlg()
{
    dispose();
    disposeOnce();
}

void ScSubTotalDlg::dispose()
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index a90a35d..6ec64bf 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -38,7 +38,7 @@ ScTextImportOptionsDlg::ScTextImportOptionsDlg(vcl::Window* pParent)

ScTextImportOptionsDlg::~ScTextImportOptionsDlg()
{
    dispose();
    disposeOnce();
}

void ScTextImportOptionsDlg::dispose()
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index ed21592..30ce19c 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -95,7 +95,7 @@ ScTabPageSortFields::ScTabPageSortFields(vcl::Window* pParent,

ScTabPageSortFields::~ScTabPageSortFields()
{
    dispose();
    disposeOnce();
}

void ScTabPageSortFields::dispose()
@@ -523,7 +523,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( vcl::Window*             pParent,

ScTabPageSortOptions::~ScTabPageSortOptions()
{
    dispose();
    disposeOnce();
}

void ScTabPageSortOptions::dispose()
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index a7f010b9..cc8c560 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -67,7 +67,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( vcl::Window* pParent,

ScTpSubTotalGroup::~ScTpSubTotalGroup()
{
    dispose();
    disposeOnce();
}

void ScTpSubTotalGroup::dispose()
@@ -451,7 +451,7 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( vcl::Window*               pParent,

ScTpSubTotalOptions::~ScTpSubTotalOptions()
{
    dispose();
    disposeOnce();
}

void ScTpSubTotalOptions::dispose()
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 27dd263..7336e07 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -170,7 +170,7 @@ void ScTPValidationValue::RefInputDonePostHdl()

ScTPValidationValue::ScRefButtonEx::~ScRefButtonEx()
{
    dispose();
    disposeOnce();
}

void ScTPValidationValue::ScRefButtonEx::dispose()
@@ -359,7 +359,7 @@ ScTPValidationValue::ScTPValidationValue( vcl::Window* pParent, const SfxItemSet

ScTPValidationValue::~ScTPValidationValue()
{
    dispose();
    disposeOnce();
}

void ScTPValidationValue::dispose()
@@ -687,7 +687,7 @@ ScTPValidationHelp::ScTPValidationHelp( vcl::Window*         pParent,

ScTPValidationHelp::~ScTPValidationHelp()
{
    dispose();
    disposeOnce();
}

void ScTPValidationHelp::dispose()
@@ -760,7 +760,7 @@ ScTPValidationError::ScTPValidationError( vcl::Window*           pParent,

ScTPValidationError::~ScTPValidationError()
{
    dispose();
    disposeOnce();
}

void ScTPValidationError::dispose()
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index 218f325..7dd4ce6 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -41,7 +41,7 @@ SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParen

SearchResultsDlg::~SearchResultsDlg()
{
    dispose();
    disposeOnce();
}

void SearchResultsDlg::dispose()
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 096c208..94e2d6c 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -56,7 +56,7 @@ ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet )

ScDocStatPage::~ScDocStatPage()
{
    dispose();
    disposeOnce();
}

void ScDocStatPage::dispose()
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 099b2d3..a6766cb 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -169,7 +169,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,

ScFunctionDockWin::~ScFunctionDockWin()
{
    dispose();
    disposeOnce();
}

void ScFunctionDockWin::dispose()
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 8867fad..e9f160f 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -241,7 +241,7 @@ void ScFormulaDlg::fill()

ScFormulaDlg::~ScFormulaDlg()
{
    dispose();
    disposeOnce();
}

void ScFormulaDlg::dispose()
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 739fd356..080ddb4 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -197,7 +197,7 @@ class ScCheckListBox : public SvTreeListBox
    public:

    ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 );
    virtual ~ScCheckListBox() { dispose(); }
    virtual ~ScCheckListBox() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { delete mpCheckButton; SvTreeListBox::dispose(); }
    void Init();
    void CheckEntry( const OUString& sName, SvTreeListEntry* pParent, bool bCheck = true );
diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx
index 6f6ebd4..dbc8dcc 100644
--- a/sc/source/ui/inc/corodlg.hxx
+++ b/sc/source/ui/inc/corodlg.hxx
@@ -37,7 +37,7 @@ public:
        m_pBtnCol->Check(bCol);
        m_pBtnRow->Check(bRow);
    }
    virtual ~ScColRowLabelDlg() { dispose(); }
    virtual ~ScColRowLabelDlg() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        m_pBtnRow.clear();
diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx
index f50b7bd..f87e3dd 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -66,6 +66,7 @@ private:
public:
    ScRangeManagerTable( SvSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos );
    virtual ~ScRangeManagerTable();
    virtual void dispose() SAL_OVERRIDE;

    virtual void Resize() SAL_OVERRIDE;
    virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index cd6a5ae..5fe4179 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -188,7 +188,7 @@ class ScValidationDlg

public:
    explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL );
    virtual                     ~ScValidationDlg() { dispose(); }
    virtual                     ~ScValidationDlg() { disposeOnce(); }
    virtual void                dispose() SAL_OVERRIDE
    {
        if( m_bOwnRefHdlr )
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 7c0b4f3..f420316 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -154,7 +154,7 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window

ScAcceptChgDlg::~ScAcceptChgDlg()
{
    dispose();
    disposeOnce();
}

void ScAcceptChgDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 5d2899e..63c729b 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -90,7 +90,7 @@ void ScAutoFmtPreview::Resize()

ScAutoFmtPreview::~ScAutoFmtPreview()
{
    dispose();
    disposeOnce();
}

void ScAutoFmtPreview::dispose()
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 0229df8..d75dea9 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -442,7 +442,7 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD

ScConflictsDlg::~ScConflictsDlg()
{
    dispose();
    disposeOnce();
}

void ScConflictsDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 643ffdc..497a76e 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -46,7 +46,7 @@ ScColOrRowDlg::ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle,

ScColOrRowDlg::~ScColOrRowDlg()
{
    dispose();
    disposeOnce();
}

void ScColOrRowDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 8560a88..c219514 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -74,7 +74,7 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,

ScColRowNameRangesDlg::~ScColRowNameRangesDlg()
{
    dispose();
    disposeOnce();
}

void ScColRowNameRangesDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index 0c88495..fc996c9 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -204,7 +204,7 @@ ScDataFormDlg::ScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell

ScDataFormDlg::~ScDataFormDlg()
{
    dispose();
    disposeOnce();
}

void ScDataFormDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index fac0e65..7f6c826 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -54,7 +54,7 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent)

DataStreamDlg::~DataStreamDlg()
{
    dispose();
    disposeOnce();
}

void DataStreamDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx
index a838bfc..a618d80 100644
--- a/sc/source/ui/miscdlgs/delcldlg.cxx
+++ b/sc/source/ui/miscdlgs/delcldlg.cxx
@@ -59,7 +59,7 @@ ScDeleteCellDlg::ScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove)

ScDeleteCellDlg::~ScDeleteCellDlg()
{
    dispose();
    disposeOnce();
}

void ScDeleteCellDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 10e92b7..911af87 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -73,7 +73,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( vcl::Window* pParent,

ScDeleteContentsDlg::~ScDeleteContentsDlg()
{
    dispose();
    disposeOnce();
}

void ScDeleteContentsDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 6709c2d..4a0113d 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -76,7 +76,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( vcl::Window*       pParent,

ScFillSeriesDlg::~ScFillSeriesDlg()
{
    dispose();
    disposeOnce();
}

void ScFillSeriesDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index 255e116..0b85da7 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -44,7 +44,7 @@ ScGroupDlg::ScGroupDlg(vcl::Window* pParent, bool bUngroup, bool bRows)

ScGroupDlg::~ScGroupDlg()
{
    dispose();
    disposeOnce();
}

void ScGroupDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index abe3d1d..4c5fc95 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -69,7 +69,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl:

ScHighlightChgDlg::~ScHighlightChgDlg()
{
    dispose();
    disposeOnce();
}

void ScHighlightChgDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx
index 264b9f5..001d077 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -60,7 +60,7 @@ ScInsertCellDlg::ScInsertCellDlg( vcl::Window* pParent,bool bDisallowCellMove) :

ScInsertCellDlg::~ScInsertCellDlg()
{
    dispose();
    disposeOnce();
}

void ScInsertCellDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 0a4c858..6d7d1ce 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -361,7 +361,7 @@ IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl)

ScInsertContentsDlg::~ScInsertContentsDlg()
{
    dispose();
    disposeOnce();
}

void ScInsertContentsDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 328db1ce..27825d3 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -64,7 +64,7 @@ ScInsertTableDlg::ScInsertTableDlg( vcl::Window* pParent, ScViewData& rData, SCT

ScInsertTableDlg::~ScInsertTableDlg()
{
    dispose();
    disposeOnce();
}

void ScInsertTableDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index f7347c2..2528212 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -43,7 +43,7 @@ ScSelEntryDlg::ScSelEntryDlg(vcl::Window*  pParent, const std::vector<OUString> 

ScSelEntryDlg::~ScSelEntryDlg()
{
    dispose();
    disposeOnce();
}

void ScSelEntryDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index f163e03..51402b1 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -62,7 +62,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg(vcl::Window* pParent)

ScLinkedAreaDlg::~ScLinkedAreaDlg()
{
    dispose();
    disposeOnce();
}

void ScLinkedAreaDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 67379ac..ce23d37 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -60,7 +60,7 @@ ScMetricInputDlg::ScMetricInputDlg( vcl::Window*         pParent,

ScMetricInputDlg::~ScMetricInputDlg()
{
    dispose();
    disposeOnce();
}

void ScMetricInputDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 62fc953..995aa72 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -65,7 +65,7 @@ ScMoveTableDlg::ScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault)

ScMoveTableDlg::~ScMoveTableDlg()
{
    dispose();
    disposeOnce();
}

void ScMoveTableDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx
index 7becdb5..1db6193 100644
--- a/sc/source/ui/miscdlgs/namecrea.cxx
+++ b/sc/source/ui/miscdlgs/namecrea.cxx
@@ -37,7 +37,7 @@ ScNameCreateDlg::ScNameCreateDlg( vcl::Window * pParent, sal_uInt16 nFlags )

ScNameCreateDlg::~ScNameCreateDlg()
{
    dispose();
    disposeOnce();
}

void ScNameCreateDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 067fd2d..6b9d272 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -55,7 +55,7 @@ ScSolverProgressDialog::ScSolverProgressDialog(vcl::Window* pParent)

ScSolverProgressDialog::~ScSolverProgressDialog()
{
    dispose();
    disposeOnce();
}

void ScSolverProgressDialog::dispose()
@@ -86,7 +86,7 @@ ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( vcl::Window* pParent, const 

ScSolverNoSolutionDialog::~ScSolverNoSolutionDialog()
{
    dispose();
    disposeOnce();
}

void ScSolverNoSolutionDialog::dispose()
@@ -109,7 +109,7 @@ ScSolverSuccessDialog::ScSolverSuccessDialog( vcl::Window* pParent, const OUStri

ScSolverSuccessDialog::~ScSolverSuccessDialog()
{
    dispose();
    disposeOnce();
}

void ScSolverSuccessDialog::dispose()
@@ -303,7 +303,7 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Windo

ScOptSolverDlg::~ScOptSolverDlg()
{
    dispose();
    disposeOnce();
}

void ScOptSolverDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index 96f0c40..cf552f4 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -50,7 +50,7 @@ ScTableProtectionDlg::ScTableProtectionDlg(vcl::Window* pParent)

ScTableProtectionDlg::~ScTableProtectionDlg()
{
    dispose();
    disposeOnce();
}

void ScTableProtectionDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index b968cb1..84d58ff 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -54,7 +54,7 @@ ScRetypePassDlg::ScRetypePassDlg(vcl::Window* pParent) :

ScRetypePassDlg::~ScRetypePassDlg()
{
    dispose();
    disposeOnce();
}

void ScRetypePassDlg::dispose()
@@ -333,7 +333,7 @@ ScRetypePassInputDlg::ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProte

ScRetypePassInputDlg::~ScRetypePassInputDlg()
{
    dispose();
    disposeOnce();
}

void ScRetypePassInputDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 0f05a5b..9907628 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -90,7 +90,7 @@ ScAutoFormatDlg::ScAutoFormatDlg(vcl::Window* pParent,

ScAutoFormatDlg::~ScAutoFormatDlg()
{
    dispose();
    disposeOnce();
}

void ScAutoFormatDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 4a2fd3a..ac80d10 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -108,7 +108,7 @@ ScShareDocumentDlg::ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewD

ScShareDocumentDlg::~ScShareDocumentDlg()
{
    dispose();
    disposeOnce();
}

void ScShareDocumentDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index e941059..7898fc9 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -39,7 +39,7 @@ ScShowTabDlg::ScShowTabDlg(vcl::Window* pParent)

ScShowTabDlg::~ScShowTabDlg()
{
    dispose();
    disposeOnce();
}

void ScShowTabDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index e6f27a9..866bb12 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -59,7 +59,7 @@ ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window

ScSimpleRefDlg::~ScSimpleRefDlg()
{
    dispose();
    disposeOnce();
}

void ScSimpleRefDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index c3514c5..c419a8a 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -159,7 +159,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( vcl::Window* pParent,

ScSolverOptionsDialog::~ScSolverOptionsDialog()
{
    dispose();
    disposeOnce();
}

void ScSolverOptionsDialog::dispose()
@@ -399,7 +399,7 @@ ScSolverIntegerDialog::ScSolverIntegerDialog(vcl::Window * pParent)

ScSolverIntegerDialog::~ScSolverIntegerDialog()
{
    dispose();
    disposeOnce();
}

void ScSolverIntegerDialog::dispose()
@@ -439,7 +439,7 @@ ScSolverValueDialog::ScSolverValueDialog( vcl::Window * pParent )

ScSolverValueDialog::~ScSolverValueDialog()
{
    dispose();
    disposeOnce();
}

void ScSolverValueDialog::dispose()
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index b841c26..45f6f45 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -73,7 +73,7 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPa

ScSolverDlg::~ScSolverDlg()
{
    dispose();
    disposeOnce();
}

void ScSolverDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index a2f1b36..482ca29 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -41,7 +41,7 @@ ScStringInputDlg::ScStringInputDlg( vcl::Window*         pParent,

ScStringInputDlg::~ScStringInputDlg()
{
    dispose();
    disposeOnce();
}

void ScStringInputDlg::dispose()
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 710c5c6..db1714b 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -61,7 +61,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle,

ScTabBgColorDlg::~ScTabBgColorDlg()
{
    dispose();
    disposeOnce();
}

void ScTabBgColorDlg::dispose()
@@ -149,7 +149,7 @@ ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(vcl::Window* pParent

ScTabBgColorDlg::ScTabBgColorValueSet::~ScTabBgColorValueSet()
{
    dispose();
    disposeOnce();
}

void ScTabBgColorDlg::ScTabBgColorValueSet::dispose()
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 9b49e34e..d4f8c17 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -76,7 +76,7 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPare

ScTabOpDlg::~ScTabOpDlg()
{
    dispose();
    disposeOnce();
}

void ScTabOpDlg::dispose()
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 42ab802..0f80368 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -95,7 +95,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* p

ScNameDefDlg::~ScNameDefDlg()
{
    dispose();
    disposeOnce();
}

void ScNameDefDlg::dispose()
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 71a3e38..f5a1053 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -102,7 +102,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent

ScNameDlg::~ScNameDlg()
{
    dispose();
    disposeOnce();
}

void ScNameDlg::dispose()
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 1f37f67..715e3da 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -105,7 +105,13 @@ void ScRangeManagerTable::setColWidths()

ScRangeManagerTable::~ScRangeManagerTable()
{
    disposeOnce();
}

void ScRangeManagerTable::dispose()
{
    Clear();
    SvSimpleTable::dispose();
}

void ScRangeManagerTable::setInitListener( InitListener* pListener )
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 13cef6a..01e97cc 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -65,7 +65,7 @@ ScNamePasteDlg::ScNamePasteDlg( vcl::Window * pParent, ScDocShell* pShell, bool 

ScNamePasteDlg::~ScNamePasteDlg()
{
    dispose();
    disposeOnce();
}

void ScNamePasteDlg::dispose()
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index fd69e7a..867d41c 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -142,7 +142,7 @@ ScContentTree::ScContentTree( vcl::Window* pParent, const ResId& rResId ) :

ScContentTree::~ScContentTree()
{
    dispose();
    disposeOnce();
}

void ScContentTree::dispose()
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 8861741..7c1ea4d 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -679,7 +679,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl

ScNavigatorDlg::~ScNavigatorDlg()
{
    dispose();
    disposeOnce();
}

void ScNavigatorDlg::dispose()
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index c9fb51f..0ff6af4 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -226,7 +226,7 @@ ScScenarioWindow::ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_Li

ScScenarioWindow::~ScScenarioWindow()
{
    dispose();
    disposeOnce();
}

void ScScenarioWindow::dispose()
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index a5b4d1d..621e54d 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -111,7 +111,7 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfi

ScCalcOptionsDialog::~ScCalcOptionsDialog()
{
    dispose();
    disposeOnce();
}

void ScCalcOptionsDialog::dispose()
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index f38124c..0716fea 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -57,7 +57,7 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( vcl::Window* pParent,

ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void ScRedlineOptionsTabPage::dispose()
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index cd11950..eb203b2 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -66,7 +66,7 @@ ScTpCalcOptions::ScTpCalcOptions(vcl::Window* pParent, const SfxItemSet& rCoreAt

ScTpCalcOptions::~ScTpCalcOptions()
{
    dispose();
    disposeOnce();
}

void ScTpCalcOptions::dispose()
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index bb81ab2f..42c0902 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -23,7 +23,7 @@ ScTpCompatOptions::ScTpCompatOptions(vcl::Window *pParent, const SfxItemSet &rCo

ScTpCompatOptions::~ScTpCompatOptions()
{
    dispose();
    disposeOnce();
}

void ScTpCompatOptions::dispose()
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index bb3bea8..e2b3538 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -30,7 +30,7 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(vcl::Window *pParent, const SfxItemSet 

ScTpDefaultsOptions::~ScTpDefaultsOptions()
{
    dispose();
    disposeOnce();
}

void ScTpDefaultsOptions::dispose()
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 2f3afe6..1209cae 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -81,7 +81,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& r

ScTpFormulaOptions::~ScTpFormulaOptions()
{
    dispose();
    disposeOnce();
}

void ScTpFormulaOptions::dispose()
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index 67fe07e..1370a0e 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -41,7 +41,7 @@ ScTpPrintOptions::ScTpPrintOptions( vcl::Window*           pParent,

ScTpPrintOptions::~ScTpPrintOptions()
{
    dispose();
    disposeOnce();
}

void ScTpPrintOptions::dispose()
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 4e3a990..04ff831 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -84,7 +84,7 @@ ScTpUserLists::ScTpUserLists( vcl::Window*               pParent,

ScTpUserLists::~ScTpUserLists()
{
    dispose();
    disposeOnce();
}

void ScTpUserLists::dispose()
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 40571f2..f8aa0e9 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -95,7 +95,7 @@ ScTpContentOptions::ScTpContentOptions( vcl::Window*         pParent,

ScTpContentOptions::~ScTpContentOptions()
{
    dispose();
    disposeOnce();
}

void ScTpContentOptions::dispose()
@@ -433,7 +433,7 @@ ScTpLayoutOptions::ScTpLayoutOptions(   vcl::Window* pParent,

ScTpLayoutOptions::~ScTpLayoutOptions()
{
    dispose();
    disposeOnce();
}

void ScTpLayoutOptions::dispose()
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 9f778e3..1985e09 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -136,7 +136,7 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Win

ScPrintAreasDlg::~ScPrintAreasDlg()
{
    dispose();
    disposeOnce();
}

void ScPrintAreasDlg::dispose()
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index bb7cfda..7fece05 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -152,7 +152,7 @@ IMPL_LINK( ScHFEditPage, ObjectSelectHdl, ScEditWindow*, pEdit )

ScHFEditPage::~ScHFEditPage()
{
    dispose();
    disposeOnce();
}

void ScHFEditPage::dispose()
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 3f2bc30..dc525da 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -78,7 +78,7 @@ ScHFPage::ScHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSe

ScHFPage::~ScHFPage()
{
    dispose();
    disposeOnce();
}

void ScHFPage::dispose()
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 7b842ed..87eded5 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -118,7 +118,7 @@ void ScEditWindow::Resize()

ScEditWindow::~ScEditWindow()
{
    dispose();
    disposeOnce();
}

void ScEditWindow::dispose()
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 80663da..95baa7d 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -125,7 +125,7 @@ void ScTablePage::ShowImage()

ScTablePage::~ScTablePage()
{
    dispose();
    disposeOnce();
}

void ScTablePage::dispose()
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 2cacee3..7bd1fbf 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -68,7 +68,7 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(

AlignmentPropertyPanel::~AlignmentPropertyPanel()
{
    dispose();
    disposeOnce();
}

void AlignmentPropertyPanel::dispose()
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index b79e4fb..2ca87de 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -142,7 +142,7 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(

CellAppearancePropertyPanel::~CellAppearancePropertyPanel()
{
    dispose();
    disposeOnce();
}

void CellAppearancePropertyPanel::dispose()
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 72bd59e..9b98109 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -58,7 +58,7 @@ CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppeara

CellBorderStyleControl::~CellBorderStyleControl(void)
{
    dispose();
    disposeOnce();
}

void CellBorderStyleControl::dispose()
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 187cbed..8186162 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -46,7 +46,7 @@ CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearanceP

CellLineStyleControl::~CellLineStyleControl()
{
    dispose();
    disposeOnce();
}

void CellLineStyleControl::dispose()
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index d928903..5ba64bd 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -34,7 +34,7 @@ CellLineStyleValueSet::CellLineStyleValueSet( vcl::Window* pParent, const ResId&

CellLineStyleValueSet::~CellLineStyleValueSet()
{
    dispose();
    disposeOnce();
}

void CellLineStyleValueSet::dispose()
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index ba600e2..fb70ac6 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -70,7 +70,7 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel(

NumberFormatPropertyPanel::~NumberFormatPropertyPanel()
{
    dispose();
    disposeOnce();
}

void NumberFormatPropertyPanel::dispose()
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 783c3ad..41ec52f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -259,7 +259,7 @@ ScFilterListBox::ScFilterListBox( vcl::Window* pParent, ScGridWindow* pGrid,

ScFilterListBox::~ScFilterListBox()
{
    dispose();
    disposeOnce();
}

void ScFilterListBox::dispose()
@@ -345,6 +345,7 @@ class ScFilterFloatingWindow : public FloatingWindow
public:
    ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN );
    virtual ~ScFilterFloatingWindow();
    virtual void dispose() SAL_OVERRIDE;
    // required for System FloatingWindows that will not process KeyInput by themselves
    virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE;
};
@@ -355,7 +356,13 @@ ScFilterFloatingWindow::ScFilterFloatingWindow( vcl::Window* pParent, WinBits nS

ScFilterFloatingWindow::~ScFilterFloatingWindow()
{
    disposeOnce();
}

void ScFilterFloatingWindow::dispose()
{
    EndPopupMode();
    FloatingWindow::dispose();
}

vcl::Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow()
@@ -530,7 +537,7 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos 

ScGridWindow::~ScGridWindow()
{
    dispose();
    disposeOnce();
}

void ScGridWindow::dispose()
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 18a1375..5e5f46d 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -71,7 +71,7 @@ ScOutlineWindow::ScOutlineWindow( vcl::Window* pParent, ScOutlineMode eMode, ScV

ScOutlineWindow::~ScOutlineWindow()
{
    dispose();
    disposeOnce();
}

void ScOutlineWindow::dispose()
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 15da775..3267fb8 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -143,7 +143,7 @@ ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* 

ScPreview::~ScPreview()
{
    dispose();
    disposeOnce();
}

void ScPreview::dispose()
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index ef26087..0224565 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -117,7 +117,7 @@ ScXMLSourceDlg::ScXMLSourceDlg(

ScXMLSourceDlg::~ScXMLSourceDlg()
{
    dispose();
    disposeOnce();
}

void ScXMLSourceDlg::dispose()
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 200e62b..ab64b18 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -484,7 +484,7 @@ SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType)

SdPublishingDlg::~SdPublishingDlg()
{
    dispose();
    disposeOnce();
}

void SdPublishingDlg::dispose()
@@ -1634,7 +1634,7 @@ SdDesignNameDlg::SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName)

SdDesignNameDlg::~SdDesignNameDlg()
{
    dispose();
    disposeOnce();
}

void SdDesignNameDlg::dispose()
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 358ce07..9beb864 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -297,7 +297,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( vcl::Window* pParent

CustomAnimationCreateTabPage::~CustomAnimationCreateTabPage()
{
    dispose();
    disposeOnce();
}

void CustomAnimationCreateTabPage::dispose()
@@ -544,7 +544,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( vcl::Window* pParent, 

CustomAnimationCreateDialog::~CustomAnimationCreateDialog()
{
    dispose();
    disposeOnce();
}

void CustomAnimationCreateDialog::dispose()
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index b493eca..a21d4f6 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -351,7 +351,7 @@ DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, Popup

DropdownMenuBox::~DropdownMenuBox()
{
    dispose();
    disposeOnce();
}

void DropdownMenuBox::dispose()
@@ -1263,7 +1263,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent

CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage()
{
    dispose();
    disposeOnce();
}

void CustomAnimationEffectTabPage::dispose()
@@ -1787,7 +1787,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar

CustomAnimationDurationTabPage::~CustomAnimationDurationTabPage()
{
    dispose();
    disposeOnce();
}

void CustomAnimationDurationTabPage::dispose()
@@ -2077,7 +2077,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(vcl::Window* pPar

CustomAnimationTextAnimTabPage::~CustomAnimationTextAnimTabPage()
{
    dispose();
    disposeOnce();
}

void CustomAnimationTextAnimTabPage::dispose()
@@ -2207,7 +2207,7 @@ CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySe

CustomAnimationDialog::~CustomAnimationDialog()
{
    dispose();
    disposeOnce();
}

void CustomAnimationDialog::dispose()
@@ -2298,7 +2298,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePropertyControl( vcl::

PropertyControl::~PropertyControl()
{
    dispose();
    disposeOnce();
}

void PropertyControl::dispose()
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 24bf4e8..dd4441a 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -444,7 +444,7 @@ const Image&  CustomAnimationList::getImage( sal_uInt16 nId )

CustomAnimationList::~CustomAnimationList()
{
    dispose();
    disposeOnce();
}

void CustomAnimationList::dispose()
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index c83dc71..78e83a0 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -225,7 +225,7 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,

CustomAnimationPane::~CustomAnimationPane()
{
    dispose();
    disposeOnce();
}

void CustomAnimationPane::dispose()
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index ce7e187..370ef49 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -483,7 +483,7 @@ SlideTransitionPane::SlideTransitionPane(

SlideTransitionPane::~SlideTransitionPane()
{
    dispose();
    disposeOnce();
}

void SlideTransitionPane::dispose()
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index f17151d..7ca80ef 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -118,7 +118,7 @@ AnnotationTextWindow::AnnotationTextWindow( AnnotationWindow* pParent, WinBits n

AnnotationTextWindow::~AnnotationTextWindow()
{
    dispose();
    disposeOnce();
}

void AnnotationTextWindow::dispose()
@@ -291,7 +291,7 @@ AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShel

AnnotationWindow::~AnnotationWindow()
{
    dispose();
    disposeOnce();
}

void AnnotationWindow::dispose()
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 53a7d6d..2b6b00e9 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -257,7 +257,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const 

LayoutToolbarMenu::~LayoutToolbarMenu()
{
    dispose();
    disposeOnce();
}

void LayoutToolbarMenu::dispose()
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 5a81ddc..2f79921 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -76,7 +76,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pAc

SdPhotoAlbumDialog::~SdPhotoAlbumDialog()
{
    dispose();
    disposeOnce();
}

void SdPhotoAlbumDialog::dispose()
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 625cc04..62c9d3e 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -32,7 +32,7 @@ RemoteDialog::RemoteDialog( vcl::Window *pWindow )

RemoteDialog::~RemoteDialog()
{
    dispose();
    disposeOnce();
}

void RemoteDialog::dispose()
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 3853a98..842ffd1 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -124,7 +124,7 @@ Size ClientBox::GetOptimalSize() const

ClientBox::~ClientBox()
{
    dispose();
    disposeOnce();
}

void ClientBox::dispose()
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index e6fb265..a5d0109 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -206,7 +206,7 @@ AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW, 

AnimationWindow::~AnimationWindow()
{
    dispose();
    disposeOnce();
}

void AnimationWindow::dispose()
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index fa6b4e1..2bd293b 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -67,7 +67,7 @@ BreakDlg::BreakDlg(

BreakDlg::~BreakDlg()
{
    dispose();
    disposeOnce();
}

void BreakDlg::dispose()
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 7fcd278..b87f58e 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -84,7 +84,7 @@ CopyDlg::CopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs,

CopyDlg::~CopyDlg()
{
    dispose();
    disposeOnce();
}

void CopyDlg::dispose()
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 95132d4..b6c2905 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -85,7 +85,7 @@ SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow,

SdCustomShowDlg::~SdCustomShowDlg()
{
    dispose();
    disposeOnce();
}

void SdCustomShowDlg::dispose()
@@ -351,7 +351,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow,

SdDefineCustomShowDlg::~SdDefineCustomShowDlg()
{
    dispose();
    disposeOnce();
}

void SdDefineCustomShowDlg::dispose()
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index bec74ca9..8e90d31 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1769,7 +1769,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl)

AssistentDlg::~AssistentDlg()
{
    dispose();
    disposeOnce();
}

void AssistentDlg::dispose()
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 331c1af..652a2b2 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -78,7 +78,7 @@ IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl)

SdPageListControl::~SdPageListControl()
{
    dispose();
    disposeOnce();
}

void SdPageListControl::dispose()
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index 0fc35a6..cb9df95 100644
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -40,7 +40,7 @@ FadeEffectLB::FadeEffectLB(vcl::Window* pParent, WinBits nStyle)

FadeEffectLB::~FadeEffectLB()
{
    dispose();
    disposeOnce();
}

void FadeEffectLB::dispose()
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index e236cd1..7927f4d 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -55,7 +55,7 @@ SdModifyFieldDlg::SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pI

SdModifyFieldDlg::~SdModifyFieldDlg()
{
    dispose();
    disposeOnce();
}

void SdModifyFieldDlg::dispose()
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index b8fb42d..2582ca2 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -138,7 +138,7 @@ OutlineBulletDlg::OutlineBulletDlg(

OutlineBulletDlg::~OutlineBulletDlg()
{
    dispose();
    disposeOnce();
}

void OutlineBulletDlg::dispose()
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 2e590fa..aed2a10 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -113,7 +113,7 @@ SdSnapLineDlg::SdSnapLineDlg(

SdSnapLineDlg::~SdSnapLineDlg()
{
    dispose();
    disposeOnce();
}

void SdSnapLineDlg::dispose()
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 2929f46..9669499 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -83,7 +83,7 @@ SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle )

SdDocPreviewWin::~SdDocPreviewWin()
{
    dispose();
    disposeOnce();
}

void SdDocPreviewWin::dispose()
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index f82e75f..8d81eb1 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -241,7 +241,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pPar

HeaderFooterDialog::~HeaderFooterDialog()
{
    dispose();
    disposeOnce();
}

void HeaderFooterDialog::dispose()
@@ -462,7 +462,7 @@ HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* 

HeaderFooterTabPage::~HeaderFooterTabPage()
{
    dispose();
    disposeOnce();
}

void HeaderFooterTabPage::dispose()
diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx
index 833b471..ad9e982 100644
--- a/sd/source/ui/dlg/ins_paste.cxx
+++ b/sd/source/ui/dlg/ins_paste.cxx
@@ -30,7 +30,7 @@ SdInsertPasteDlg::SdInsertPasteDlg(vcl::Window* pWindow)

SdInsertPasteDlg::~SdInsertPasteDlg()
{
    dispose();
    disposeOnce();
}

void SdInsertPasteDlg::dispose()
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 0d5e29c1..c77ba67 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -55,7 +55,7 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(

SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg()
{
    dispose();
    disposeOnce();
}

void SdInsertPagesObjsDlg::dispose()
diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx
index 12b3e4d..a1e5d7f 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.cxx
+++ b/sd/source/ui/dlg/layeroptionsdlg.cxx
@@ -52,7 +52,7 @@ SdInsertLayerDlg::SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInA

SdInsertLayerDlg::~SdInsertLayerDlg()
{
    dispose();
    disposeOnce();
}

void SdInsertLayerDlg::dispose()
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index 898ca5b..e1cce5c 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -77,7 +77,7 @@ MasterLayoutDialog::MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pD

MasterLayoutDialog::~MasterLayoutDialog()
{
    dispose();
    disposeOnce();
}

void MasterLayoutDialog::dispose()
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 8ea2b18..96be9f7 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -66,7 +66,7 @@ MorphDlg::MorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObjec

MorphDlg::~MorphDlg()
{
    dispose();
    disposeOnce();
}

void MorphDlg::dispose()
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 60e1074..157a2f9 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -152,7 +152,7 @@ SdNavigatorWin::SdNavigatorWin(

SdNavigatorWin::~SdNavigatorWin()
{
    dispose();
    disposeOnce();
}

void SdNavigatorWin::dispose()
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 6714cb0..3f79a00 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -73,7 +73,7 @@ SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItem

SdParagraphNumTabPage::~SdParagraphNumTabPage()
{
    dispose();
    disposeOnce();
}

void SdParagraphNumTabPage::dispose()
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 72d30c3..bd635ad 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -152,7 +152,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow,

SdStartPresentationDlg::~SdStartPresentationDlg()
{
    dispose();
    disposeOnce();
}

void SdStartPresentationDlg::dispose()
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 0d8520b..42a02cc 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -223,7 +223,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,

SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg()
{
    dispose();
    disposeOnce();
}

void SdPresLayoutTemplateDlg::dispose()
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index b9cdc6e..1591070 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -74,7 +74,7 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs

SdPrintOptions::~SdPrintOptions()
{
    dispose();
    disposeOnce();
}

void SdPrintOptions::dispose()
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 6c9691a..4b424693 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -55,7 +55,7 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,

SdPresLayoutDlg::~SdPresLayoutDlg()
{
    dispose();
    disposeOnce();
}

void SdPresLayoutDlg::dispose()
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index e7473b1..02bedaf 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -255,7 +255,7 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle )

SdPageObjsTLB::~SdPageObjsTLB()
{
    dispose();
    disposeOnce();
}

void SdPageObjsTLB::dispose()
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index f4ae362..553789b 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -142,7 +142,7 @@ SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs)

SdTPAction::~SdTPAction()
{
    dispose();
    disposeOnce();
}

void SdTPAction::dispose()
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index eefac35..6faf6e5 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -122,7 +122,7 @@ SdTpOptionsContents::SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet

SdTpOptionsContents::~SdTpOptionsContents()
{
    dispose();
    disposeOnce();
}

void SdTpOptionsContents::dispose()
@@ -286,7 +286,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttr

SdTpOptionsMisc::~SdTpOptionsMisc()
{
    dispose();
    disposeOnce();
}

void SdTpOptionsMisc::dispose()
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 99f86cb..fc5e38d 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -72,7 +72,7 @@ SdVectorizeDlg::SdVectorizeDlg(vcl::Window* pParent, const Bitmap& rBmp, ::sd::D

SdVectorizeDlg::~SdVectorizeDlg()
{
    dispose();
    disposeOnce();
}

void SdVectorizeDlg::dispose()
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index cb77dd3..c07f096 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -91,7 +91,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (

CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void)
{
    dispose();
    disposeOnce();
}

void CurrentMasterPagesSelector::dispose()
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 800943c..1871c13 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -194,7 +194,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )

LayoutMenu::~LayoutMenu (void)
{
    dispose();
    disposeOnce();
}

void LayoutMenu::dispose()
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 154f742f..53a1aca 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -104,7 +104,7 @@ MasterPagesSelector::MasterPagesSelector (

MasterPagesSelector::~MasterPagesSelector (void)
{
    dispose();
    disposeOnce();
}

void MasterPagesSelector::dispose()
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index 276d8d8..ff63abb 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -49,7 +49,7 @@ NavigatorWrapper::NavigatorWrapper (

NavigatorWrapper::~NavigatorWrapper (void)
{
    dispose();
    disposeOnce();
}

void NavigatorWrapper::dispose()
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx
index 3fa7451..7ee2a89 100644
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ b/sd/source/ui/sidebar/PanelBase.cxx
@@ -38,7 +38,7 @@ PanelBase::PanelBase (

PanelBase::~PanelBase (void)
{
    dispose();
    disposeOnce();
}

void PanelBase::dispose()
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index 002f088..e3b7b2a 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -66,10 +66,16 @@ RecentMasterPagesSelector::RecentMasterPagesSelector (
{
}

RecentMasterPagesSelector::~RecentMasterPagesSelector (void)
RecentMasterPagesSelector::~RecentMasterPagesSelector()
{
    disposeOnce();
}

void RecentMasterPagesSelector::dispose()
{
    RecentlyUsedMasterPages::Instance().RemoveEventListener (
        LINK(this,RecentMasterPagesSelector,MasterPageListListener));
    MasterPagesSelector::dispose();
}

void RecentMasterPagesSelector::LateInit (void)
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index 0c1c53f..8f64a43 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -35,6 +35,8 @@ public:
        ViewShellBase& rViewShellBase,
        const css::uno::Reference<css::ui::XSidebar>& rxSidebar);

    virtual ~RecentMasterPagesSelector();
    virtual void dispose() SAL_OVERRIDE;
protected:
    DECL_LINK(MasterPageListListener, void*);
    virtual void Fill (ItemList& rItemList) SAL_OVERRIDE;
@@ -64,7 +66,6 @@ private:
        ViewShellBase& rBase,
        const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
        const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
    virtual ~RecentMasterPagesSelector (void);

    virtual void LateInit (void) SAL_OVERRIDE;
};
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 7575734..2dacb9c 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -79,7 +79,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vc

ShowWindow::~ShowWindow(void)
{
    dispose();
    disposeOnce();
}

void ShowWindow::dispose()
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 3bd57dc..21a9197 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1386,7 +1386,7 @@ FocusForwardingWindow::FocusForwardingWindow (

FocusForwardingWindow::~FocusForwardingWindow (void)
{
    dispose();
    disposeOnce();
}

void FocusForwardingWindow::dispose()
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index f4c1d22..8f55b22 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -92,7 +92,7 @@ Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, 

Ruler::~Ruler()
{
    dispose();
    disposeOnce();
}

void Ruler::dispose()
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 5b6523e..4dc3ab6b1 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -94,7 +94,7 @@ Window::Window(vcl::Window* pParent)

Window::~Window (void)
{
    dispose();
    disposeOnce();
}

void Window::dispose()
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index ecc5208..196962b 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -94,7 +94,7 @@ SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLin

SvDDELinkEditDialog::~SvDDELinkEditDialog()
{
    dispose();
    disposeOnce();
}

void SvDDELinkEditDialog::dispose()
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 5433024..321ef7f 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -303,7 +303,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeContentListBox(vcl::Wi

ContentListBox_Impl::~ContentListBox_Impl()
{
    dispose();
    disposeOnce();
}

void ContentListBox_Impl::dispose()
@@ -434,7 +434,7 @@ HelpTabPage_Impl::HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl

HelpTabPage_Impl::~HelpTabPage_Impl()
{
    dispose();
    disposeOnce();
}

void HelpTabPage_Impl::dispose()
@@ -456,7 +456,7 @@ ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindo

ContentTabPage_Impl::~ContentTabPage_Impl()
{
    dispose();
    disposeOnce();
}

void ContentTabPage_Impl::dispose()
@@ -573,7 +573,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im

IndexTabPage_Impl::~IndexTabPage_Impl()
{
    dispose();
    disposeOnce();
}

void IndexTabPage_Impl::dispose()
@@ -982,7 +982,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_

SearchTabPage_Impl::~SearchTabPage_Impl()
{
   dispose();
    disposeOnce();
}

void SearchTabPage_Impl::dispose()
@@ -1190,7 +1190,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarksBox(vcl::Wind

BookmarksBox_Impl::~BookmarksBox_Impl()
{
    dispose();
    disposeOnce();
}

void BookmarksBox_Impl::dispose()
@@ -1328,7 +1328,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl(vcl::Window* pParent, SfxHelpIndexW

BookmarksTabPage_Impl::~BookmarksTabPage_Impl()
{
    dispose();
    disposeOnce();
}

void BookmarksTabPage_Impl::dispose()
@@ -1482,7 +1482,7 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent)

SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
{
    dispose();
    disposeOnce();
}

void SfxHelpIndexWindow_Impl::dispose()
@@ -1968,7 +1968,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :

SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl()
{
    dispose();
    disposeOnce();
}

void SfxHelpTextWindow_Impl::dispose()
@@ -3074,7 +3074,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(

SfxHelpWindow_Impl::~SfxHelpWindow_Impl()
{
    dispose();
    disposeOnce();
}

void SfxHelpWindow_Impl::dispose()
@@ -3293,7 +3293,7 @@ SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window* pParen

SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl()
{
    dispose();
    disposeOnce();
}

void SfxAddHelpBookmarkDialog_Impl::dispose()
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index cfbd886..2452f72 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -151,7 +151,7 @@ TemplateAbstractView::TemplateAbstractView(vcl::Window *pParent)

TemplateAbstractView::~TemplateAbstractView()
{
    dispose();
    disposeOnce();
}

void TemplateAbstractView::dispose()
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 022172a..c2e42d9 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -45,7 +45,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateLocalView(vcl:

TemplateLocalView::~TemplateLocalView()
{
    dispose();
    disposeOnce();
}

void TemplateLocalView::dispose()
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 555e55f..f8fecff 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -66,7 +66,7 @@ ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle, bool bDis

ThumbnailView::~ThumbnailView()
{
    dispose();
    disposeOnce();
}

void ThumbnailView::dispose()
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 81032bd..009a593 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -51,7 +51,7 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(vcl::Window* pParent, const OUStrin

SfxAlienWarningDialog::~SfxAlienWarningDialog()
{
    dispose();
    disposeOnce();
}

void SfxAlienWarningDialog::dispose()
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 39bee6d..cab9b33 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -195,7 +195,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :

BackingWindow::~BackingWindow()
{
    dispose();
    disposeOnce();
}

void BackingWindow::dispose()
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 8794ce0..6a6e4b5 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -170,7 +170,7 @@ SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const 

SfxModalDialog::~SfxModalDialog()
{
    dispose();
    disposeOnce();
}

void SfxModalDialog::dispose()
@@ -362,7 +362,7 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt )

SfxModelessDialog::~SfxModelessDialog()
{
    dispose();
    disposeOnce();
}

void SfxModelessDialog::dispose()
@@ -512,7 +512,7 @@ bool SfxFloatingWindow::Close()

SfxFloatingWindow::~SfxFloatingWindow()
{
    dispose();
    disposeOnce();
}

void SfxFloatingWindow::dispose()
@@ -707,7 +707,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* p

SfxSingleTabDialog::~SfxSingleTabDialog()
{
    dispose();
    disposeOnce();
}

void SfxSingleTabDialog::dispose()
diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx
index b365ada..e628476 100644
--- a/sfx2/source/dialog/checkin.cxx
+++ b/sfx2/source/dialog/checkin.cxx
@@ -22,7 +22,7 @@ SfxCheckinDialog::SfxCheckinDialog( vcl::Window* pParent ) :

SfxCheckinDialog::~SfxCheckinDialog()
{
    dispose();
    disposeOnce();
}

void SfxCheckinDialog::dispose()
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 75581c9..efd2dbef 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -628,7 +628,7 @@ SfxDocumentDescPage::SfxDocumentDescPage( vcl::Window * pParent, const SfxItemSe

SfxDocumentDescPage::~SfxDocumentDescPage()
{
    dispose();
    disposeOnce();
}

void SfxDocumentDescPage::dispose()
@@ -805,7 +805,7 @@ SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSe

SfxDocumentPage::~SfxDocumentPage()
{
    dispose();
    disposeOnce();
}

void SfxDocumentPage::dispose()
@@ -1238,7 +1238,7 @@ CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( vcl::Window* pParent, 

CustomPropertiesYesNoButton::~CustomPropertiesYesNoButton()
{
    dispose();
    disposeOnce();
}

void CustomPropertiesYesNoButton::dispose()
@@ -1293,7 +1293,7 @@ DurationDialog_Impl::DurationDialog_Impl(vcl::Window* pParent,

DurationDialog_Impl::~DurationDialog_Impl()
{
    dispose();
    disposeOnce();
}

void DurationDialog_Impl::dispose()
@@ -1491,7 +1491,7 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,

CustomPropertiesWindow::~CustomPropertiesWindow()
{
    dispose();
    disposeOnce();
}

void CustomPropertiesWindow::dispose()
@@ -2138,7 +2138,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCustomPropertiesContro

CustomPropertiesControl::~CustomPropertiesControl()
{
    dispose();
    disposeOnce();
}

void CustomPropertiesControl::dispose()
@@ -2189,7 +2189,7 @@ SfxCustomPropertiesPage::SfxCustomPropertiesPage( vcl::Window* pParent, const Sf

SfxCustomPropertiesPage::~SfxCustomPropertiesPage()
{
    dispose();
    disposeOnce();
}

void SfxCustomPropertiesPage::dispose()
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 5c7160d..a69ac5b 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -253,7 +253,7 @@ SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind ,

SfxTitleDockingWindow::~SfxTitleDockingWindow()
{
    dispose();
    disposeOnce();
}

void SfxTitleDockingWindow::dispose()
@@ -1274,7 +1274,7 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const

SfxDockingWindow::~SfxDockingWindow()
{
    dispose();
    disposeOnce();
}

void SfxDockingWindow::dispose()
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index 6f0fab8..c326e11 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -36,7 +36,7 @@ SfxDocumentFontsPage::SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSe

SfxDocumentFontsPage::~SfxDocumentFontsPage()
{
    dispose();
    disposeOnce();
}

void SfxDocumentFontsPage::dispose()
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 639bd4b..b7b9f73 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -145,7 +145,7 @@ void SfxInfoBarWindow::addButton(PushButton* pButton) {

SfxInfoBarWindow::~SfxInfoBarWindow()
{
    dispose();
    disposeOnce();
}

void SfxInfoBarWindow::dispose()
@@ -242,7 +242,7 @@ SfxInfoBarContainerWindow::SfxInfoBarContainerWindow(SfxInfoBarContainerChild* p

SfxInfoBarContainerWindow::~SfxInfoBarContainerWindow()
{
    dispose();
    disposeOnce();
}

void SfxInfoBarContainerWindow::dispose()
diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx
index a49a412..faa591d 100644
--- a/sfx2/source/dialog/inputdlg.cxx
+++ b/sfx2/source/dialog/inputdlg.cxx
@@ -28,7 +28,7 @@ InputDialog::InputDialog(const OUString &rLabelText, vcl::Window *pParent)

InputDialog::~InputDialog()
{
    dispose();
    disposeOnce();
}

void InputDialog::dispose()
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 0a8a5b2..b4dd4e5 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -250,7 +250,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx

SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
{
    dispose();
    disposeOnce();
}

void SfxManageStyleSheetPage::dispose()
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 8fe73b0..e4aa3bce 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -82,7 +82,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rIn

SfxNewStyleDlg::~SfxNewStyleDlg()
{
    dispose();
    disposeOnce();
}

void SfxNewStyleDlg::dispose()
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 1db877f..1921305 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -127,7 +127,7 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou

SfxPasswordDialog::~SfxPasswordDialog()
{
    dispose();
    disposeOnce();
}

void SfxPasswordDialog::dispose()
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index b5e5d49..0c00b34 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -87,7 +87,7 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( vcl::Window* pParent

SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SfxCommonPrintOptionsTabPage::dispose()
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index c674d98..e9da704 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -200,7 +200,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(

SfxRecordingFloat_Impl::~SfxRecordingFloat_Impl()
{
    dispose();
    disposeOnce();
}

void SfxRecordingFloat_Impl::dispose()
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 4a7d423..4a4e97e 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -116,7 +116,7 @@ public:
                        }

                        virtual ~SfxEmptySplitWin_Impl()
                        { dispose(); }
                        { disposeOnce(); }
   virtual void         dispose() SAL_OVERRIDE
                        {
                            aTimer.Stop();
@@ -304,7 +304,7 @@ SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl,

SfxSplitWindow::~SfxSplitWindow()
{
    dispose();
    disposeOnce();
}

void SfxSplitWindow::dispose()
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 7fd8ec7..0da322c 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -62,7 +62,7 @@ SearchDialog::SearchDialog(vcl::Window* pWindow, const OUString& rConfigName)

SearchDialog::~SearchDialog()
{
    dispose();
    disposeOnce();
}

void SearchDialog::dispose()
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 5fc0c4c..1735f1b 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -72,7 +72,7 @@ SfxStyleDialog::SfxStyleDialog

SfxStyleDialog::~SfxStyleDialog()
{
    dispose();
    disposeOnce();
}

/*  [Description]
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index bd4a59c..854493c 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -172,7 +172,7 @@ SfxTabPage::SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString&

SfxTabPage::~SfxTabPage()
{
    dispose();
    disposeOnce();
}

void SfxTabPage::dispose()
@@ -365,7 +365,7 @@ SfxTabDialog::SfxTabDialog

SfxTabDialog::~SfxTabDialog()
{
    dispose();
    disposeOnce();
}

void SfxTabDialog::dispose()
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index b092808..9750f6c 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -211,7 +211,7 @@ namespace sfx2

    TaskPaneDockingWindow::~TaskPaneDockingWindow()
    {
        dispose();
        disposeOnce();
    }

    void TaskPaneDockingWindow::dispose()
diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx
index e16db6d..68c52d3 100644
--- a/sfx2/source/dialog/templateinfodlg.cxx
+++ b/sfx2/source/dialog/templateinfodlg.cxx
@@ -54,7 +54,7 @@ SfxTemplateInfoDlg::SfxTemplateInfoDlg (vcl::Window *pParent)

SfxTemplateInfoDlg::~SfxTemplateInfoDlg()
{
    dispose();
    disposeOnce();
}

void SfxTemplateInfoDlg::dispose()
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 9b728a0..381b5be 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -253,7 +253,7 @@ SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Wi

SfxTemplatePanelControl::~SfxTemplatePanelControl()
{
    dispose();
    disposeOnce();
}

void SfxTemplatePanelControl::dispose()
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 5f2a99f..a176cc1 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -59,7 +59,7 @@ namespace sfx2

    TitledDockingWindow::~TitledDockingWindow()
    {
        dispose();
        disposeOnce();
    }

    void TitledDockingWindow::dispose()
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 0b43ce0..c3908fc 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -329,7 +329,7 @@ void SfxVersionDialog::Init_Impl()

SfxVersionDialog::~SfxVersionDialog()
{
    dispose();
    disposeOnce();
}

void SfxVersionDialog::dispose()
@@ -508,7 +508,7 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVe

SfxViewVersionDialog_Impl::~SfxViewVersionDialog_Impl()
{
    dispose();
    disposeOnce();
}

void SfxViewVersionDialog_Impl::dispose()
@@ -586,7 +586,7 @@ SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame, bool bIsS

SfxCmisVersionsDialog::~SfxCmisVersionsDialog()
{
    dispose();
    disposeOnce();
}

void SfxCmisVersionsDialog::dispose()
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 629a6ef..84a3a1c 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2450,7 +2450,7 @@ WaitWindow_Impl::WaitWindow_Impl()

WaitWindow_Impl::~WaitWindow_Impl()
{
    dispose();
    disposeOnce();
}

void  WaitWindow_Impl::dispose()
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 3ad16cf..1d4f8e6 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -454,7 +454,7 @@ SfxNewFileDialog::SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags)

SfxNewFileDialog::~SfxNewFileDialog()
{
    dispose();
    disposeOnce();
}

void SfxNewFileDialog::dispose()
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 3ace50cb..23a0003 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -298,7 +298,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)

SfxTemplateManagerDlg::~SfxTemplateManagerDlg()
{
    dispose();
    disposeOnce();
}

void SfxTemplateManagerDlg::dispose()
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 5e345f9..28e78f7 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -75,7 +75,7 @@ Deck::Deck (

Deck::~Deck()
{
    dispose();
    disposeOnce();
}

void Deck::dispose()
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 456642f..7d762ea 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -71,7 +71,7 @@ Panel::Panel (

Panel::~Panel()
{
    dispose();
    disposeOnce();
}

void Panel::dispose()
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 30ad847..e4cc3b8 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -60,7 +60,7 @@ PanelTitleBar::PanelTitleBar (

PanelTitleBar::~PanelTitleBar()
{
    dispose();
    disposeOnce();
}

void PanelTitleBar::dispose()
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 047b218..5e50d6d 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -53,7 +53,7 @@ SidebarDockingWindow::SidebarDockingWindow(

SidebarDockingWindow::~SidebarDockingWindow (void)
{
    dispose();
    disposeOnce();
}

void SidebarDockingWindow::dispose()
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 4d9f9f4..f52aa29 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -57,7 +57,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarToolBox(vcl::Wi

SidebarToolBox::~SidebarToolBox()
{
    dispose();
    disposeOnce();
}

void SidebarToolBox::dispose()
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 9b450cc..f765972 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -64,7 +64,7 @@ TabBar::TabBar (

TabBar::~TabBar()
{
    dispose();
    disposeOnce();
}

void TabBar::dispose()
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index 0e0e495..2a78dfa 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -52,7 +52,7 @@ TitleBar::TitleBar (

TitleBar::~TitleBar()
{
    dispose();
    disposeOnce();
}

void TitleBar::dispose()
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index c1df787..e993174 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1200,7 +1200,7 @@ SfxPopupWindow::SfxPopupWindow(

SfxPopupWindow::~SfxPopupWindow()
{
    dispose();
    disposeOnce();
}

void SfxPopupWindow::dispose()
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index c9594f2..ee08f4d 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -229,7 +229,7 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(vcl::Window *pParent,

SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
{
    dispose();
    disposeOnce();
}

void SfxPrintOptionsDialog::dispose()
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index efbd225..b075e0d 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -109,6 +109,7 @@ class SmElementsControl : public Control
public:
    SmElementsControl(vcl::Window *pParent);
    virtual ~SmElementsControl();
    virtual void dispose() SAL_OVERRIDE;

    void setElementSetId(sal_uInt16 aSetId);

diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 0170bd7..1797c9a 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -238,7 +238,13 @@ SmElementsControl::SmElementsControl(vcl::Window *pParent)

SmElementsControl::~SmElementsControl()
{
    disposeOnce();
}

void SmElementsControl::dispose()
{
    mpDocShell->DoClose();
    Control::dispose();
}

void SmElementsControl::setVerticalMode(bool bVerticalMode)
@@ -671,7 +677,7 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf

SmElementsDockingWindow::~SmElementsDockingWindow ()
{
    dispose();
    disposeOnce();
}

void SmElementsDockingWindow::dispose()
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index f000e78..0bb93b4 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -179,7 +179,7 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItem

SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SmPrintOptionsTabPage::dispose()
@@ -387,7 +387,7 @@ SmFontDialog::SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, 

SmFontDialog::~SmFontDialog()
{
    dispose();
    disposeOnce();
}

void SmFontDialog::dispose()
@@ -477,7 +477,7 @@ SmFontSizeDialog::SmFontSizeDialog(vcl::Window * pParent)

SmFontSizeDialog::~SmFontSizeDialog()
{
    dispose();
    disposeOnce();
}

void SmFontSizeDialog::dispose()
@@ -591,7 +591,7 @@ SmFontTypeDialog::SmFontTypeDialog(vcl::Window * pParent, OutputDevice *pFntList

SmFontTypeDialog::~SmFontTypeDialog()
{
    dispose();
    disposeOnce();
}

void SmFontTypeDialog::dispose()
@@ -961,7 +961,7 @@ SmDistanceDialog::SmDistanceDialog(vcl::Window *pParent)

SmDistanceDialog::~SmDistanceDialog()
{
    dispose();
    disposeOnce();
}

void SmDistanceDialog::dispose()
@@ -1086,7 +1086,7 @@ SmAlignDialog::SmAlignDialog(vcl::Window * pParent)

SmAlignDialog::~SmAlignDialog()
{
    dispose();
    disposeOnce();
}

void SmAlignDialog::dispose()
@@ -1158,7 +1158,7 @@ SmShowSymbolSetWindow::SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyl

SmShowSymbolSetWindow::~SmShowSymbolSetWindow()
{
    dispose();
    disposeOnce();
}

void SmShowSymbolSetWindow::dispose()
@@ -1306,7 +1306,7 @@ SmShowSymbolSet::SmShowSymbolSet(vcl::Window *pParent)

SmShowSymbolSet::~SmShowSymbolSet()
{
    dispose();
    disposeOnce();
}

void SmShowSymbolSet::dispose()
@@ -1610,7 +1610,7 @@ SmSymbolDialog::SmSymbolDialog(vcl::Window *pParent, OutputDevice *pFntListDevic

SmSymbolDialog::~SmSymbolDialog()
{
    dispose();
    disposeOnce();
}

void SmSymbolDialog::dispose()
@@ -2172,7 +2172,7 @@ SmSymDefineDialog::SmSymDefineDialog(vcl::Window * pParent,

SmSymDefineDialog::~SmSymDefineDialog()
{
    dispose();
    disposeOnce();
}

void SmSymDefineDialog::dispose()
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 18f8696..890c1b1 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -123,7 +123,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :

SmEditWindow::~SmEditWindow()
{
    dispose();
    disposeOnce();
}

void SmEditWindow::dispose()
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 7d14a1e..c716a12 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -139,7 +139,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,

SmToolBoxWindow::~SmToolBoxWindow()
{
    dispose();
    disposeOnce();
}

void SmToolBoxWindow::dispose()
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index ee50e10..2a5ec95 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -119,7 +119,7 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell):

SmGraphicWindow::~SmGraphicWindow()
{
    dispose();
    disposeOnce();
}

void SmGraphicWindow::dispose()
@@ -728,7 +728,7 @@ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWi

SmCmdBoxWindow::~SmCmdBoxWindow ()
{
    dispose();
    disposeOnce();
}

void SmCmdBoxWindow::dispose()
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 6c09611..dd6df46 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -138,7 +138,7 @@ BrowseBox::BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode 

BrowseBox::~BrowseBox()
{
    dispose();
    disposeOnce();
}

void BrowseBox::dispose()
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index 6cfbf57..0c723a3 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -38,7 +38,7 @@ BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits )

BrowserHeader::~BrowserHeader()
{
    dispose();
    disposeOnce();
}

void BrowserHeader::dispose()
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 682595a..41635c2 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -227,7 +227,7 @@ BrowserDataWin::BrowserDataWin( BrowseBox* pParent )

BrowserDataWin::~BrowserDataWin()
{
    dispose();
    disposeOnce();
}

void BrowserDataWin::dispose()
@@ -732,7 +732,7 @@ void BrowserDataWin::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )

BrowserScrollBar::~BrowserScrollBar()
{
    dispose();
    disposeOnce();
}

void BrowserScrollBar::dispose()
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 9e00860..395f351 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -249,7 +249,7 @@ namespace svt

    CheckBoxControl::~CheckBoxControl()
    {
        dispose();
        disposeOnce();
    }

    void CheckBoxControl::dispose()
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index c376113..9e53109 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -183,7 +183,7 @@ namespace svt

    EditBrowseBox::~EditBrowseBox()
    {
        dispose();
        disposeOnce();
    }

    void EditBrowseBox::dispose()
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 434920a..7a2be8f 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -56,7 +56,7 @@ ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits)

ODocumentInfoPreview::~ODocumentInfoPreview()
{
   dispose();
    disposeOnce();
}

void ODocumentInfoPreview::dispose()
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 23a3172..ef2e2da 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -635,7 +635,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin,

ViewTabListBox_Impl::~ViewTabListBox_Impl()
{
    dispose();
    disposeOnce();
}

void ViewTabListBox_Impl::dispose()
@@ -1096,7 +1096,7 @@ SvtFileView::SvtFileView( vcl::Window* pParent, WinBits nBits,

SvtFileView::~SvtFileView()
{
    dispose();
    disposeOnce();
}

void SvtFileView::dispose()
@@ -2336,7 +2336,7 @@ QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& r

QueryDeleteDlg_Impl::~QueryDeleteDlg_Impl()
{
    dispose();
    disposeOnce();
}

void QueryDeleteDlg_Impl::dispose()
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 1afc9e3..0217577 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -3279,7 +3279,7 @@ IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPo

IcnViewEdit_Impl::~IcnViewEdit_Impl()
{
    dispose();
    disposeOnce();
}

void IcnViewEdit_Impl::dispose()
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 9c4465b..45290d6 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -88,7 +88,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle ) 

SvtIconChoiceCtrl::~SvtIconChoiceCtrl()
{
    dispose();
    disposeOnce();
}

void SvtIconChoiceCtrl::dispose()
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index 61e9bd2..3b1eb00 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -33,7 +33,7 @@ SvSimpleTableContainer::SvSimpleTableContainer(vcl::Window* pParent, WinBits nBi

SvSimpleTableContainer::~SvSimpleTableContainer()
{
    dispose();
    disposeOnce();
}

void SvSimpleTableContainer::dispose()
@@ -123,7 +123,7 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits):

SvSimpleTable::~SvSimpleTable()
{
    dispose();
    disposeOnce();
}

void SvSimpleTable::dispose()
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index afb886d..6d9aa70 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -110,7 +110,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvTabListBox(vcl::Wind

SvTabListBox::~SvTabListBox()
{
   dispose();
    disposeOnce();
}

void SvTabListBox::dispose()
@@ -526,7 +526,7 @@ SvHeaderTabListBox::SvHeaderTabListBox( vcl::Window* pParent, WinBits nWinStyle 

SvHeaderTabListBox::~SvHeaderTabListBox()
{
    dispose();
    disposeOnce();
}

void SvHeaderTabListBox::dispose()
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 2555115..b4861c3 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1541,7 +1541,7 @@ OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry )

SvTreeListBox::~SvTreeListBox()
{
    dispose();
    disposeOnce();
}

void SvTreeListBox::dispose()
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 86271a9..50ebc4e 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -257,7 +257,7 @@ Calendar::Calendar( vcl::Window* pParent, WinBits nWinStyle ) :

Calendar::~Calendar()
{
    dispose();
    disposeOnce();
}

void Calendar::dispose()
@@ -2224,7 +2224,7 @@ ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) :

ImplCFieldFloatWin::~ImplCFieldFloatWin()
{
    dispose();
    disposeOnce();
}

void ImplCFieldFloatWin::dispose()
@@ -2383,7 +2383,7 @@ CalendarField::CalendarField(vcl::Window* pParent, WinBits nWinStyle)

CalendarField::~CalendarField()
{
    dispose();
    disposeOnce();
}

void CalendarField::dispose()
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 80e22ae..0c49ef8 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -118,7 +118,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorListBox(vcl::Wind

ColorListBox::~ColorListBox()
{
    dispose();
    disposeOnce();
}

void ColorListBox::dispose()
@@ -749,7 +749,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineListBox(vcl::Windo

LineListBox::~LineListBox()
{
    dispose();
    disposeOnce();
}

void LineListBox::dispose()
@@ -952,7 +952,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontNameBox(vcl::Windo

FontNameBox::~FontNameBox()
{
    dispose();
    disposeOnce();
}

void FontNameBox::dispose()
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 1451237..164ab86 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -86,7 +86,7 @@ WinBits FileControl::ImplInitStyle( WinBits nStyle )

FileControl::~FileControl()
{
    dispose();
    disposeOnce();
}

void FileControl::dispose()
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 656436e..3ecbae0 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -1022,7 +1022,7 @@ void FormattedField::UseInputStringForFormatting( bool bUseInputStr /* = true */

DoubleNumericField::~DoubleNumericField()
{
    dispose();
    disposeOnce();
}

void DoubleNumericField::dispose()
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 87e019d..2d045d8 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -114,7 +114,7 @@ HeaderBar::HeaderBar( vcl::Window* pParent, WinBits nWinStyle ) :

HeaderBar::~HeaderBar()
{
    dispose();
    disposeOnce();
}

void HeaderBar::dispose()
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 2929bcc..fa826230 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -155,7 +155,7 @@ namespace svt

    HyperLabel::~HyperLabel( )
    {
        dispose();
        disposeOnce();
    }

    void HyperLabel::dispose()
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 7f39ff6..370a1f9 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -906,7 +906,7 @@ void SvtURLBox::Init(bool bSetDefaultHelpID)

SvtURLBox::~SvtURLBox()
{
    dispose();
    disposeOnce();
}

void SvtURLBox::dispose()
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 6a5e20b..2d4a0cf 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -203,7 +203,7 @@ namespace svt

    ORoadmap::~ORoadmap( )
    {
        dispose();
        disposeOnce();
    }

    void ORoadmap::dispose()
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 482d3d3..230d10e 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -326,7 +326,7 @@ Ruler::Ruler( vcl::Window* pParent, WinBits nWinStyle ) :

Ruler::~Ruler()
{
    dispose();
    disposeOnce();
}

void Ruler::dispose()
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index cc063c9..7c5739a 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -53,7 +53,7 @@ ScrollableWindow::ScrollableWindow( vcl::Window* pParent, WinBits nBits,

ScrollableWindow::~ScrollableWindow()
{
    dispose();
    disposeOnce();
}

void ScrollableWindow::dispose()
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index f39c1b7..8fd29e4 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -378,7 +378,7 @@ TabBar::TabBar( vcl::Window* pParent, WinBits nWinStyle ) :

TabBar::~TabBar()
{
    dispose();
    disposeOnce();
}

void TabBar::dispose()
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 5f83f15..ab3fc1f 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -459,7 +459,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame)

ToolbarMenu::~ToolbarMenu()
{
    dispose();
    disposeOnce();
}

void ToolbarMenu::dispose()
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 1a40970..67b2464 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -125,7 +125,7 @@ ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTran

ValueSet::~ValueSet()
{
    dispose();
    disposeOnce();
}

void ValueSet::dispose()
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 0539d5b..7d4267b 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -81,7 +81,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Pla

PlaceEditDialog::~PlaceEditDialog()
{
    dispose();
    disposeOnce();
}

void PlaceEditDialog::dispose()
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 65cc4af..b71113a 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -733,7 +733,7 @@ void AssignmentPersistentData::ImplCommit()

    AddressBookSourceDialog::~AddressBookSourceDialog()
    {
        dispose();
        disposeOnce();
    }

    void AddressBookSourceDialog::dispose()
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 77d6fcf..42b7854 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -245,7 +245,7 @@ PrinterSetupDialog::PrinterSetupDialog(vcl::Window* pParent)

PrinterSetupDialog::~PrinterSetupDialog()
{
    dispose();
    disposeOnce();
}

void PrinterSetupDialog::dispose()
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index 282553b..1e99d16 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -47,7 +47,7 @@ public:
        btnYes_->SetClickHdl(LINK(this, RestartDialog, hdlYes));
        btnNo_->SetClickHdl(LINK(this, RestartDialog, hdlNo));
    }
    virtual ~RestartDialog() { dispose(); }
    virtual ~RestartDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        reason_.clear();
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 1c398cf..411c9b0 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -149,7 +149,7 @@ namespace svt

    RoadmapWizard::~RoadmapWizard()
    {
        dispose();
        disposeOnce();
    }

    void RoadmapWizard::dispose()
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index e0cf0f9..47e8178 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -49,7 +49,7 @@ namespace svt

    OWizardPage::~OWizardPage()
    {
        dispose();
        disposeOnce();
    }

    void OWizardPage::dispose()
@@ -202,7 +202,7 @@ namespace svt

    OWizardMachine::~OWizardMachine()
    {
        dispose();
        disposeOnce();
    }

    void OWizardMachine::dispose()
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 890cbc4..a2b0d97e 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -363,7 +363,7 @@ WizardDialog::WizardDialog( vcl::Window* pParent, const OUString& rID, const OUS

WizardDialog::~WizardDialog()
{
    dispose();
    disposeOnce();
}

void WizardDialog::dispose()
diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx
index da1f2d31..8277304 100644
--- a/svtools/source/filter/GraphicExportOptionsDialog.cxx
+++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx
@@ -45,7 +45,7 @@ GraphicExportOptionsDialog::GraphicExportOptionsDialog(vcl::Window* pWindow, con

GraphicExportOptionsDialog::~GraphicExportOptionsDialog()
{
    dispose();
    disposeOnce();
}

void GraphicExportOptionsDialog::dispose()
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 9301993..e210735 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -979,7 +979,7 @@ void ExportDialog::updateControls()

ExportDialog::~ExportDialog()
{
    dispose();
    disposeOnce();
}

void ExportDialog::dispose()
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index d6b0485..e8b51c5 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -64,7 +64,7 @@ namespace svt { namespace table

    TableControl::~TableControl()
    {
        dispose();
        disposeOnce();
    }

    void TableControl::dispose()
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index b71c582..2b81903 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -51,7 +51,7 @@ namespace svt { namespace table

    TableDataWindow::~TableDataWindow()
    {
        dispose();
        disposeOnce();
    }

    void TableDataWindow::dispose()
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 33bf1df..1cb90cc 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -998,7 +998,7 @@ namespace svt

    PanelTabBar::~PanelTabBar()
    {
        dispose();
        disposeOnce();
    }

    void PanelTabBar::dispose()
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index c5a733c..e816e0d 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -354,7 +354,7 @@ namespace svt

    ToolPanelDeck::~ToolPanelDeck()
    {
        dispose();
        disposeOnce();
    }

    void ToolPanelDeck::dispose()
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx
index 475117d..32e9f85 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -89,7 +89,7 @@ namespace svt

    ToolPanelDrawer::~ToolPanelDrawer()
    {
        dispose();
        disposeOnce();
    }

    void ToolPanelDrawer::dispose()
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index c575890..8feb8d3 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1491,7 +1491,7 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pPa

UnoTreeListBoxImpl::~UnoTreeListBoxImpl()
{
    dispose();
    disposeOnce();
}

void UnoTreeListBoxImpl::dispose()
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 2d528fd..6eb9fcf 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -86,14 +86,13 @@ public:

class MaskSet : public ValueSet
{
    VclPtr<SvxBmpMask>     pSvxBmpMask;

    VclPtr<SvxBmpMask> pSvxBmpMask;

public:
    MaskSet(SvxBmpMask* pMask, vcl::Window* pParent);
    virtual ~MaskSet() { dispose(); }
    virtual ~MaskSet() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { pSvxBmpMask.clear(); ValueSet::dispose(); }
    virtual void    Select() SAL_OVERRIDE;
    virtual void Select() SAL_OVERRIDE;
    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
    virtual void GetFocus() SAL_OVERRIDE;
    virtual Size GetOptimalSize() const SAL_OVERRIDE
@@ -486,7 +485,7 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* 

SvxBmpMask::~SvxBmpMask()
{
    dispose();
    disposeOnce();
}

void SvxBmpMask::dispose()
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 2ed20df..df4dd3e 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -88,7 +88,7 @@ SvxContourDlg::SvxContourDlg(SfxBindings* _pBindings, SfxChildWindow* pCW,

SvxContourDlg::~SvxContourDlg()
{
    dispose();
    disposeOnce();
}

void SvxContourDlg::dispose()
@@ -294,7 +294,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *

SvxSuperContourDlg::~SvxSuperContourDlg()
{
    dispose();
    disposeOnce();
}

void SvxSuperContourDlg::dispose()
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index e9d4ffa..e3c60fe 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -691,7 +691,7 @@ IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl)

SvxShowCharSet::~SvxShowCharSet()
{
    dispose();
    disposeOnce();
}

void SvxShowCharSet::dispose()
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 514e3de..d767d47 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -50,7 +50,7 @@ void SvxCheckListBox::SetNormalStaticImage(const Image& rNormalStaticImage)

SvxCheckListBox::~SvxCheckListBox()
{
    dispose();
    disposeOnce();
}

void SvxCheckListBox::dispose()
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index e8fc165..2b55322 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -67,7 +67,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, Graphic& r

CompressGraphicsDialog::~CompressGraphicsDialog()
{
    dispose();
    disposeOnce();
}

void CompressGraphicsDialog::dispose()
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 2b636c2..3db87d5 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -57,7 +57,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXConnectionPreview(

SvxXConnectionPreview::~SvxXConnectionPreview()
{
    dispose();
    disposeOnce();
}

void SvxXConnectionPreview::dispose()
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 81551a1..ddb6852 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -112,7 +112,7 @@ SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits)

SvxRedlinTable::~SvxRedlinTable()
{
    dispose();
    disposeOnce();
}

void SvxRedlinTable::dispose()
@@ -418,7 +418,7 @@ void SvxTPView::DeactivatePage()

SvxTPView::~SvxTPView()
{
    dispose();
    disposeOnce();
}

void SvxTPView::dispose()
@@ -604,7 +604,7 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent)

SvxTPFilter::~SvxTPFilter()
{
    dispose();
    disposeOnce();
}

void SvxTPFilter::dispose()
@@ -1113,7 +1113,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTop

SvxAcceptChgCtr::~SvxAcceptChgCtr()
{
    dispose();
    disposeOnce();
}

void SvxAcceptChgCtr::dispose()
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 8cf27409c..519dfc0 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -69,7 +69,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvx3DPreviewControl(vc

Svx3DPreviewControl::~Svx3DPreviewControl()
{
    dispose();
    disposeOnce();
}

void Svx3DPreviewControl::dispose()
@@ -1007,7 +1007,7 @@ void SvxLightCtl3D::Init()

SvxLightCtl3D::~SvxLightCtl3D()
{
    dispose();
    disposeOnce();
}

void SvxLightCtl3D::dispose()
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 46890c6..87d7061 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -106,7 +106,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxRectCtl(vcl::Window

SvxRectCtl::~SvxRectCtl()
{
    dispose();
    disposeOnce();
}

void SvxRectCtl::dispose()
@@ -847,7 +847,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPixelCtl(vcl::Windo

SvxPixelCtl::~SvxPixelCtl( )
{
    dispose();
    disposeOnce();
}

void SvxPixelCtl::dispose()
@@ -1837,7 +1837,7 @@ SvxPreviewBase::SvxPreviewBase(vcl::Window* pParent)

SvxPreviewBase::~SvxPreviewBase()
{
    dispose();
    disposeOnce();
}

void SvxPreviewBase::dispose()
@@ -1998,7 +1998,7 @@ Size SvxXLinePreview::GetOptimalSize() const

SvxXLinePreview::~SvxXLinePreview()
{
    dispose();
    disposeOnce();
}

void SvxXLinePreview::dispose()
@@ -2110,7 +2110,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXRectPreview(vcl::W

SvxXRectPreview::~SvxXRectPreview()
{
    dispose();
    disposeOnce();
}

void SvxXRectPreview::dispose()
@@ -2171,7 +2171,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXShadowPreview (vcl

SvxXShadowPreview::~SvxXShadowPreview()
{
    dispose();
    disposeOnce();
}

void SvxXShadowPreview::dispose()
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 9de79a9..82db09a 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -539,7 +539,7 @@ PluginProgressWindow::PluginProgressWindow(      vcl::Window*                   

PluginProgressWindow::~PluginProgressWindow()
{
    dispose();
    disposeOnce();
}

void PluginProgressWindow::dispose()
@@ -668,7 +668,7 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore)

SaveDialog::~SaveDialog()
{
    dispose();
    disposeOnce();
}

void SaveDialog::dispose()
@@ -711,7 +711,7 @@ SaveProgressDialog::SaveProgressDialog(vcl::Window* pParent, RecoveryCore* pCore

SaveProgressDialog::~SaveProgressDialog()
{
    dispose();
    disposeOnce();
}

void SaveProgressDialog::dispose()
@@ -927,7 +927,7 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore)

RecoveryDialog::~RecoveryDialog()
{
    dispose();
    disposeOnce();
}

void RecoveryDialog::dispose()
@@ -1270,7 +1270,7 @@ BrokenRecoveryDialog::BrokenRecoveryDialog(vcl::Window*       pParent        ,

BrokenRecoveryDialog::~BrokenRecoveryDialog()
{
    dispose();
    disposeOnce();
}

void BrokenRecoveryDialog::dispose()
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 66ad4cf..a633315 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -502,7 +502,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFontPrevWindow(vcl:

SvxFontPrevWindow::~SvxFontPrevWindow()
{
    dispose();
    disposeOnce();
}

void SvxFontPrevWindow::dispose()
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 3ddca61..2f392b1 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -287,7 +287,7 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx,

SvxFontWorkDialog::~SvxFontWorkDialog()
{
    dispose();
    disposeOnce();
}

void SvxFontWorkDialog::dispose()
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index d2d6d8a..236f046 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -84,7 +84,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGraphCtrl(vcl::Window 

GraphCtrl::~GraphCtrl()
{
    dispose();
    disposeOnce();
}

void GraphCtrl::dispose()
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 65ea635..704c0dc 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -203,7 +203,7 @@ SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 n

SvxHFPage::~SvxHFPage()
{
    dispose();
    disposeOnce();
}

void SvxHFPage::dispose()
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 2e545e0..67a1a13 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -217,7 +217,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window

SvxIMapDlg::~SvxIMapDlg()
{
    dispose();
    disposeOnce();
}

void SvxIMapDlg::dispose()
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 17e6017..06f7ed0 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -72,7 +72,7 @@ IMapWindow::IMapWindow( vcl::Window* pParent, WinBits nBits, const Reference< XF

IMapWindow::~IMapWindow()
{
    dispose();
    disposeOnce();
}

void IMapWindow::dispose()
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 8aeab4bf..26879f2 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -43,7 +43,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* pParent, const OUString

SvxLinkWarningDialog::~SvxLinkWarningDialog()
{
    dispose();
    disposeOnce();
}

void SvxLinkWarningDialog::dispose()
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 3ba702b..e2ed6e0 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -78,7 +78,7 @@ Size SvxXMeasurePreview::GetOptimalSize() const

SvxXMeasurePreview::~SvxXMeasurePreview()
{
    dispose();
    disposeOnce();
}

void SvxXMeasurePreview::dispose()
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 58c0f4a..48317dd 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -173,7 +173,7 @@ SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet

SvxGridTabPage::~SvxGridTabPage()
{
    dispose();
    disposeOnce();
}

void SvxGridTabPage::dispose()
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 6b6c245..d1e4c5c 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -90,7 +90,7 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent)

SvxPageWindow::~SvxPageWindow()
{
    dispose();
    disposeOnce();
}

void SvxPageWindow::dispose()
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 84e56e0..25b01d7 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -99,7 +99,7 @@ SvxPasswordDialog::SvxPasswordDialog(vcl::Window* pParent, bool bAllowEmptyPassw

SvxPasswordDialog::~SvxPasswordDialog()
{
    dispose();
    disposeOnce();
}

void SvxPasswordDialog::dispose()
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 2ebbbec..43e0c8b 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -263,7 +263,7 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings *pBind, SfxChildWindow *pCW,

SvxRubyDialog::~SvxRubyDialog()
{
    dispose();
    disposeOnce();
}

void SvxRubyDialog::dispose()
@@ -790,7 +790,7 @@ RubyPreview::RubyPreview(vcl::Window *pParent)

RubyPreview::~RubyPreview()
{
    dispose();
    disposeOnce();
}

void RubyPreview::dispose()
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 24a5d33..7e2c709 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -345,7 +345,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi

SvxSearchDialog::~SvxSearchDialog()
{
    dispose();
    disposeOnce();
}

void SvxSearchDialog::dispose()
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 32f3065..7ac8567 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -423,7 +423,7 @@ void SvxNumValueSet::init(sal_uInt16 nType)

SvxNumValueSet::~SvxNumValueSet()
{
    dispose();
    disposeOnce();
}

void SvxNumValueSet::dispose()
@@ -493,7 +493,7 @@ void SvxBmpNumValueSet::init()

SvxBmpNumValueSet::~SvxBmpNumValueSet()
{
    dispose();
    disposeOnce();
}

void SvxBmpNumValueSet::dispose()
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index b2bfffd..120b5ac 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -341,7 +341,7 @@ SvxRuler::SvxRuler(

SvxRuler::~SvxRuler()
{
    dispose();
    disposeOnce();
}

void SvxRuler::dispose()
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 2eb940b..1b43822 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -59,7 +59,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxTextEncodingBox(vcl

SvxTextEncodingBox::~SvxTextEncodingBox()
{
    dispose();
    disposeOnce();
}

void SvxTextEncodingBox::dispose()
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index cf12376..f413b14 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -325,7 +325,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p

Svx3DWin::~Svx3DWin()
{
    dispose();
    disposeOnce();
}

void Svx3DWin::dispose()
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index e1ed4af..2b6577a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -134,7 +134,7 @@ FmGridHeader::FmGridHeader( BrowseBox* pParent, WinBits nWinBits)

FmGridHeader::~FmGridHeader()
{
    dispose();
    disposeOnce();
}

void FmGridHeader::dispose()
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 21ba11a..58313a4 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -404,7 +404,7 @@ DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent, WinBits nStyle

DbGridControl::NavigationBar::~NavigationBar()
{
    dispose();
    disposeOnce();
}

void DbGridControl::NavigationBar::dispose()
@@ -951,7 +951,7 @@ void DbGridControl::Init()

DbGridControl::~DbGridControl()
{
    dispose();
    disposeOnce();
}

void DbGridControl::dispose()
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 06d105e..a24f04d 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -142,7 +142,7 @@ namespace svxform

    DataTreeListBox::~DataTreeListBox()
    {
        dispose();
        disposeOnce();
    }

    void DataTreeListBox::dispose()
@@ -377,7 +377,7 @@ namespace svxform

    XFormsPage::~XFormsPage()
    {
        dispose();
        disposeOnce();
    }

    void XFormsPage::dispose()
@@ -1421,7 +1421,7 @@ namespace svxform

    DataNavigatorWindow::~DataNavigatorWindow()
    {
        dispose();
        disposeOnce();
    }

    void DataNavigatorWindow::dispose()
@@ -2173,7 +2173,7 @@ namespace svxform

    DataNavigator::~DataNavigator()
    {
        dispose();
        disposeOnce();
    }

    void DataNavigator::dispose()
@@ -2301,7 +2301,7 @@ namespace svxform

    AddDataItemDialog::~AddDataItemDialog()
    {
        dispose();
        disposeOnce();
    }

    void AddDataItemDialog::dispose()
@@ -2819,7 +2819,7 @@ namespace svxform

    AddConditionDialog::~AddConditionDialog()
    {
        dispose();
        disposeOnce();
    }

    void AddConditionDialog::dispose()
@@ -2943,7 +2943,7 @@ namespace svxform

    NamespaceItemDialog::~NamespaceItemDialog()
    {
        dispose();
        disposeOnce();
    }

    void NamespaceItemDialog::dispose()
@@ -3097,7 +3097,7 @@ namespace svxform

    ManageNamespaceDialog::~ManageNamespaceDialog()
    {
        dispose();
        disposeOnce();
    }

    void ManageNamespaceDialog::dispose()
@@ -3158,7 +3158,7 @@ namespace svxform

    AddSubmissionDialog::~AddSubmissionDialog()
    {
        dispose();
        disposeOnce();
    }

    void AddSubmissionDialog::dispose()
@@ -3377,7 +3377,7 @@ namespace svxform

    AddModelDialog::~AddModelDialog()
    {
        dispose();
        disposeOnce();
    }

    void AddModelDialog::dispose()
@@ -3408,7 +3408,7 @@ namespace svxform

    AddInstanceDialog::~AddInstanceDialog()
    {
        dispose();
        disposeOnce();
    }

    void AddInstanceDialog::dispose()
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index ec5bd20..a3d7e3a 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1150,7 +1150,7 @@ FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent )

FmFilterNavigator::~FmFilterNavigator()
{
    dispose();
    disposeOnce();
}

void FmFilterNavigator::dispose()
@@ -1867,7 +1867,7 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin

FmFilterNavigatorWin::~FmFilterNavigatorWin()
{
    dispose();
    disposeOnce();
}

void FmFilterNavigatorWin::dispose()
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index caef3ef..b61dde5 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -252,7 +252,7 @@ void FmPropBrw::Resize()

FmPropBrw::~FmPropBrw()
{
    dispose();
    disposeOnce();
}

void FmPropBrw::dispose()
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index e69a7b5..5084c60 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -514,7 +514,7 @@ namespace svxform

    NavigatorFrame::~NavigatorFrame()
    {
        dispose();
        disposeOnce();
    }

    void NavigatorFrame::dispose()
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 7fd2630..b022b22 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -162,7 +162,7 @@ namespace svxform

    NavigatorTree::~NavigatorTree()
    {
        dispose();
        disposeOnce();
    }

    void NavigatorTree::dispose()
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 942f95a..0887b43 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -115,7 +115,7 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent )

FmFieldWinListBox::~FmFieldWinListBox()
{
    dispose();
    disposeOnce();
}

void FmFieldWinListBox::dispose()
@@ -198,7 +198,7 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Wind

FmFieldWin::~FmFieldWin()
{
    dispose();
    disposeOnce();
}

void FmFieldWin::dispose()
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 55c8009..6d18452 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -146,7 +146,7 @@ GalleryBrowser1::GalleryBrowser1(

GalleryBrowser1::~GalleryBrowser1()
{
    dispose();
    disposeOnce();
}

void GalleryBrowser1::dispose()
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 3aae480..6e3a330 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -474,7 +474,7 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) :

GalleryBrowser2::~GalleryBrowser2()
{
    dispose();
    disposeOnce();
}

void GalleryBrowser2::dispose()
diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx
index e1639bf..16c8169 100644
--- a/svx/source/sidebar/EmptyPanel.cxx
+++ b/svx/source/sidebar/EmptyPanel.cxx
@@ -48,7 +48,7 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent)

EmptyPanel::~EmptyPanel()
{
    dispose();
    disposeOnce();
}

void EmptyPanel::dispose()
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 5224725..9a1f11f 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -26,7 +26,7 @@ PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUStrin

PanelLayout::~PanelLayout()
{
    dispose();
    disposeOnce();
}

void PanelLayout::dispose()
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 5a66785..0063d05 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -115,7 +115,7 @@ AreaPropertyPanel::AreaPropertyPanel(

AreaPropertyPanel::~AreaPropertyPanel()
{
    dispose();
    disposeOnce();
}

void AreaPropertyPanel::dispose()
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 2ba2230..880bb21 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -110,7 +110,7 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl (

AreaTransparencyGradientControl::~AreaTransparencyGradientControl()
{
    dispose();
    disposeOnce();
}

void AreaTransparencyGradientControl::dispose()
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 98e26fb..8ac484d8 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -68,7 +68,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(

GraphicPropertyPanel::~GraphicPropertyPanel()
{
    dispose();
    disposeOnce();
}

void GraphicPropertyPanel::dispose()
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index 08f2dad..da3dc6e 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -77,7 +77,7 @@ InsertPropertyPanel::InsertPropertyPanel (

InsertPropertyPanel::~InsertPropertyPanel()
{
    dispose();
    disposeOnce();
}

void InsertPropertyPanel::dispose()
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index f2c7a94..5ff67de 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -194,7 +194,7 @@ LinePropertyPanel::LinePropertyPanel(

LinePropertyPanel::~LinePropertyPanel()
{
    dispose();
    disposeOnce();
}

void LinePropertyPanel::dispose()
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index 4e394f8..00c9271 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -66,7 +66,7 @@ LineWidthControl::LineWidthControl (

LineWidthControl::~LineWidthControl()
{
    dispose();
    disposeOnce();
}

void LineWidthControl::dispose()
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx
index c9e7ecd..c57196f 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -41,7 +41,7 @@ LineWidthValueSet::LineWidthValueSet (

LineWidthValueSet::~LineWidthValueSet()
{
    dispose();
    disposeOnce();
}

void LineWidthValueSet::dispose()
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index ccb0b24..29f93b2 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -94,7 +94,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId)

ParaLineSpacingControl::~ParaLineSpacingControl()
{
    dispose();
    disposeOnce();
}

void ParaLineSpacingControl::dispose()
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 0c9759b..b84a068 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -748,7 +748,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,

ParaPropertyPanel::~ParaPropertyPanel()
{
    dispose();
    disposeOnce();
}

void ParaPropertyPanel::dispose()
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 24dfebd..cfb5939d 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -117,7 +117,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(

PosSizePropertyPanel::~PosSizePropertyPanel()
{
    dispose();
    disposeOnce();
}

void PosSizePropertyPanel::dispose()
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index c029a8f..8ec03f6 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -73,7 +73,7 @@ TextCharacterSpacingControl::TextCharacterSpacingControl (

TextCharacterSpacingControl::~TextCharacterSpacingControl()
{
    dispose();
    disposeOnce();
}

void TextCharacterSpacingControl::dispose()
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 667bb91..b9b8c26 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -116,7 +116,7 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref

TextPropertyPanel::~TextPropertyPanel()
{
    dispose();
    disposeOnce();
}

void TextPropertyPanel::dispose()
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index bb1caed..f3cb563 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -67,7 +67,7 @@ TextUnderlineControl::TextUnderlineControl (

TextUnderlineControl::~TextUnderlineControl()
{
    dispose();
    disposeOnce();
}

void TextUnderlineControl::dispose()
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 42a9904..ad948fa 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -169,7 +169,7 @@ public:
    :   Edit(pParent, nBits),
        pBrowse(pBrowse_)
    {}
    virtual ~ImpItemEdit() { dispose(); }
    virtual ~ImpItemEdit() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { pBrowse.clear(); Edit::dispose(); }
    virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE;
};
@@ -213,7 +213,7 @@ _SdrItemBrowserControl::_SdrItemBrowserControl(vcl::Window* pParent, WinBits nBi

_SdrItemBrowserControl::~_SdrItemBrowserControl()
{
    dispose();
    disposeOnce();
}

void _SdrItemBrowserControl::dispose()
@@ -1055,7 +1055,7 @@ _SdrItemBrowserWindow::_SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits

_SdrItemBrowserWindow::~_SdrItemBrowserWindow()
{
    dispose();
    disposeOnce();
}

void _SdrItemBrowserWindow::dispose()
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 4e7c2db..e11ed84 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -137,7 +137,7 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController,

NumberingPopup::~NumberingPopup()
{
    dispose();
    disposeOnce();
}

void NumberingPopup::dispose()
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index a5e8777..6a631dc 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -244,7 +244,7 @@ SvxColorDockingWindow::SvxColorDockingWindow

SvxColorDockingWindow::~SvxColorDockingWindow()
{
    dispose();
    disposeOnce();
}

void SvxColorDockingWindow::dispose()
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 4366ac1..1417254 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -106,7 +106,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(

ExtrusionDirectionWindow::~ExtrusionDirectionWindow()
{
    dispose();
    disposeOnce();
}

void ExtrusionDirectionWindow::dispose()
@@ -311,7 +311,7 @@ ExtrusionDepthDialog::ExtrusionDepthDialog( vcl::Window* pParent, double fDepth,

ExtrusionDepthDialog::~ExtrusionDepthDialog()
{
    dispose();
    disposeOnce();
}

void ExtrusionDepthDialog::dispose()
@@ -602,7 +602,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro

ExtrusionLightingWindow::~ExtrusionLightingWindow()
{
    dispose();
    disposeOnce();
}

void ExtrusionLightingWindow::dispose()
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 775fc01..bd0ca39 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -562,7 +562,7 @@ FillControl::FillControl(vcl::Window* pParent,WinBits nStyle)

FillControl::~FillControl()
{
    dispose();
    disposeOnce();
}

void FillControl::dispose()
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index c36e582..a045c1f 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -96,7 +96,7 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pP

FontWorkGalleryDialog::~FontWorkGalleryDialog()
{
    dispose();
    disposeOnce();
}

void FontWorkGalleryDialog::dispose()
@@ -721,7 +721,7 @@ FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( vcl::Window* pPa

FontworkCharacterSpacingDialog::~FontworkCharacterSpacingDialog()
{
    dispose();
    disposeOnce();
}

void FontworkCharacterSpacingDialog::dispose()
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index e03c344..3128074 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -296,7 +296,7 @@ ImplGrafControl::ImplGrafControl(

ImplGrafControl::~ImplGrafControl()
{
   dispose();
    disposeOnce();
}

void ImplGrafControl::dispose()
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 49a8337..bd82e70 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -157,7 +157,7 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri

TableWindow::~TableWindow()
{
    dispose();
    disposeOnce();
}

void TableWindow::dispose()
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 1f500a7..99ca4bc 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -100,7 +100,7 @@ SvxPopupWindowListBox::SvxPopupWindowListBox(sal_uInt16 nSlotId, const OUString&

SvxPopupWindowListBox::~SvxPopupWindowListBox()
{
    dispose();
    disposeOnce();
}

void SvxPopupWindowListBox::dispose()
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 8128f3e..d6e5fe4 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -329,7 +329,7 @@ SfxPopupWindow* SvxLineEndWindow::Clone() const

SvxLineEndWindow::~SvxLineEndWindow()
{
    dispose();
    disposeOnce();
}

void SvxLineEndWindow::dispose()
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 79f1edf..8769b4c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -278,7 +278,7 @@ protected:
    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
public:
    SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow );
    virtual ~SvxLineWindow_Impl() { dispose(); }
    virtual ~SvxLineWindow_Impl() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { m_aLineStyleLb.disposeAndClear(); SfxPopupWindow::dispose(); }
    virtual SfxPopupWindow* Clone() const SAL_OVERRIDE;
};
@@ -332,7 +332,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent,

SvxStyleBox_Impl::~SvxStyleBox_Impl()
{
    dispose();
    disposeOnce();
}

void SvxStyleBox_Impl::dispose()
@@ -884,7 +884,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference<

SvxFontNameBox_Impl::~SvxFontNameBox_Impl()
{
    dispose();
    disposeOnce();
}

void SvxFontNameBox_Impl::dispose()
@@ -1244,7 +1244,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,

SvxColorWindow_Impl::~SvxColorWindow_Impl()
{
    dispose();
    disposeOnce();
}

void SvxColorWindow_Impl::dispose()
@@ -1525,7 +1525,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram

SvxFrameWindow_Impl::~SvxFrameWindow_Impl()
{
    dispose();
    disposeOnce();
}

void SvxFrameWindow_Impl::dispose()
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 7a461ef..8aea398 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -62,7 +62,7 @@ DictionaryList::DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits)

DictionaryList::~DictionaryList()
{
    dispose();
    disposeOnce();
}

void DictionaryList::dispose()
@@ -555,7 +555,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent )

ChineseDictionaryDialog::~ChineseDictionaryDialog()
{
    dispose();
    disposeOnce();
}

void ChineseDictionaryDialog::dispose()
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 6c0f040..1c301c5 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -63,7 +63,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( vcl::Window* pParent )

ChineseTranslationDialog::~ChineseTranslationDialog()
{
    dispose();
    disposeOnce();
}

void ChineseTranslationDialog::dispose()
diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx
index 731e6dc..c1105c3 100644
--- a/svx/workben/pixelctl.cxx
+++ b/svx/workben/pixelctl.cxx
@@ -83,7 +83,7 @@ class MyWin : public WorkWindow

public:
                MyWin( vcl::Window* pParent, WinBits nWinStyle );
    virtual      ~MyWin() { dispose(); }
    virtual      ~MyWin() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE;
    void        MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
    void        MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx
index 00a4b1f..dfedd6b 100644
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/tiledrendering/tiledrendering.cxx
@@ -92,7 +92,7 @@ public:

    virtual ~TiledRenderingDialog()
    {
        dispose();
        disposeOnce();
    }

    virtual void dispose() SAL_OVERRIDE
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 9db5c7d..d0dea5f 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -175,7 +175,7 @@ SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS )

SwBreakDlg::~SwBreakDlg()
{
    dispose();
    disposeOnce();
}

void SwBreakDlg::dispose()
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index e19be02..a1836d6 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -185,7 +185,7 @@ SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)

SwCharURLPage::~SwCharURLPage()
{
    dispose();
    disposeOnce();
}

void SwCharURLPage::dispose()
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 6390f46..d5157f7 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -203,7 +203,7 @@ static void calcFontHeightAnyAscent( OutputDevice* _pWin, vcl::Font& _rFont, lon

SwDropCapsPict::~SwDropCapsPict()
{
    dispose();
    disposeOnce();
}

void SwDropCapsPict::dispose()
@@ -576,7 +576,7 @@ SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet)

SwDropCapsPage::~SwDropCapsPage()
{
    dispose();
    disposeOnce();
}

void SwDropCapsPage::dispose()
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 04e923c..e16fa6d 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -101,7 +101,7 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(vcl::Window* pParent, const SfxItem

SwParagraphNumTabPage::~SwParagraphNumTabPage()
{
    dispose();
    disposeOnce();
}

void SwParagraphNumTabPage::dispose()
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index f279d54..7794952 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -124,7 +124,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet)

SwCondCollPage::~SwCondCollPage()
{
    dispose();
    disposeOnce();
}

void SwCondCollPage::dispose()
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index c902ed7..86f0a4d 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -138,7 +138,7 @@ SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet

SwMailConfigPage::~SwMailConfigPage()
{
    dispose();
    disposeOnce();
}

void SwMailConfigPage::dispose()
@@ -259,7 +259,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare

SwTestAccountSettingsDialog::~SwTestAccountSettingsDialog()
{
    dispose();
    disposeOnce();
}

void SwTestAccountSettingsDialog::dispose()
@@ -452,7 +452,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(

SwAuthenticationSettingsDialog::~SwAuthenticationSettingsDialog()
{
    dispose();
    disposeOnce();
}

void SwAuthenticationSettingsDialog::dispose()
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index b902150..1342d58 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -128,7 +128,7 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxIt

SwCompatibilityOptPage::~SwCompatibilityOptPage()
{
    dispose();
    disposeOnce();
}

void SwCompatibilityOptPage::dispose()
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index d0c8d8a..090f496 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -127,7 +127,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)

SwLoadOptPage::~SwLoadOptPage()
{
    dispose();
    disposeOnce();
}

void SwLoadOptPage::dispose()
@@ -541,7 +541,7 @@ SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet

SwCaptionOptPage::~SwCaptionOptPage()
{
    dispose();
    disposeOnce();
}

void SwCaptionOptPage::dispose()
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 5acc585..ee6a85b 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -156,7 +156,7 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,

SwContentOptPage::~SwContentOptPage()
{
    dispose();
    disposeOnce();
}

void SwContentOptPage::dispose()
@@ -380,7 +380,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,

SwAddPrinterTabPage::~SwAddPrinterTabPage()
{
    dispose();
    disposeOnce();
}

void SwAddPrinterTabPage::dispose()
@@ -629,7 +629,7 @@ SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent,

SwStdFontTabPage::~SwStdFontTabPage()
{
    dispose();
    disposeOnce();
}

void SwStdFontTabPage::dispose()
@@ -1157,7 +1157,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte

SwTableOptionsTabPage::~SwTableOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SwTableOptionsTabPage::dispose()
@@ -1413,7 +1413,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( vcl::Window* pParent,

SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SwShdwCrsrOptionsTabPage::dispose()
@@ -1851,7 +1851,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent,

SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SwRedlineOptionsTabPage::dispose()
@@ -2370,7 +2370,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage(  vcl::Window* pParent, const S

SwCompareOptionsTabPage::~SwCompareOptionsTabPage()
{
    dispose();
    disposeOnce();
}

void SwCompareOptionsTabPage::dispose()
@@ -2520,7 +2520,7 @@ SwTestTabPage::SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)

SwTestTabPage::~SwTestTabPage()
{
    dispose();
    disposeOnce();
}

void SwTestTabPage::dispose()
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 388c6d3..427ba95 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -265,7 +265,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)

SwAddressListDialog::~SwAddressListDialog()
{
    dispose();
    disposeOnce();
}

void SwAddressListDialog::dispose()
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index fb86a0e..d0a84b3 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -114,7 +114,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAddressControlImpl(v

SwAddressControl_Impl::~SwAddressControl_Impl()
{
    dispose();
    disposeOnce();
}

void SwAddressControl_Impl::dispose()
@@ -490,7 +490,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(

SwCreateAddressListDialog::~SwCreateAddressListDialog()
{
    dispose();
    disposeOnce();
}

void SwCreateAddressListDialog::dispose()
@@ -765,7 +765,7 @@ SwFindEntryDialog::SwFindEntryDialog(SwCreateAddressListDialog* pParent)

SwFindEntryDialog::~SwFindEntryDialog()
{
    dispose();
    disposeOnce();
}

void SwFindEntryDialog::dispose()
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 5db3c7c..5ea0665 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -60,7 +60,7 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(

SwCustomizeAddressListDialog::~SwCustomizeAddressListDialog()
{
    dispose();
    disposeOnce();
}

void SwCustomizeAddressListDialog::dispose()
@@ -197,7 +197,7 @@ SwAddRenameEntryDialog::SwAddRenameEntryDialog(

SwAddRenameEntryDialog::~SwAddRenameEntryDialog()
{
    dispose();
    disposeOnce();
}

void SwAddRenameEntryDialog::dispose()
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 4c8da21..64ee14a 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -412,7 +412,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,

SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
{
    dispose();
    disposeOnce();
}

void SwInsertDBColAutoPilot::dispose()
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index d62f410..fd9e2eb 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -81,7 +81,7 @@ SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent, uno::Sequen

SwDBTablePreviewDialog::~SwDBTablePreviewDialog()
{
    dispose();
    disposeOnce();
}

void SwDBTablePreviewDialog::dispose()
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 73476fd..257ee38 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -95,7 +95,7 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP

SwMailMergeAddressBlockPage::~SwMailMergeAddressBlockPage()
{
    dispose();
    disposeOnce();
}

void SwMailMergeAddressBlockPage::dispose()
@@ -356,7 +356,7 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(

SwSelectAddressBlockDialog::~SwSelectAddressBlockDialog()
{
    dispose();
    disposeOnce();
}

void SwSelectAddressBlockDialog::dispose()
@@ -573,7 +573,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(

SwCustomizeAddressBlockDialog::~SwCustomizeAddressBlockDialog()
{
    dispose();
    disposeOnce();
}

void SwCustomizeAddressBlockDialog::dispose()
@@ -984,7 +984,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)

SwAssignFieldsControl::~SwAssignFieldsControl()
{
    dispose();
    disposeOnce();
}

void SwAssignFieldsControl::dispose()
@@ -1209,7 +1209,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(

SwAssignFieldsDialog::~SwAssignFieldsDialog()
{
    dispose();
    disposeOnce();
}

void SwAssignFieldsDialog::dispose()
@@ -1273,7 +1273,7 @@ DDListBox::DDListBox(vcl::Window* pParent, WinBits nStyle)

DDListBox::~DDListBox()
{
    dispose();
    disposeOnce();
}

void DDListBox::dispose()
@@ -1329,7 +1329,7 @@ AddressMultiLineEdit::AddressMultiLineEdit(vcl::Window* pParent, WinBits nBits)

AddressMultiLineEdit::~AddressMultiLineEdit()
{
    dispose();
    disposeOnce();
}

void AddressMultiLineEdit::dispose()
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index fff6018..61a4546 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -92,7 +92,7 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent)

SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage()
{
    dispose();
    disposeOnce();
}

void SwMailMergeDocSelectPage::dispose()
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 15aa60b..1580099 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -292,7 +292,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent)

SwMailMergeGreetingsPage::~SwMailMergeGreetingsPage()
{
    dispose();
    disposeOnce();
}

void SwMailMergeGreetingsPage::dispose()
@@ -484,7 +484,7 @@ SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* _pWi

SwMailBodyDialog::~SwMailBodyDialog()
{
    dispose();
    disposeOnce();
}

void SwMailBodyDialog::dispose()
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index c023331..e00f986 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -155,7 +155,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :

SwMailMergeLayoutPage::~SwMailMergeLayoutPage()
{
    dispose();
    disposeOnce();
}

void SwMailMergeLayoutPage::dispose()
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index f2e4169..9823363 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -52,7 +52,7 @@ SwMailMergeMergePage::SwMailMergeMergePage(SwMailMergeWizard* _pParent)

SwMailMergeMergePage::~SwMailMergeMergePage()
{
    dispose();
    disposeOnce();
}

void SwMailMergeMergePage::dispose()
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 1de4133..00cdcef 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -205,7 +205,7 @@ public:
        get(m_pCCED, "cc");
        get(m_pBCCED, "bcc");
    }
    virtual ~SwCopyToDialog() { dispose(); }
    virtual ~SwCopyToDialog() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        m_pCCED.clear();
@@ -307,7 +307,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage(SwMailMergeWizard* _pParent)

SwMailMergeOutputPage::~SwMailMergeOutputPage()
{
    dispose();
    disposeOnce();
}

void SwMailMergeOutputPage::dispose()
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 9ce000b..f7d8ab3 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -50,7 +50,7 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent)

SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage()
{
    dispose();
    disposeOnce();
}

void SwMailMergeOutputTypePage::dispose()
@@ -227,7 +227,7 @@ class SwSendWarningBox_Impl : public MessageDialog
    VclPtr<VclMultiLineEdit> m_pDetailED;
public:
    SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails);
    virtual ~SwSendWarningBox_Impl() { dispose(); }
    virtual ~SwSendWarningBox_Impl() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        m_pDetailED.clear();
@@ -305,7 +305,7 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& 

SwSendMailDialog::~SwSendMailDialog()
{
    dispose();
    disposeOnce();
}

void SwSendMailDialog::dispose()
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index d768c88..702b26b 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -60,7 +60,7 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP

SwMailMergePrepareMergePage::~SwMailMergePrepareMergePage()
{
    dispose();
    disposeOnce();
}

void SwMailMergePrepareMergePage::dispose()
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index eb99205..309ccb8 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -147,7 +147,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,

SwSelectDBTableDialog::~SwSelectDBTableDialog()
{
    dispose();
    disposeOnce();
}

void SwSelectDBTableDialog::dispose()
diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx
index 192da3c..a5de42b 100644
--- a/sw/source/ui/dialog/abstract.cxx
+++ b/sw/source/ui/dialog/abstract.cxx
@@ -33,7 +33,7 @@ SwInsertAbstractDlg::SwInsertAbstractDlg(vcl::Window* pParent)

SwInsertAbstractDlg::~SwInsertAbstractDlg()
{
    dispose();
    disposeOnce();
}

void SwInsertAbstractDlg::dispose()
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 6960908..d1b6472 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -242,7 +242,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh,

SwAsciiFilterDlg::~SwAsciiFilterDlg()
{
    dispose();
    disposeOnce();
}

void SwAsciiFilterDlg::dispose()
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 9e76121..5277c49 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -75,7 +75,7 @@ SwDocStatPage::SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet)

SwDocStatPage::~SwDocStatPage()
{
    dispose();
    disposeOnce();
}

void SwDocStatPage::dispose()
diff --git a/sw/source/ui/dialog/swmessdialog.cxx b/sw/source/ui/dialog/swmessdialog.cxx
index a93e12a..79aba44 100644
--- a/sw/source/ui/dialog/swmessdialog.cxx
+++ b/sw/source/ui/dialog/swmessdialog.cxx
@@ -32,7 +32,7 @@ SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OUStr

SwMessageAndEditDialog::~SwMessageAndEditDialog()
{
    dispose();
    disposeOnce();
}

void SwMessageAndEditDialog::dispose()
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 6896f5c..8d97a7a 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -516,7 +516,7 @@ sal_uInt16 SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt )

SwEditRegionDlg::~SwEditRegionDlg( )
{
    dispose();
    disposeOnce();
}

void SwEditRegionDlg::dispose()
@@ -1561,7 +1561,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(

SwInsertSectionTabPage::~SwInsertSectionTabPage()
{
    dispose();
    disposeOnce();
}

void SwInsertSectionTabPage::dispose()
@@ -1886,7 +1886,7 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( vcl::Window *pParent,

SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage()
{
    dispose();
    disposeOnce();
}

void SwSectionFtnEndTabPage::dispose()
@@ -2173,7 +2173,7 @@ SwSectionIndentTabPage::SwSectionIndentTabPage(vcl::Window *pParent, const SfxIt

SwSectionIndentTabPage::~SwSectionIndentTabPage()
{
    dispose();
    disposeOnce();
}

void SwSectionIndentTabPage::dispose()
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 8f0ff7d..471309e 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -46,7 +46,7 @@ IMPL_LINK_NOARG(SwWordCountFloatDlg, CloseHdl)

SwWordCountFloatDlg::~SwWordCountFloatDlg()
{
    dispose();
    disposeOnce();
}

void SwWordCountFloatDlg::dispose()
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index 5809ab2..2cde14c 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -37,7 +37,7 @@ SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShort

SwSelGlossaryDlg::~SwSelGlossaryDlg()
{
    dispose();
    disposeOnce();
}

void SwSelGlossaryDlg::dispose()
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 943aa0b..518d1de 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -199,7 +199,7 @@ SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)

SwEnvFmtPage::~SwEnvFmtPage()
{
    dispose();
    disposeOnce();
}

void SwEnvFmtPage::dispose()
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index b0df406..3566307 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -153,7 +153,7 @@ SwEnvDlg::SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet,

SwEnvDlg::~SwEnvDlg()
{
    dispose();
    disposeOnce();
}

void SwEnvDlg::dispose()
@@ -235,7 +235,7 @@ SwEnvPage::SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet)

SwEnvPage::~SwEnvPage()
{
    dispose();
    disposeOnce();
}

void SwEnvPage::dispose()
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 02c99db..79f353b 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -69,7 +69,7 @@ SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)

SwEnvPrtPage::~SwEnvPrtPage()
{
    dispose();
    disposeOnce();
}

void SwEnvPrtPage::dispose()
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index c91582b..9883e9a 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -170,7 +170,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,

SwLabDlg::~SwLabDlg()
{
    dispose();
    disposeOnce();
}

void SwLabDlg::dispose()
@@ -295,7 +295,7 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet)

SwLabPage::~SwLabPage()
{
    dispose();
    disposeOnce();
}

void SwLabPage::dispose()
@@ -616,7 +616,7 @@ SwVisitingCardPage::SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& r

SwVisitingCardPage::~SwVisitingCardPage()
{
    dispose();
    disposeOnce();
}

void SwVisitingCardPage::dispose()
@@ -768,7 +768,7 @@ SwPrivateDataPage::SwPrivateDataPage(vcl::Window* pParent, const SfxItemSet& rSe

SwPrivateDataPage::~SwPrivateDataPage()
{
    dispose();
    disposeOnce();
}

void SwPrivateDataPage::dispose()
@@ -884,7 +884,7 @@ SwBusinessDataPage::SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& r

SwBusinessDataPage::~SwBusinessDataPage()
{
    dispose();
    disposeOnce();
}

void SwBusinessDataPage::dispose()
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 0b2a826..5e526ac 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -353,7 +353,7 @@ SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)

SwLabFmtPage::~SwLabFmtPage()
{
    dispose();
    disposeOnce();
}

void SwLabFmtPage::dispose()
@@ -623,7 +623,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec)

SwSaveLabelDlg::~SwSaveLabelDlg()
{
    dispose();
    disposeOnce();
}

void SwSaveLabelDlg::dispose()
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index c52b88f..f7c304c 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -62,7 +62,7 @@ SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)

SwLabPrtPage::~SwLabPrtPage()
{
    dispose();
    disposeOnce();
}

void SwLabPrtPage::dispose()
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index e7f9173..bab81b7 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -389,7 +389,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,

SwMailMergeDlg::~SwMailMergeDlg()
{
    dispose();
    disposeOnce();
}

void SwMailMergeDlg::dispose()
@@ -673,7 +673,7 @@ SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(vcl::Window* pParent)

SwMailMergeCreateFromDlg::~SwMailMergeCreateFromDlg()
{
    dispose();
    disposeOnce();
}

void SwMailMergeCreateFromDlg::dispose()
@@ -691,7 +691,7 @@ SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(vcl::Window* pPar

SwMailMergeFieldConnectionsDlg::~SwMailMergeFieldConnectionsDlg()
{
    dispose();
    disposeOnce();
}

void SwMailMergeFieldConnectionsDlg::dispose()
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 13453ca..12ebb82 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -73,7 +73,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r

sw::DropDownFieldDialog::~DropDownFieldDialog()
{
    dispose();
    disposeOnce();
}

void sw::DropDownFieldDialog::dispose()
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 224f56b..b94c049 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -164,7 +164,7 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName)
// destroy dialog
SwChangeDBDlg::~SwChangeDBDlg()
{
    dispose();
    disposeOnce();
}

void SwChangeDBDlg::dispose()
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 5faa704..a05a7f2 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -74,7 +74,7 @@ SwFldDBPage::SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)

SwFldDBPage::~SwFldDBPage()
{
    dispose();
    disposeOnce();
}

void SwFldDBPage::dispose()
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 58a9fd0..d5d41f3 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -89,7 +89,7 @@ SwFldDokInfPage::SwFldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSe

SwFldDokInfPage::~SwFldDokInfPage()
{
    dispose();
    disposeOnce();
}

void SwFldDokInfPage::dispose()
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 18df09e..2744141 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -80,7 +80,7 @@ SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )

SwFldDokPage::~SwFldDokPage()
{
    dispose();
    disposeOnce();
}

void SwFldDokPage::dispose()
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index f936b66..2bcc08d 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -214,7 +214,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup)

SwFldEditDlg::~SwFldEditDlg()
{
    dispose();
    disposeOnce();
}

void SwFldEditDlg::dispose()
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 944512b..07d0fdd 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -91,7 +91,7 @@ SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)

SwFldFuncPage::~SwFldFuncPage()
{
    dispose();
    disposeOnce();
}

void SwFldFuncPage::dispose()
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 4bb357e..527e44c 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -107,7 +107,7 @@ SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )

SwFldRefPage::~SwFldRefPage()
{
    dispose();
    disposeOnce();
}

void SwFldRefPage::dispose()
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 9452d98..1163e0a 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -87,7 +87,7 @@ SwFldVarPage::SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )

SwFldVarPage::~SwFldVarPage()
{
    dispose();
    disposeOnce();
}

void SwFldVarPage::dispose()
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 38226fa..1da4ca5 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -108,7 +108,7 @@ SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS,

SwFldInputDlg::~SwFldInputDlg()
{
    dispose();
    disposeOnce();
}

void SwFldInputDlg::dispose()
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index a265ff89..7df369a 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -88,7 +88,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :

SwJavaEditDialog::~SwJavaEditDialog()
{
    dispose();
    disposeOnce();
}

void SwJavaEditDialog::dispose()
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 7a8e036..4f14a5e 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -214,7 +214,7 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh)

SwColumnDlg::~SwColumnDlg()
{
    dispose();
    disposeOnce();
}

void SwColumnDlg::dispose()
@@ -549,7 +549,7 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)

SwColumnPage::~SwColumnPage()
{
    dispose();
    disposeOnce();
}

void SwColumnPage::dispose()
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 82d350b..e3c3f9e 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -412,7 +412,7 @@ void SwCaptionDialog::DrawSample()

SwCaptionDialog::~SwCaptionDialog()
{
    dispose();
    disposeOnce();
}

void SwCaptionDialog::dispose()
@@ -476,7 +476,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV

SwSequenceOptionDialog::~SwSequenceOptionDialog()
{
    dispose();
    disposeOnce();
}

void SwSequenceOptionDialog::dispose()
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 34254ac..f5ca75f 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -714,7 +714,7 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet)

SwFrmPage::~SwFrmPage()
{
    dispose();
    disposeOnce();
}

void SwFrmPage::dispose()
@@ -2403,7 +2403,7 @@ SwGrfExtPage::SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet)

SwGrfExtPage::~SwGrfExtPage()
{
    dispose();
    disposeOnce();
}

void SwGrfExtPage::dispose()
@@ -2756,7 +2756,7 @@ SwFrmURLPage::SwFrmURLPage( vcl::Window *pParent, const SfxItemSet &rSet ) :

SwFrmURLPage::~SwFrmURLPage()
{
    dispose();
    disposeOnce();
}

void SwFrmURLPage::dispose()
@@ -2910,7 +2910,7 @@ SwFrmAddPage::SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet)

SwFrmAddPage::~SwFrmAddPage()
{
    dispose();
    disposeOnce();
}

void SwFrmAddPage::dispose()
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index df3c5c7..56ab5d9 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -133,7 +133,7 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet)

SwWrapTabPage::~SwWrapTabPage()
{
    dispose();
    disposeOnce();
}

void SwWrapTabPage::dispose()
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 784cfc0..76dccb9 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -322,7 +322,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&

SwMultiTOXTabDialog::~SwMultiTOXTabDialog()
{
    dispose();
    disposeOnce();
}

void SwMultiTOXTabDialog::dispose()
@@ -718,7 +718,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent,

SwAddStylesDlg_Impl::~SwAddStylesDlg_Impl()
{
    dispose();
    disposeOnce();
}

void SwAddStylesDlg_Impl::dispose()
@@ -902,7 +902,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r

SwTOXSelectTabPage::~SwTOXSelectTabPage()
{
    dispose();
    disposeOnce();
}

void SwTOXSelectTabPage::dispose()
@@ -1538,7 +1538,7 @@ public:
        m_pParent( pTokenWin )
    {
    }
    virtual ~SwTOXEdit() { dispose(); }
    virtual ~SwTOXEdit() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { m_pParent.clear(); Edit::dispose(); }

    virtual void    KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
@@ -1625,8 +1625,13 @@ public:
        m_pParent(pTokenWin)
    {
    }
<<<<<<< HEAD
    virtual ~SwTOXButton() { dispose(); }
    virtual void dispose() SAL_OVERRIDE { m_pParent.clear(); PushButton::dispose(); }
=======
    virtual ~SwTOXButton() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { m_pParent.disposeAndClear(); PushButton::dispose(); }
>>>>>>> 82c89a6... vclwidget: only call dispose() once

    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
    virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
@@ -1749,7 +1754,7 @@ SwIdxTreeListBox::SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle)

SwIdxTreeListBox::~SwIdxTreeListBox()
{
    dispose();
    disposeOnce();
}

void SwIdxTreeListBox::dispose()
@@ -1959,7 +1964,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt

SwTOXEntryTabPage::~SwTOXEntryTabPage()
{
    dispose();
    disposeOnce();
}

void SwTOXEntryTabPage::dispose()
@@ -2760,7 +2765,7 @@ void SwTokenWindow::setAllocation(const Size &rAllocation)

SwTokenWindow::~SwTokenWindow()
{
    dispose();
    disposeOnce();
}

void SwTokenWindow::dispose()
@@ -3652,7 +3657,7 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& r

SwTOXStylesTabPage::~SwTOXStylesTabPage()
{
    dispose();
    disposeOnce();
}

void SwTOXStylesTabPage::dispose()
@@ -3913,7 +3918,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB

SwEntryBrowseBox::~SwEntryBrowseBox()
{
    dispose();
    disposeOnce();
}

void SwEntryBrowseBox::dispose()
@@ -4212,7 +4217,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAu

SwAutoMarkDlg_Impl::~SwAutoMarkDlg_Impl()
{
    dispose();
    disposeOnce();
}

void SwAutoMarkDlg_Impl::dispose()
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index 5d1dfa0..51cffac 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -63,7 +63,7 @@ void SwMultiTOXMarkDlg::Apply()

SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg()
{
    dispose();
    disposeOnce();
}

void SwMultiTOXMarkDlg::dispose()
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 653ba8b..5c42b0d 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -565,7 +565,7 @@ class SwNewUserIdxDlg : public ModalDialog
                m_pOKPB->Enable(false);
                m_pNameED->GrabFocus();
            }
    virtual ~SwNewUserIdxDlg() { dispose(); }
    virtual ~SwNewUserIdxDlg() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE
    {
        m_pOKPB.clear();
@@ -1527,7 +1527,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,

SwCreateAuthEntryDlg_Impl::~SwCreateAuthEntryDlg_Impl()
{
    dispose();
    disposeOnce();
}

void SwCreateAuthEntryDlg_Impl::dispose()
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 13bc3e7..5eaf63a 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -147,7 +147,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rS, 

SwInsertBookmarkDlg::~SwInsertBookmarkDlg()
{
    dispose();
    disposeOnce();
}

void SwInsertBookmarkDlg::dispose()
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 49bd6c9..73fb010 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -119,7 +119,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN,

SwEndNoteOptionPage::~SwEndNoteOptionPage()
{
    dispose();
    disposeOnce();
}

void SwEndNoteOptionPage::dispose()
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 26b2b94..d5baec1 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -112,7 +112,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent,

SwGlossaryGroupDlg::~SwGlossaryGroupDlg()
{
    dispose();
    disposeOnce();
}

void SwGlossaryGroupDlg::dispose()
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 42f0b99..bcc826e 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -160,7 +160,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(vcl::Window* pParent,

SwNewGlosNameDlg::~SwNewGlosNameDlg()
{
    dispose();
    disposeOnce();
}

void SwNewGlosNameDlg::dispose()
@@ -249,7 +249,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,

SwGlossaryDlg::~SwGlossaryDlg()
{
    dispose();
    disposeOnce();
}

void SwGlossaryDlg::dispose()
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 023db17..0824f3d 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -204,7 +204,7 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(vcl::Window *pParent, SwWrtShell &rShell, boo

SwInsFootNoteDlg::~SwInsFootNoteDlg()
{
    dispose();
    disposeOnce();
}

void SwInsFootNoteDlg::dispose()
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index ee63406..b14903c 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -169,7 +169,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)

SwLineNumberingDlg::~SwLineNumberingDlg()
{
    dispose();
    disposeOnce();
}

void SwLineNumberingDlg::dispose()
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 69d7d24..5fd9698 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -163,7 +163,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent,

SwNumPositionTabPage::~SwNumPositionTabPage()
{
    dispose();
    disposeOnce();
}

void SwNumPositionTabPage::dispose()
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index c4216d09..9d6d290 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -79,7 +79,7 @@ public:

SwNumNamesDlg::~SwNumNamesDlg()
{
    dispose();
    disposeOnce();
}

void SwNumNamesDlg::dispose()
@@ -209,7 +209,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p

SwOutlineTabDialog::~SwOutlineTabDialog()
{
    dispose();
    disposeOnce();
}

void SwOutlineTabDialog::dispose()
@@ -762,7 +762,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl)

SwOutlineSettingsTabPage::~SwOutlineSettingsTabPage()
{
    dispose();
    disposeOnce();
}

void SwOutlineSettingsTabPage::dispose()
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index cd75060..8f1551c 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -135,7 +135,7 @@ SwFootNotePage::SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet)

SwFootNotePage::~SwFootNotePage()
{
    dispose();
    disposeOnce();
}

void SwFootNotePage::dispose()
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 0ff7f97..df7cbcd 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -151,7 +151,7 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) :

SwTextGridPage::~SwTextGridPage()
{
    dispose();
    disposeOnce();
}

void SwTextGridPage::dispose()
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 1b94783..03789e0 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -250,7 +250,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)

SwSortDlg::~SwSortDlg()
{
    dispose();
    disposeOnce();
}

void SwSortDlg::dispose()
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index cb8a89e92..252e264 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -55,7 +55,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(vcl::Window *pParent)

SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg()
{
    dispose();
    disposeOnce();
}

void SwModalRedlineAcceptDlg::dispose()
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index da0a0d4..5f888f3 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -270,7 +270,7 @@ IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl)

SwTitlePageDlg::~SwTitlePageDlg()
{
    dispose();
    disposeOnce();
}

void SwTitlePageDlg::dispose()
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index b7a212b..50ffa47 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -68,7 +68,7 @@ SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc )

SwTableWidthDlg::~SwTableWidthDlg()
{
    dispose();
    disposeOnce();
}

void SwTableWidthDlg::dispose()
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 907b6cd..63fb7aa 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -174,7 +174,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )

SwConvertTableDlg:: ~SwConvertTableDlg()
{
    dispose();
    disposeOnce();
}

void SwConvertTableDlg::dispose()
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index d4f9d3a2..e673194 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -137,7 +137,7 @@ IMPL_LINK_NOARG(SwInsTableDlg, OKHdl)

SwInsTableDlg::~SwInsTableDlg()
{
    dispose();
    disposeOnce();
}

void SwInsTableDlg::dispose()
diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx
index 6e687b7..1206a8b 100644
--- a/sw/source/ui/table/mergetbl.cxx
+++ b/sw/source/ui/table/mergetbl.cxx
@@ -30,7 +30,7 @@ SwMergeTblDlg::SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev )

SwMergeTblDlg::~SwMergeTblDlg()
{
    dispose();
    disposeOnce();
}

void SwMergeTblDlg::dispose()
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 70cc897..6c8bdb4 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -77,7 +77,7 @@ SwTableHeightDlg::SwTableHeightDlg(vcl::Window *pParent, SwWrtShell &rS)

SwTableHeightDlg::~SwTableHeightDlg()
{
    dispose();
    disposeOnce();
}

void SwTableHeightDlg::dispose()
diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx
index 7fab281..c1d0048 100644
--- a/sw/source/ui/table/splittbl.cxx
+++ b/sw/source/ui/table/splittbl.cxx
@@ -35,7 +35,7 @@ SwSplitTblDlg::SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh )

SwSplitTblDlg::~SwSplitTblDlg()
{
    dispose();
    disposeOnce();
}

void SwSplitTblDlg::dispose()
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b3d529c..23103b1 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -107,7 +107,7 @@ SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSe

SwFormatTablePage::~SwFormatTablePage()
{
    dispose();
    disposeOnce();
}

void SwFormatTablePage::dispose()
@@ -777,7 +777,7 @@ SwTableColumnPage::SwTableColumnPage(vcl::Window* pParent, const SfxItemSet& rSe

SwTableColumnPage::~SwTableColumnPage()
{
    dispose();
    disposeOnce();
}

void SwTableColumnPage::dispose()
@@ -1352,7 +1352,7 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet)

SwTextFlowPage::~SwTextFlowPage()
{
    dispose();
    disposeOnce();
}

void SwTextFlowPage::dispose()
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 7ddf935..49f7f58 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -132,7 +132,7 @@ OUString SwStringInputDlg::GetInputString() const

SwStringInputDlg::~SwStringInputDlg()
{
    dispose();
    disposeOnce();
}

void SwStringInputDlg::dispose()
@@ -183,7 +183,7 @@ SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell,

SwAutoFormatDlg::~SwAutoFormatDlg()
{
    dispose();
    disposeOnce();
}

void SwAutoFormatDlg::dispose()
@@ -565,7 +565,7 @@ void AutoFmtPreview::DetectRTL(SwWrtShell* pWrtShell)

AutoFmtPreview::~AutoFmtPreview()
{
    dispose();
    disposeOnce();
}

void AutoFmtPreview::dispose()
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 34aae67..f2ebdb3 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -76,7 +76,7 @@ SwRenameXNamedDlg::SwRenameXNamedDlg( vcl::Window* pWin,

SwRenameXNamedDlg::~SwRenameXNamedDlg()
{
    dispose();
    disposeOnce();
}

void SwRenameXNamedDlg::dispose()
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 0227a58..70ef937 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -196,7 +196,7 @@ Size SwDBTreeList::GetOptimalSize() const

SwDBTreeList::~SwDBTreeList()
{
    dispose();
    disposeOnce();
}

void SwDBTreeList::dispose()
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index b768d11..c4112ee 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -44,7 +44,7 @@ PrintMonitor::PrintMonitor(vcl::Window *pParent, bool modal, PrintMonitorType eT

PrintMonitor::~PrintMonitor()
{
    dispose();
    disposeOnce();
}

void PrintMonitor::dispose()
@@ -73,7 +73,7 @@ CreateMonitor::CreateMonitor( vcl::Window *pParent, bool modal )

CreateMonitor::~CreateMonitor()
{
    dispose();
    disposeOnce();
}

void CreateMonitor::dispose()
@@ -114,7 +114,7 @@ CancelableDialog::CancelableDialog( vcl::Window *pParent, bool modal,

CancelableDialog::~CancelableDialog()
{
    dispose();
    disposeOnce();
}

void CancelableDialog::dispose()
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
index df756fb..f3feeaa 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -75,7 +75,7 @@ SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings,

SwMailMergeChildWin::~SwMailMergeChildWin()
{
    dispose();
    disposeOnce();
}

void SwMailMergeChildWin::dispose()
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 1812536..fb26720 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -197,7 +197,7 @@ SwAddressPreview::SwAddressPreview(vcl::Window* pParent, WinBits nStyle)

SwAddressPreview::~SwAddressPreview()
{
    dispose();
    disposeOnce();
}

void SwAddressPreview::dispose()
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index fbbed6b..14c4863 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -58,7 +58,13 @@ AnnotationMenuButton::AnnotationMenuButton( sw::sidebarwindows::SwSidebarWin& rS

AnnotationMenuButton::~AnnotationMenuButton()
{
    disposeOnce();
}

void AnnotationMenuButton::dispose()
{
    RemoveEventListener( LINK( &mrSidebarWin, sw::sidebarwindows::SwSidebarWin, WindowEventListener ) );
    MenuButton::dispose();
}

void AnnotationMenuButton::Select()
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
index 1bc2c13..9682bcf 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
@@ -33,6 +33,7 @@ class AnnotationMenuButton : public MenuButton
    public:
        AnnotationMenuButton( sw::sidebarwindows::SwSidebarWin& rSidebarWin );
        virtual ~AnnotationMenuButton();
        virtual void dispose() SAL_OVERRIDE;

        // override MenuButton methods
        virtual void Select() SAL_OVERRIDE;
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 372fa81..2d253ba 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -70,7 +70,7 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,

SwAnnotationWin::~SwAnnotationWin()
{
    dispose();
    disposeOnce();
}

void SwAnnotationWin::dispose()
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index c415f6e..e96a838 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -169,7 +169,7 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwPageFrm* pPag

SwHeaderFooterWin::~SwHeaderFooterWin( )
{
    dispose();
    disposeOnce();
}

void SwHeaderFooterWin::dispose()
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index cc09543..703c8c1 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -62,7 +62,7 @@ namespace
            SwBreakDashedLine( vcl::Window* pParent, Color& ( *pColorFn )(), SwPageBreakWin* pWin ) :
                SwDashedLine( pParent, pColorFn ),
                m_pWin( pWin ) {};
            virtual ~SwBreakDashedLine() { dispose(); }
            virtual ~SwBreakDashedLine() { disposeOnce(); }
            virtual void dispose() SAL_OVERRIDE { m_pWin.clear(); SwDashedLine::dispose(); }

            virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -118,7 +118,7 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm )

SwPageBreakWin::~SwPageBreakWin( )
{
    dispose();
    disposeOnce();
}

void SwPageBreakWin::dispose()
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 88f5316..fcb3eb6 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -70,7 +70,13 @@ SidebarTxtControl::SidebarTxtControl( SwSidebarWin& rSidebarWin,

SidebarTxtControl::~SidebarTxtControl()
{
    disposeOnce();
}

void SidebarTxtControl::dispose()
{
    RemoveEventListener( LINK( &mrSidebarWin, SwSidebarWin, WindowEventListener ) );
    Control::dispose();
}

OutlinerView* SidebarTxtControl::GetTextView() const
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index f145020..4bd1fe8 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -58,6 +58,7 @@ class SidebarTxtControl : public Control
                           SwView& rDocView,
                           SwPostItMgr& rPostItMgr );
        virtual ~SidebarTxtControl();
        virtual void dispose() SAL_OVERRIDE;

        virtual void GetFocus() SAL_OVERRIDE;

diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 296ba3b..ebd0021 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -137,7 +137,7 @@ SwSidebarWin::SwSidebarWin( SwEditWin& rEditWin,

SwSidebarWin::~SwSidebarWin()
{
    dispose();
    disposeOnce();
}

void SwSidebarWin::dispose()
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 1e2b292..cc10c20 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4968,7 +4968,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):

SwEditWin::~SwEditWin()
{
    dispose();
    disposeOnce();
}

void SwEditWin::dispose()
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index f46685b..3068102 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -270,7 +270,7 @@ SwSrcEditWindow::SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView )

SwSrcEditWindow::~SwSrcEditWindow()
{
    dispose();
    disposeOnce();
}

void SwSrcEditWindow::dispose()
diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
index 361f2ba..2032aba 100644
--- a/sw/source/uibase/envelp/syncbtn.cxx
+++ b/sw/source/uibase/envelp/syncbtn.cxx
@@ -70,7 +70,7 @@ SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings,

SwSyncBtnDlg::~SwSyncBtnDlg()
{
    dispose();
    disposeOnce();
}

void SwSyncBtnDlg::dispose()
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index ec49c35..2c5df53 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -487,7 +487,7 @@ Size SwColumnOnlyExample::GetOptimalSize() const

SwPageGridExample::~SwPageGridExample()
{
    dispose();
    disposeOnce();
}

void SwPageGridExample::dispose()
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 14c81b6..88c586a 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -63,7 +63,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwNumberingTypeListBox

SwNumberingTypeListBox::~SwNumberingTypeListBox()
{
    dispose();
    disposeOnce();
}

void SwNumberingTypeListBox::dispose()
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 0f0b34c..c2f616c 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -137,7 +137,7 @@ void SwModelessRedlineAcceptDlg::FillInfo(SfxChildWinInfo& rInfo) const

SwModelessRedlineAcceptDlg::~SwModelessRedlineAcceptDlg()
{
    dispose();
    disposeOnce();
}

void SwModelessRedlineAcceptDlg::dispose()
@@ -1248,7 +1248,7 @@ SwRedlineAcceptPanel::SwRedlineAcceptPanel(vcl::Window* pParent, const css::uno:

SwRedlineAcceptPanel::~SwRedlineAcceptPanel()
{
    dispose();
    disposeOnce();
}

void SwRedlineAcceptPanel::dispose()
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 675a17b..5440c22 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -51,7 +51,7 @@ SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, vcl::Window* pParent, SwEd
// Destructor
SwCommentRuler::~SwCommentRuler()
{
    dispose();
    disposeOnce();
}

void SwCommentRuler::dispose()
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 6f01222..b2dc3c1 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -127,7 +127,7 @@ SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind )

SwInputWindow::~SwInputWindow()
{
    dispose();
    disposeOnce();
}

void SwInputWindow::dispose()
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 4fb3b9f..a6c9415 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -448,7 +448,7 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& 

SwScrollNaviPopup::~SwScrollNaviPopup()
{
    dispose();
    disposeOnce();
}

void SwScrollNaviPopup::dispose()
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index 47a3477..23676cbc 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -77,7 +77,7 @@ PageColumnControl::PageColumnControl(

PageColumnControl::~PageColumnControl(void)
{
    dispose();
    disposeOnce();
}

void PageColumnControl::dispose()
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 14f6bef..e01c373 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -133,7 +133,7 @@ PageMarginControl::PageMarginControl(

PageMarginControl::~PageMarginControl()
{
    dispose();
    disposeOnce();
}

void PageMarginControl::dispose()
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index 2ca1375..ccca113 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -63,7 +63,7 @@ PageOrientationControl::PageOrientationControl(

PageOrientationControl::~PageOrientationControl(void)
{
    dispose();
    disposeOnce();
}

void PageOrientationControl::dispose()
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 1ce8f61..c04874d 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -200,7 +200,7 @@ PagePropertyPanel::PagePropertyPanel(

PagePropertyPanel::~PagePropertyPanel()
{
    dispose();
    disposeOnce();
}

void PagePropertyPanel::dispose()
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 5218a78..6eb4ea3 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -143,7 +143,7 @@ PageSizeControl::PageSizeControl(

PageSizeControl::~PageSizeControl()
{
    dispose();
    disposeOnce();
}

void PageSizeControl::dispose()
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index d1fffd6..71c873f 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -89,7 +89,7 @@ WrapPropertyPanel::WrapPropertyPanel(

WrapPropertyPanel::~WrapPropertyPanel()
{
    dispose();
    disposeOnce();
}

void WrapPropertyPanel::dispose()
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index ccd5cb1..9e2f997 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -168,7 +168,7 @@ SwPreviewZoomDlg::SwPreviewZoomDlg( SwPagePreviewWin& rParent )

SwPreviewZoomDlg::~SwPreviewZoomDlg()
{
    dispose();
    disposeOnce();
}

void SwPreviewZoomDlg::dispose()
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 35395a0..6c8d9ad 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -856,7 +856,7 @@ SwFieldDialog::SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ) :

SwFieldDialog::~SwFieldDialog()
{
    dispose();
    disposeOnce();
}

void SwFieldDialog::dispose()
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 3220307..40b1154 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -843,7 +843,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)

SwContentTree::~SwContentTree()
{
    dispose();
    disposeOnce();
}

void SwContentTree::dispose()
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 7a9fafe..c93db9b 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -180,7 +180,7 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, const ResId& rResId) :

SwGlobalTree::~SwGlobalTree()
{
    dispose();
    disposeOnce();
}

void SwGlobalTree::dispose()
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 1e4e794..eb6be8e 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -78,7 +78,7 @@ SwGlossDecideDlg::SwGlossDecideDlg(vcl::Window* pParent)

SwGlossDecideDlg::~SwGlossDecideDlg()
{
    dispose();
    disposeOnce();
}

void SwGlossDecideDlg::dispose()
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 0f50639..1032b7f 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -841,7 +841,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,

SwNavigationPI::~SwNavigationPI()
{
    dispose();
    disposeOnce();
}

void SwNavigationPI::dispose()
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index a473498..64590d8 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -109,7 +109,7 @@ void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)

NumFormatListBox::~NumFormatListBox()
{
    dispose();
    disposeOnce();
}

void NumFormatListBox::dispose()
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index 0f568fc..58362cb 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -34,7 +34,7 @@ AuthFallbackDlg::AuthFallbackDlg(Window* pParent, const OUString& instructions,

AuthFallbackDlg::~AuthFallbackDlg()
{
    dispose();
    disposeOnce();
}

void AuthFallbackDlg::dispose()
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index ca0ef80..1bd824b 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -59,7 +59,7 @@ FilterDialog::FilterDialog( vcl::Window* pParentWindow )

FilterDialog::~FilterDialog()
{
    dispose();
    disposeOnce();
}

void FilterDialog::dispose()
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index facfdf6..ca44729 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -38,7 +38,7 @@ using namespace com::sun::star;

LoginDialog::~LoginDialog()
{
    dispose();
    disposeOnce();
}

void LoginDialog::dispose()
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 9528901..91f9186 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -65,7 +65,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, Res

MasterPasswordCreateDialog::~MasterPasswordCreateDialog()
{
    dispose();
    disposeOnce();
}

void MasterPasswordCreateDialog::dispose()
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 7a10b30..98dfad1 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -58,7 +58,7 @@ MasterPasswordDialog::MasterPasswordDialog

MasterPasswordDialog::~MasterPasswordDialog()
{
    dispose();
    disposeOnce();
}

void MasterPasswordDialog::dispose()
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 4329dd6..032e6e7 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -96,7 +96,7 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,

NameClashDialog::~NameClashDialog()
{
    dispose();
    disposeOnce();
}

void NameClashDialog::dispose()
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index c0872bc..c855226 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -84,7 +84,7 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,

PasswordDialog::~PasswordDialog()
{
    dispose();
    disposeOnce();
}

void PasswordDialog::dispose()
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index bde5dc28..cb32f76 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -89,7 +89,7 @@ MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr

MacroWarning::~MacroWarning()
{
    dispose();
    disposeOnce();
}

void MacroWarning::dispose()
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 8a30bd5..731882c 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -77,7 +77,7 @@ UnknownAuthDialog::UnknownAuthDialog(vcl::Window* pParent,

UnknownAuthDialog::~UnknownAuthDialog()
{
    dispose();
    disposeOnce();
}

void UnknownAuthDialog::dispose()
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index d8c1849..62a4bdd 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -101,7 +101,7 @@ namespace
    public:
        // parent window, Query text, initial value
        QueryString(vcl::Window*, OUString &, OUString &);
        virtual ~QueryString() { dispose(); }
        virtual ~QueryString() { disposeOnce(); }
        virtual void dispose() SAL_OVERRIDE
        {
            m_pOKButton.clear();
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index a67c9de..1603b8e 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -93,7 +93,7 @@ RTSDialog::RTSDialog(const PrinterInfo& rJobData, vcl::Window* pParent)

RTSDialog::~RTSDialog()
{
    dispose();
    disposeOnce();
}

void RTSDialog::dispose()
@@ -196,7 +196,7 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)

RTSPaperPage::~RTSPaperPage()
{
    dispose();
    disposeOnce();
}

void RTSPaperPage::dispose()
@@ -378,7 +378,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )

RTSDevicePage::~RTSDevicePage()
{
    dispose();
    disposeOnce();
}

void RTSDevicePage::dispose()
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 2a46022..d73dcc8 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -102,7 +102,7 @@ public:
    DisposableChild(vcl::Window *pParent) : vcl::Window(pParent) {}
    virtual ~DisposableChild()
    {
        dispose();
        disposeOnce();
    }
};

diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 859f0c8..50151ac 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -290,7 +290,7 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal

HelpTextWindow::~HelpTextWindow()
{
    dispose();
    disposeOnce();
}

void HelpTextWindow::dispose()
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index fb1a4a8..7bcea27 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -95,7 +95,7 @@ Button::Button( WindowType nType ) :

Button::~Button()
{
    dispose();
    disposeOnce();
}

void Button::dispose()
@@ -2309,7 +2309,7 @@ void RadioButton::ImplLoadRes( const ResId& rResId )

RadioButton::~RadioButton()
{
    dispose();
    disposeOnce();
}

void RadioButton::dispose()
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 969cadc..c5ef3eb 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -68,7 +68,7 @@ ComboBox::ComboBox( vcl::Window* pParent, const ResId& rResId ) :

ComboBox::~ComboBox()
{
    dispose();
    disposeOnce();
}

void ComboBox::dispose()
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 264a546..85ca495 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -67,7 +67,7 @@ Control::Control( vcl::Window* pParent, const ResId& rResId ) :

Control::~Control()
{
   dispose();
    disposeOnce();
}

void Control::dispose()
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 8fe828e..63511fd 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -239,7 +239,7 @@ bool Edit::set_property(const OString &rKey, const OString &rValue)

Edit::~Edit()
{
    dispose();
    disposeOnce();
}

void Edit::dispose()
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 52b8bda..69922de 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -460,7 +460,7 @@ void FixedText::set_mnemonic_widget(vcl::Window *pWindow)

FixedText::~FixedText()
{
    dispose();
    disposeOnce();
}

void FixedText::dispose()
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index fce7d3f..d6fde49 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -536,7 +536,7 @@ ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle ) 

ImplListBoxWindow::~ImplListBoxWindow()
{
    dispose();
    disposeOnce();
}

void ImplListBoxWindow::dispose()
@@ -2169,7 +2169,7 @@ ImplListBox::ImplListBox( vcl::Window* pParent, WinBits nWinStyle ) :

ImplListBox::~ImplListBox()
{
    dispose();
    disposeOnce();
}

void ImplListBox::dispose()
@@ -2933,7 +2933,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( vcl::Window* pParent ) :

ImplListBoxFloatingWindow::~ImplListBoxFloatingWindow()
{
    dispose();
    disposeOnce();
}

void ImplListBoxFloatingWindow::dispose()
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 1e50eee..00eba39 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -70,7 +70,7 @@ ListBox::ListBox( vcl::Window* pParent, const ResId& rResId ) :

ListBox::~ListBox()
{
    dispose();
    disposeOnce();
}

void ListBox::dispose()
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index f388867..314c41a 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -82,7 +82,7 @@ MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits )

MenuButton::~MenuButton()
{
    dispose();
    disposeOnce();
}

void MenuButton::dispose()
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index eb28f3a..aa542ca 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -80,7 +80,7 @@ MoreButton::MoreButton( vcl::Window* pParent, WinBits nStyle ) :

MoreButton::~MoreButton()
{
    dispose();
    disposeOnce();
}

void MoreButton::dispose()
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index ddefa9a..0db5ffb 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -125,7 +125,7 @@ ScrollBar::ScrollBar( vcl::Window* pParent, WinBits nStyle ) :

ScrollBar::~ScrollBar()
{
    dispose();
    disposeOnce();
}

void ScrollBar::dispose()
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 4fcd128..03af006 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -359,7 +359,7 @@ SpinField::SpinField( vcl::Window* pParent, const ResId& rResId ) :

SpinField::~SpinField()
{
    dispose();
    disposeOnce();
}

void SpinField::dispose()
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index ecb2c60..961dd91 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -192,7 +192,7 @@ TabControl::TabControl( vcl::Window* pParent, WinBits nStyle ) :

TabControl::~TabControl()
{
    dispose();
    disposeOnce();
}

void TabControl::dispose()
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index e91f24b..eedadc4 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -59,7 +59,7 @@ Throbber::Throbber( vcl::Window* i_parentWindow, WinBits i_style, const ImageSet

Throbber::~Throbber()
{
    dispose();
    disposeOnce();
}

void Throbber::dispose()
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 30213f5..f11e404 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -724,7 +724,7 @@ TextWindow::TextWindow( vcl::Window* pParent ) : Window( pParent )

TextWindow::~TextWindow()
{
    dispose();
    disposeOnce();
}

void TextWindow::dispose()
@@ -937,7 +937,7 @@ VclMultiLineEdit::VclMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle )

VclMultiLineEdit::~VclMultiLineEdit()
{
    dispose();
    disposeOnce();
}

void VclMultiLineEdit::dispose()
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index a023af6..127ece3 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1846,7 +1846,7 @@ ImplBorderWindow::ImplBorderWindow( vcl::Window* pParent, WinBits nStyle ,

ImplBorderWindow::~ImplBorderWindow()
{
    dispose();
    disposeOnce();
}

void ImplBorderWindow::dispose()
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index cc3c69e..37a4b3a 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -59,7 +59,7 @@ ButtonDialog::ButtonDialog( vcl::Window* pParent, WinBits nStyle ) :

ButtonDialog::~ButtonDialog()
{
    dispose();
    disposeOnce();
}

void ButtonDialog::dispose()
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 6c86419..1ade01e 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -544,7 +544,7 @@ void Dialog::settingOptimalLayoutSize(Window *pBox)

Dialog::~Dialog()
{
    dispose();
    disposeOnce();
}

void Dialog::dispose()
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 1aad1dc..43ce7bd 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -92,7 +92,7 @@ DockingAreaWindow::DockingAreaWindow( vcl::Window* pParent ) :

DockingAreaWindow::~DockingAreaWindow()
{
    dispose();
    disposeOnce();
}

void DockingAreaWindow::dispose()
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index ab5b04d..2010fd9 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -98,7 +98,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits,

ImplDockFloatWin2::~ImplDockFloatWin2()
{
    dispose();
    disposeOnce();
}

void ImplDockFloatWin2::dispose()
@@ -521,7 +521,7 @@ ImplPopupFloatWin::ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWra

ImplPopupFloatWin::~ImplPopupFloatWin()
{
    dispose();
    disposeOnce();
}

void ImplPopupFloatWin::dispose()
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 853e759f..6ceafc2 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -112,7 +112,7 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits,

ImplDockFloatWin::~ImplDockFloatWin()
{
    dispose();
    disposeOnce();
}

void ImplDockFloatWin::dispose()
@@ -471,7 +471,7 @@ DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID,

DockingWindow::~DockingWindow()
{
    dispose();
    disposeOnce();
}

void DockingWindow::dispose()
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 7102b60..3b41ab0 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -185,7 +185,7 @@ void FloatingWindow::doDeferredInit(WinBits nBits)

FloatingWindow::~FloatingWindow()
{
    dispose();
    disposeOnce();
}

void FloatingWindow::dispose()
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index 709f976..3dae19c 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -40,7 +40,7 @@ IntroWindow::IntroWindow( ) :

IntroWindow::~IntroWindow()
{
    dispose();
    disposeOnce();
}

void IntroWindow::dispose()
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index e763b77..d0933b1 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1288,7 +1288,7 @@ void VclBin::setAllocation(const Size &rAllocation)

VclFrame::~VclFrame()
{
    dispose();
    disposeOnce();
}

void VclFrame::dispose()
@@ -2041,7 +2041,7 @@ void MessageDialog::dispose()

MessageDialog::~MessageDialog()
{
    dispose();
    disposeOnce();
}

void MessageDialog::response(short nResponseId)
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index ac2170b..08b820c 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -165,7 +165,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) :

MenuBarWindow::~MenuBarWindow()
{
    dispose();
    disposeOnce();
}

void MenuBarWindow::dispose()
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 66297ea..62c43e2 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -104,7 +104,7 @@ void MenuFloatingWindow::doShutdown()

MenuFloatingWindow::~MenuFloatingWindow()
{
    dispose();
    disposeOnce();
}

void MenuFloatingWindow::dispose()
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 5527aa5..a96011b 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -151,7 +151,7 @@ MessBox::MessBox( vcl::Window* pParent, WinBits nStyle,

MessBox::~MessBox()
{
    dispose();
    disposeOnce();
}

void MessBox::dispose()
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index d026be2..13cf52e 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -41,7 +41,7 @@ OpenGLWindow::OpenGLWindow(vcl::Window* pParent):

OpenGLWindow::~OpenGLWindow()
{
    dispose();
    disposeOnce();
}

void OpenGLWindow::dispose()
diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx
index fec8ebc..2d9c526 100644
--- a/vcl/source/window/popupmenuwindow.cxx
+++ b/vcl/source/window/popupmenuwindow.cxx
@@ -46,7 +46,7 @@ PopupMenuFloatingWindow::PopupMenuFloatingWindow( vcl::Window* pParent, WinBits 

PopupMenuFloatingWindow::~PopupMenuFloatingWindow()
{
    dispose();
    disposeOnce();
}

void PopupMenuFloatingWindow::dispose()
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index bf4081a..096f26f 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -82,7 +82,7 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( vcl::Window* i_pParent )

PrintDialog::PrintPreviewWindow::~PrintPreviewWindow()
{
    dispose();
    disposeOnce();
}

void PrintDialog::PrintPreviewWindow::dispose()
@@ -716,7 +716,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC

PrintDialog::~PrintDialog()
{
    dispose();
    disposeOnce();
}

void PrintDialog::dispose()
@@ -1916,7 +1916,7 @@ PrintProgressDialog::PrintProgressDialog(vcl::Window* i_pParent, int i_nMax)

PrintProgressDialog::~PrintProgressDialog()
{
    dispose();
    disposeOnce();
}

void PrintProgressDialog::dispose()
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 7d4b232..22f19a7 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -84,7 +84,7 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) :

ImplWheelWindow::~ImplWheelWindow()
{
    dispose();
    disposeOnce();
}

void ImplWheelWindow::dispose()
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 8201ea1..70482c0 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -151,7 +151,7 @@ Splitter::Splitter( vcl::Window* pParent, WinBits nStyle ) :

Splitter::~Splitter()
{
    dispose();
    disposeOnce();
}

void Splitter::dispose()
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 0e43c0c..4884a92 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1347,7 +1347,7 @@ SplitWindow::SplitWindow( vcl::Window* pParent, WinBits nStyle ) :

SplitWindow::~SplitWindow()
{
    dispose();
    disposeOnce();
}

void SplitWindow::dispose()
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 15db5b5..95a6d4c2 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -151,7 +151,7 @@ StatusBar::StatusBar( vcl::Window* pParent, WinBits nStyle ) :

StatusBar::~StatusBar()
{
    dispose();
    disposeOnce();
}

void StatusBar::dispose()
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 119bd1b..6181709 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -133,7 +133,7 @@ SystemChildWindow::SystemChildWindow( vcl::Window* pParent, WinBits nStyle, Syst

SystemChildWindow::~SystemChildWindow()
{
    dispose();
    disposeOnce();
}

void SystemChildWindow::dispose()
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index e13f1a2..9cb57f3 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -106,7 +106,7 @@ void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUStri

SystemWindow::~SystemWindow()
{
    dispose();
    disposeOnce();
}

void SystemWindow::dispose()
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 4f52d5c..3f31767 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -221,7 +221,7 @@ TabDialog::TabDialog( vcl::Window* pParent, const OUString& rID, const OUString&

TabDialog::~TabDialog()
{
    dispose();
    disposeOnce();
}

void TabDialog::dispose()
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 995438f..964f960 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -87,7 +87,7 @@ TabPage::TabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXM

TabPage::~TabPage()
{
    dispose();
    disposeOnce();
}

void TabPage::dispose()
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 678bd43..83d61cb 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1570,7 +1570,7 @@ ToolBox::ToolBox( vcl::Window* pParent, const ResId& rResId ) :

ToolBox::~ToolBox()
{
    dispose();
    disposeOnce();
}

void ToolBox::dispose()
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c2ac77f..5f53a4d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -137,6 +137,12 @@ bool Window::IsDisposed() const
    return !mpWindowImpl;
}

void Window::disposeOnce()
{
    if (!IsDisposed())
        dispose();
}

void Window::dispose()
{
    if (IsDisposed())
@@ -580,7 +586,7 @@ void Window::dispose()
Window::~Window()
{
    vcl::LazyDeletor<vcl::Window>::Undelete( this );
    dispose();
    disposeOnce();
}

} /* namespace vcl */
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index d53718a..cdd4be9 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -113,7 +113,7 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) :

WorkWindow::~WorkWindow()
{
    dispose();
    disposeOnce();
}

void WorkWindow::dispose()
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 3bac12e..e05f29c 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -124,7 +124,7 @@ XIMStatusWindow::XIMStatusWindow( bool bOn ) :

XIMStatusWindow::~XIMStatusWindow()
{
    dispose();
    disposeOnce();
}

void XIMStatusWindow::dispose()
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index a38c01a..533b076 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -941,7 +941,7 @@ namespace

    RTSPWDialog::~RTSPWDialog()
    {
        dispose();
        disposeOnce();
    }

    void RTSPWDialog::dispose()
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 481818b..8562feb 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -74,7 +74,7 @@ public:
    VclPtr<FixedBitmap> mpFixedBitmap;

    MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
    virtual ~MyWorkWindow() { dispose(); }
    virtual ~MyWorkWindow() { disposeOnce(); }
    virtual void dispose() SAL_OVERRIDE { mpFixedBitmap.clear(); WorkWindow::dispose(); }
    void LoadGraphic( const OUString& sImageFile );

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 33c4eff..18fb1c6 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1384,7 +1384,7 @@ public:
    }
    virtual ~DemoWin()
    {
        dispose();
        disposeOnce();
    }
    virtual void dispose() SAL_OVERRIDE
    {
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 28050b6..1616b81 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -81,7 +81,7 @@ CertificateChooser::CertificateChooser( vcl::Window* _pParent, uno::Reference< u

CertificateChooser::~CertificateChooser()
{
    dispose();
    disposeOnce();
}

void CertificateChooser::dispose()
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 5c77f69..5ca8435 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -61,7 +61,7 @@ CertificateViewer::CertificateViewer(

CertificateViewer::~CertificateViewer()
{
    dispose();
    disposeOnce();
}

void CertificateViewer::dispose()
@@ -82,7 +82,7 @@ CertificateViewerTP::CertificateViewerTP( vcl::Window* _pParent, const OString& 

CertificateViewerTP::~CertificateViewerTP()
{
    dispose();
    disposeOnce();
}

void CertificateViewerTP::dispose()
@@ -151,7 +151,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C

CertificateViewerGeneralTP::~CertificateViewerGeneralTP()
{
    dispose();
    disposeOnce();
}

void CertificateViewerGeneralTP::dispose()
@@ -293,7 +293,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, C

CertificateViewerDetailsTP::~CertificateViewerDetailsTP()
{
    dispose();
    disposeOnce();
}

void CertificateViewerDetailsTP::dispose()
@@ -372,7 +372,7 @@ CertificateViewerCertPathTP::CertificateViewerCertPathTP( vcl::Window* _pParent,

CertificateViewerCertPathTP::~CertificateViewerCertPathTP()
{
    dispose();
    disposeOnce();
}

void CertificateViewerCertPathTP::dispose()
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 9cfde2b..444b699 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -235,7 +235,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(

DigitalSignaturesDialog::~DigitalSignaturesDialog()
{
    dispose();
    disposeOnce();
}

void DigitalSignaturesDialog::dispose()
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 6ff60ac..8924a49 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -84,7 +84,7 @@ MacroSecurity::MacroSecurity( vcl::Window* _pParent,

MacroSecurity::~MacroSecurity()
{
    dispose();
    disposeOnce();
}

void MacroSecurity::dispose()
@@ -108,7 +108,7 @@ MacroSecurityTP::MacroSecurityTP(vcl::Window* _pParent, const OString& rID,

MacroSecurityTP::~MacroSecurityTP()
{
    dispose();
    disposeOnce();
}

void MacroSecurityTP::dispose()
@@ -172,7 +172,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP(vcl::Window* _pParent, MacroSecurity*

MacroSecurityLevelTP::~MacroSecurityLevelTP()
{
    dispose();
    disposeOnce();
}

void MacroSecurityLevelTP::dispose()
@@ -430,7 +430,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(vcl::Window* _pPare

MacroSecurityTrustedSourcesTP::~MacroSecurityTrustedSourcesTP()
{
    dispose();
    disposeOnce();
}

void MacroSecurityTrustedSourcesTP::dispose()