[Libreoffice-commits] core.git: Branch 'feature/vclref' - avmedia/source basctl/source basic/source chart2/source compilerplugins/clang cui/source dbaccess/source desktop/source extensions/source filter/source forms/source formula/source fpicker/source framework/source include/vcl mysqlc/source odk/examples reportdesign/source sc/source sd/source sfx2/source starmath/inc starmath/source svtools/source svx/source svx/workben sw/qa sw/source uui/source vcl/generic vcl/qa vcl/source vcl/unx vcl/workben xmlsecurity/source

Noel Grandin noel at peralex.com
Tue Mar 10 02:47:20 PDT 2015


 avmedia/source/framework/mediacontrol.cxx                              |    2 
 avmedia/source/framework/mediaplayer.cxx                               |    2 
 avmedia/source/viewer/mediawindow_impl.cxx                             |    2 
 basctl/source/basicide/basicbox.cxx                                    |    6 +-
 basctl/source/basicide/baside2.cxx                                     |    4 -
 basctl/source/basicide/baside2b.cxx                                    |   14 +++---
 basctl/source/basicide/baside3.cxx                                     |    2 
 basctl/source/basicide/bastype2.cxx                                    |    2 
 basctl/source/basicide/bastypes.cxx                                    |    4 -
 basctl/source/basicide/brkdlg.cxx                                      |    2 
 basctl/source/basicide/layout.cxx                                      |    2 
 basctl/source/basicide/linenumberwindow.cxx                            |    2 
 basctl/source/basicide/macrodlg.cxx                                    |    2 
 basctl/source/basicide/moduldl2.cxx                                    |   10 ++--
 basctl/source/basicide/moduldlg.cxx                                    |    6 +-
 basctl/source/basicide/objdlg.cxx                                      |    2 
 basctl/source/dlged/managelang.cxx                                     |    4 -
 basctl/source/dlged/propbrw.cxx                                        |    2 
 basic/source/runtime/inputbox.cxx                                      |    2 
 basic/source/runtime/iosys.cxx                                         |    2 
 chart2/source/controller/dialogs/DataBrowser.cxx                       |    2 
 chart2/source/controller/dialogs/dlg_ChartType.cxx                     |    2 
 chart2/source/controller/dialogs/dlg_DataEditor.cxx                    |    2 
 chart2/source/controller/dialogs/dlg_DataSource.cxx                    |    2 
 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx               |    2 
 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx              |    2 
 chart2/source/controller/dialogs/dlg_View3D.cxx                        |    2 
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx             |    2 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx               |    2 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx           |    2 
 chart2/source/controller/dialogs/tp_AxisLabel.cxx                      |    2 
 chart2/source/controller/dialogs/tp_AxisPositions.cxx                  |    2 
 chart2/source/controller/dialogs/tp_ChartType.cxx                      |    6 +-
 chart2/source/controller/dialogs/tp_DataSource.cxx                     |    2 
 chart2/source/controller/dialogs/tp_LegendPosition.cxx                 |    2 
 chart2/source/controller/dialogs/tp_PointGeometry.cxx                  |    2 
 chart2/source/controller/dialogs/tp_PolarOptions.cxx                   |    2 
 chart2/source/controller/dialogs/tp_RangeChooser.cxx                   |    2 
 chart2/source/controller/dialogs/tp_Scale.cxx                          |    2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx                   |    2 
 chart2/source/controller/dialogs/tp_TitleRotation.cxx                  |    2 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx        |    2 
 chart2/source/controller/main/ChartWindow.cxx                          |    2 
 compilerplugins/clang/vclwidgets.cxx                                   |    9 +++-
 cui/source/customize/acccfg.cxx                                        |    4 -
 cui/source/customize/cfg.cxx                                           |   18 ++++----
 cui/source/customize/cfgutil.cxx                                       |    4 -
 cui/source/customize/eventdlg.cxx                                      |    2 
 cui/source/customize/macropg.cxx                                       |    6 +-
 cui/source/customize/selector.cxx                                      |    6 +-
 cui/source/dialogs/SpellDialog.cxx                                     |    2 
 cui/source/dialogs/about.cxx                                           |    2 
 cui/source/dialogs/colorpicker.cxx                                     |    6 +-
 cui/source/dialogs/cuicharmap.cxx                                      |    2 
 cui/source/dialogs/cuifmsearch.cxx                                     |    2 
 cui/source/dialogs/cuigaldlg.cxx                                       |   14 +++---
 cui/source/dialogs/cuigrfflt.cxx                                       |   14 +++---
 cui/source/dialogs/cuihyperdlg.cxx                                     |    2 
 cui/source/dialogs/cuiimapwnd.cxx                                      |    2 
 cui/source/dialogs/cuitbxform.cxx                                      |    2 
 cui/source/dialogs/dlgname.cxx                                         |    8 +--
 cui/source/dialogs/hangulhanjadlg.cxx                                  |   14 +++---
 cui/source/dialogs/hldocntp.cxx                                        |    2 
 cui/source/dialogs/hldoctp.cxx                                         |    2 
 cui/source/dialogs/hlinettp.cxx                                        |    2 
 cui/source/dialogs/hlmailtp.cxx                                        |    2 
 cui/source/dialogs/hlmarkwn.cxx                                        |    4 -
 cui/source/dialogs/hltpbase.cxx                                        |    2 
 cui/source/dialogs/hyphen.cxx                                          |    2 
 cui/source/dialogs/iconcdlg.cxx                                        |    4 -
 cui/source/dialogs/insdlg.cxx                                          |    6 +-
 cui/source/dialogs/insrc.cxx                                           |    2 
 cui/source/dialogs/linkdlg.cxx                                         |    2 
 cui/source/dialogs/multipat.cxx                                        |    4 -
 cui/source/dialogs/newtabledlg.cxx                                     |    2 
 cui/source/dialogs/passwdomdlg.cxx                                     |    2 
 cui/source/dialogs/pastedlg.cxx                                        |    2 
 cui/source/dialogs/postdlg.cxx                                         |    2 
 cui/source/dialogs/scriptdlg.cxx                                       |    6 +-
 cui/source/dialogs/showcols.cxx                                        |    2 
 cui/source/dialogs/splitcelldlg.cxx                                    |    2 
 cui/source/dialogs/srchxtra.cxx                                        |    6 +-
 cui/source/dialogs/thesdlg.cxx                                         |    8 +--
 cui/source/dialogs/zoom.cxx                                            |    2 
 cui/source/options/certpath.cxx                                        |    2 
 cui/source/options/connpooloptions.cxx                                 |    2 
 cui/source/options/cuisrchdlg.cxx                                      |    2 
 cui/source/options/dbregister.cxx                                      |    2 
 cui/source/options/doclinkdialog.cxx                                   |    2 
 cui/source/options/fontsubs.cxx                                        |    2 
 cui/source/options/optaboutconfig.cxx                                  |    4 -
 cui/source/options/optaccessibility.cxx                                |    2 
 cui/source/options/optasian.cxx                                        |    2 
 cui/source/options/optbasic.cxx                                        |    2 
 cui/source/options/optchart.cxx                                        |    2 
 cui/source/options/optcolor.cxx                                        |    6 +-
 cui/source/options/optctl.cxx                                          |    2 
 cui/source/options/optdict.cxx                                         |    4 -
 cui/source/options/optfltr.cxx                                         |    4 -
 cui/source/options/optgdlg.cxx                                         |    6 +-
 cui/source/options/optgenrl.cxx                                        |    2 
 cui/source/options/opthtml.cxx                                         |    2 
 cui/source/options/optinet2.cxx                                        |    6 +-
 cui/source/options/optjava.cxx                                         |    6 +-
 cui/source/options/optjsearch.cxx                                      |    2 
 cui/source/options/optlingu.cxx                                        |    6 +-
 cui/source/options/optmemory.cxx                                       |    2 
 cui/source/options/optopencl.cxx                                       |    4 -
 cui/source/options/optpath.cxx                                         |    2 
 cui/source/options/optsave.cxx                                         |    2 
 cui/source/options/optupdt.cxx                                         |    2 
 cui/source/options/personalization.cxx                                 |    4 -
 cui/source/options/securityoptions.cxx                                 |    2 
 cui/source/options/treeopt.cxx                                         |    4 -
 cui/source/options/webconninfo.cxx                                     |    2 
 cui/source/tabpages/align.cxx                                          |    2 
 cui/source/tabpages/autocdlg.cxx                                       |   20 ++++-----
 cui/source/tabpages/backgrnd.cxx                                       |    4 -
 cui/source/tabpages/border.cxx                                         |    2 
 cui/source/tabpages/chardlg.cxx                                        |   10 ++--
 cui/source/tabpages/connect.cxx                                        |    2 
 cui/source/tabpages/dstribut.cxx                                       |    4 -
 cui/source/tabpages/grfpage.cxx                                        |    2 
 cui/source/tabpages/labdlg.cxx                                         |    2 
 cui/source/tabpages/macroass.cxx                                       |    2 
 cui/source/tabpages/measure.cxx                                        |    2 
 cui/source/tabpages/numfmt.cxx                                         |    2 
 cui/source/tabpages/numpages.cxx                                       |   12 ++---
 cui/source/tabpages/page.cxx                                           |    2 
 cui/source/tabpages/paragrph.cxx                                       |    8 +--
 cui/source/tabpages/swpossizetabpage.cxx                               |    2 
 cui/source/tabpages/tabstpge.cxx                                       |    4 -
 cui/source/tabpages/textanim.cxx                                       |    2 
 cui/source/tabpages/textattr.cxx                                       |    2 
 cui/source/tabpages/tparea.cxx                                         |    4 -
 cui/source/tabpages/tpbitmap.cxx                                       |    2 
 cui/source/tabpages/tpcolor.cxx                                        |    2 
 cui/source/tabpages/tpgradnt.cxx                                       |    2 
 cui/source/tabpages/tphatch.cxx                                        |    2 
 cui/source/tabpages/tpline.cxx                                         |    2 
 cui/source/tabpages/tplnedef.cxx                                       |    2 
 cui/source/tabpages/tplneend.cxx                                       |    2 
 cui/source/tabpages/tpshadow.cxx                                       |    2 
 cui/source/tabpages/transfrm.cxx                                       |    6 +-
 dbaccess/source/ext/macromigration/macromigrationpages.cxx             |    8 +--
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                         |    2 
 dbaccess/source/ui/app/AppDetailView.cxx                               |    4 -
 dbaccess/source/ui/app/AppIconControl.cxx                              |    2 
 dbaccess/source/ui/app/AppSwapWindow.cxx                               |    2 
 dbaccess/source/ui/app/AppTitleWindow.cxx                              |    2 
 dbaccess/source/ui/app/AppView.cxx                                     |    4 -
 dbaccess/source/ui/browser/brwview.cxx                                 |    2 
 dbaccess/source/ui/browser/dataview.cxx                                |    2 
 dbaccess/source/ui/browser/dbtreeview.cxx                              |    2 
 dbaccess/source/ui/browser/sbagrid.cxx                                 |    2 
 dbaccess/source/ui/control/FieldDescControl.cxx                        |    2 
 dbaccess/source/ui/control/TableGrantCtrl.cxx                          |    2 
 dbaccess/source/ui/control/VertSplitView.cxx                           |    2 
 dbaccess/source/ui/control/curledit.cxx                                |    2 
 dbaccess/source/ui/control/dbtreelistbox.cxx                           |    2 
 dbaccess/source/ui/control/marktree.cxx                                |    2 
 dbaccess/source/ui/control/sqledit.cxx                                 |    2 
 dbaccess/source/ui/dlg/CollectionView.cxx                              |    2 
 dbaccess/source/ui/dlg/ConnectionHelper.cxx                            |    2 
 dbaccess/source/ui/dlg/ConnectionPage.cxx                              |    2 
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx                         |    2 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx                      |   18 ++++----
 dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx                       |    2 
 dbaccess/source/ui/dlg/RelationDlg.cxx                                 |    2 
 dbaccess/source/ui/dlg/TablesSingleDlg.cxx                             |    2 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx                        |    2 
 dbaccess/source/ui/dlg/UserAdmin.cxx                                   |    4 -
 dbaccess/source/ui/dlg/UserAdminDlg.cxx                                |    2 
 dbaccess/source/ui/dlg/admincontrols.cxx                               |    2 
 dbaccess/source/ui/dlg/adtabdlg.cxx                                    |    2 
 dbaccess/source/ui/dlg/advancedsettings.cxx                            |    6 +-
 dbaccess/source/ui/dlg/dbadmin.cxx                                     |    2 
 dbaccess/source/ui/dlg/dbfindex.cxx                                    |    2 
 dbaccess/source/ui/dlg/dbwiz.cxx                                       |    2 
 dbaccess/source/ui/dlg/dbwizsetup.cxx                                  |    2 
 dbaccess/source/ui/dlg/detailpages.cxx                                 |   16 +++----
 dbaccess/source/ui/dlg/directsql.cxx                                   |    2 
 dbaccess/source/ui/dlg/dlgattr.cxx                                     |    2 
 dbaccess/source/ui/dlg/dlgsave.cxx                                     |    2 
 dbaccess/source/ui/dlg/dlgsize.cxx                                     |    2 
 dbaccess/source/ui/dlg/dsselect.cxx                                    |    2 
 dbaccess/source/ui/dlg/generalpage.cxx                                 |    4 -
 dbaccess/source/ui/dlg/indexdialog.cxx                                 |    2 
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx                          |    2 
 dbaccess/source/ui/dlg/paramdialog.cxx                                 |    2 
 dbaccess/source/ui/dlg/queryfilter.cxx                                 |    2 
 dbaccess/source/ui/dlg/queryorder.cxx                                  |    2 
 dbaccess/source/ui/dlg/sqlmessage.cxx                                  |    4 -
 dbaccess/source/ui/dlg/tablespage.cxx                                  |    2 
 dbaccess/source/ui/dlg/textconnectionsettings.cxx                      |    2 
 dbaccess/source/ui/misc/WCPage.cxx                                     |    2 
 dbaccess/source/ui/misc/WColumnSelect.cxx                              |    4 -
 dbaccess/source/ui/misc/WCopyTable.cxx                                 |    2 
 dbaccess/source/ui/misc/WNameMatch.cxx                                 |    2 
 dbaccess/source/ui/misc/WTypeSelect.cxx                                |    6 +-
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx                |    2 
 dbaccess/source/ui/querydesign/JoinDesignView.cxx                      |    2 
 dbaccess/source/ui/querydesign/JoinTableView.cxx                       |    4 -
 dbaccess/source/ui/querydesign/QueryDesignView.cxx                     |    2 
 dbaccess/source/ui/querydesign/QueryTextView.cxx                       |    2 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx                  |    4 -
 dbaccess/source/ui/querydesign/TableWindow.cxx                         |    2 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx                  |    2 
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx                    |    2 
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx                |    2 
 dbaccess/source/ui/querydesign/querydlg.cxx                            |    2 
 dbaccess/source/ui/relationdesign/RelationTableView.cxx                |    2 
 dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx                     |    2 
 dbaccess/source/ui/tabledesign/TEditControl.cxx                        |    2 
 dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx                  |    2 
 dbaccess/source/ui/tabledesign/TableDesignView.cxx                     |    4 -
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx                   |    2 
 desktop/source/deployment/gui/dp_gui_dependencydialog.cxx              |    2 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx                       |    8 +--
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx                    |    2 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx                  |    2 
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx           |    2 
 desktop/source/deployment/gui/license_dialog.cxx                       |    4 -
 desktop/source/splash/splash.cxx                                       |    2 
 extensions/source/abpilot/abpfinalpage.cxx                             |    2 
 extensions/source/abpilot/admininvokationpage.cxx                      |    2 
 extensions/source/abpilot/fieldmappingpage.cxx                         |    2 
 extensions/source/abpilot/tableselectionpage.cxx                       |    2 
 extensions/source/abpilot/typeselectionpage.cxx                        |    2 
 extensions/source/bibliography/bibbeam.cxx                             |    4 -
 extensions/source/bibliography/bibcont.cxx                             |    4 -
 extensions/source/bibliography/bibview.cxx                             |    2 
 extensions/source/bibliography/datman.cxx                              |    4 -
 extensions/source/bibliography/general.cxx                             |    2 
 extensions/source/bibliography/toolbar.cxx                             |    2 
 extensions/source/dbpilots/commonpagesdbp.cxx                          |    6 +-
 extensions/source/dbpilots/controlwizard.cxx                           |    2 
 extensions/source/dbpilots/gridwizard.cxx                              |    2 
 extensions/source/dbpilots/groupboxwiz.cxx                             |    8 +--
 extensions/source/dbpilots/listcombowizard.cxx                         |    6 +-
 extensions/source/propctrlr/browserlistbox.cxx                         |    2 
 extensions/source/propctrlr/browserpage.cxx                            |    2 
 extensions/source/propctrlr/browserview.cxx                            |    2 
 extensions/source/propctrlr/formlinkdialog.cxx                         |    4 -
 extensions/source/propctrlr/inspectorhelpwindow.cxx                    |    2 
 extensions/source/propctrlr/listselectiondlg.cxx                       |    2 
 extensions/source/propctrlr/newdatatype.cxx                            |    2 
 extensions/source/propctrlr/propertyeditor.cxx                         |    2 
 extensions/source/propctrlr/selectlabeldialog.cxx                      |    2 
 extensions/source/propctrlr/standardcontrol.cxx                        |    4 -
 extensions/source/propctrlr/taborder.cxx                               |    2 
 extensions/source/scanner/grid.cxx                                     |    4 -
 extensions/source/scanner/sanedlg.cxx                                  |    4 -
 filter/source/flash/impswfdialog.cxx                                   |    2 
 filter/source/pdf/impdialog.cxx                                        |   16 +++----
 filter/source/svg/impsvgdialog.cxx                                     |    2 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx                   |    6 +-
 filter/source/xsltdialog/xmlfiltertabdialog.cxx                        |    2 
 filter/source/xsltdialog/xmlfiltertabpagebasic.cxx                     |    2 
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx                      |    2 
 filter/source/xsltdialog/xmlfiltertestdialog.cxx                       |    2 
 forms/source/richtext/richtextvclcontrol.cxx                           |    2 
 forms/source/solar/control/navtoolbar.cxx                              |    2 
 formula/source/ui/dlg/funcpage.cxx                                     |    2 
 formula/source/ui/dlg/funcutl.cxx                                      |    8 +--
 formula/source/ui/dlg/parawin.cxx                                      |    2 
 formula/source/ui/dlg/structpg.cxx                                     |    2 
 fpicker/source/office/PlacesListBox.cxx                                |    4 -
 fpicker/source/office/iodlg.cxx                                        |    6 +-
 fpicker/source/office/iodlgimp.cxx                                     |    2 
 framework/source/classes/fwktabwindow.cxx                              |    4 -
 framework/source/uielement/comboboxtoolbarcontroller.cxx               |    2 
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx            |    2 
 framework/source/uielement/edittoolbarcontroller.cxx                   |    2 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx              |    2 
 include/vcl/layout.hxx                                                 |    4 -
 include/vcl/window.hxx                                                 |    2 
 mysqlc/source/mysqlc_connection.cxx                                    |    2 
 mysqlc/source/mysqlc_resultset.cxx                                     |    2 
 mysqlc/source/mysqlc_statement.cxx                                     |    2 
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx   |    2 
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx    |    2 
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx    |    2 
 reportdesign/source/ui/dlg/AddField.cxx                                |    4 -
 reportdesign/source/ui/dlg/CondFormat.cxx                              |    2 
 reportdesign/source/ui/dlg/Condition.cxx                               |    4 -
 reportdesign/source/ui/dlg/DateTime.cxx                                |    2 
 reportdesign/source/ui/dlg/Formula.cxx                                 |    2 
 reportdesign/source/ui/dlg/GroupsSorting.cxx                           |    4 -
 reportdesign/source/ui/dlg/Navigator.cxx                               |    2 
 reportdesign/source/ui/dlg/PageNumber.cxx                              |    2 
 reportdesign/source/ui/inc/ColorListener.hxx                           |    1 
 reportdesign/source/ui/misc/ColorListener.cxx                          |    6 ++
 reportdesign/source/ui/report/DesignView.cxx                           |    4 -
 reportdesign/source/ui/report/ReportSection.cxx                        |    2 
 reportdesign/source/ui/report/ReportWindow.cxx                         |    2 
 reportdesign/source/ui/report/ScrollHelper.cxx                         |    2 
 reportdesign/source/ui/report/SectionWindow.cxx                        |    2 
 reportdesign/source/ui/report/StartMarker.cxx                          |    2 
 reportdesign/source/ui/report/ViewsWindow.cxx                          |    2 
 reportdesign/source/ui/report/propbrw.cxx                              |    2 
 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx            |    2 
 sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx          |    2 
 sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx                 |    2 
 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx         |    2 
 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx                      |    2 
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx         |    2 
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx         |    2 
 sc/source/ui/app/inputwin.cxx                                          |    8 +--
 sc/source/ui/attrdlg/tabpages.cxx                                      |    2 
 sc/source/ui/cctrl/checklistmenu.cxx                                   |    6 +-
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx                                |    2 
 sc/source/ui/condformat/colorformat.cxx                                |    2 
 sc/source/ui/condformat/condformatdlg.cxx                              |    4 -
 sc/source/ui/condformat/condformatdlgentry.cxx                         |   18 ++++----
 sc/source/ui/condformat/condformatmgr.cxx                              |    2 
 sc/source/ui/dbgui/PivotLayoutDialog.cxx                               |    2 
 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx                         |    2 
 sc/source/ui/dbgui/consdlg.cxx                                         |    2 
 sc/source/ui/dbgui/csvcontrol.cxx                                      |    2 
 sc/source/ui/dbgui/csvgrid.cxx                                         |    2 
 sc/source/ui/dbgui/csvruler.cxx                                        |    2 
 sc/source/ui/dbgui/csvtablebox.cxx                                     |    2 
 sc/source/ui/dbgui/dapidata.cxx                                        |    2 
 sc/source/ui/dbgui/dapitype.cxx                                        |    4 -
 sc/source/ui/dbgui/dbnamdlg.cxx                                        |    2 
 sc/source/ui/dbgui/dpgroupdlg.cxx                                      |    4 -
 sc/source/ui/dbgui/filtdlg.cxx                                         |    2 
 sc/source/ui/dbgui/pfiltdlg.cxx                                        |    2 
 sc/source/ui/dbgui/pvfundlg.cxx                                        |    8 +--
 sc/source/ui/dbgui/scendlg.cxx                                         |    2 
 sc/source/ui/dbgui/scuiasciiopt.cxx                                    |    2 
 sc/source/ui/dbgui/scuiimoptdlg.cxx                                    |    2 
 sc/source/ui/dbgui/sfiltdlg.cxx                                        |    2 
 sc/source/ui/dbgui/sortdlg.cxx                                         |    2 
 sc/source/ui/dbgui/subtdlg.cxx                                         |    2 
 sc/source/ui/dbgui/textimportoptions.cxx                               |    2 
 sc/source/ui/dbgui/tpsort.cxx                                          |    4 -
 sc/source/ui/dbgui/tpsubt.cxx                                          |    4 -
 sc/source/ui/dbgui/validate.cxx                                        |    8 +--
 sc/source/ui/dialogs/searchresults.cxx                                 |    2 
 sc/source/ui/docshell/tpstat.cxx                                       |    2 
 sc/source/ui/formdlg/dwfunctr.cxx                                      |    2 
 sc/source/ui/formdlg/formula.cxx                                       |    2 
 sc/source/ui/inc/checklistmenu.hxx                                     |    2 
 sc/source/ui/inc/corodlg.hxx                                           |    2 
 sc/source/ui/inc/namemgrtable.hxx                                      |    1 
 sc/source/ui/inc/validate.hxx                                          |    2 
 sc/source/ui/miscdlgs/acredlin.cxx                                     |    2 
 sc/source/ui/miscdlgs/autofmt.cxx                                      |    2 
 sc/source/ui/miscdlgs/conflictsdlg.cxx                                 |    2 
 sc/source/ui/miscdlgs/crdlg.cxx                                        |    2 
 sc/source/ui/miscdlgs/crnrdlg.cxx                                      |    2 
 sc/source/ui/miscdlgs/datafdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/datastreamdlg.cxx                                |    2 
 sc/source/ui/miscdlgs/delcldlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/delcodlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/filldlg.cxx                                      |    2 
 sc/source/ui/miscdlgs/groupdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/highred.cxx                                      |    2 
 sc/source/ui/miscdlgs/inscldlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/inscodlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/instbdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/lbseldlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/linkarea.cxx                                     |    2 
 sc/source/ui/miscdlgs/mtrindlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/mvtabdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/namecrea.cxx                                     |    2 
 sc/source/ui/miscdlgs/optsolver.cxx                                    |    8 +--
 sc/source/ui/miscdlgs/protectiondlg.cxx                                |    2 
 sc/source/ui/miscdlgs/retypepassdlg.cxx                                |    4 -
 sc/source/ui/miscdlgs/scuiautofmt.cxx                                  |    2 
 sc/source/ui/miscdlgs/sharedocdlg.cxx                                  |    2 
 sc/source/ui/miscdlgs/shtabdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/simpref.cxx                                      |    2 
 sc/source/ui/miscdlgs/solveroptions.cxx                                |    6 +-
 sc/source/ui/miscdlgs/solvrdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/strindlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx                                |    4 -
 sc/source/ui/miscdlgs/tabopdlg.cxx                                     |    2 
 sc/source/ui/namedlg/namedefdlg.cxx                                    |    2 
 sc/source/ui/namedlg/namedlg.cxx                                       |    2 
 sc/source/ui/namedlg/namemgrtable.cxx                                  |    6 ++
 sc/source/ui/namedlg/namepast.cxx                                      |    2 
 sc/source/ui/navipi/content.cxx                                        |    2 
 sc/source/ui/navipi/navipi.cxx                                         |    2 
 sc/source/ui/navipi/scenwnd.cxx                                        |    2 
 sc/source/ui/optdlg/calcoptionsdlg.cxx                                 |    2 
 sc/source/ui/optdlg/opredlin.cxx                                       |    2 
 sc/source/ui/optdlg/tpcalc.cxx                                         |    2 
 sc/source/ui/optdlg/tpcompatibility.cxx                                |    2 
 sc/source/ui/optdlg/tpdefaults.cxx                                     |    2 
 sc/source/ui/optdlg/tpformula.cxx                                      |    2 
 sc/source/ui/optdlg/tpprint.cxx                                        |    2 
 sc/source/ui/optdlg/tpusrlst.cxx                                       |    2 
 sc/source/ui/optdlg/tpview.cxx                                         |    4 -
 sc/source/ui/pagedlg/areasdlg.cxx                                      |    2 
 sc/source/ui/pagedlg/scuitphfedit.cxx                                  |    2 
 sc/source/ui/pagedlg/tphf.cxx                                          |    2 
 sc/source/ui/pagedlg/tphfedit.cxx                                      |    2 
 sc/source/ui/pagedlg/tptable.cxx                                       |    2 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx                        |    2 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx                   |    2 
 sc/source/ui/sidebar/CellBorderStyleControl.cxx                        |    2 
 sc/source/ui/sidebar/CellLineStyleControl.cxx                          |    2 
 sc/source/ui/sidebar/CellLineStyleValueSet.cxx                         |    2 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx                     |    2 
 sc/source/ui/view/gridwin.cxx                                          |   11 ++++-
 sc/source/ui/view/olinewin.cxx                                         |    2 
 sc/source/ui/view/preview.cxx                                          |    2 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx                                |    2 
 sd/source/filter/html/pubdlg.cxx                                       |    4 -
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx                |    4 -
 sd/source/ui/animations/CustomAnimationDialog.cxx                      |   12 ++---
 sd/source/ui/animations/CustomAnimationList.cxx                        |    2 
 sd/source/ui/animations/CustomAnimationPane.cxx                        |    2 
 sd/source/ui/animations/SlideTransitionPane.cxx                        |    2 
 sd/source/ui/annotations/annotationwindow.cxx                          |    4 -
 sd/source/ui/controller/slidelayoutcontroller.cxx                      |    2 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx                                  |    2 
 sd/source/ui/dlg/RemoteDialog.cxx                                      |    2 
 sd/source/ui/dlg/RemoteDialogClientBox.cxx                             |    2 
 sd/source/ui/dlg/animobjs.cxx                                          |    2 
 sd/source/ui/dlg/brkdlg.cxx                                            |    2 
 sd/source/ui/dlg/copydlg.cxx                                           |    2 
 sd/source/ui/dlg/custsdlg.cxx                                          |    4 -
 sd/source/ui/dlg/dlgass.cxx                                            |    2 
 sd/source/ui/dlg/dlgassim.cxx                                          |    2 
 sd/source/ui/dlg/dlgctrls.cxx                                          |    2 
 sd/source/ui/dlg/dlgfield.cxx                                          |    2 
 sd/source/ui/dlg/dlgolbul.cxx                                          |    2 
 sd/source/ui/dlg/dlgsnap.cxx                                           |    2 
 sd/source/ui/dlg/docprev.cxx                                           |    2 
 sd/source/ui/dlg/headerfooterdlg.cxx                                   |    4 -
 sd/source/ui/dlg/ins_paste.cxx                                         |    2 
 sd/source/ui/dlg/inspagob.cxx                                          |    2 
 sd/source/ui/dlg/layeroptionsdlg.cxx                                   |    2 
 sd/source/ui/dlg/masterlayoutdlg.cxx                                   |    2 
 sd/source/ui/dlg/morphdlg.cxx                                          |    2 
 sd/source/ui/dlg/navigatr.cxx                                          |    2 
 sd/source/ui/dlg/paragr.cxx                                            |    2 
 sd/source/ui/dlg/present.cxx                                           |    2 
 sd/source/ui/dlg/prltempl.cxx                                          |    2 
 sd/source/ui/dlg/prntopts.cxx                                          |    2 
 sd/source/ui/dlg/sdpreslt.cxx                                          |    2 
 sd/source/ui/dlg/sdtreelb.cxx                                          |    2 
 sd/source/ui/dlg/tpaction.cxx                                          |    2 
 sd/source/ui/dlg/tpoption.cxx                                          |    4 -
 sd/source/ui/dlg/vectdlg.cxx                                           |    2 
 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx                    |    2 
 sd/source/ui/sidebar/LayoutMenu.cxx                                    |    2 
 sd/source/ui/sidebar/MasterPagesSelector.cxx                           |    2 
 sd/source/ui/sidebar/NavigatorWrapper.cxx                              |    2 
 sd/source/ui/sidebar/PanelBase.cxx                                     |    2 
 sd/source/ui/sidebar/RecentMasterPagesSelector.cxx                     |    8 +++
 sd/source/ui/sidebar/RecentMasterPagesSelector.hxx                     |    3 -
 sd/source/ui/slideshow/showwin.cxx                                     |    2 
 sd/source/ui/view/ViewShellBase.cxx                                    |    2 
 sd/source/ui/view/sdruler.cxx                                          |    2 
 sd/source/ui/view/sdwindow.cxx                                         |    2 
 sfx2/source/appl/impldde.cxx                                           |    2 
 sfx2/source/appl/newhelp.cxx                                           |   22 +++++-----
 sfx2/source/control/templateabstractview.cxx                           |    2 
 sfx2/source/control/templatelocalview.cxx                              |    2 
 sfx2/source/control/thumbnailview.cxx                                  |    2 
 sfx2/source/dialog/alienwarn.cxx                                       |    2 
 sfx2/source/dialog/backingwindow.cxx                                   |    2 
 sfx2/source/dialog/basedlgs.cxx                                        |    8 +--
 sfx2/source/dialog/checkin.cxx                                         |    2 
 sfx2/source/dialog/dinfdlg.cxx                                         |   14 +++---
 sfx2/source/dialog/dockwin.cxx                                         |    4 -
 sfx2/source/dialog/documentfontsdialog.cxx                             |    2 
 sfx2/source/dialog/infobar.cxx                                         |    4 -
 sfx2/source/dialog/inputdlg.cxx                                        |    2 
 sfx2/source/dialog/mgetempl.cxx                                        |    2 
 sfx2/source/dialog/newstyle.cxx                                        |    2 
 sfx2/source/dialog/passwd.cxx                                          |    2 
 sfx2/source/dialog/printopt.cxx                                        |    2 
 sfx2/source/dialog/recfloat.cxx                                        |    2 
 sfx2/source/dialog/splitwin.cxx                                        |    4 -
 sfx2/source/dialog/srchdlg.cxx                                         |    2 
 sfx2/source/dialog/styledlg.cxx                                        |    2 
 sfx2/source/dialog/tabdlg.cxx                                          |    4 -
 sfx2/source/dialog/taskpane.cxx                                        |    2 
 sfx2/source/dialog/templateinfodlg.cxx                                 |    2 
 sfx2/source/dialog/templdlg.cxx                                        |    2 
 sfx2/source/dialog/titledockwin.cxx                                    |    2 
 sfx2/source/dialog/versdlg.cxx                                         |    6 +-
 sfx2/source/doc/doctemplates.cxx                                       |    2 
 sfx2/source/doc/new.cxx                                                |    2 
 sfx2/source/doc/templatedlg.cxx                                        |    2 
 sfx2/source/sidebar/Deck.cxx                                           |    2 
 sfx2/source/sidebar/Panel.cxx                                          |    2 
 sfx2/source/sidebar/PanelTitleBar.cxx                                  |    2 
 sfx2/source/sidebar/SidebarDockingWindow.cxx                           |    2 
 sfx2/source/sidebar/SidebarToolBox.cxx                                 |    2 
 sfx2/source/sidebar/TabBar.cxx                                         |    2 
 sfx2/source/sidebar/TitleBar.cxx                                       |    2 
 sfx2/source/toolbox/tbxitem.cxx                                        |    2 
 sfx2/source/view/printer.cxx                                           |    2 
 starmath/inc/ElementsDockingWindow.hxx                                 |    1 
 starmath/source/ElementsDockingWindow.cxx                              |    8 +++
 starmath/source/dialog.cxx                                             |   20 ++++-----
 starmath/source/edit.cxx                                               |    2 
 starmath/source/toolbox.cxx                                            |    2 
 starmath/source/view.cxx                                               |    4 -
 svtools/source/brwbox/brwbox1.cxx                                      |    2 
 svtools/source/brwbox/brwhead.cxx                                      |    2 
 svtools/source/brwbox/datwin.cxx                                       |    4 -
 svtools/source/brwbox/ebbcontrols.cxx                                  |    2 
 svtools/source/brwbox/editbrowsebox.cxx                                |    2 
 svtools/source/contnr/DocumentInfoPreview.cxx                          |    2 
 svtools/source/contnr/fileview.cxx                                     |    6 +-
 svtools/source/contnr/imivctl1.cxx                                     |    2 
 svtools/source/contnr/ivctrl.cxx                                       |    2 
 svtools/source/contnr/simptabl.cxx                                     |    4 -
 svtools/source/contnr/svtabbx.cxx                                      |    4 -
 svtools/source/contnr/treelistbox.cxx                                  |    2 
 svtools/source/control/calendar.cxx                                    |    6 +-
 svtools/source/control/ctrlbox.cxx                                     |    6 +-
 svtools/source/control/filectrl.cxx                                    |    2 
 svtools/source/control/fmtfield.cxx                                    |    2 
 svtools/source/control/headbar.cxx                                     |    2 
 svtools/source/control/hyperlabel.cxx                                  |    2 
 svtools/source/control/inettbc.cxx                                     |    2 
 svtools/source/control/roadmap.cxx                                     |    2 
 svtools/source/control/ruler.cxx                                       |    2 
 svtools/source/control/scrwin.cxx                                      |    2 
 svtools/source/control/tabbar.cxx                                      |    2 
 svtools/source/control/toolbarmenu.cxx                                 |    2 
 svtools/source/control/valueset.cxx                                    |    2 
 svtools/source/dialogs/PlaceEditDialog.cxx                             |    2 
 svtools/source/dialogs/addresstemplate.cxx                             |    2 
 svtools/source/dialogs/prnsetup.cxx                                    |    2 
 svtools/source/dialogs/restartdialog.cxx                               |    2 
 svtools/source/dialogs/roadmapwizard.cxx                               |    2 
 svtools/source/dialogs/wizardmachine.cxx                               |    4 -
 svtools/source/dialogs/wizdlg.cxx                                      |    2 
 svtools/source/filter/GraphicExportOptionsDialog.cxx                   |    2 
 svtools/source/filter/exportdialog.cxx                                 |    2 
 svtools/source/table/tablecontrol.cxx                                  |    2 
 svtools/source/table/tabledatawindow.cxx                               |    2 
 svtools/source/toolpanel/paneltabbar.cxx                               |    2 
 svtools/source/toolpanel/toolpaneldeck.cxx                             |    2 
 svtools/source/toolpanel/toolpaneldrawer.cxx                           |    2 
 svtools/source/uno/treecontrolpeer.cxx                                 |    2 
 svx/source/dialog/_bmpmask.cxx                                         |    4 -
 svx/source/dialog/_contdlg.cxx                                         |    4 -
 svx/source/dialog/charmap.cxx                                          |    2 
 svx/source/dialog/checklbx.cxx                                         |    2 
 svx/source/dialog/compressgraphicdialog.cxx                            |    2 
 svx/source/dialog/connctrl.cxx                                         |    2 
 svx/source/dialog/ctredlin.cxx                                         |    8 +--
 svx/source/dialog/dlgctl3d.cxx                                         |    4 -
 svx/source/dialog/dlgctrl.cxx                                          |   12 ++---
 svx/source/dialog/docrecovery.cxx                                      |   10 ++--
 svx/source/dialog/fntctrl.cxx                                          |    2 
 svx/source/dialog/fontwork.cxx                                         |    2 
 svx/source/dialog/graphctl.cxx                                         |    2 
 svx/source/dialog/hdft.cxx                                             |    2 
 svx/source/dialog/imapdlg.cxx                                          |    2 
 svx/source/dialog/imapwnd.cxx                                          |    2 
 svx/source/dialog/linkwarn.cxx                                         |    2 
 svx/source/dialog/measctrl.cxx                                         |    2 
 svx/source/dialog/optgrid.cxx                                          |    2 
 svx/source/dialog/pagectrl.cxx                                         |    2 
 svx/source/dialog/passwd.cxx                                           |    2 
 svx/source/dialog/rubydialog.cxx                                       |    4 -
 svx/source/dialog/srchdlg.cxx                                          |    2 
 svx/source/dialog/svxbmpnumvalueset.cxx                                |    4 -
 svx/source/dialog/svxruler.cxx                                         |    2 
 svx/source/dialog/txencbox.cxx                                         |    2 
 svx/source/engine3d/float3d.cxx                                        |    2 
 svx/source/fmcomp/fmgridcl.cxx                                         |    2 
 svx/source/fmcomp/gridctrl.cxx                                         |    4 -
 svx/source/form/datanavi.cxx                                           |   22 +++++-----
 svx/source/form/filtnav.cxx                                            |    4 -
 svx/source/form/fmPropBrw.cxx                                          |    2 
 svx/source/form/fmexpl.cxx                                             |    2 
 svx/source/form/navigatortree.cxx                                      |    2 
 svx/source/form/tabwin.cxx                                             |    4 -
 svx/source/gallery2/galbrws1.cxx                                       |    2 
 svx/source/gallery2/galbrws2.cxx                                       |    2 
 svx/source/sidebar/EmptyPanel.cxx                                      |    2 
 svx/source/sidebar/PanelLayout.cxx                                     |    2 
 svx/source/sidebar/area/AreaPropertyPanel.cxx                          |    2 
 svx/source/sidebar/area/AreaTransparencyGradientControl.cxx            |    2 
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx                    |    2 
 svx/source/sidebar/insert/InsertPropertyPanel.cxx                      |    2 
 svx/source/sidebar/line/LinePropertyPanel.cxx                          |    2 
 svx/source/sidebar/line/LineWidthControl.cxx                           |    2 
 svx/source/sidebar/line/LineWidthValueSet.cxx                          |    2 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx                |    2 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx                     |    2 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx                    |    2 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx                |    2 
 svx/source/sidebar/text/TextPropertyPanel.cxx                          |    2 
 svx/source/sidebar/text/TextUnderlineControl.cxx                       |    2 
 svx/source/svdraw/svdibrow.cxx                                         |    6 +-
 svx/source/tbxctrls/bulletsnumbering.cxx                               |    2 
 svx/source/tbxctrls/colrctrl.cxx                                       |    2 
 svx/source/tbxctrls/extrusioncontrols.cxx                              |    6 +-
 svx/source/tbxctrls/fillctrl.cxx                                       |    2 
 svx/source/tbxctrls/fontworkgallery.cxx                                |    4 -
 svx/source/tbxctrls/grafctrl.cxx                                       |    2 
 svx/source/tbxctrls/layctrl.cxx                                        |    2 
 svx/source/tbxctrls/lboxctrl.cxx                                       |    2 
 svx/source/tbxctrls/linectrl.cxx                                       |    2 
 svx/source/tbxctrls/tbcontrl.cxx                                       |   10 ++--
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx  |    4 -
 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx |    2 
 svx/workben/pixelctl.cxx                                               |    2 
 sw/qa/tiledrendering/tiledrendering.cxx                                |    2 
 sw/source/ui/chrdlg/break.cxx                                          |    2 
 sw/source/ui/chrdlg/chardlg.cxx                                        |    2 
 sw/source/ui/chrdlg/drpcps.cxx                                         |    4 -
 sw/source/ui/chrdlg/numpara.cxx                                        |    2 
 sw/source/ui/chrdlg/swuiccoll.cxx                                      |    2 
 sw/source/ui/config/mailconfigpage.cxx                                 |    6 +-
 sw/source/ui/config/optcomp.cxx                                        |    2 
 sw/source/ui/config/optload.cxx                                        |    4 -
 sw/source/ui/config/optpage.cxx                                        |   16 +++----
 sw/source/ui/dbui/addresslistdialog.cxx                                |    2 
 sw/source/ui/dbui/createaddresslistdialog.cxx                          |    6 +-
 sw/source/ui/dbui/customizeaddresslistdialog.cxx                       |    4 -
 sw/source/ui/dbui/dbinsdlg.cxx                                         |    2 
 sw/source/ui/dbui/dbtablepreviewdialog.cxx                             |    2 
 sw/source/ui/dbui/mmaddressblockpage.cxx                               |   14 +++---
 sw/source/ui/dbui/mmdocselectpage.cxx                                  |    2 
 sw/source/ui/dbui/mmgreetingspage.cxx                                  |    4 -
 sw/source/ui/dbui/mmlayoutpage.cxx                                     |    2 
 sw/source/ui/dbui/mmmergepage.cxx                                      |    2 
 sw/source/ui/dbui/mmoutputpage.cxx                                     |    4 -
 sw/source/ui/dbui/mmoutputtypepage.cxx                                 |    6 +-
 sw/source/ui/dbui/mmpreparemergepage.cxx                               |    2 
 sw/source/ui/dbui/selectdbtabledialog.cxx                              |    2 
 sw/source/ui/dialog/abstract.cxx                                       |    2 
 sw/source/ui/dialog/ascfldlg.cxx                                       |    2 
 sw/source/ui/dialog/docstdlg.cxx                                       |    2 
 sw/source/ui/dialog/swmessdialog.cxx                                   |    2 
 sw/source/ui/dialog/uiregionsw.cxx                                     |    8 +--
 sw/source/ui/dialog/wordcountdialog.cxx                                |    2 
 sw/source/ui/dochdl/selglos.cxx                                        |    2 
 sw/source/ui/envelp/envfmt.cxx                                         |    2 
 sw/source/ui/envelp/envlop1.cxx                                        |    4 -
 sw/source/ui/envelp/envprt.cxx                                         |    2 
 sw/source/ui/envelp/label1.cxx                                         |   10 ++--
 sw/source/ui/envelp/labfmt.cxx                                         |    4 -
 sw/source/ui/envelp/labprt.cxx                                         |    2 
 sw/source/ui/envelp/mailmrge.cxx                                       |    6 +-
 sw/source/ui/fldui/DropDownFieldDialog.cxx                             |    2 
 sw/source/ui/fldui/changedb.cxx                                        |    2 
 sw/source/ui/fldui/flddb.cxx                                           |    2 
 sw/source/ui/fldui/flddinf.cxx                                         |    2 
 sw/source/ui/fldui/flddok.cxx                                          |    2 
 sw/source/ui/fldui/fldedt.cxx                                          |    2 
 sw/source/ui/fldui/fldfunc.cxx                                         |    2 
 sw/source/ui/fldui/fldref.cxx                                          |    2 
 sw/source/ui/fldui/fldvar.cxx                                          |    2 
 sw/source/ui/fldui/inpdlg.cxx                                          |    2 
 sw/source/ui/fldui/javaedit.cxx                                        |    2 
 sw/source/ui/frmdlg/column.cxx                                         |    4 -
 sw/source/ui/frmdlg/cption.cxx                                         |    4 -
 sw/source/ui/frmdlg/frmpage.cxx                                        |    8 +--
 sw/source/ui/frmdlg/wrap.cxx                                           |    2 
 sw/source/ui/index/cnttab.cxx                                          |   22 +++++-----
 sw/source/ui/index/multmrk.cxx                                         |    2 
 sw/source/ui/index/swuiidxmrk.cxx                                      |    4 -
 sw/source/ui/misc/bookmark.cxx                                         |    2 
 sw/source/ui/misc/docfnote.cxx                                         |    2 
 sw/source/ui/misc/glosbib.cxx                                          |    2 
 sw/source/ui/misc/glossary.cxx                                         |    4 -
 sw/source/ui/misc/insfnote.cxx                                         |    2 
 sw/source/ui/misc/linenum.cxx                                          |    2 
 sw/source/ui/misc/num.cxx                                              |    2 
 sw/source/ui/misc/outline.cxx                                          |    6 +-
 sw/source/ui/misc/pgfnote.cxx                                          |    2 
 sw/source/ui/misc/pggrid.cxx                                           |    2 
 sw/source/ui/misc/srtdlg.cxx                                           |    2 
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx                          |    2 
 sw/source/ui/misc/titlepage.cxx                                        |    2 
 sw/source/ui/table/colwd.cxx                                           |    2 
 sw/source/ui/table/convert.cxx                                         |    2 
 sw/source/ui/table/instable.cxx                                        |    2 
 sw/source/ui/table/mergetbl.cxx                                        |    2 
 sw/source/ui/table/rowht.cxx                                           |    2 
 sw/source/ui/table/splittbl.cxx                                        |    2 
 sw/source/ui/table/tabledlg.cxx                                        |    6 +-
 sw/source/ui/table/tautofmt.cxx                                        |    6 +-
 sw/source/ui/utlui/swrenamexnameddlg.cxx                               |    2 
 sw/source/uibase/dbui/dbtree.cxx                                       |    2 
 sw/source/uibase/dbui/dbui.cxx                                         |    6 +-
 sw/source/uibase/dbui/mailmergechildwindow.cxx                         |    2 
 sw/source/uibase/dbui/mailmergehelper.cxx                              |    2 
 sw/source/uibase/docvw/AnnotationMenuButton.cxx                        |    6 ++
 sw/source/uibase/docvw/AnnotationMenuButton.hxx                        |    1 
 sw/source/uibase/docvw/AnnotationWin.cxx                               |    2 
 sw/source/uibase/docvw/HeaderFooterWin.cxx                             |    2 
 sw/source/uibase/docvw/PageBreakWin.cxx                                |    4 -
 sw/source/uibase/docvw/SidebarTxtControl.cxx                           |    6 ++
 sw/source/uibase/docvw/SidebarTxtControl.hxx                           |    1 
 sw/source/uibase/docvw/SidebarWin.cxx                                  |    2 
 sw/source/uibase/docvw/edtwin.cxx                                      |    2 
 sw/source/uibase/docvw/srcedtw.cxx                                     |    2 
 sw/source/uibase/envelp/syncbtn.cxx                                    |    2 
 sw/source/uibase/frmdlg/colex.cxx                                      |    2 
 sw/source/uibase/misc/numberingtypelistbox.cxx                         |    2 
 sw/source/uibase/misc/redlndlg.cxx                                     |    4 -
 sw/source/uibase/misc/swruler.cxx                                      |    2 
 sw/source/uibase/ribbar/inputwin.cxx                                   |    2 
 sw/source/uibase/ribbar/workctrl.cxx                                   |    2 
 sw/source/uibase/sidebar/PageColumnControl.cxx                         |    2 
 sw/source/uibase/sidebar/PageMarginControl.cxx                         |    2 
 sw/source/uibase/sidebar/PageOrientationControl.cxx                    |    2 
 sw/source/uibase/sidebar/PagePropertyPanel.cxx                         |    2 
 sw/source/uibase/sidebar/PageSizeControl.cxx                           |    2 
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx                         |    2 
 sw/source/uibase/uiview/pview.cxx                                      |    2 
 sw/source/uibase/uiview/viewling.cxx                                   |    2 
 sw/source/uibase/utlui/content.cxx                                     |    2 
 sw/source/uibase/utlui/glbltree.cxx                                    |    2 
 sw/source/uibase/utlui/gloslst.cxx                                     |    2 
 sw/source/uibase/utlui/navipi.cxx                                      |    2 
 sw/source/uibase/utlui/numfmtlb.cxx                                    |    2 
 uui/source/authfallbackdlg.cxx                                         |    2 
 uui/source/fltdlg.cxx                                                  |    2 
 uui/source/logindlg.cxx                                                |    2 
 uui/source/masterpasscrtdlg.cxx                                        |    2 
 uui/source/masterpassworddlg.cxx                                       |    2 
 uui/source/nameclashdlg.cxx                                            |    2 
 uui/source/passworddlg.cxx                                             |    2 
 uui/source/secmacrowarnings.cxx                                        |    2 
 uui/source/unknownauthdlg.cxx                                          |    2 
 vcl/generic/print/genprnpsp.cxx                                        |    2 
 vcl/generic/print/prtsetup.cxx                                         |    6 +-
 vcl/qa/cppunit/lifecycle.cxx                                           |    2 
 vcl/source/app/help.cxx                                                |    2 
 vcl/source/control/button.cxx                                          |    4 -
 vcl/source/control/combobox.cxx                                        |    2 
 vcl/source/control/ctrl.cxx                                            |    2 
 vcl/source/control/edit.cxx                                            |    2 
 vcl/source/control/fixed.cxx                                           |    2 
 vcl/source/control/ilstbox.cxx                                         |    6 +-
 vcl/source/control/lstbox.cxx                                          |    2 
 vcl/source/control/menubtn.cxx                                         |    2 
 vcl/source/control/morebtn.cxx                                         |    2 
 vcl/source/control/scrbar.cxx                                          |    2 
 vcl/source/control/spinfld.cxx                                         |    2 
 vcl/source/control/tabctrl.cxx                                         |    2 
 vcl/source/control/throbber.cxx                                        |    2 
 vcl/source/edit/vclmedit.cxx                                           |    4 -
 vcl/source/window/brdwin.cxx                                           |    2 
 vcl/source/window/btndlg.cxx                                           |    2 
 vcl/source/window/dialog.cxx                                           |    2 
 vcl/source/window/dockingarea.cxx                                      |    2 
 vcl/source/window/dockmgr.cxx                                          |    4 -
 vcl/source/window/dockwin.cxx                                          |    4 -
 vcl/source/window/floatwin.cxx                                         |    2 
 vcl/source/window/introwin.cxx                                         |    2 
 vcl/source/window/layout.cxx                                           |    4 -
 vcl/source/window/menubarwindow.cxx                                    |    2 
 vcl/source/window/menufloatingwindow.cxx                               |    2 
 vcl/source/window/msgbox.cxx                                           |    2 
 vcl/source/window/openglwin.cxx                                        |    2 
 vcl/source/window/popupmenuwindow.cxx                                  |    2 
 vcl/source/window/printdlg.cxx                                         |    6 +-
 vcl/source/window/scrwnd.cxx                                           |    2 
 vcl/source/window/split.cxx                                            |    2 
 vcl/source/window/splitwin.cxx                                         |    2 
 vcl/source/window/status.cxx                                           |    2 
 vcl/source/window/syschild.cxx                                         |    2 
 vcl/source/window/syswin.cxx                                           |    2 
 vcl/source/window/tabdlg.cxx                                           |    2 
 vcl/source/window/tabpage.cxx                                          |    2 
 vcl/source/window/toolbox.cxx                                          |    2 
 vcl/source/window/window.cxx                                           |    8 +++
 vcl/source/window/wrkwin.cxx                                           |    2 
 vcl/unx/generic/app/i18n_status.cxx                                    |    2 
 vcl/unx/generic/printer/cupsmgr.cxx                                    |    2 
 vcl/workben/icontest.cxx                                               |    2 
 vcl/workben/vcldemo.cxx                                                |    4 -
 xmlsecurity/source/dialogs/certificatechooser.cxx                      |    2 
 xmlsecurity/source/dialogs/certificateviewer.cxx                       |   10 ++--
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx                 |    2 
 xmlsecurity/source/dialogs/macrosecurity.cxx                           |    8 +--
 785 files changed, 1229 insertions(+), 1167 deletions(-)

New commits:
commit 82c89a6243f5b5220a08f4bcd03118c572b6e18e
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Mar 10 09:07:06 2015 +0200

    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 e1d8fd6..57ca787 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 314a5c5..82eb8ae 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 5803baf..400f1e2 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 9bd5c9e..f088be0 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 526fa3c..b067341 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()
@@ -1451,7 +1451,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 81e8ede..4358e0b 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()
@@ -1652,7 +1652,7 @@ WatchWindow::WatchWindow (Layout* pParent) :
 
 WatchWindow::~WatchWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void WatchWindow::dispose()
@@ -1902,7 +1902,7 @@ StackWindow::StackWindow (Layout* pParent) :
 
 StackWindow::~StackWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void StackWindow::dispose()
@@ -2038,7 +2038,7 @@ ComplexEditorWindow::ComplexEditorWindow( ModulWindow* pParent ) :
 
 ComplexEditorWindow::~ComplexEditorWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ComplexEditorWindow::dispose()
@@ -2147,7 +2147,7 @@ WatchTreeListBox::WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits )
 
 WatchTreeListBox::~WatchTreeListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void WatchTreeListBox::dispose()
@@ -2659,7 +2659,7 @@ pCodeCompleteWindow( pPar )
 
 CodeCompleteListBox::~CodeCompleteListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CodeCompleteListBox::dispose()
@@ -2841,7 +2841,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 ba43f1f..de26250 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 cda31df..d37ba80 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 6fc02ce..d6518bc 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 8d89bcb..8432228 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 b2ebd0e..f1c2f9c 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 ab5cbb2..af715f5 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 a0b560d..0d5b23b 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -160,7 +160,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCheckBox(vcl::Window *
 
 CheckBox::~CheckBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CheckBox::dispose()
@@ -393,7 +393,7 @@ NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode,
 
 NewObjectDialog::~NewObjectDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void NewObjectDialog::dispose()
@@ -416,7 +416,7 @@ GotoLineDialog::GotoLineDialog(vcl::Window * pParent )
 
 GotoLineDialog::~GotoLineDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void GotoLineDialog::dispose()
@@ -462,7 +462,7 @@ ExportDialog::ExportDialog(vcl::Window * pParent)
 
 ExportDialog::~ExportDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExportDialog::dispose()
@@ -519,7 +519,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 8d52675a..bc09dec 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 334253a..327b3cd 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 1190b10..0218da0 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 41061f4..c748537 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -473,7 +473,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 af84d7a..fef3a78 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 d26b124..415a0a5 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 91cd386..3bb7877 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 4841223..cbbd012 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 759736d..e10133a 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 f37d380..0340955 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 5c6c83b..de2ac2d 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 05b0995..4dfadb0 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -74,7 +74,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 83225dc..a1f77ef 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 dceff6a..7cb3e83 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 917fcb5..8cf8ff7 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 33678fc..ce6b119 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 466804c..8c1a692 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 0ec9209..c63cfa6 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 e20880b..0fe60ec 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 d1a6dcd..37fee5e 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -64,7 +64,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 6493c85..0624461 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 fb638b5..8c36c17 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 25f2b76..3e557ee 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 d9f4bc3..9359d8a 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 3e26607..d147564 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -684,7 +684,7 @@ void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry,
 
 SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxAccCfgTabListBox_Impl::dispose()
@@ -825,7 +825,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 a1f61bb..09a1705 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()
@@ -4576,7 +4576,7 @@ SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(vcl::Window* pParent, SvxTool
 
 SvxToolbarEntriesListBox::~SvxToolbarEntriesListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxToolbarEntriesListBox::dispose()
@@ -4770,7 +4770,7 @@ SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& r
 
 SvxNewToolbarDialog::~SvxNewToolbarDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxNewToolbarDialog::dispose()
@@ -4985,7 +4985,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
 
 SvxIconSelectorDialog::~SvxIconSelectorDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxIconSelectorDialog::dispose()
@@ -5457,7 +5457,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 c69d902..afc077b 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()
@@ -437,7 +437,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 94a4ba8..e683c32 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 e85ad6a..4fb963b 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -142,7 +142,7 @@ MacroEventListBox::MacroEventListBox( vcl::Window* pParent, WinBits nStyle )
 
 MacroEventListBox::~MacroEventListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MacroEventListBox::dispose()
@@ -239,7 +239,7 @@ _SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID,
 
 _SvxMacroTabPage::~_SvxMacroTabPage()
 {
-   dispose();
+    disposeOnce();
 }
 
 void _SvxMacroTabPage::dispose()
@@ -891,7 +891,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 d363538..3add211 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 a6b9fa0..d627bc4 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -245,7 +245,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 091245b..c614ceb 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -101,7 +101,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 d0fcbc1..d9b5a8f 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -363,7 +363,7 @@ ColorFieldControl::ColorFieldControl( vcl::Window* pParent, const WinBits& nStyl
 
 ColorFieldControl::~ColorFieldControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ColorFieldControl::dispose()
@@ -756,7 +756,7 @@ ColorSliderControl::ColorSliderControl( vcl::Window* pParent, const WinBits& nSt
 
 ColorSliderControl::~ColorSliderControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ColorSliderControl::dispose()
@@ -976,7 +976,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 107d163..e77dc12 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 0529a8c..ef9c3f8 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 68ec49b..9bd702a 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()
@@ -555,7 +555,7 @@ TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle)
 
 TitleDialog::~TitleDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TitleDialog::dispose()
@@ -587,7 +587,7 @@ GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm )
 
 GalleryIdDialog::~GalleryIdDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void GalleryIdDialog::dispose()
@@ -681,7 +681,7 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItem
 
 TPGalleryThemeGeneral::~TPGalleryThemeGeneral()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TPGalleryThemeGeneral::dispose()
@@ -835,7 +835,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 b9097c2..f46f9e4 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 6b2c308..1ef8214 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 36b548b..722bbce 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 9d8303c..aa9909d 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 292b499..cf067f5 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 f2251e8..251567e 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()
@@ -1240,7 +1240,7 @@ namespace svx
 
     HangulHanjaNewDictDialog::~HangulHanjaNewDictDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void HangulHanjaNewDictDialog::dispose()
@@ -1427,7 +1427,7 @@ namespace svx
 
     SuggestionEdit::~SuggestionEdit()
     {
-        dispose();
+        disposeOnce();
     }
 
     void SuggestionEdit::dispose()
@@ -1846,7 +1846,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 a3970d8..a9730b8 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 dcd31a0..f6596df 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 4c07508..b25e49c 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 a408993..1b40442 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -75,7 +75,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 6c60311..0831223 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 b2e1175..0e99b4f 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 2398b90..64c719e 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 a777c7f..0f93d9a 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()
@@ -234,7 +234,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 9a2410b..7de89bf 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 6310f25..e7d0d61 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 cf695c7..cecc2d4 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -144,7 +144,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 6600730..16bdc76 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 27aecff..9454ff8 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 8f1c1b5..8769b54 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 23b3e22..67e1e62 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 e0fa52a..9217d84 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()
@@ -449,7 +449,7 @@ CuiInputDialog::CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode )
 
 CuiInputDialog::~CuiInputDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CuiInputDialog::dispose()
@@ -508,7 +508,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 d6578a7..d6020b1d 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 04a3ff4..c093f75 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 d08402d..54b65cb 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 28f2700..62dc214 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 d72e778..d5b53bc 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -288,7 +288,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 ed0a1a4..f61ee02 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 70e6723..fcd5fcc 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 8cb606f..74ee851 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 99cce0c..9c4d9b1 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 4a303db..7b3fbbb 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 01b1010..eeb1a53 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 6c478c4..a75f45b 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -156,7 +156,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
 
 CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CuiAboutConfigTabPage::dispose()
@@ -478,7 +478,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 cf43686..15a9134 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 13cd9bd..84e4dde 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 2c50c00..6244c1e 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 091c248..81930b0 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 702154d..c438fe9 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:
@@ -913,7 +913,7 @@ void ColorConfigCtrl_Impl::InitHeaderBar(const OUString &rOn, const OUString &rU
 
 ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ColorConfigCtrl_Impl::dispose()
@@ -1065,7 +1065,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 172173d..f2b729b 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 a629722..94269ef 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -118,7 +118,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent,
 
 SvxNewDictionaryDialog::~SvxNewDictionaryDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxNewDictionaryDialog::dispose()
@@ -345,7 +345,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 bce56de..3afbfb3 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()
@@ -174,7 +174,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 f1b26bb..c047f41 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -308,7 +308,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 OfaMiscTabPage::~OfaMiscTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaMiscTabPage::dispose()
@@ -690,7 +690,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 OfaViewTabPage::~OfaViewTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaViewTabPage::dispose()
@@ -1234,7 +1234,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 c75e80e..b0a6063 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 cd633de..f1ecd66 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 f27e96d..aa90977 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -212,7 +212,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 SvxProxyTabPage::~SvxProxyTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxProxyTabPage::dispose()
@@ -640,7 +640,7 @@ SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& r
 
 SvxSecurityTabPage::~SvxSecurityTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxSecurityTabPage::dispose()
@@ -1072,7 +1072,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 9e32274..2d41230 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 f131150..547dfea 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 50038ef..83c4c47 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -371,7 +371,7 @@ public:
             get(m_pBreakNF, "wordlength");
         }
     }
-    virtual ~OptionsBreakSet() { dispose(); }
+    virtual ~OptionsBreakSet() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE
     {
         m_pBeforeFrame.disposeAndClear();
@@ -1138,7 +1138,7 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
 
 SvxLinguTabPage::~SvxLinguTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxLinguTabPage::dispose()
@@ -1932,7 +1932,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 a5713f4..e8940c5 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 f5d4e24..c350663 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -69,7 +69,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 SvxOpenCLTabPage::~SvxOpenCLTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxOpenCLTabPage::dispose()
@@ -173,7 +173,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.disposeAndClear();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index fa13631..050c186 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 5b6ac66..f5138e2 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 f4c0b74..bc0b9cd 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 6b627ac..2e502c3 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 0b67348..97b1bdc 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 ef7c72a..f7ae83a 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -549,7 +549,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const OUString
 
 OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
 {
-   dispose();
+    disposeOnce();
 }
 
 void OfaTreeOptionsDialog::dispose()
@@ -2161,7 +2161,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 2715494..ef247fb 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 7056874..64dcb25 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 53f5c08..5edbfa5 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.disposeAndClear(); 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 45fe53a..f4f5502 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -230,7 +230,7 @@ void BackgroundPreviewImpl::setBmp(bool bBmp)
 
 BackgroundPreviewImpl::~BackgroundPreviewImpl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void BackgroundPreviewImpl::dispose()
@@ -428,7 +428,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 7460248..f7f6597 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 935aa2c..96b7791 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -184,7 +184,7 @@ SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const
 
 SvxCharBasePage::~SvxCharBasePage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxCharBasePage::dispose()
@@ -378,7 +378,7 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet
 
 SvxCharNamePage::~SvxCharNamePage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxCharNamePage::dispose()
@@ -1384,7 +1384,7 @@ SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet&
 
 SvxCharEffectsPage::~SvxCharEffectsPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxCharEffectsPage::dispose()
@@ -2664,7 +2664,7 @@ SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet
 
 SvxCharPositionPage::~SvxCharPositionPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxCharPositionPage::dispose()
@@ -3431,7 +3431,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 551e5f2..3688ab4 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 d6d747b..fa11be8 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 43d6454..c2b356e 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 3117684..b884ac5 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 aa5b1a1..d5b7502 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -142,7 +142,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 ed1693f..43cd56e 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 13ab8fc..4701067 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 d80722d..548011f 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 73354ac..9ce7b61 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -374,7 +374,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 7167677..2f7386c 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()
@@ -1046,7 +1046,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet
 
 SvxParaAlignTabPage::~SvxParaAlignTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxParaAlignTabPage::dispose()
@@ -1955,7 +1955,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxI
 
 SvxExtParagraphTabPage::~SvxExtParagraphTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxExtParagraphTabPage::dispose()
@@ -2197,7 +2197,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 fab8930..db5c19f 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 7eec93d..1ab79e9 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -50,7 +50,7 @@ public:
         , nTabStyle(0)
     {
     }
-    virtual ~TabWin_Impl() { dispose(); }
+    virtual ~TabWin_Impl() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE { mpPage.disposeAndClear(); vcl::Window::dispose(); }
 
     virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
@@ -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 7318789..9ed04c3 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 7440d7d..f37883b 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 f8d9ef7..2790c99 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()
@@ -806,7 +806,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 cbb926c..1a0602e 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 ec4be9f..9e38104 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 674eee4..2edb5e6 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 f5dd142..17fa590 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 68322f0..046973f 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 9ac3215..735fd10 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 e174b6b..7320b4a 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 7e07f0d..a35c93d 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 0793a23..fbd5e48 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()
@@ -448,7 +448,7 @@ SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
 
 SvxSlantTabPage::~SvxSlantTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxSlantTabPage::dispose()
@@ -684,7 +684,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 9e76b94..b06c1b4 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 d9cb940..6cf01a5 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 f5761c7..0253cac 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 c5551b5..3f35e18 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 e403a8f..ffd713d 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 672aa8a..05b83cd 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 0b8fbfe..720cc6f 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 e023e5b..e27b0ef 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 0299e6c..e37b789 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 bdff335..0823681 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 397257d..1e0dddd 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 62d94a1..3d4907e 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 711b599..1c7ec5b 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 fa223f0..e8e4cbc 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 697a410..9939abf 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 ac4e5a6..cd3bc8b 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 24d31cd..df9fca3 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 4b7fa32..3456d02 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 e5582c3..9a7b32c 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 903c5f7..639af4e 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 204cc3a..4e4b158 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 e1ff844..5331609 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 4de769f..010c095 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

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list