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

Michael Meeks michael.meeks at collabora.com
Fri Apr 10 02:40:44 PDT 2015


 accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx |    3 
 accessibility/inc/accessibility/extended/accessibletabbarbase.hxx          |    3 
 accessibility/inc/accessibility/extended/accessibletablistbox.hxx          |    2 
 accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx     |    2 
 accessibility/inc/accessibility/extended/listboxaccessible.hxx             |    5 
 accessibility/inc/accessibility/extended/textwindowaccessibility.hxx       |    2 
 accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx         |    3 
 accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx       |    3 
 accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx   |    8 
 accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx      |    3 
 accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx         |    3 
 accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx   |    5 
 accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx     |   13 
 accessibility/source/extended/AccessibleToolPanelDeck.cxx                  |    6 
 accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx            |    4 
 accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx        |    4 
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx            |    2 
 accessibility/source/extended/textwindowaccessibility.cxx                  |    6 
 accessibility/source/standard/vclxaccessibleradiobutton.cxx                |    6 
 accessibility/source/standard/vclxaccessibletabpagewindow.cxx              |    2 
 avmedia/inc/mediacontrol.hxx                                               |    2 
 avmedia/source/framework/mediacontrol.cxx                                  |    3 
 avmedia/source/framework/mediaplayer.cxx                                   |    2 
 avmedia/source/viewer/mediaevent_impl.cxx                                  |   14 
 avmedia/source/viewer/mediaevent_impl.hxx                                  |    3 
 avmedia/source/viewer/mediawindow_impl.cxx                                 |    3 
 avmedia/source/viewer/mediawindow_impl.hxx                                 |    2 
 basctl/source/basicide/basicrenderable.hxx                                 |    2 
 basctl/source/basicide/baside2.cxx                                         |    1 
 basctl/source/basicide/baside2.hxx                                         |   12 
 basctl/source/basicide/baside2b.cxx                                        |   15 
 basctl/source/basicide/baside3.cxx                                         |    8 
 basctl/source/basicide/basides1.cxx                                        |   28 
 basctl/source/basicide/basides2.cxx                                        |    8 
 basctl/source/basicide/basides3.cxx                                        |    4 
 basctl/source/basicide/basidesh.cxx                                        |   12 
 basctl/source/basicide/bastypes.cxx                                        |   15 
 basctl/source/basicide/brkdlg.cxx                                          |   15 
 basctl/source/basicide/brkdlg.hxx                                          |   14 
 basctl/source/basicide/layout.cxx                                          |   11 
 basctl/source/basicide/layout.hxx                                          |    7 
 basctl/source/basicide/linenumberwindow.cxx                                |   11 
 basctl/source/basicide/linenumberwindow.hxx                                |    4 
 basctl/source/basicide/macrodlg.cxx                                        |   14 
 basctl/source/basicide/macrodlg.hxx                                        |   30 
 basctl/source/basicide/moduldl2.cxx                                        |   46 +
 basctl/source/basicide/moduldlg.cxx                                        |   33 -
 basctl/source/basicide/moduldlg.hxx                                        |   62 +
 basctl/source/dlged/managelang.cxx                                         |   20 
 basctl/source/inc/accessibledialogcontrolshape.hxx                         |    3 
 basctl/source/inc/accessibledialogwindow.hxx                               |    3 
 basctl/source/inc/baside3.hxx                                              |    4 
 basctl/source/inc/basidesh.hxx                                             |    8 
 basctl/source/inc/bastypes.hxx                                             |    9 
 basctl/source/inc/dlged.hxx                                                |    5 
 basctl/source/inc/managelang.hxx                                           |   22 
 chart2/inc/ChartModel.hxx                                                  |    2 
 chart2/source/controller/accessibility/AccessibleViewForwarder.hxx         |    3 
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx             |    4 
 chart2/source/controller/dialogs/dlg_ChartType.cxx                         |    3 
 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx                |   12 
 chart2/source/controller/dialogs/dlg_DataEditor.cxx                        |    1 
 chart2/source/controller/dialogs/dlg_DataSource.cxx                        |   12 
 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx                   |   17 
 chart2/source/controller/dialogs/dlg_View3D.cxx                            |   14 
 chart2/source/controller/dialogs/res_BarGeometry.hxx                       |    4 
 chart2/source/controller/dialogs/res_DataLabel.hxx                         |   38 -
 chart2/source/controller/dialogs/res_Trendline.hxx                         |   46 -
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx                 |   14 
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx                 |   10 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx                   |   18 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx                   |   16 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx               |   15 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx               |   32 
 chart2/source/controller/dialogs/tp_AxisLabel.cxx                          |   17 
 chart2/source/controller/dialogs/tp_AxisLabel.hxx                          |   34 -
 chart2/source/controller/dialogs/tp_AxisPositions.cxx                      |   24 
 chart2/source/controller/dialogs/tp_AxisPositions.hxx                      |   38 -
 chart2/source/controller/dialogs/tp_ChartType.cxx                          |   63 +
 chart2/source/controller/dialogs/tp_ChartType.hxx                          |    6 
 chart2/source/controller/dialogs/tp_DataSource.cxx                         |   28 
 chart2/source/controller/dialogs/tp_DataSource.hxx                         |   42 -
 chart2/source/controller/dialogs/tp_LegendPosition.cxx                     |   12 
 chart2/source/controller/dialogs/tp_LegendPosition.hxx                     |    4 
 chart2/source/controller/dialogs/tp_PolarOptions.cxx                       |   16 
 chart2/source/controller/dialogs/tp_PolarOptions.hxx                       |   14 
 chart2/source/controller/dialogs/tp_RangeChooser.cxx                       |   24 
 chart2/source/controller/dialogs/tp_RangeChooser.hxx                       |   28 
 chart2/source/controller/dialogs/tp_Scale.cxx                              |   35 +
 chart2/source/controller/dialogs/tp_Scale.hxx                              |   66 +-
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx                       |   24 
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx                       |   36 -
 chart2/source/controller/dialogs/tp_TitleRotation.cxx                      |    7 
 chart2/source/controller/dialogs/tp_TitleRotation.hxx                      |   14 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx            |   13 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx            |    8 
 chart2/source/controller/inc/dlg_ChartType.hxx                             |    2 
 chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx                    |    2 
 chart2/source/controller/inc/dlg_DataEditor.hxx                            |    2 
 chart2/source/controller/inc/dlg_DataSource.hxx                            |    8 
 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx                       |   14 
 chart2/source/controller/inc/dlg_View3D.hxx                                |    8 
 chart2/source/controller/inc/res_ErrorBar.hxx                              |   54 -
 chart2/source/controller/inc/res_LegendPosition.hxx                        |   10 
 chart2/source/controller/inc/res_Titles.hxx                                |   28 
 chart2/source/controller/main/ChartController.hxx                          |    2 
 chart2/source/controller/main/ChartWindow.cxx                              |    5 
 chart2/source/controller/main/ChartWindow.hxx                              |    2 
 chart2/source/controller/main/ShapeController.cxx                          |   12 
 chart2/source/view/charttypes/GL3DBarChart.cxx                             |    2 
 chart2/source/view/inc/GL3DBarChart.hxx                                    |    2 
 chart2/source/view/main/ChartView.cxx                                      |    2 
 compilerplugins/clang/vclwidgets.cxx                                       |  205 ++++--
 cui/source/customize/acccfg.cxx                                            |   23 
 cui/source/customize/cfg.cxx                                               |  115 ++-
 cui/source/customize/cfgutil.cxx                                           |    1 
 cui/source/customize/eventdlg.cxx                                          |    1 
 cui/source/customize/eventdlg.hxx                                          |    2 
 cui/source/customize/macropg.cxx                                           |   12 
 cui/source/customize/macropg_impl.hxx                                      |   14 
 cui/source/customize/selector.cxx                                          |   17 
 cui/source/dialogs/SpellDialog.cxx                                         |   20 
 cui/source/dialogs/about.cxx                                               |   17 
 cui/source/dialogs/colorpicker.cxx                                         |   82 +-
 cui/source/dialogs/cuicharmap.cxx                                          |   19 
 cui/source/dialogs/cuifmsearch.cxx                                         |   30 
 cui/source/dialogs/cuigaldlg.cxx                                           |   86 ++
 cui/source/dialogs/cuigrfflt.cxx                                           |   72 ++
 cui/source/dialogs/cuiimapwnd.cxx                                          |   15 
 cui/source/dialogs/cuitbxform.cxx                                          |   11 
 cui/source/dialogs/dlgname.cxx                                             |   41 +
 cui/source/dialogs/hangulhanjadlg.cxx                                      |   84 ++
 cui/source/dialogs/hldocntp.cxx                                            |    5 
 cui/source/dialogs/hldoctp.cxx                                             |   15 
 cui/source/dialogs/hlinettp.cxx                                            |   21 
 cui/source/dialogs/hlmailtp.cxx                                            |   14 
 cui/source/dialogs/hlmarkwn.cxx                                            |   15 
 cui/source/dialogs/hltpbase.cxx                                            |   14 
 cui/source/dialogs/hyphen.cxx                                              |   18 
 cui/source/dialogs/iconcdlg.cxx                                            |   20 
 cui/source/dialogs/insdlg.cxx                                              |   45 +
 cui/source/dialogs/insrc.cxx                                               |   13 
 cui/source/dialogs/linkdlg.cxx                                             |   20 
 cui/source/dialogs/multipat.cxx                                            |   21 
 cui/source/dialogs/newtabledlg.cxx                                         |   12 
 cui/source/dialogs/passwdomdlg.cxx                                         |   18 
 cui/source/dialogs/pastedlg.cxx                                            |   13 
 cui/source/dialogs/postdlg.cxx                                             |    7 
 cui/source/dialogs/scriptdlg.cxx                                           |   18 
 cui/source/dialogs/showcols.cxx                                            |   11 
 cui/source/dialogs/splitcelldlg.cxx                                        |   14 
 cui/source/dialogs/srchxtra.cxx                                            |   25 
 cui/source/dialogs/thesdlg.cxx                                             |   39 +
 cui/source/dialogs/zoom.cxx                                                |   13 
 cui/source/factory/cuiexp.cxx                                              |   29 
 cui/source/factory/dlgfact.cxx                                             |    2 
 cui/source/factory/dlgfact.hxx                                             |    5 
 cui/source/inc/ControlFocusHelper.hxx                                      |    4 
 cui/source/inc/SpellDialog.hxx                                             |   40 -
 cui/source/inc/about.hxx                                                   |   16 
 cui/source/inc/acccfg.hxx                                                  |   26 
 cui/source/inc/align.hxx                                                   |   52 -
 cui/source/inc/autocdlg.hxx                                                |  114 +--
 cui/source/inc/backgrnd.hxx                                                |   58 -
 cui/source/inc/border.hxx                                                  |   66 +-
 cui/source/inc/cfg.hxx                                                     |   77 +-
 cui/source/inc/cfgutil.hxx                                                 |    2 
 cui/source/inc/chardlg.hxx                                                 |  180 ++---
 cui/source/inc/connect.hxx                                                 |   26 
 cui/source/inc/cuicharmap.hxx                                              |   22 
 cui/source/inc/cuifmsearch.hxx                                             |   54 -
 cui/source/inc/cuigaldlg.hxx                                               |   70 +-
 cui/source/inc/cuigrfflt.hxx                                               |   34 -
 cui/source/inc/cuihyperdlg.hxx                                             |    2 
 cui/source/inc/cuiimapwnd.hxx                                              |   12 
 cui/source/inc/cuioptgenrl.hxx                                             |    4 
 cui/source/inc/cuisrchdlg.hxx                                              |    4 
 cui/source/inc/cuitabarea.hxx                                              |  280 ++++----
 cui/source/inc/cuitabline.hxx                                              |  110 +--
 cui/source/inc/cuitbxform.hxx                                              |    4 
 cui/source/inc/dbregister.hxx                                              |   10 
 cui/source/inc/dlgname.hxx                                                 |   29 
 cui/source/inc/dstribut.hxx                                                |   26 
 cui/source/inc/grfpage.hxx                                                 |   42 -
 cui/source/inc/hangulhanjadlg.hxx                                          |   92 +-
 cui/source/inc/hldocntp.hxx                                                |   10 
 cui/source/inc/hldoctp.hxx                                                 |   12 
 cui/source/inc/hlinettp.hxx                                                |   20 
 cui/source/inc/hlmailtp.hxx                                                |   10 
 cui/source/inc/hlmarkwn.hxx                                                |   12 
 cui/source/inc/hltpbase.hxx                                                |   14 
 cui/source/inc/hyphen.hxx                                                  |   18 
 cui/source/inc/iconcdlg.hxx                                                |   26 
 cui/source/inc/insdlg.hxx                                                  |   54 -
 cui/source/inc/insrc.hxx                                                   |    8 
 cui/source/inc/labdlg.hxx                                                  |   22 
 cui/source/inc/linkdlg.hxx                                                 |   22 
 cui/source/inc/measure.hxx                                                 |   36 -
 cui/source/inc/multipat.hxx                                                |   12 
 cui/source/inc/newtabledlg.hxx                                             |    6 
 cui/source/inc/numfmt.hxx                                                  |   60 -
 cui/source/inc/numpages.hxx                                                |  128 +--
 cui/source/inc/optasian.hxx                                                |   26 
 cui/source/inc/optdict.hxx                                                 |   30 
 cui/source/inc/optlingu.hxx                                                |   36 -
 cui/source/inc/optpath.hxx                                                 |    8 
 cui/source/inc/page.hxx                                                    |   58 -
 cui/source/inc/paragrph.hxx                                                |  130 ++-
 cui/source/inc/pastedlg.hxx                                                |   10 
 cui/source/inc/postdlg.hxx                                                 |   14 
 cui/source/inc/scriptdlg.hxx                                               |   20 
 cui/source/inc/selector.hxx                                                |   16 
 cui/source/inc/showcols.hxx                                                |    6 
 cui/source/inc/splitcelldlg.hxx                                            |   10 
 cui/source/inc/srchxtra.hxx                                                |   16 
 cui/source/inc/swpossizetabpage.hxx                                        |   54 -
 cui/source/inc/tabstpge.hxx                                                |   56 -
 cui/source/inc/textanim.hxx                                                |   37 -
 cui/source/inc/textattr.hxx                                                |   35 -
 cui/source/inc/thesdlg.hxx                                                 |   23 
 cui/source/inc/transfrm.hxx                                                |   62 +
 cui/source/inc/treeopt.hxx                                                 |   10 
 cui/source/inc/zoom.hxx                                                    |   26 
 cui/source/options/certpath.cxx                                            |    6 
 cui/source/options/certpath.hxx                                            |    8 
 cui/source/options/connpooloptions.cxx                                     |   17 
 cui/source/options/connpooloptions.hxx                                     |   18 
 cui/source/options/cuisrchdlg.cxx                                          |   11 
 cui/source/options/dbregister.cxx                                          |    7 
 cui/source/options/doclinkdialog.cxx                                       |   14 
 cui/source/options/doclinkdialog.hxx                                       |   10 
 cui/source/options/fontsubs.cxx                                            |   12 
 cui/source/options/fontsubs.hxx                                            |   24 
 cui/source/options/optaboutconfig.cxx                                      |   26 
 cui/source/options/optaboutconfig.hxx                                      |   16 
 cui/source/options/optaccessibility.cxx                                    |    9 
 cui/source/options/optaccessibility.hxx                                    |   18 
 cui/source/options/optasian.cxx                                            |   13 
 cui/source/options/optbasic.cxx                                            |   16 
 cui/source/options/optbasic.hxx                                            |   14 
 cui/source/options/optchart.cxx                                            |    5 
 cui/source/options/optchart.hxx                                            |   10 
 cui/source/options/optcolor.cxx                                            |   63 -
 cui/source/options/optcolor.hxx                                            |    8 
 cui/source/options/optctl.cxx                                              |   16 
 cui/source/options/optctl.hxx                                              |   14 
 cui/source/options/optdict.cxx                                             |   31 
 cui/source/options/optfltr.cxx                                             |   23 
 cui/source/options/optfltr.hxx                                             |   22 
 cui/source/options/optgdlg.cxx                                             |   54 +
 cui/source/options/optgdlg.hxx                                             |   92 +-
 cui/source/options/optgenrl.cxx                                            |   14 
 cui/source/options/opthtml.cxx                                             |   26 
 cui/source/options/opthtml.hxx                                             |   34 -
 cui/source/options/optinet2.cxx                                            |   50 +
 cui/source/options/optinet2.hxx                                            |   72 +-
 cui/source/options/optjava.cxx                                             |   35 -
 cui/source/options/optjava.hxx                                             |   44 -
 cui/source/options/optjsearch.cxx                                          |   28 
 cui/source/options/optjsearch.hxx                                          |   42 -
 cui/source/options/optlingu.cxx                                            |   35 -
 cui/source/options/optmemory.cxx                                           |   17 
 cui/source/options/optmemory.hxx                                           |   16 
 cui/source/options/optopencl.cxx                                           |   49 +
 cui/source/options/optopencl.hxx                                           |   41 -
 cui/source/options/optpath.cxx                                             |    6 
 cui/source/options/optsave.cxx                                             |   17 
 cui/source/options/optsave.hxx                                             |   38 -
 cui/source/options/optupdt.cxx                                             |   19 
 cui/source/options/optupdt.hxx                                             |   22 
 cui/source/options/personalization.cxx                                     |   39 +
 cui/source/options/personalization.hxx                                     |   36 -
 cui/source/options/securityoptions.cxx                                     |   18 
 cui/source/options/securityoptions.hxx                                     |   18 
 cui/source/options/treeopt.cxx                                             |   22 
 cui/source/options/webconninfo.cxx                                         |    6 
 cui/source/options/webconninfo.hxx                                         |    8 
 cui/source/tabpages/align.cxx                                              |   24 
 cui/source/tabpages/autocdlg.cxx                                           |  113 +++
 cui/source/tabpages/backgrnd.cxx                                           |   27 
 cui/source/tabpages/border.cxx                                             |   34 +
 cui/source/tabpages/chardlg.cxx                                            |  116 +++
 cui/source/tabpages/connect.cxx                                            |   22 
 cui/source/tabpages/dstribut.cxx                                           |   32 
 cui/source/tabpages/grfpage.cxx                                            |   18 
 cui/source/tabpages/labdlg.cxx                                             |   20 
 cui/source/tabpages/macroass.cxx                                           |   20 
 cui/source/tabpages/measure.cxx                                            |   25 
 cui/source/tabpages/numfmt.cxx                                             |   26 
 cui/source/tabpages/numpages.cxx                                           |   61 +
 cui/source/tabpages/page.cxx                                               |   29 
 cui/source/tabpages/paragrph.cxx                                           |   99 +++
 cui/source/tabpages/swpossizetabpage.cxx                                   |   37 +
 cui/source/tabpages/tabstpge.cxx                                           |   35 +
 cui/source/tabpages/textanim.cxx                                           |   26 
 cui/source/tabpages/textattr.cxx                                           |   24 
 cui/source/tabpages/tparea.cxx                                             |   72 ++
 cui/source/tabpages/tpbitmap.cxx                                           |   15 
 cui/source/tabpages/tpcolor.cxx                                            |   32 
 cui/source/tabpages/tpgradnt.cxx                                           |   28 
 cui/source/tabpages/tphatch.cxx                                            |   21 
 cui/source/tabpages/tpline.cxx                                             |   29 
 cui/source/tabpages/tplnedef.cxx                                           |   25 
 cui/source/tabpages/tplneend.cxx                                           |   18 
 cui/source/tabpages/tpshadow.cxx                                           |   17 
 cui/source/tabpages/transfrm.cxx                                           |   58 +
 dbaccess/source/ext/macromigration/macromigrationpages.cxx                 |   42 +
 dbaccess/source/ext/macromigration/macromigrationpages.hxx                 |   34 -
 dbaccess/source/ext/macromigration/rangeprogressbar.hxx                    |    2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                             |    1 
 dbaccess/source/ui/app/AppDetailView.cxx                                   |    3 
 dbaccess/source/ui/app/AppDetailView.hxx                                   |    4 
 dbaccess/source/ui/app/AppTitleWindow.cxx                                  |    2 
 dbaccess/source/ui/app/AppTitleWindow.hxx                                  |    2 
 dbaccess/source/ui/app/AppView.cxx                                         |   14 
 dbaccess/source/ui/app/AppView.hxx                                         |    8 
 dbaccess/source/ui/app/subcomponentmanager.cxx                             |    1 
 dbaccess/source/ui/browser/brwview.cxx                                     |   23 
 dbaccess/source/ui/browser/dbtreeview.cxx                                  |    3 
 dbaccess/source/ui/browser/dbtreeview.hxx                                  |    2 
 dbaccess/source/ui/browser/genericcontroller.cxx                           |   10 
 dbaccess/source/ui/control/FieldDescControl.cxx                            |  109 ++-
 dbaccess/source/ui/control/TableGrantCtrl.cxx                              |    4 
 dbaccess/source/ui/control/VertSplitView.cxx                               |    4 
 dbaccess/source/ui/control/curledit.cxx                                    |    6 
 dbaccess/source/ui/control/sqledit.cxx                                     |    1 
 dbaccess/source/ui/dlg/CollectionView.cxx                                  |   16 
 dbaccess/source/ui/dlg/ConnectionHelper.cxx                                |   13 
 dbaccess/source/ui/dlg/ConnectionHelper.hxx                                |    9 
 dbaccess/source/ui/dlg/ConnectionPage.cxx                                  |   19 
 dbaccess/source/ui/dlg/ConnectionPage.hxx                                  |   24 
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx                             |   12 
 dbaccess/source/ui/dlg/ConnectionPageSetup.hxx                             |    6 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx                          |  114 +++
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx                          |  109 +--
 dbaccess/source/ui/dlg/DbAdminImpl.hxx                                     |    3 
 dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx                           |   13 
 dbaccess/source/ui/dlg/RelationDlg.cxx                                     |   20 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx                            |   31 
 dbaccess/source/ui/dlg/TextConnectionHelper.hxx                            |   40 -
 dbaccess/source/ui/dlg/UserAdmin.cxx                                       |   24 
 dbaccess/source/ui/dlg/UserAdmin.hxx                                       |    8 
 dbaccess/source/ui/dlg/admincontrols.cxx                                   |   22 
 dbaccess/source/ui/dlg/admincontrols.hxx                                   |   27 
 dbaccess/source/ui/dlg/adminpages.hxx                                      |    2 
 dbaccess/source/ui/dlg/adtabdlg.cxx                                        |    6 
 dbaccess/source/ui/dlg/advancedsettings.cxx                                |   88 +-
 dbaccess/source/ui/dlg/advancedsettings.hxx                                |   56 -
 dbaccess/source/ui/dlg/dbfindex.cxx                                        |   19 
 dbaccess/source/ui/dlg/dbfindex.hxx                                        |   20 
 dbaccess/source/ui/dlg/dbwizsetup.cxx                                      |   11 
 dbaccess/source/ui/dlg/detailpages.cxx                                     |  102 ++-
 dbaccess/source/ui/dlg/detailpages.hxx                                     |   80 +-
 dbaccess/source/ui/dlg/directsql.cxx                                       |    7 
 dbaccess/source/ui/dlg/dlgsave.cxx                                         |   16 
 dbaccess/source/ui/dlg/dlgsize.cxx                                         |   13 
 dbaccess/source/ui/dlg/dsselect.cxx                                        |   14 
 dbaccess/source/ui/dlg/dsselect.hxx                                        |   11 
 dbaccess/source/ui/dlg/generalpage.cxx                                     |   30 
 dbaccess/source/ui/dlg/generalpage.hxx                                     |   26 
 dbaccess/source/ui/dlg/indexdialog.cxx                                     |    9 
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx                              |    4 
 dbaccess/source/ui/dlg/paramdialog.cxx                                     |    5 
 dbaccess/source/ui/dlg/queryfilter.cxx                                     |   21 
 dbaccess/source/ui/dlg/queryorder.cxx                                      |   18 
 dbaccess/source/ui/dlg/sqlmessage.cxx                                      |   11 
 dbaccess/source/ui/dlg/tablespage.cxx                                      |    3 
 dbaccess/source/ui/dlg/tablespage.hxx                                      |    6 
 dbaccess/source/ui/dlg/textconnectionsettings.cxx                          |   11 
 dbaccess/source/ui/inc/CollectionView.hxx                                  |   15 
 dbaccess/source/ui/inc/ConnectionLine.hxx                                  |    3 
 dbaccess/source/ui/inc/ConnectionLineAccess.hxx                            |    3 
 dbaccess/source/ui/inc/FieldDescControl.hxx                                |   70 +-
 dbaccess/source/ui/inc/JAccess.hxx                                         |    3 
 dbaccess/source/ui/inc/JoinController.hxx                                  |    2 
 dbaccess/source/ui/inc/JoinDesignView.hxx                                  |    4 
 dbaccess/source/ui/inc/JoinTableView.hxx                                   |   26 
 dbaccess/source/ui/inc/QueryDesignView.hxx                                 |    2 
 dbaccess/source/ui/inc/QueryPropertiesDialog.hxx                           |    9 
 dbaccess/source/ui/inc/QueryTextView.hxx                                   |    2 
 dbaccess/source/ui/inc/QueryViewSwitch.hxx                                 |    4 
 dbaccess/source/ui/inc/RelationControl.hxx                                 |    6 
 dbaccess/source/ui/inc/RelationDlg.hxx                                     |   20 
 dbaccess/source/ui/inc/RelationTableView.hxx                               |    2 
 dbaccess/source/ui/inc/TableConnection.hxx                                 |    2 
 dbaccess/source/ui/inc/TableDesignHelpBar.hxx                              |    2 
 dbaccess/source/ui/inc/TableDesignView.hxx                                 |    6 
 dbaccess/source/ui/inc/TableFieldDescription.hxx                           |    3 
 dbaccess/source/ui/inc/TableGrantCtrl.hxx                                  |    4 
 dbaccess/source/ui/inc/TableWindow.hxx                                     |    2 
 dbaccess/source/ui/inc/TableWindowAccess.hxx                               |    3 
 dbaccess/source/ui/inc/TableWindowListBox.hxx                              |    4 
 dbaccess/source/ui/inc/TableWindowTitle.hxx                                |    2 
 dbaccess/source/ui/inc/TokenWriter.hxx                                     |    2 
 dbaccess/source/ui/inc/VertSplitView.hxx                                   |    6 
 dbaccess/source/ui/inc/WCPage.hxx                                          |   24 
 dbaccess/source/ui/inc/WColumnSelect.hxx                                   |   12 
 dbaccess/source/ui/inc/WCopyTable.hxx                                      |   10 
 dbaccess/source/ui/inc/WNameMatch.hxx                                      |   23 
 dbaccess/source/ui/inc/WTabPage.hxx                                        |    4 
 dbaccess/source/ui/inc/WTypeSelect.hxx                                     |   22 
 dbaccess/source/ui/inc/adtabdlg.hxx                                        |   12 
 dbaccess/source/ui/inc/brwview.hxx                                         |   10 
 dbaccess/source/ui/inc/curledit.hxx                                        |    2 
 dbaccess/source/ui/inc/datasourceconnector.hxx                             |    7 
 dbaccess/source/ui/inc/dbwizsetup.hxx                                      |    6 
 dbaccess/source/ui/inc/directsql.hxx                                       |   14 
 dbaccess/source/ui/inc/dlgsize.hxx                                         |    6 
 dbaccess/source/ui/inc/indexdialog.hxx                                     |   18 
 dbaccess/source/ui/inc/indexfieldscontrol.hxx                              |    4 
 dbaccess/source/ui/inc/linkeddocuments.hxx                                 |    3 
 dbaccess/source/ui/inc/paramdialog.hxx                                     |   10 
 dbaccess/source/ui/inc/querycontainerwindow.hxx                            |    4 
 dbaccess/source/ui/inc/queryfilter.hxx                                     |   24 
 dbaccess/source/ui/inc/queryorder.hxx                                      |   18 
 dbaccess/source/ui/inc/sqledit.hxx                                         |    2 
 dbaccess/source/ui/inc/textconnectionsettings.hxx                          |    4 
 dbaccess/source/ui/inc/undosqledit.hxx                                     |    3 
 dbaccess/source/ui/inc/unodatbr.hxx                                        |   10 
 dbaccess/source/ui/misc/ToolBoxHelper.cxx                                  |    2 
 dbaccess/source/ui/misc/WCPage.cxx                                         |   23 
 dbaccess/source/ui/misc/WColumnSelect.cxx                                  |   17 
 dbaccess/source/ui/misc/WCopyTable.cxx                                     |   10 
 dbaccess/source/ui/misc/WNameMatch.cxx                                     |   20 
 dbaccess/source/ui/misc/WTypeSelect.cxx                                    |   55 +
 dbaccess/source/ui/misc/singledoccontroller.cxx                            |    1 
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx                    |    9 
 dbaccess/source/ui/querydesign/JoinController.cxx                          |    2 
 dbaccess/source/ui/querydesign/JoinDesignView.cxx                          |    6 
 dbaccess/source/ui/querydesign/JoinTableView.cxx                           |   50 -
 dbaccess/source/ui/querydesign/QTableWindow.cxx                            |    2 
 dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx                 |    2 
 dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx                   |    3 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx                         |   59 -
 dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx                  |    2 
 dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx                  |    2 
 dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx                  |   18 
 dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx                  |    2 
 dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx                      |    8 
 dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx                      |    6 
 dbaccess/source/ui/querydesign/QueryTableView.cxx                          |   54 -
 dbaccess/source/ui/querydesign/QueryTextView.cxx                           |    3 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx                      |   22 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx                      |   12 
 dbaccess/source/ui/querydesign/TableConnection.cxx                         |    2 
 dbaccess/source/ui/querydesign/TableFieldDescription.cxx                   |    1 
 dbaccess/source/ui/querydesign/TableWindow.cxx                             |    5 
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx                       |    8 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx                      |    2 
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx                        |    8 
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx                      |    3 
 dbaccess/source/ui/querydesign/limitboxcontroller.hxx                      |    3 
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx                    |    5 
 dbaccess/source/ui/querydesign/querydlg.cxx                                |    5 
 dbaccess/source/ui/querydesign/querydlg.hxx                                |   10 
 dbaccess/source/ui/relationdesign/RelationTableView.cxx                    |    5 
 dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx                         |    3 
 dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx                         |    2 
 dbaccess/source/ui/tabledesign/TEditControl.cxx                            |    9 
 dbaccess/source/ui/tabledesign/TEditControl.hxx                            |   12 
 dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx                      |    3 
 dbaccess/source/ui/tabledesign/TableDesignView.cxx                         |   17 
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx                       |   15 
 dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx                       |    6 
 dbaccess/source/ui/tabledesign/TableUndo.hxx                               |    7 
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx                               |    2 
 dbaccess/source/ui/uno/composerdialogs.cxx                                 |    6 
 dbaccess/source/ui/uno/copytablewizard.cxx                                 |    2 
 desktop/source/app/cmdlinehelp.hxx                                         |    8 
 desktop/source/deployment/gui/dp_gui_dependencydialog.cxx                  |   10 
 desktop/source/deployment/gui/dp_gui_dependencydialog.hxx                  |    4 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx                           |   43 +
 desktop/source/deployment/gui/dp_gui_dialog2.hxx                           |   42 -
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx                        |   14 
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx                        |    6 
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx                         |   17 
 desktop/source/deployment/gui/dp_gui_theextmgr.hxx                         |    6 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx                      |   16 
 desktop/source/deployment/gui/dp_gui_updatedialog.hxx                      |   30 
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx               |    7 
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx               |   14 
 desktop/source/deployment/gui/license_dialog.cxx                           |   29 
 editeng/source/editeng/impedit.hxx                                         |    3 
 editeng/source/editeng/textconv.hxx                                        |    3 
 editeng/source/misc/hangulhanja.cxx                                        |    2 
 editeng/source/misc/splwrap.cxx                                            |    4 
 extensions/source/abpilot/abpfinalpage.cxx                                 |    6 
 extensions/source/abpilot/abpfinalpage.hxx                                 |   13 
 extensions/source/abpilot/admininvokationimpl.hxx                          |    3 
 extensions/source/abpilot/admininvokationpage.cxx                          |   11 
 extensions/source/abpilot/admininvokationpage.hxx                          |    7 
 extensions/source/abpilot/fieldmappingpage.cxx                             |   12 
 extensions/source/abpilot/fieldmappingpage.hxx                             |    8 
 extensions/source/abpilot/tableselectionpage.cxx                           |   10 
 extensions/source/abpilot/tableselectionpage.hxx                           |    6 
 extensions/source/abpilot/typeselectionpage.cxx                            |   11 
 extensions/source/abpilot/typeselectionpage.hxx                            |   25 
 extensions/source/abpilot/unodialogabp.cxx                                 |    2 
 extensions/source/bibliography/bibbeam.cxx                                 |   12 
 extensions/source/bibliography/bibbeam.hxx                                 |    4 
 extensions/source/bibliography/bibcont.cxx                                 |    7 
 extensions/source/bibliography/bibcont.hxx                                 |    4 
 extensions/source/bibliography/bibmod.cxx                                  |    1 
 extensions/source/bibliography/bibshortcuthandler.hxx                      |    2 
 extensions/source/bibliography/bibview.cxx                                 |   27 
 extensions/source/bibliography/bibview.hxx                                 |   34 -
 extensions/source/bibliography/datman.cxx                                  |  120 ++-
 extensions/source/bibliography/datman.hxx                                  |    5 
 extensions/source/bibliography/framectr.cxx                                |    1 
 extensions/source/bibliography/general.cxx                                 |   62 +
 extensions/source/bibliography/general.hxx                                 |   98 +-
 extensions/source/bibliography/toolbar.cxx                                 |    1 
 extensions/source/bibliography/toolbar.hxx                                 |    4 
 extensions/source/dbpilots/commonpagesdbp.cxx                              |   39 +
 extensions/source/dbpilots/commonpagesdbp.hxx                              |   28 
 extensions/source/dbpilots/controlwizard.cxx                               |   12 
 extensions/source/dbpilots/controlwizard.hxx                               |   13 
 extensions/source/dbpilots/gridwizard.cxx                                  |   15 
 extensions/source/dbpilots/gridwizard.hxx                                  |   14 
 extensions/source/dbpilots/groupboxwiz.cxx                                 |   50 +
 extensions/source/dbpilots/groupboxwiz.hxx                                 |   28 
 extensions/source/dbpilots/listcombowizard.cxx                             |   33 +
 extensions/source/dbpilots/listcombowizard.hxx                             |   18 
 extensions/source/plugin/inc/plugin/plctrl.hxx                             |   13 
 extensions/source/propctrlr/browserline.cxx                                |    7 
 extensions/source/propctrlr/browserline.hxx                                |    8 
 extensions/source/propctrlr/browserview.cxx                                |    4 
 extensions/source/propctrlr/browserview.hxx                                |    2 
 extensions/source/propctrlr/commoncontrol.cxx                              |    9 
 extensions/source/propctrlr/commoncontrol.hxx                              |    2 
 extensions/source/propctrlr/controlfontdialog.cxx                          |    2 
 extensions/source/propctrlr/formlinkdialog.cxx                             |   27 
 extensions/source/propctrlr/formlinkdialog.hxx                             |   11 
 extensions/source/propctrlr/listselectiondlg.cxx                           |   11 
 extensions/source/propctrlr/listselectiondlg.hxx                           |    4 
 extensions/source/propctrlr/newdatatype.cxx                                |   11 
 extensions/source/propctrlr/newdatatype.hxx                                |    6 
 extensions/source/propctrlr/propcontroller.cxx                             |    1 
 extensions/source/propctrlr/propcontroller.hxx                             |    4 
 extensions/source/propctrlr/propertyeditor.cxx                             |    6 
 extensions/source/propctrlr/propertyeditor.hxx                             |    2 
 extensions/source/propctrlr/selectlabeldialog.cxx                          |    3 
 extensions/source/propctrlr/selectlabeldialog.hxx                          |    6 
 extensions/source/propctrlr/standardcontrol.cxx                            |   16 
 extensions/source/propctrlr/standardcontrol.hxx                            |    4 
 extensions/source/propctrlr/taborder.cxx                                   |    5 
 extensions/source/propctrlr/taborder.hxx                                   |   10 
 extensions/source/scanner/grid.cxx                                         |   14 
 extensions/source/scanner/grid.hxx                                         |   11 
 extensions/source/scanner/sanedlg.cxx                                      |   32 
 extensions/source/scanner/sanedlg.hxx                                      |   48 -
 filter/source/flash/impswfdialog.cxx                                       |   13 
 filter/source/flash/impswfdialog.hxx                                       |   17 
 filter/source/flash/swfdialog.cxx                                          |    2 
 filter/source/pdf/impdialog.cxx                                            |  124 +++
 filter/source/pdf/impdialog.hxx                                            |  192 +++--
 filter/source/pdf/pdfdialog.cxx                                            |    2 
 filter/source/pdf/pdffilter.cxx                                            |    4 
 filter/source/svg/svgdialog.cxx                                            |    2 
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx                      |   10 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx                       |   31 
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx                       |   30 
 filter/source/xsltdialog/xmlfiltertabdialog.cxx                            |    6 
 filter/source/xsltdialog/xmlfiltertabdialog.hxx                            |    8 
 filter/source/xsltdialog/xmlfiltertabpagebasic.cxx                         |   12 
 filter/source/xsltdialog/xmlfiltertabpagebasic.hxx                         |   11 
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx                          |   14 
 filter/source/xsltdialog/xmlfiltertabpagexslt.hxx                          |   17 
 filter/source/xsltdialog/xmlfiltertestdialog.cxx                           |   16 
 filter/source/xsltdialog/xmlfiltertestdialog.hxx                           |   30 
 forms/source/richtext/richtextimplcontrol.cxx                              |   19 
 forms/source/richtext/richtextimplcontrol.hxx                              |   14 
 forms/source/solar/control/navtoolbar.cxx                                  |   10 
 forms/source/solar/inc/navtoolbar.hxx                                      |    4 
 formula/source/ui/dlg/ControlHelper.hxx                                    |   18 
 formula/source/ui/dlg/formula.cxx                                          |   66 +-
 formula/source/ui/dlg/funcpage.cxx                                         |   12 
 formula/source/ui/dlg/funcpage.hxx                                         |    6 
 formula/source/ui/dlg/funcutl.cxx                                          |   55 +
 formula/source/ui/dlg/parawin.cxx                                          |   20 
 formula/source/ui/dlg/parawin.hxx                                          |   50 -
 formula/source/ui/dlg/structpg.cxx                                         |   11 
 formula/source/ui/dlg/structpg.hxx                                         |    4 
 fpicker/source/office/OfficeControlAccess.hxx                              |    2 
 fpicker/source/office/PlacesListBox.cxx                                    |   14 
 fpicker/source/office/PlacesListBox.hxx                                    |   12 
 fpicker/source/office/QueryFolderName.hxx                                  |    8 
 fpicker/source/office/asyncfilepicker.hxx                                  |    5 
 fpicker/source/office/commonpicker.cxx                                     |   10 
 fpicker/source/office/commonpicker.hxx                                     |    3 
 fpicker/source/office/iodlg.cxx                                            |   43 +
 fpicker/source/office/iodlg.hxx                                            |   22 
 fpicker/source/office/iodlgimp.cxx                                         |    5 
 fpicker/source/office/iodlgimp.hxx                                         |   52 -
 framework/inc/classes/fwktabwindow.hxx                                     |    7 
 framework/inc/dispatch/closedispatcher.hxx                                 |    3 
 framework/inc/helper/vclstatusindicator.hxx                                |    2 
 framework/inc/uielement/buttontoolbarcontroller.hxx                        |    7 
 framework/inc/uielement/comboboxtoolbarcontroller.hxx                      |    2 
 framework/inc/uielement/complextoolbarcontroller.hxx                       |    5 
 framework/inc/uielement/dropdownboxtoolbarcontroller.hxx                   |    3 
 framework/inc/uielement/edittoolbarcontroller.hxx                          |    2 
 framework/inc/uielement/generictoolbarcontroller.hxx                       |   11 
 framework/inc/uielement/spinfieldtoolbarcontroller.hxx                     |    3 
 framework/inc/uielement/statusbaritem.hxx                                  |    3 
 framework/inc/uielement/statusbarmanager.hxx                               |   11 
 framework/inc/uielement/toolbarmanager.hxx                                 |    2 
 framework/inc/uielement/toolbarmerger.hxx                                  |    2 
 framework/source/helper/vclstatusindicator.cxx                             |    3 
 framework/source/services/tabwindowservice.cxx                             |    8 
 framework/source/uielement/buttontoolbarcontroller.cxx                     |    2 
 framework/source/uielement/comboboxtoolbarcontroller.cxx                   |    4 
 framework/source/uielement/complextoolbarcontroller.cxx                    |    2 
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx                |    4 
 framework/source/uielement/edittoolbarcontroller.cxx                       |    4 
 framework/source/uielement/generictoolbarcontroller.cxx                    |    2 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx                  |    4 
 framework/source/uielement/statusbarmanager.cxx                            |   51 -
 framework/source/uielement/toolbarmanager.cxx                              |    8 
 include/dbaccess/ToolBoxHelper.hxx                                         |    3 
 include/dbaccess/genericcontroller.hxx                                     |    7 
 include/editeng/splwrap.hxx                                                |    3 
 include/formula/funcutl.hxx                                                |    6 
 include/sfx2/basedlgs.hxx                                                  |   16 
 include/sfx2/checkin.hxx                                                   |    8 
 include/sfx2/childwin.hxx                                                  |    8 
 include/sfx2/dinfdlg.hxx                                                   |   86 +-
 include/sfx2/fcontnr.hxx                                                   |    5 
 include/sfx2/frame.hxx                                                     |    3 
 include/sfx2/infobar.hxx                                                   |   17 
 include/sfx2/ipclient.hxx                                                  |    2 
 include/sfx2/mgetempl.hxx                                                  |   24 
 include/sfx2/newstyle.hxx                                                  |    4 
 include/sfx2/passwd.hxx                                                    |   30 
 include/sfx2/printopt.hxx                                                  |   43 -
 include/sfx2/prnmon.hxx                                                    |    2 
 include/sfx2/sidebar/SidebarPanelBase.hxx                                  |    3 
 include/sfx2/stbitem.hxx                                                   |    6 
 include/sfx2/tabdlg.hxx                                                    |   20 
 include/sfx2/templatedlg.hxx                                               |   20 
 include/sfx2/templateinfodlg.hxx                                           |    8 
 include/sfx2/thumbnailview.hxx                                             |    2 
 include/sfx2/thumbnailviewitem.hxx                                         |    2 
 include/sfx2/viewsh.hxx                                                    |    3 
 include/svtools/GraphicExportOptionsDialog.hxx                             |    9 
 include/svtools/PlaceEditDialog.hxx                                        |   13 
 include/svtools/ServerDetailsControls.hxx                                  |   26 
 include/svtools/accessibleruler.hxx                                        |    3 
 include/svtools/addresstemplate.hxx                                        |    8 
 include/svtools/brwbox.hxx                                                 |   16 
 include/svtools/brwhead.hxx                                                |    5 
 include/svtools/calendar.hxx                                               |    8 
 include/svtools/colrdlg.hxx                                                |    8 
 include/svtools/editbrowsebox.hxx                                          |   10 
 include/svtools/fileview.hxx                                               |    4 
 include/svtools/generictoolboxcontroller.hxx                               |    4 
 include/svtools/genericunodialog.hxx                                       |    3 
 include/svtools/prnsetup.hxx                                               |   14 
 include/svtools/simptabl.hxx                                               |    4 
 include/svtools/tabbar.hxx                                                 |    2 
 include/svtools/treelistbox.hxx                                            |    4 
 include/svtools/wizardmachine.hxx                                          |   13 
 include/svtools/wizdlg.hxx                                                 |   10 
 include/svx/AccessibleShapeTreeInfo.hxx                                    |    3 
 include/svx/bmpmask.hxx                                                    |   50 -
 include/svx/compressgraphicdialog.hxx                                      |   34 -
 include/svx/contdlg.hxx                                                    |    6 
 include/svx/ctredlin.hxx                                                   |   56 -
 include/svx/dialcontrol.hxx                                                |    2 
 include/svx/fillctrl.hxx                                                   |   10 
 include/svx/fmshell.hxx                                                    |    2 
 include/svx/fontworkgallery.hxx                                            |   10 
 include/svx/hdft.hxx                                                       |   32 
 include/svx/imapdlg.hxx                                                    |   18 
 include/svx/lboxctrl.hxx                                                   |    2 
 include/svx/linkwarn.hxx                                                   |    2 
 include/svx/optgrid.hxx                                                    |   40 -
 include/svx/passwd.hxx                                                     |   14 
 include/svx/rubydialog.hxx                                                 |   46 -
 include/svx/ruler.hxx                                                      |    2 
 include/svx/sidebar/Popup.hxx                                              |    3 
 include/svx/srchdlg.hxx                                                    |  100 +--
 include/svx/svdedxv.hxx                                                    |    4 
 include/svx/svdpntv.hxx                                                    |    4 
 include/svx/tbxcolorupdate.hxx                                             |    7 
 include/tools/errinf.hxx                                                   |    5 
 include/vcl/builder.hxx                                                    |   20 
 include/vcl/button.hxx                                                     |    4 
 include/vcl/combobox.hxx                                                   |    6 
 include/vcl/controllayout.hxx                                              |    4 
 include/vcl/cursor.hxx                                                     |    3 
 include/vcl/dialog.hxx                                                     |    2 
 include/vcl/dockwin.hxx                                                    |   14 
 include/vcl/event.hxx                                                      |    3 
 include/vcl/field.hxx                                                      |    2 
 include/vcl/fixed.hxx                                                      |    2 
 include/vcl/floatwin.hxx                                                   |    4 
 include/vcl/fltcall.hxx                                                    |    2 
 include/vcl/layout.hxx                                                     |   30 
 include/vcl/lstbox.hxx                                                     |    8 
 include/vcl/menu.hxx                                                       |    2 
 include/vcl/msgbox.hxx                                                     |   16 
 include/vcl/opengl/OpenGLContext.hxx                                       |    8 
 include/vcl/seleng.hxx                                                     |    2 
 include/vcl/split.hxx                                                      |    2 
 include/vcl/syswin.hxx                                                     |    2 
 include/vcl/tabdlg.hxx                                                     |    4 
 include/vcl/tabpage.hxx                                                    |    2 
 include/vcl/taskpanelist.hxx                                               |    2 
 include/vcl/toolbox.hxx                                                    |    4 
 include/vcl/vclevent.hxx                                                   |    7 
 include/vcl/vclptr.hxx                                                     |   40 +
 include/vcl/waitobj.hxx                                                    |    2 
 include/vcl/window.hxx                                                     |    4 
 reportdesign/source/ui/dlg/AddField.cxx                                    |    9 
 reportdesign/source/ui/dlg/CondFormat.cxx                                  |    9 
 reportdesign/source/ui/dlg/Condition.cxx                                   |   17 
 reportdesign/source/ui/dlg/Condition.hxx                                   |   32 
 reportdesign/source/ui/dlg/DateTime.cxx                                    |   13 
 reportdesign/source/ui/dlg/Formula.cxx                                     |    2 
 reportdesign/source/ui/dlg/GroupsSorting.cxx                               |   75 +-
 reportdesign/source/ui/dlg/Navigator.cxx                                   |    2 
 reportdesign/source/ui/dlg/PageNumber.cxx                                  |   12 
 reportdesign/source/ui/inc/CondFormat.hxx                                  |   12 
 reportdesign/source/ui/inc/DateTime.hxx                                    |   15 
 reportdesign/source/ui/inc/DesignView.hxx                                  |    8 
 reportdesign/source/ui/inc/Formula.hxx                                     |    6 
 reportdesign/source/ui/inc/GroupsSorting.hxx                               |   20 
 reportdesign/source/ui/inc/PageNumber.hxx                                  |   13 
 reportdesign/source/ui/inc/ReportController.hxx                            |    2 
 reportdesign/source/ui/inc/ReportSection.hxx                               |    2 
 reportdesign/source/ui/inc/ReportWindow.hxx                                |    8 
 reportdesign/source/ui/inc/ScrollHelper.hxx                                |    2 
 reportdesign/source/ui/inc/SectionView.hxx                                 |    4 
 reportdesign/source/ui/inc/SectionWindow.hxx                               |    2 
 reportdesign/source/ui/inc/StartMarker.hxx                                 |    2 
 reportdesign/source/ui/inc/ViewsWindow.hxx                                 |   12 
 reportdesign/source/ui/inc/dlgedfunc.hxx                                   |    2 
 reportdesign/source/ui/inc/propbrw.hxx                                     |    2 
 reportdesign/source/ui/report/DesignView.cxx                               |   12 
 reportdesign/source/ui/report/ReportSection.cxx                            |    1 
 reportdesign/source/ui/report/ReportWindow.cxx                             |    2 
 reportdesign/source/ui/report/ScrollHelper.cxx                             |    1 
 reportdesign/source/ui/report/SectionWindow.cxx                            |    1 
 reportdesign/source/ui/report/StartMarker.cxx                              |    1 
 reportdesign/source/ui/report/ViewsWindow.cxx                              |    1 
 reportdesign/source/ui/report/propbrw.cxx                                  |    1 
 sc/inc/AccessibleFilterMenu.hxx                                            |    3 
 sc/inc/AccessibleFilterMenuItem.hxx                                        |    3 
 sc/inc/scmod.hxx                                                           |    4 
 sc/inc/scopetools.hxx                                                      |    3 
 sc/inc/waitoff.hxx                                                         |    2 
 sc/source/ui/Accessibility/AccessibleText.cxx                              |   24 
 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx                |   13 
 sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx              |   10 
 sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx                     |   10 
 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx             |   28 
 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx                          |   25 
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx             |   19 
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx             |   24 
 sc/source/ui/app/inputhdl.cxx                                              |    5 
 sc/source/ui/app/scmod.cxx                                                 |   14 
 sc/source/ui/attrdlg/scdlgfact.hxx                                         |    8 
 sc/source/ui/attrdlg/scuiexp.cxx                                           |   30 
 sc/source/ui/attrdlg/tabpages.cxx                                          |   14 
 sc/source/ui/cctrl/checklistmenu.cxx                                       |   18 
 sc/source/ui/condformat/colorformat.cxx                                    |   23 
 sc/source/ui/condformat/condformatdlg.cxx                                  |   24 
 sc/source/ui/condformat/condformatmgr.cxx                                  |    5 
 sc/source/ui/dbgui/PivotLayoutDialog.cxx                                   |   40 +
 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx                             |   12 
 sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx                            |    2 
 sc/source/ui/dbgui/consdlg.cxx                                             |   17 
 sc/source/ui/dbgui/dapidata.cxx                                            |   13 
 sc/source/ui/dbgui/dapitype.cxx                                            |   23 
 sc/source/ui/dbgui/dbnamdlg.cxx                                            |   15 
 sc/source/ui/dbgui/dpgroupdlg.cxx                                          |   39 +
 sc/source/ui/dbgui/filtdlg.cxx                                             |   32 
 sc/source/ui/dbgui/pfiltdlg.cxx                                            |   18 
 sc/source/ui/dbgui/pvfundlg.cxx                                            |   78 ++
 sc/source/ui/dbgui/scendlg.cxx                                             |   18 
 sc/source/ui/dbgui/scuiasciiopt.cxx                                        |   22 
 sc/source/ui/dbgui/scuiimoptdlg.cxx                                        |   12 
 sc/source/ui/dbgui/sfiltdlg.cxx                                            |   19 
 sc/source/ui/dbgui/sortdlg.cxx                                             |   13 
 sc/source/ui/dbgui/subtdlg.cxx                                             |   11 
 sc/source/ui/dbgui/textimportoptions.cxx                                   |   12 
 sc/source/ui/dbgui/tpsort.cxx                                              |   30 
 sc/source/ui/dbgui/tpsubt.cxx                                              |   18 
 sc/source/ui/dbgui/validate.cxx                                            |   59 +
 sc/source/ui/dialogs/searchresults.cxx                                     |    2 
 sc/source/ui/docshell/tablink.cxx                                          |    6 
 sc/source/ui/docshell/tpstat.cxx                                           |   10 
 sc/source/ui/drawfunc/fupoor.cxx                                           |    2 
 sc/source/ui/formdlg/dwfunctr.cxx                                          |    1 
 sc/source/ui/inc/AccessibleCsvControl.hxx                                  |    3 
 sc/source/ui/inc/AccessibleEditObject.hxx                                  |    2 
 sc/source/ui/inc/AccessibleText.hxx                                        |    4 
 sc/source/ui/inc/AnalysisOfVarianceDialog.hxx                              |    9 
 sc/source/ui/inc/ExponentialSmoothingDialog.hxx                            |    3 
 sc/source/ui/inc/MovingAverageDialog.hxx                                   |    3 
 sc/source/ui/inc/PivotLayoutDialog.hxx                                     |   55 -
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx                               |    3 
 sc/source/ui/inc/RandomNumberGeneratorDialog.hxx                           |   31 
 sc/source/ui/inc/SamplingDialog.hxx                                        |   29 
 sc/source/ui/inc/StatisticsInputOutputDialog.hxx                           |   21 
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx                           |   27 
 sc/source/ui/inc/acredlin.hxx                                              |    8 
 sc/source/ui/inc/anyrefdg.hxx                                              |   18 
 sc/source/ui/inc/areasdlg.hxx                                              |   24 
 sc/source/ui/inc/checklistmenu.hxx                                         |   13 
 sc/source/ui/inc/colorformat.hxx                                           |   29 
 sc/source/ui/inc/condformatdlg.hxx                                         |   19 
 sc/source/ui/inc/condformatmgr.hxx                                         |    8 
 sc/source/ui/inc/conflictsdlg.hxx                                          |   11 
 sc/source/ui/inc/consdlg.hxx                                               |   34 -
 sc/source/ui/inc/content.hxx                                               |    3 
 sc/source/ui/inc/corodlg.hxx                                               |   11 
 sc/source/ui/inc/crdlg.hxx                                                 |   10 
 sc/source/ui/inc/crnrdlg.hxx                                               |   25 
 sc/source/ui/inc/dapidata.hxx                                              |    8 
 sc/source/ui/inc/dapitype.hxx                                              |   23 
 sc/source/ui/inc/datafdlg.hxx                                              |   19 
 sc/source/ui/inc/datastreamdlg.hxx                                         |   36 -
 sc/source/ui/inc/dbnamdlg.hxx                                              |   36 -
 sc/source/ui/inc/delcldlg.hxx                                              |   10 
 sc/source/ui/inc/delcodlg.hxx                                              |   19 
 sc/source/ui/inc/dpgroupdlg.hxx                                            |   55 -
 sc/source/ui/inc/dwfunctr.hxx                                              |    2 
 sc/source/ui/inc/filldlg.hxx                                               |   41 -
 sc/source/ui/inc/filtdlg.hxx                                               |  120 +--
 sc/source/ui/inc/foptmgr.hxx                                               |   24 
 sc/source/ui/inc/fupoor.hxx                                                |    4 
 sc/source/ui/inc/gridwin.hxx                                               |    4 
 sc/source/ui/inc/groupdlg.hxx                                              |    6 
 sc/source/ui/inc/highred.hxx                                               |   16 
 sc/source/ui/inc/inputhdl.hxx                                              |    9 
 sc/source/ui/inc/inscldlg.hxx                                              |    9 
 sc/source/ui/inc/inscodlg.hxx                                              |   52 -
 sc/source/ui/inc/instbdlg.hxx                                              |   26 
 sc/source/ui/inc/lbseldlg.hxx                                              |    4 
 sc/source/ui/inc/linkarea.hxx                                              |   15 
 sc/source/ui/inc/mtrindlg.hxx                                              |    6 
 sc/source/ui/inc/mvtabdlg.hxx                                              |   15 
 sc/source/ui/inc/namecrea.hxx                                              |   11 
 sc/source/ui/inc/namedefdlg.hxx                                            |   25 
 sc/source/ui/inc/namedlg.hxx                                               |   28 
 sc/source/ui/inc/namepast.hxx                                              |    8 
 sc/source/ui/inc/navipi.hxx                                                |    2 
 sc/source/ui/inc/notemark.hxx                                              |    8 
 sc/source/ui/inc/opredlin.hxx                                              |   10 
 sc/source/ui/inc/optsolver.hxx                                             |  127 ++-
 sc/source/ui/inc/pfiltdlg.hxx                                              |   42 -
 sc/source/ui/inc/prevwsh.hxx                                               |   10 
 sc/source/ui/inc/protectiondlg.hxx                                         |   15 
 sc/source/ui/inc/pvfundlg.hxx                                              |   88 +-
 sc/source/ui/inc/reffact.hxx                                               |    2 
 sc/source/ui/inc/retypepassdlg.hxx                                         |   26 
 sc/source/ui/inc/scendlg.hxx                                               |   19 
 sc/source/ui/inc/scuiasciiopt.hxx                                          |   44 -
 sc/source/ui/inc/scuiautofmt.hxx                                           |   28 
 sc/source/ui/inc/scuiimoptdlg.hxx                                          |   24 
 sc/source/ui/inc/scuitphfedit.hxx                                          |   43 -
 sc/source/ui/inc/searchresults.hxx                                         |    2 
 sc/source/ui/inc/sharedocdlg.hxx                                           |    6 
 sc/source/ui/inc/shtabdlg.hxx                                              |    6 
 sc/source/ui/inc/simpref.hxx                                               |   11 
 sc/source/ui/inc/solveroptions.hxx                                         |   18 
 sc/source/ui/inc/solvrdlg.hxx                                              |   21 
 sc/source/ui/inc/sortdlg.hxx                                               |    8 
 sc/source/ui/inc/sortkeydlg.hxx                                            |   12 
 sc/source/ui/inc/strindlg.hxx                                              |    7 
 sc/source/ui/inc/subtdlg.hxx                                               |    4 
 sc/source/ui/inc/tabbgcolordlg.hxx                                         |   11 
 sc/source/ui/inc/tabopdlg.hxx                                              |   25 
 sc/source/ui/inc/tabpages.hxx                                              |   11 
 sc/source/ui/inc/tabview.hxx                                               |   10 
 sc/source/ui/inc/textimportoptions.hxx                                     |   12 
 sc/source/ui/inc/tpcalc.hxx                                                |   32 
 sc/source/ui/inc/tpcompatibility.hxx                                       |    6 
 sc/source/ui/inc/tpdefaults.hxx                                            |    5 
 sc/source/ui/inc/tpformula.hxx                                             |   24 
 sc/source/ui/inc/tphf.hxx                                                  |   13 
 sc/source/ui/inc/tpprint.hxx                                               |   10 
 sc/source/ui/inc/tpsort.hxx                                                |   34 -
 sc/source/ui/inc/tpstat.hxx                                                |   10 
 sc/source/ui/inc/tpsubt.hxx                                                |   26 
 sc/source/ui/inc/tptable.hxx                                               |   48 -
 sc/source/ui/inc/tpusrlst.hxx                                              |   24 
 sc/source/ui/inc/tpview.hxx                                                |   88 +-
 sc/source/ui/inc/validate.hxx                                              |   62 +
 sc/source/ui/inc/xmlsourcedlg.hxx                                          |   20 
 sc/source/ui/miscdlgs/acredlin.cxx                                         |    5 
 sc/source/ui/miscdlgs/anyrefdg.cxx                                         |   18 
 sc/source/ui/miscdlgs/conflictsdlg.cxx                                     |   11 
 sc/source/ui/miscdlgs/crdlg.cxx                                            |   15 
 sc/source/ui/miscdlgs/crnrdlg.cxx                                          |   20 
 sc/source/ui/miscdlgs/datafdlg.cxx                                         |   14 
 sc/source/ui/miscdlgs/datastreamdlg.cxx                                    |   27 
 sc/source/ui/miscdlgs/delcldlg.cxx                                         |   15 
 sc/source/ui/miscdlgs/delcodlg.cxx                                         |   23 
 sc/source/ui/miscdlgs/filldlg.cxx                                          |   26 
 sc/source/ui/miscdlgs/groupdlg.cxx                                         |   14 
 sc/source/ui/miscdlgs/highred.cxx                                          |    8 
 sc/source/ui/miscdlgs/inscldlg.cxx                                         |   18 
 sc/source/ui/miscdlgs/inscodlg.cxx                                         |   22 
 sc/source/ui/miscdlgs/instbdlg.cxx                                         |   13 
 sc/source/ui/miscdlgs/lbseldlg.cxx                                         |   12 
 sc/source/ui/miscdlgs/linkarea.cxx                                         |   13 
 sc/source/ui/miscdlgs/mtrindlg.cxx                                         |   12 
 sc/source/ui/miscdlgs/mvtabdlg.cxx                                         |   13 
 sc/source/ui/miscdlgs/namecrea.cxx                                         |   14 
 sc/source/ui/miscdlgs/optsolver.cxx                                        |   95 ++
 sc/source/ui/miscdlgs/protectiondlg.cxx                                    |   13 
 sc/source/ui/miscdlgs/retypepassdlg.cxx                                    |   25 
 sc/source/ui/miscdlgs/scuiautofmt.cxx                                      |   23 
 sc/source/ui/miscdlgs/sharedocdlg.cxx                                      |    4 
 sc/source/ui/miscdlgs/shtabdlg.cxx                                         |   12 
 sc/source/ui/miscdlgs/simpref.cxx                                          |   11 
 sc/source/ui/miscdlgs/solveroptions.cxx                                    |   27 
 sc/source/ui/miscdlgs/solvrdlg.cxx                                         |   18 
 sc/source/ui/miscdlgs/strindlg.cxx                                         |   12 
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx                                    |   23 
 sc/source/ui/miscdlgs/tabopdlg.cxx                                         |   19 
 sc/source/ui/namedlg/namedefdlg.cxx                                        |   21 
 sc/source/ui/namedlg/namedlg.cxx                                           |   15 
 sc/source/ui/namedlg/namepast.cxx                                          |    5 
 sc/source/ui/navipi/content.cxx                                            |    7 
 sc/source/ui/optdlg/calcoptionsdlg.cxx                                     |   22 
 sc/source/ui/optdlg/calcoptionsdlg.hxx                                     |   33 -
 sc/source/ui/optdlg/opredlin.cxx                                           |   10 
 sc/source/ui/optdlg/tpcalc.cxx                                             |   16 
 sc/source/ui/optdlg/tpcompatibility.cxx                                    |    7 
 sc/source/ui/optdlg/tpdefaults.cxx                                         |    8 
 sc/source/ui/optdlg/tpformula.cxx                                          |   17 
 sc/source/ui/optdlg/tpprint.cxx                                            |    9 
 sc/source/ui/optdlg/tpusrlst.cxx                                           |   12 
 sc/source/ui/optdlg/tpview.cxx                                             |   43 +
 sc/source/ui/pagedlg/areasdlg.cxx                                          |   12 
 sc/source/ui/pagedlg/scuitphfedit.cxx                                      |   26 
 sc/source/ui/pagedlg/tphf.cxx                                              |    8 
 sc/source/ui/pagedlg/tptable.cxx                                           |   27 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx                            |   14 
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx                            |   20 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx                       |   10 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx                       |   12 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx                         |   12 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx                         |   15 
 sc/source/ui/vba/vbaeventshelper.cxx                                       |    8 
 sc/source/ui/view/gridwin.cxx                                              |   27 
 sc/source/ui/view/gridwin2.cxx                                             |    2 
 sc/source/ui/view/prevwsh.cxx                                              |    8 
 sc/source/ui/view/reffact.cxx                                              |   30 
 sc/source/ui/view/tabview.cxx                                              |    2 
 sc/source/ui/view/tabview5.cxx                                             |    7 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx                                    |   21 
 sd/inc/Outliner.hxx                                                        |    2 
 sd/source/filter/html/pubdlg.cxx                                           |  108 +++
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx                   |   16 
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx                    |   24 
 sd/source/ui/animations/CustomAnimationCreateDialog.hxx                    |    4 
 sd/source/ui/animations/CustomAnimationDialog.cxx                          |  178 +++--
 sd/source/ui/animations/CustomAnimationDialog.hxx                          |    8 
 sd/source/ui/animations/CustomAnimationList.cxx                            |    2 
 sd/source/ui/animations/CustomAnimationPane.cxx                            |   23 
 sd/source/ui/animations/CustomAnimationPane.hxx                            |   34 -
 sd/source/ui/animations/SlideTransitionPane.cxx                            |   15 
 sd/source/ui/animations/SlideTransitionPane.hxx                            |   26 
 sd/source/ui/annotations/annotationtag.hxx                                 |    2 
 sd/source/ui/annotations/annotationwindow.cxx                              |   13 
 sd/source/ui/annotations/annotationwindow.hxx                              |    9 
 sd/source/ui/controller/slidelayoutcontroller.cxx                          |   13 
 sd/source/ui/dlg/PaneChildWindows.cxx                                      |    4 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx                                      |   17 
 sd/source/ui/dlg/PhotoAlbumDialog.hxx                                      |   24 
 sd/source/ui/dlg/RemoteDialog.cxx                                          |   13 
 sd/source/ui/dlg/RemoteDialog.hxx                                          |    8 
 sd/source/ui/dlg/RemoteDialogClientBox.hxx                                 |    2 
 sd/source/ui/dlg/animobjs.cxx                                              |   22 
 sd/source/ui/dlg/brkdlg.cxx                                                |    8 
 sd/source/ui/dlg/copydlg.cxx                                               |   36 -
 sd/source/ui/dlg/custsdlg.cxx                                              |   29 
 sd/source/ui/dlg/dlgass.cxx                                                |  122 +--
 sd/source/ui/dlg/dlgfield.cxx                                              |   15 
 sd/source/ui/dlg/dlgsnap.cxx                                               |   19 
 sd/source/ui/dlg/headerfooterdlg.cxx                                       |   66 +-
 sd/source/ui/dlg/ins_paste.cxx                                             |   12 
 sd/source/ui/dlg/inspagob.cxx                                              |    9 
 sd/source/ui/dlg/layeroptionsdlg.cxx                                       |   16 
 sd/source/ui/dlg/masterlayoutdlg.cxx                                       |   15 
 sd/source/ui/dlg/morphdlg.cxx                                              |    9 
 sd/source/ui/dlg/paragr.cxx                                                |   16 
 sd/source/ui/dlg/present.cxx                                               |   33 +
 sd/source/ui/dlg/prntopts.cxx                                              |   27 
 sd/source/ui/dlg/sddlgfact.cxx                                             |   14 
 sd/source/ui/dlg/sddlgfact.hxx                                             |    3 
 sd/source/ui/dlg/sdpreslt.cxx                                              |   10 
 sd/source/ui/dlg/sdtreelb.cxx                                              |    4 
 sd/source/ui/dlg/sduiexp.cxx                                               |   15 
 sd/source/ui/dlg/tpaction.cxx                                              |   19 
 sd/source/ui/dlg/tpoption.cxx                                              |   42 +
 sd/source/ui/dlg/vectdlg.cxx                                               |   16 
 sd/source/ui/framework/factories/ChildWindowPane.cxx                       |    2 
 sd/source/ui/framework/factories/FullScreenPane.cxx                        |   12 
 sd/source/ui/framework/factories/Pane.cxx                                  |    2 
 sd/source/ui/func/fupoor.cxx                                               |    8 
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx                            |    2 
 sd/source/ui/inc/AccessibleSlideSorterView.hxx                             |    3 
 sd/source/ui/inc/BreakDlg.hxx                                              |    8 
 sd/source/ui/inc/FormShellManager.hxx                                      |    3 
 sd/source/ui/inc/Ruler.hxx                                                 |    2 
 sd/source/ui/inc/ViewShell.hxx                                             |    4 
 sd/source/ui/inc/Window.hxx                                                |    2 
 sd/source/ui/inc/WindowUpdater.hxx                                         |    3 
 sd/source/ui/inc/animobjs.hxx                                              |   46 -
 sd/source/ui/inc/copydlg.hxx                                               |   22 
 sd/source/ui/inc/custsdlg.hxx                                              |   41 -
 sd/source/ui/inc/dlgfield.hxx                                              |   11 
 sd/source/ui/inc/dlgsnap.hxx                                               |   20 
 sd/source/ui/inc/framework/Pane.hxx                                        |    3 
 sd/source/ui/inc/fupoor.hxx                                                |    6 
 sd/source/ui/inc/headerfooterdlg.hxx                                       |   12 
 sd/source/ui/inc/ins_paste.hxx                                             |    6 
 sd/source/ui/inc/inspagob.hxx                                              |    7 
 sd/source/ui/inc/layeroptionsdlg.hxx                                       |   15 
 sd/source/ui/inc/masterlayoutdlg.hxx                                       |   12 
 sd/source/ui/inc/morphdlg.hxx                                              |    9 
 sd/source/ui/inc/navigatr.hxx                                              |    4 
 sd/source/ui/inc/present.hxx                                               |   48 -
 sd/source/ui/inc/prntopts.hxx                                              |   39 -
 sd/source/ui/inc/pubdlg.hxx                                                |  169 ++---
 sd/source/ui/inc/sdpreslt.hxx                                              |   11 
 sd/source/ui/inc/sdtreelb.hxx                                              |    4 
 sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx                      |    2 
 sd/source/ui/inc/tpaction.hxx                                              |   31 
 sd/source/ui/inc/tpoption.hxx                                              |   62 -
 sd/source/ui/inc/vectdlg.hxx                                               |   21 
 sd/source/ui/slideshow/slideshow.cxx                                       |    2 
 sd/source/ui/slideshow/slideshowimpl.cxx                                   |   17 
 sd/source/ui/slideshow/slideshowimpl.hxx                                   |   12 
 sd/source/ui/table/TableDesignPane.hxx                                     |    4 
 sd/source/ui/view/FormShellManager.cxx                                     |    4 
 sd/source/ui/view/sdruler.cxx                                              |    1 
 sd/source/ui/view/sdview2.cxx                                              |    2 
 sd/source/ui/view/sdwindow.cxx                                             |    1 
 sd/source/ui/view/viewshe2.cxx                                             |    2 
 sd/source/ui/view/viewshel.cxx                                             |    2 
 sfx2/inc/srchdlg.hxx                                                       |   12 
 sfx2/source/appl/childwin.cxx                                              |   18 
 sfx2/source/appl/fileobj.hxx                                               |    2 
 sfx2/source/appl/helpinterceptor.hxx                                       |    3 
 sfx2/source/appl/impldde.cxx                                               |   24 
 sfx2/source/appl/lnkbase2.cxx                                              |    4 
 sfx2/source/appl/newhelp.cxx                                               |   79 +-
 sfx2/source/appl/newhelp.hxx                                               |   58 +
 sfx2/source/appl/workwin.cxx                                               |   16 
 sfx2/source/control/thumbnailview.cxx                                      |    2 
 sfx2/source/control/thumbnailviewacc.cxx                                   |    2 
 sfx2/source/control/thumbnailviewacc.hxx                                   |    5 
 sfx2/source/control/thumbnailviewitem.cxx                                  |    5 
 sfx2/source/dialog/alienwarn.cxx                                           |    2 
 sfx2/source/dialog/backingwindow.cxx                                       |   27 
 sfx2/source/dialog/backingwindow.hxx                                       |   58 -
 sfx2/source/dialog/basedlgs.cxx                                            |   13 
 sfx2/source/dialog/checkin.cxx                                             |   13 
 sfx2/source/dialog/dinfdlg.cxx                                             |  102 ++-
 sfx2/source/dialog/dockwin.cxx                                             |   10 
 sfx2/source/dialog/documentfontsdialog.cxx                                 |   11 
 sfx2/source/dialog/filedlgimpl.hxx                                         |    2 
 sfx2/source/dialog/infobar.cxx                                             |   31 
 sfx2/source/dialog/inputdlg.cxx                                            |   14 
 sfx2/source/dialog/mgetempl.cxx                                            |   12 
 sfx2/source/dialog/navigat.cxx                                             |    2 
 sfx2/source/dialog/newstyle.cxx                                            |    2 
 sfx2/source/dialog/partwnd.cxx                                             |    8 
 sfx2/source/dialog/passwd.cxx                                              |   22 
 sfx2/source/dialog/printopt.cxx                                            |   30 
 sfx2/source/dialog/recfloat.cxx                                            |    3 
 sfx2/source/dialog/securitypage.cxx                                        |    8 
 sfx2/source/dialog/splitwin.cxx                                            |   19 
 sfx2/source/dialog/srchdlg.cxx                                             |    6 
 sfx2/source/dialog/tabdlg.cxx                                              |   44 -
 sfx2/source/dialog/templateinfodlg.cxx                                     |    6 
 sfx2/source/dialog/templdlg.cxx                                            |    9 
 sfx2/source/dialog/versdlg.cxx                                             |   31 
 sfx2/source/doc/new.cxx                                                    |   22 
 sfx2/source/doc/templatedlg.cxx                                            |   14 
 sfx2/source/inc/alienwarn.hxx                                              |    4 
 sfx2/source/inc/documentfontsdialog.hxx                                    |    4 
 sfx2/source/inc/inputdlg.hxx                                               |   10 
 sfx2/source/inc/recfloat.hxx                                               |    2 
 sfx2/source/inc/splitwin.hxx                                               |   10 
 sfx2/source/inc/templdgi.hxx                                               |   10 
 sfx2/source/inc/versdlg.hxx                                                |   40 -
 sfx2/source/inc/workwin.hxx                                                |   12 
 sfx2/source/sidebar/FocusManager.cxx                                       |   24 
 sfx2/source/sidebar/FocusManager.hxx                                       |   10 
 sfx2/source/sidebar/PanelTitleBar.cxx                                      |   19 
 sfx2/source/sidebar/PanelTitleBar.hxx                                      |    4 
 sfx2/source/sidebar/SidebarChildWindow.cxx                                 |    2 
 sfx2/source/sidebar/SidebarController.cxx                                  |   18 
 sfx2/source/sidebar/SidebarController.hxx                                  |    4 
 sfx2/source/sidebar/SidebarPanelBase.cxx                                   |   16 
 sfx2/source/statbar/stbitem.cxx                                            |    2 
 sfx2/source/toolbox/imgmgr.cxx                                             |    2 
 sfx2/source/toolbox/tbxitem.cxx                                            |   26 
 sfx2/source/view/frame.cxx                                                 |    2 
 sfx2/source/view/frame2.cxx                                                |    2 
 sfx2/source/view/impframe.hxx                                              |   14 
 sfx2/source/view/impviewframe.hxx                                          |    4 
 sfx2/source/view/printer.cxx                                               |    2 
 sfx2/source/view/sfxbasecontroller.cxx                                     |    2 
 sfx2/source/view/viewfrm.cxx                                               |    4 
 sfx2/source/view/viewprn.cxx                                               |    4 
 starmath/inc/ElementsDockingWindow.hxx                                     |    4 
 starmath/inc/dialog.hxx                                                    |  156 ++--
 starmath/inc/edit.hxx                                                      |    6 
 starmath/inc/toolbox.hxx                                                   |    6 
 starmath/inc/view.hxx                                                      |    2 
 starmath/source/ElementsDockingWindow.cxx                                  |    3 
 starmath/source/accessibility.hxx                                          |    4 
 starmath/source/dialog.cxx                                                 |  141 ++++
 starmath/source/edit.cxx                                                   |   10 
 starmath/source/toolbox.cxx                                                |   11 
 starmath/source/view.cxx                                                   |    2 
 svtools/inc/vclxaccessibleheaderbar.hxx                                    |    2 
 svtools/inc/vclxaccessibleheaderbaritem.hxx                                |    3 
 svtools/source/brwbox/brwbox1.cxx                                          |   28 
 svtools/source/brwbox/brwbox2.cxx                                          |   32 
 svtools/source/brwbox/brwhead.cxx                                          |   12 
 svtools/source/brwbox/datwin.cxx                                           |   12 
 svtools/source/brwbox/datwin.hxx                                           |   10 
 svtools/source/brwbox/ebbcontrols.cxx                                      |    2 
 svtools/source/brwbox/editbrowsebox.cxx                                    |    6 
 svtools/source/contnr/fileview.cxx                                         |   19 
 svtools/source/contnr/imivctl.hxx                                          |    4 
 svtools/source/contnr/imivctl1.cxx                                         |    4 
 svtools/source/contnr/simptabl.cxx                                         |   11 
 svtools/source/contnr/svtabbx.cxx                                          |    2 
 svtools/source/contnr/treelistbox.cxx                                      |    2 
 svtools/source/control/calendar.cxx                                        |   42 -
 svtools/source/control/inettbc.cxx                                         |    8 
 svtools/source/control/roadmap.cxx                                         |    4 
 svtools/source/control/tabbar.cxx                                          |   36 -
 svtools/source/control/toolbarmenu.cxx                                     |   12 
 svtools/source/control/toolbarmenuimp.hxx                                  |    2 
 svtools/source/control/valueacc.cxx                                        |    2 
 svtools/source/control/valueimp.hxx                                        |    4 
 svtools/source/dialogs/PlaceEditDialog.cxx                                 |   16 
 svtools/source/dialogs/addresstemplate.cxx                                 |    4 
 svtools/source/dialogs/colrdlg.cxx                                         |    1 
 svtools/source/dialogs/prnsetup.cxx                                        |    8 
 svtools/source/dialogs/restartdialog.cxx                                   |   15 
 svtools/source/dialogs/roadmapwizard.cxx                                   |    7 
 svtools/source/dialogs/wizardmachine.cxx                                   |   10 
 svtools/source/dialogs/wizdlg.cxx                                          |    8 
 svtools/source/filter/GraphicExportOptionsDialog.cxx                       |   13 
 svtools/source/filter/exportdialog.cxx                                     |   33 +
 svtools/source/filter/exportdialog.hxx                                     |   66 +-
 svtools/source/hatchwindow/hatchwindow.cxx                                 |    2 
 svtools/source/inc/hatchwindow.hxx                                         |    2 
 svtools/source/inc/svimpbox.hxx                                            |    4 
 svtools/source/misc/dialogcontrolling.cxx                                  |    4 
 svtools/source/table/tablecontrol_impl.cxx                                 |   20 
 svtools/source/table/tablecontrol_impl.hxx                                 |    6 
 svtools/source/toolpanel/paneltabbarpeer.cxx                               |    4 
 svtools/source/toolpanel/paneltabbarpeer.hxx                               |    2 
 svtools/source/toolpanel/toolpaneldeckpeer.cxx                             |    4 
 svtools/source/toolpanel/toolpaneldeckpeer.hxx                             |    2 
 svtools/source/uno/addrtempuno.cxx                                         |    2 
 svtools/source/uno/generictoolboxcontroller.cxx                            |    6 
 svtools/source/uno/genericunodialog.cxx                                    |    3 
 svtools/source/uno/popupwindowcontroller.cxx                               |    6 
 svtools/source/uno/treecontrolpeer.hxx                                     |    2 
 svtools/source/uno/wizard/unowizard.cxx                                    |   20 
 svtools/source/uno/wizard/wizardshell.hxx                                  |    2 
 svx/inc/extrusiondepthdialog.hxx                                           |    4 
 svx/inc/galbrws2.hxx                                                       |    6 
 svx/inc/svdibrow.hxx                                                       |    2 
 svx/inc/tbunosearchcontrollers.hxx                                         |    4 
 svx/source/accessibility/AccessibleShapeTreeInfo.cxx                       |    1 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx                     |    6 
 svx/source/dialog/_bmpmask.cxx                                             |   33 -
 svx/source/dialog/_contdlg.cxx                                             |   21 
 svx/source/dialog/compressgraphicdialog.cxx                                |   25 
 svx/source/dialog/contimp.hxx                                              |    8 
 svx/source/dialog/ctredlin.cxx                                             |   52 +
 svx/source/dialog/docrecovery.cxx                                          |   47 +
 svx/source/dialog/fontwork.cxx                                             |  329 ----------
 svx/source/dialog/hdft.cxx                                                 |   16 
 svx/source/dialog/imapdlg.cxx                                              |   12 
 svx/source/dialog/linkwarn.cxx                                             |    1 
 svx/source/dialog/optgrid.cxx                                              |   27 
 svx/source/dialog/orienthelper.cxx                                         |    2 
 svx/source/dialog/passwd.cxx                                               |   15 
 svx/source/dialog/rubydialog.cxx                                           |   33 +
 svx/source/dialog/srchdlg.cxx                                              |   44 +
 svx/source/dialog/svxruler.cxx                                             |    1 
 svx/source/fmcomp/gridcell.cxx                                             |  321 ++++-----
 svx/source/fmcomp/gridctrl.cxx                                             |    6 
 svx/source/form/datanavi.cxx                                               |  121 +++
 svx/source/form/filtnav.cxx                                                |    4 
 svx/source/form/fmPropBrw.cxx                                              |    3 
 svx/source/form/fmexpl.cxx                                                 |    4 
 svx/source/form/tabwin.cxx                                                 |   15 
 svx/source/form/xfm_addcondition.cxx                                       |    2 
 svx/source/gallery2/galbrws1.cxx                                           |    3 
 svx/source/gallery2/galbrws1.hxx                                           |    2 
 svx/source/gallery2/galbrws2.cxx                                           |   16 
 svx/source/inc/AccessibleFrameSelector.hxx                                 |    3 
 svx/source/inc/GraphCtlAccessibleContext.hxx                               |    2 
 svx/source/inc/charmapacc.hxx                                              |    2 
 svx/source/inc/datalistener.hxx                                            |    3 
 svx/source/inc/datanavi.hxx                                                |  134 ++--
 svx/source/inc/docrecovery.hxx                                             |   38 -
 svx/source/inc/filtnav.hxx                                                 |    2 
 svx/source/inc/fmexch.hxx                                                  |    2 
 svx/source/inc/fmexpl.hxx                                                  |    2 
 svx/source/inc/fmvwimp.hxx                                                 |    3 
 svx/source/inc/gridcell.hxx                                                |   12 
 svx/source/inc/svxrectctaccessiblecontext.hxx                              |    3 
 svx/source/inc/tabwin.hxx                                                  |    6 
 svx/source/inc/tbxform.hxx                                                 |    2 
 svx/source/sidebar/area/AreaPropertyPanel.cxx                              |   17 
 svx/source/sidebar/area/AreaPropertyPanel.hxx                              |   20 
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx                        |   17 
 svx/source/sidebar/graphic/GraphicPropertyPanel.hxx                        |   19 
 svx/source/sidebar/insert/InsertPropertyPanel.cxx                          |    6 
 svx/source/sidebar/insert/InsertPropertyPanel.hxx                          |    4 
 svx/source/sidebar/line/LinePropertyPanel.cxx                              |   23 
 svx/source/sidebar/line/LinePropertyPanel.hxx                              |   29 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx                    |   29 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx                    |   20 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx                         |   20 
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx                         |   23 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx                        |   23 
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx                        |   31 
 svx/source/sidebar/text/TextPropertyPanel.cxx                              |   15 
 svx/source/sidebar/text/TextPropertyPanel.hxx                              |   13 
 svx/source/sidebar/tools/Popup.cxx                                         |    6 
 svx/source/svdraw/sdrpaintwindow.cxx                                       |   12 
 svx/source/svdraw/svdedxv.cxx                                              |   22 
 svx/source/svdraw/svdibrow.cxx                                             |   17 
 svx/source/svdraw/svdmrkv.cxx                                              |    2 
 svx/source/svdraw/svdpntv.cxx                                              |   20 
 svx/source/svdraw/svdview.cxx                                              |    4 
 svx/source/tbxctrls/bulletsnumbering.cxx                                   |   15 
 svx/source/tbxctrls/colorwindow.hxx                                        |   14 
 svx/source/tbxctrls/extrusioncontrols.cxx                                  |   33 +
 svx/source/tbxctrls/extrusioncontrols.hxx                                  |    8 
 svx/source/tbxctrls/fillctrl.cxx                                           |    4 
 svx/source/tbxctrls/fontworkgallery.cxx                                    |   22 
 svx/source/tbxctrls/lboxctrl.cxx                                           |   23 
 svx/source/tbxctrls/tbcontrl.cxx                                           |   16 
 svx/source/tbxctrls/tbunocontroller.cxx                                    |    5 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx                             |    6 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx      |   31 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx      |   40 -
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx |    3 
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx |    3 
 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx     |    7 
 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx     |   12 
 svx/source/unodraw/recoveryui.cxx                                          |    2 
 svx/source/unodraw/unoshtxt.cxx                                            |    2 
 sw/inc/PostItMgr.hxx                                                       |    5 
 sw/inc/SidebarWin.hxx                                                      |   10 
 sw/inc/colwd.hxx                                                           |    6 
 sw/inc/hhcwrp.hxx                                                          |    2 
 sw/inc/postithelper.hxx                                                    |    2 
 sw/inc/viewsh.hxx                                                          |    2 
 sw/qa/tiledrendering/tiledrendering.cxx                                    |   31 
 sw/source/core/access/accdoc.hxx                                           |    2 
 sw/source/core/access/accfrmobj.cxx                                        |    2 
 sw/source/core/access/accfrmobj.hxx                                        |    3 
 sw/source/core/view/viewsh.cxx                                             |    2 
 sw/source/ui/chrdlg/break.cxx                                              |   21 
 sw/source/ui/chrdlg/chardlg.cxx                                            |   10 
 sw/source/ui/chrdlg/drpcps.cxx                                             |   22 
 sw/source/ui/chrdlg/numpara.cxx                                            |   20 
 sw/source/ui/chrdlg/swuiccoll.cxx                                          |   10 
 sw/source/ui/config/mailconfigpage.cxx                                     |  127 ++-
 sw/source/ui/config/optcomp.cxx                                            |    4 
 sw/source/ui/config/optload.cxx                                            |   42 +
 sw/source/ui/config/optpage.cxx                                            |  165 +++++
 sw/source/ui/dbui/addresslistdialog.cxx                                    |   10 
 sw/source/ui/dbui/addresslistdialog.hxx                                    |   18 
 sw/source/ui/dbui/createaddresslistdialog.cxx                              |   62 +
 sw/source/ui/dbui/createaddresslistdialog.hxx                              |   38 -
 sw/source/ui/dbui/customizeaddresslistdialog.cxx                           |   33 -
 sw/source/ui/dbui/customizeaddresslistdialog.hxx                           |   20 
 sw/source/ui/dbui/dbinsdlg.cxx                                             |   33 -
 sw/source/ui/dbui/dbtablepreviewdialog.cxx                                 |    2 
 sw/source/ui/dbui/dbtablepreviewdialog.hxx                                 |    4 
 sw/source/ui/dbui/mmaddressblockpage.cxx                                   |  144 +++-
 sw/source/ui/dbui/mmaddressblockpage.hxx                                   |   99 +--
 sw/source/ui/dbui/mmdocselectpage.cxx                                      |   15 
 sw/source/ui/dbui/mmdocselectpage.hxx                                      |   19 
 sw/source/ui/dbui/mmgreetingspage.cxx                                      |   21 
 sw/source/ui/dbui/mmgreetingspage.hxx                                      |   52 -
 sw/source/ui/dbui/mmlayoutpage.cxx                                         |   11 
 sw/source/ui/dbui/mmlayoutpage.hxx                                         |   22 
 sw/source/ui/dbui/mmmergepage.cxx                                          |   19 
 sw/source/ui/dbui/mmmergepage.hxx                                          |   18 
 sw/source/ui/dbui/mmoutputpage.cxx                                         |   44 +
 sw/source/ui/dbui/mmoutputpage.hxx                                         |   84 +-
 sw/source/ui/dbui/mmoutputtypepage.cxx                                     |   36 +
 sw/source/ui/dbui/mmoutputtypepage.hxx                                     |   12 
 sw/source/ui/dbui/mmpreparemergepage.cxx                                   |   18 
 sw/source/ui/dbui/mmpreparemergepage.hxx                                   |   18 
 sw/source/ui/dbui/selectdbtabledialog.cxx                                  |    3 
 sw/source/ui/dbui/selectdbtabledialog.hxx                                  |    4 
 sw/source/ui/dialog/abstract.cxx                                           |   12 
 sw/source/ui/dialog/ascfldlg.cxx                                           |   15 
 sw/source/ui/dialog/docstdlg.cxx                                           |   19 
 sw/source/ui/dialog/swdlgfact.cxx                                          |    1 
 sw/source/ui/dialog/swdlgfact.hxx                                          |    5 
 sw/source/ui/dialog/swmessdialog.cxx                                       |   15 
 sw/source/ui/dialog/swuiexp.cxx                                            |   25 
 sw/source/ui/dialog/uiregionsw.cxx                                         |   74 ++
 sw/source/ui/dialog/wordcountdialog.cxx                                    |   13 
 sw/source/ui/dochdl/selglos.cxx                                            |   11 
 sw/source/ui/envelp/envfmt.cxx                                             |   21 
 sw/source/ui/envelp/envfmt.hxx                                             |   22 
 sw/source/ui/envelp/envlop1.cxx                                            |   14 
 sw/source/ui/envelp/envprt.cxx                                             |   17 
 sw/source/ui/envelp/envprt.hxx                                             |   16 
 sw/source/ui/envelp/label1.cxx                                             |   80 ++
 sw/source/ui/envelp/labfmt.cxx                                             |   35 +
 sw/source/ui/envelp/labfmt.hxx                                             |   41 -
 sw/source/ui/envelp/labprt.cxx                                             |    9 
 sw/source/ui/envelp/labprt.hxx                                             |   22 
 sw/source/ui/envelp/mailmrge.cxx                                           |   54 +
 sw/source/ui/envelp/swuilabimp.hxx                                         |  110 +--
 sw/source/ui/fldui/DropDownFieldDialog.cxx                                 |   14 
 sw/source/ui/fldui/changedb.cxx                                            |    5 
 sw/source/ui/fldui/flddb.cxx                                               |   18 
 sw/source/ui/fldui/flddb.hxx                                               |   25 
 sw/source/ui/fldui/flddinf.cxx                                             |   12 
 sw/source/ui/fldui/flddinf.hxx                                             |   13 
 sw/source/ui/fldui/flddok.cxx                                              |   21 
 sw/source/ui/fldui/flddok.hxx                                              |   29 
 sw/source/ui/fldui/fldedt.cxx                                              |    3 
 sw/source/ui/fldui/fldfunc.cxx                                             |   31 
 sw/source/ui/fldui/fldfunc.hxx                                             |   51 -
 sw/source/ui/fldui/fldref.cxx                                              |   15 
 sw/source/ui/fldui/fldref.hxx                                              |   19 
 sw/source/ui/fldui/fldvar.cxx                                              |   22 
 sw/source/ui/fldui/fldvar.hxx                                              |   33 -
 sw/source/ui/fldui/inpdlg.cxx                                              |   14 
 sw/source/ui/fldui/javaedit.cxx                                            |   10 
 sw/source/ui/frmdlg/column.cxx                                             |   26 
 sw/source/ui/frmdlg/cption.cxx                                             |   37 -
 sw/source/ui/frmdlg/frmpage.cxx                                            |   95 ++
 sw/source/ui/frmdlg/wrap.cxx                                               |   20 
 sw/source/ui/index/cnttab.cxx                                              |  183 ++++-
 sw/source/ui/index/multmrk.cxx                                             |   13 
 sw/source/ui/index/swuiidxmrk.cxx                                          |   30 
 sw/source/ui/misc/bookmark.cxx                                             |    9 
 sw/source/ui/misc/docfnote.cxx                                             |   31 
 sw/source/ui/misc/glosbib.cxx                                              |   12 
 sw/source/ui/misc/glossary.cxx                                             |   41 +
 sw/source/ui/misc/impfnote.hxx                                             |   35 -
 sw/source/ui/misc/insfnote.cxx                                             |   10 
 sw/source/ui/misc/linenum.cxx                                              |   22 
 sw/source/ui/misc/num.cxx                                                  |   28 
 sw/source/ui/misc/outline.cxx                                              |   39 +
 sw/source/ui/misc/pgfnote.cxx                                              |   17 
 sw/source/ui/misc/pggrid.cxx                                               |   29 
 sw/source/ui/misc/srtdlg.cxx                                               |   30 
 sw/source/ui/misc/titlepage.cxx                                            |   12 
 sw/source/ui/table/colwd.cxx                                               |   12 
 sw/source/ui/table/convert.cxx                                             |   14 
 sw/source/ui/table/instable.cxx                                            |   11 
 sw/source/ui/table/mergetbl.cxx                                            |   12 
 sw/source/ui/table/rowht.cxx                                               |   12 
 sw/source/ui/table/splittbl.cxx                                            |   14 
 sw/source/ui/table/tabledlg.cxx                                            |   72 ++
 sw/source/ui/table/tautofmt.cxx                                            |   23 
 sw/source/ui/utlui/swrenamexnameddlg.cxx                                   |   12 
 sw/source/uibase/dbui/dbui.cxx                                             |   33 +
 sw/source/uibase/dbui/mailmergechildwindow.cxx                             |   13 
 sw/source/uibase/docvw/HeaderFooterWin.cxx                                 |    2 
 sw/source/uibase/docvw/PageBreakWin.cxx                                    |    7 
 sw/source/uibase/docvw/PostItMgr.cxx                                       |   11 
 sw/source/uibase/docvw/SidebarWin.cxx                                      |   17 
 sw/source/uibase/docvw/srcedtw.cxx                                         |    7 
 sw/source/uibase/envelp/syncbtn.cxx                                        |   13 
 sw/source/uibase/inc/DropDownFieldDialog.hxx                               |   10 
 sw/source/uibase/inc/FrameControl.hxx                                      |    2 
 sw/source/uibase/inc/FrameControlsManager.hxx                              |    2 
 sw/source/uibase/inc/HeaderFooterWin.hxx                                   |    4 
 sw/source/uibase/inc/PageBreakWin.hxx                                      |    2 
 sw/source/uibase/inc/abstract.hxx                                          |    8 
 sw/source/uibase/inc/ascfldlg.hxx                                          |   17 
 sw/source/uibase/inc/bookmark.hxx                                          |    7 
 sw/source/uibase/inc/break.hxx                                             |   15 
 sw/source/uibase/inc/changedb.hxx                                          |   10 
 sw/source/uibase/inc/chrdlg.hxx                                            |   22 
 sw/source/uibase/inc/column.hxx                                            |   56 -
 sw/source/uibase/inc/conttree.hxx                                          |    6 
 sw/source/uibase/inc/convert.hxx                                           |   28 
 sw/source/uibase/inc/cption.hxx                                            |   30 
 sw/source/uibase/inc/dbinsdlg.hxx                                          |   50 -
 sw/source/uibase/inc/dbui.hxx                                              |   20 
 sw/source/uibase/inc/docstdlg.hxx                                          |   23 
 sw/source/uibase/inc/drawbase.hxx                                          |    2 
 sw/source/uibase/inc/drpcps.hxx                                            |   33 -
 sw/source/uibase/inc/envlop.hxx                                            |   19 
 sw/source/uibase/inc/fldedt.hxx                                            |    6 
 sw/source/uibase/inc/fldmgr.hxx                                            |    3 
 sw/source/uibase/inc/frmpage.hxx                                           |  163 ++--
 sw/source/uibase/inc/glosbib.hxx                                           |   13 
 sw/source/uibase/inc/glossary.hxx                                          |   24 
 sw/source/uibase/inc/inpdlg.hxx                                            |   10 
 sw/source/uibase/inc/inputwin.hxx                                          |    4 
 sw/source/uibase/inc/insfnote.hxx                                          |   20 
 sw/source/uibase/inc/instable.hxx                                          |   22 
 sw/source/uibase/inc/javaedit.hxx                                          |   20 
 sw/source/uibase/inc/label.hxx                                             |    2 
 sw/source/uibase/inc/linenum.hxx                                           |   31 
 sw/source/uibase/inc/mailconfigpage.hxx                                    |   20 
 sw/source/uibase/inc/mailmergechildwindow.hxx                              |    4 
 sw/source/uibase/inc/mailmergehelper.hxx                                   |    2 
 sw/source/uibase/inc/mailmrge.hxx                                          |   89 +-
 sw/source/uibase/inc/mergetbl.hxx                                          |    4 
 sw/source/uibase/inc/multmrk.hxx                                           |    5 
 sw/source/uibase/inc/navipi.hxx                                            |    4 
 sw/source/uibase/inc/num.hxx                                               |   48 -
 sw/source/uibase/inc/numpara.hxx                                           |   29 
 sw/source/uibase/inc/optcomp.hxx                                           |    8 
 sw/source/uibase/inc/optload.hxx                                           |   74 +-
 sw/source/uibase/inc/optpage.hxx                                           |  268 ++++----
 sw/source/uibase/inc/outline.hxx                                           |   23 
 sw/source/uibase/inc/pgfnote.hxx                                           |   25 
 sw/source/uibase/inc/pggrid.hxx                                            |   46 -
 sw/source/uibase/inc/prcntfld.hxx                                          |    2 
 sw/source/uibase/inc/pview.hxx                                             |   12 
 sw/source/uibase/inc/redlndlg.hxx                                          |    6 
 sw/source/uibase/inc/regionsw.hxx                                          |  128 +--
 sw/source/uibase/inc/rowht.hxx                                             |    6 
 sw/source/uibase/inc/selglos.hxx                                           |    5 
 sw/source/uibase/inc/shdwcrsr.hxx                                          |    2 
 sw/source/uibase/inc/splittbl.hxx                                          |   10 
 sw/source/uibase/inc/srcedtw.hxx                                           |    6 
 sw/source/uibase/inc/srtdlg.hxx                                            |   64 -
 sw/source/uibase/inc/swmessdialog.hxx                                      |   12 
 sw/source/uibase/inc/swrenamexnameddlg.hxx                                 |    6 
 sw/source/uibase/inc/swruler.hxx                                           |    3 
 sw/source/uibase/inc/swuiccoll.hxx                                         |   18 
 sw/source/uibase/inc/swuicnttab.hxx                                        |  214 +++---
 sw/source/uibase/inc/swuiidxmrk.hxx                                        |   90 +-
 sw/source/uibase/inc/syncbtn.hxx                                           |    4 
 sw/source/uibase/inc/tautofmt.hxx                                          |   26 
 sw/source/uibase/inc/titlepage.hxx                                         |   24 
 sw/source/uibase/inc/view.hxx                                              |   20 
 sw/source/uibase/inc/wordcountdialog.hxx                                   |   26 
 sw/source/uibase/inc/workctrl.hxx                                          |    4 
 sw/source/uibase/inc/wrap.hxx                                              |   29 
 sw/source/uibase/misc/redlndlg.cxx                                         |    2 
 sw/source/uibase/misc/swruler.cxx                                          |    7 
 sw/source/uibase/ribbar/inputwin.cxx                                       |    2 
 sw/source/uibase/ribbar/workctrl.cxx                                       |    3 
 sw/source/uibase/shells/txtattr.cxx                                        |    1 
 sw/source/uibase/shells/txtcrsr.cxx                                        |    1 
 sw/source/uibase/sidebar/PageColumnControl.cxx                             |    2 
 sw/source/uibase/sidebar/PageColumnControl.hxx                             |    2 
 sw/source/uibase/sidebar/PageMarginControl.cxx                             |    2 
 sw/source/uibase/sidebar/PageMarginControl.hxx                             |    2 
 sw/source/uibase/sidebar/PageOrientationControl.cxx                        |    2 
 sw/source/uibase/sidebar/PageOrientationControl.hxx                        |    2 
 sw/source/uibase/sidebar/PagePropertyPanel.cxx                             |    4 
 sw/source/uibase/sidebar/PagePropertyPanel.hxx                             |    8 
 sw/source/uibase/sidebar/PageSizeControl.cxx                               |    2 
 sw/source/uibase/sidebar/PageSizeControl.hxx                               |    2 
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx                             |   12 
 sw/source/uibase/sidebar/WrapPropertyPanel.hxx                             |   15 
 sw/source/uibase/table/tablepg.hxx                                         |   87 +-
 sw/source/uibase/uiview/pview.cxx                                          |   37 -
 sw/source/uibase/uiview/view.cxx                                           |   14 
 sw/source/uibase/uiview/viewling.cxx                                       |    6 
 sw/source/uibase/uiview/viewmdi.cxx                                        |   16 
 sw/source/uibase/utlui/content.cxx                                         |    1 
 sw/source/uibase/utlui/glbltree.cxx                                        |    1 
 sw/source/uibase/utlui/gloslst.cxx                                         |   23 
 sw/source/uibase/utlui/navipi.cxx                                          |    5 
 tools/source/ref/errinf.cxx                                                |    1 
 uui/source/authfallbackdlg.cxx                                             |   15 
 uui/source/authfallbackdlg.hxx                                             |   12 
 uui/source/fltdlg.cxx                                                      |   12 
 uui/source/fltdlg.hxx                                                      |    6 
 uui/source/logindlg.cxx                                                    |   25 
 uui/source/logindlg.hxx                                                    |   32 
 uui/source/masterpasscrtdlg.cxx                                            |   13 
 uui/source/masterpasscrtdlg.hxx                                            |    8 
 uui/source/masterpassworddlg.cxx                                           |   12 
 uui/source/masterpassworddlg.hxx                                           |    6 
 uui/source/nameclashdlg.cxx                                                |   15 
 uui/source/nameclashdlg.hxx                                                |   12 
 uui/source/passworddlg.cxx                                                 |   15 
 uui/source/passworddlg.hxx                                                 |   12 
 uui/source/secmacrowarnings.cxx                                            |   15 
 uui/source/secmacrowarnings.hxx                                            |   19 
 uui/source/unknownauthdlg.cxx                                              |   14 
 uui/source/unknownauthdlg.hxx                                              |   10 
 vcl/generic/print/genprnpsp.cxx                                            |   16 
 vcl/generic/print/prtsetup.cxx                                             |   42 +
 vcl/generic/print/prtsetup.hxx                                             |   44 -
 vcl/inc/brdwin.hxx                                                         |    6 
 vcl/inc/dndevdis.hxx                                                       |    4 
 vcl/inc/ilstbox.hxx                                                        |   13 
 vcl/inc/printdlg.hxx                                                       |  109 +--
 vcl/inc/salframe.hxx                                                       |    9 
 vcl/inc/svdata.hxx                                                         |   41 -
 vcl/inc/toolbox.h                                                          |    2 
 vcl/inc/unx/i18n_status.hxx                                                |    3 
 vcl/inc/window.h                                                           |   58 -
 vcl/source/app/salvtables.cxx                                              |    9 
 vcl/source/app/svapp.cxx                                                   |   30 
 vcl/source/app/svdata.cxx                                                  |    2 
 vcl/source/app/vclevent.cxx                                                |    9 
 vcl/source/control/button.cxx                                              |   28 
 vcl/source/control/combobox.cxx                                            |   13 
 vcl/source/control/ctrl.cxx                                                |    4 
 vcl/source/control/fixed.cxx                                               |    1 
 vcl/source/control/ilstbox.cxx                                             |   18 
 vcl/source/control/lstbox.cxx                                              |   16 
 vcl/source/control/tabctrl.cxx                                             |   28 
 vcl/source/edit/textview.cxx                                               |    2 
 vcl/source/edit/vclmedit.cxx                                               |   23 
 vcl/source/gdi/print3.cxx                                                  |    6 
 vcl/source/window/accel.cxx                                                |    1 
 vcl/source/window/accessibility.cxx                                        |    5 
 vcl/source/window/brdwin.cxx                                               |    2 
 vcl/source/window/btndlg.cxx                                               |   22 
 vcl/source/window/builder.cxx                                              |   27 
 vcl/source/window/clipping.cxx                                             |    2 
 vcl/source/window/cursor.cxx                                               |    4 
 vcl/source/window/dialog.cxx                                               |    3 
 vcl/source/window/dlgctrl.cxx                                              |   20 
 vcl/source/window/dndevdis.cxx                                             |    6 
 vcl/source/window/dockmgr.cxx                                              |   17 
 vcl/source/window/dockwin.cxx                                              |   17 
 vcl/source/window/event.cxx                                                |   23 
 vcl/source/window/floatwin.cxx                                             |    6 
 vcl/source/window/introwin.cxx                                             |    6 
 vcl/source/window/layout.cxx                                               |   49 +
 vcl/source/window/menu.cxx                                                 |   20 
 vcl/source/window/menubarwindow.cxx                                        |    6 
 vcl/source/window/menufloatingwindow.cxx                                   |    4 
 vcl/source/window/mouse.cxx                                                |   22 
 vcl/source/window/msgbox.cxx                                               |   23 
 vcl/source/window/paint.cxx                                                |    2 
 vcl/source/window/printdlg.cxx                                             |   63 +
 vcl/source/window/split.cxx                                                |    1 
 vcl/source/window/splitwin.cxx                                             |    6 
 vcl/source/window/stacking.cxx                                             |   37 -
 vcl/source/window/syswin.cxx                                               |    1 
 vcl/source/window/tabdlg.cxx                                               |    3 
 vcl/source/window/taskpanelist.cxx                                         |   19 
 vcl/source/window/toolbox.cxx                                              |    9 
 vcl/source/window/window.cxx                                               |   43 -
 vcl/source/window/window2.cxx                                              |   34 -
 vcl/source/window/winproc.cxx                                              |   14 
 vcl/unx/generic/app/i18n_status.cxx                                        |    4 
 vcl/unx/generic/printer/cupsmgr.cxx                                        |   22 
 vcl/workben/icontest.cxx                                                   |    5 
 vcl/workben/mtfdemo.cxx                                                    |    2 
 vcl/workben/vcldemo.cxx                                                    |   19 
 xmlsecurity/inc/xmlsecurity/certificatechooser.hxx                         |    6 
 xmlsecurity/inc/xmlsecurity/certificateviewer.hxx                          |   39 -
 xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx                    |   36 -
 xmlsecurity/inc/xmlsecurity/macrosecurity.hxx                              |   40 -
 xmlsecurity/source/dialogs/certificatechooser.cxx                          |    4 
 xmlsecurity/source/dialogs/certificateviewer.cxx                           |   45 +
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx                     |   17 
 xmlsecurity/source/dialogs/macrosecurity.cxx                               |   39 +
 1576 files changed, 20963 insertions(+), 10094 deletions(-)

New commits:
commit c0a802b59e1edddeb0b621e15137f5058299efd7
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Apr 10 10:44:13 2015 +0100

    Audit and correct misc. clears -> disposeAndClears.
    
    Anything that used to be 'delete'd should be disposeAndCleared()
    in the new world.

diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 24defd8..698e78b 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -202,7 +202,7 @@ MediaControl::~MediaControl()
 void MediaControl::dispose()
 {
     maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, NULL );
-    mpZoomListBox.clear();
+    mpZoomListBox.disposeAndClear();
     maTimeEdit.disposeAndClear();
     maZoomToolBox.disposeAndClear();
     maVolumeSlider.disposeAndClear();
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 4c08dcb..4735f12 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1414,10 +1414,8 @@ DialogWindowLayout::~DialogWindowLayout()
 void DialogWindowLayout::dispose()
 {
     if (pPropertyBrowser)
-    {
         Remove(pPropertyBrowser);
-    }
-    pPropertyBrowser.clear();
+    pPropertyBrowser.disposeAndClear();
     pChild.clear();
     Layout::dispose();
 }
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 4443610..0da5875 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -60,7 +60,7 @@ ChartTypeDialog::~ChartTypeDialog()
 
 void ChartTypeDialog::dispose()
 {
-    m_pChartTypeTabPage.clear();
+    m_pChartTypeTabPage.disposeAndClear();
     ModalDialog::dispose();
 }
 
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 66af10a..5c8bc2b 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -54,7 +54,7 @@ CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponen
 CreationWizardUnoDlg::~CreationWizardUnoDlg()
 {
     SolarMutexGuard aSolarGuard;
-    m_pDialog.clear();
+    m_pDialog.disposeAndClear();
 }
 // lang::XServiceInfo
 OUString SAL_CALL CreationWizardUnoDlg::getImplementationName()
@@ -268,7 +268,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
     m_xParentWindow.clear();
 
     SolarMutexGuard aSolarGuard;
-    m_pDialog.clear();
+    m_pDialog.disposeAndClear();
 
     try
     {
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 09e5537..cdd34e1 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -164,13 +164,11 @@ DataSourceDialog::~DataSourceDialog()
 
 void DataSourceDialog::dispose()
 {
+    m_pRangeChooserTabePage.disposeAndClear();
+    m_pDataSourceTabPage.disposeAndClear();
     if (m_pTabControl)
-    {
         m_nLastPageId = m_pTabControl->GetCurPageId();
-    }
-    m_pRangeChooserTabePage.clear();
-    m_pDataSourceTabPage.clear();
-    m_pTabControl.clear();
+    m_pTabControl.disposeAndClear();
     m_pBtnOK.clear();
     TabDialog::dispose();
 }
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index bb28a87..b3e97fb 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -71,11 +71,11 @@ View3DDialog::~View3DDialog()
 
 void View3DDialog::dispose()
 {
+    m_pGeometry.disposeAndClear();
+    m_pAppearance.disposeAndClear();
+    m_pIllumination.disposeAndClear();
     if (m_pTabControl)
         m_nLastPageId = m_pTabControl->GetCurPageId();
-    m_pGeometry.clear();
-    m_pAppearance.clear();
-    m_pIllumination.clear();
     m_pTabControl.clear();
     TabDialog::dispose();
 }
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index d5275e1..ff544bd 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -83,7 +83,7 @@ void ChartWindow::dispose()
         x3DWindowProvider->setWindow(0);
         x3DWindowProvider->update();
     }
-    m_pOpenGLWindow.clear();
+    m_pOpenGLWindow.disposeAndClear();
     vcl::Window::dispose();
 }
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 7bc162e..6d5d3a9 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -114,13 +114,15 @@ void SvxHyperlinkTabPageBase::dispose()
 {
     maTimer.Stop();
 
+    mpMarkWnd.disposeAndClear();
+
     mpCbbFrame.clear();
     mpLbForm.clear();
     mpEdIndication.clear();
     mpEdText.clear();
     mpBtScript.clear();
     mpDialog.clear();
-    mpMarkWnd.clear();
+
     IconChoicePage::dispose();
 }
 
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 9cbbef5..72979c4 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -239,7 +239,7 @@ void SvxMultiPathDialog::dispose()
         }
     }
 
-    m_pRadioLB.clear();
+    m_pRadioLB.disposeAndClear();
     m_pAddBtn.clear();
     m_pDelBtn.clear();
     ModalDialog::dispose();
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 55b85df..d813709 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -156,8 +156,8 @@ void CertPathDialog::dispose()
         delete pCertPath;
         pEntry = m_pCertPathList->Next( pEntry );
     }
+    m_pCertPathList.disposeAndClear();
     m_pCertPathListContainer.clear();
-    m_pCertPathList.clear();
     m_pAddBtn.clear();
     m_pOKBtn.clear();
     ModalDialog::dispose();
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index f149629..d9822ac 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -170,7 +170,7 @@ void DbRegistrationOptionsPage::dispose()
 {
     for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
         delete static_cast< DatabaseRegistration* >( pPathBox->GetEntry(i)->GetUserData() );
-    pPathBox.clear();
+    pPathBox.disposeAndClear();
     m_pPathCtrl.clear();
     m_pNew.clear();
     m_pEdit.clear();
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 6dfd19f..a19a889 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -147,7 +147,7 @@ void SvxFontSubstTabPage::dispose()
     pCheckButtonData = NULL;
     delete pConfig;
     pConfig = NULL;
-    m_pCheckLB.clear();
+    m_pCheckLB.disposeAndClear();
     m_pUseTableCB.clear();
     m_pReplacements.clear();
     m_pFont1CB.clear();
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 6bdf8a1..08d7d90 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -302,6 +302,8 @@ ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid,
 
 ColorConfigWindow_Impl::Chapter::~Chapter()
 {
+    // FIXME: we had an horrible m_bOwnsWidget const
+    m_pText.disposeAndClear();
 }
 
 void ColorConfigWindow_Impl::Chapter::Show(Wallpaper const& rBackWall)
@@ -368,9 +370,9 @@ ColorConfigWindow_Impl::Entry::~Entry()
 {
     if (m_bOwnsWidgets)
     {
-        m_pText.clear();
-        m_pColorList.clear();
-        m_pPreview.clear();
+        m_pText.disposeAndClear();
+        m_pColorList.disposeAndClear();
+        m_pPreview.disposeAndClear();
     }
 }
 
@@ -508,9 +510,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
 void ColorConfigWindow_Impl::dispose()
 {
     disposeBuilder();
-        m_pGrid.clear();
-        m_pVScroll.clear();
-        m_pHeaderHB.clear();
+    m_pGrid.clear();
+    m_pVScroll.clear();
+    m_pHeaderHB.clear();
     VclContainer::dispose();
 }
 
@@ -918,10 +920,10 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
 
 void ColorConfigCtrl_Impl::dispose()
 {
-    m_pVScroll.clear();
-    m_pScrollWindow.clear();
-    m_pBody.clear();
-    m_pHeaderHB.clear();
+    m_pVScroll.disposeAndClear();
+    m_pScrollWindow.disposeAndClear();
+    m_pBody.disposeAndClear();
+    m_pHeaderHB.disposeAndClear();
     VclVBox::dispose();
 }
 
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 5dc7a28..490b41c 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -222,6 +222,7 @@ SvxProxyTabPage::~SvxProxyTabPage()
 
 void SvxProxyTabPage::dispose()
 {
+    mpCertPathDlg.disposeAndClear();
     m_pProxyModeLB.clear();
     m_pHttpProxyFT.clear();
     m_pHttpProxyED.clear();
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 98853d5..7cd9977 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -207,7 +207,9 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
 
 void SvxJavaOptionsPage::dispose()
 {
-    m_pJavaList.clear();
+    m_pJavaList.disposeAndClear();
+    m_pParamDlg.disposeAndClear();
+    m_pPathDlg.disposeAndClear();
     ClearJavaInfo();
 #if HAVE_FEATURE_JAVA
     std::vector< JavaInfo* >::iterator pIter;
@@ -229,8 +231,6 @@ void SvxJavaOptionsPage::dispose()
     m_pExpertConfigBtn.clear();
     m_pExperimentalCB.clear();
     m_pMacroCB.clear();
-    m_pParamDlg.clear();
-    m_pPathDlg.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7d2d48c..39e94a0 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -256,7 +256,7 @@ void SvxPathTabPage::dispose()
     {
         for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
             delete static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData());
-        pPathBox.clear();
+        pPathBox.disposeAndClear();
     }
     delete pImpl;
     pImpl = NULL;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f37c797..e45cbc8 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -575,6 +575,7 @@ void OfaTreeOptionsDialog::dispose()
                     SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number( pPageInfo->m_nPageId) );
                     SetViewOptUserItem( aTabPageOpt, aPageData );
                 }
+                pPageInfo->m_pPage.disposeAndClear();
             }
 
             if (pPageInfo->m_nPageId == RID_SFXPAGE_LINGU)
@@ -587,6 +588,8 @@ void OfaTreeOptionsDialog::dispose()
                 }
             }
 
+            pPageInfo->m_pExtPage.disposeAndClear();
+
             delete pPageInfo;
         }
         pEntry = pTreeLB->Next(pEntry);
@@ -600,7 +603,7 @@ void OfaTreeOptionsDialog::dispose()
         {
             OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData());
             if ( pGroupInfo )
-                pGroupInfo->m_pExtPage.clear();
+                pGroupInfo->m_pExtPage.disposeAndClear();
             delete pGroupInfo;
         }
         pEntry = pTreeLB->Next(pEntry);
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 16fcd75..d114fe9 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -147,7 +147,7 @@ WebConnectionInfoDialog::~WebConnectionInfoDialog()
 
 void WebConnectionInfoDialog::dispose()
 {
-    m_pPasswordsLB.clear();
+    m_pPasswordsLB.disposeAndClear();
     m_pRemoveBtn.clear();
     m_pRemoveAllBtn.clear();
     m_pChangeBtn.clear();
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 83a436a..92ee3e21 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -122,10 +122,10 @@ UnoDataBrowserView::~UnoDataBrowserView()
 
 void UnoDataBrowserView::dispose()
 {
-    m_pSplitter.clear();
+    m_pSplitter.disposeAndClear();
     setTreeView(NULL);
 
-    m_pStatus.clear();
+    m_pStatus.disposeAndClear();
 
     try
     {
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 73495b5..9de7ee2 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -83,8 +83,8 @@ namespace
             --_nPos;
             _pControl->Hide();
             _pControlText->Hide();
-            _pControl.clear();
-            _pControlText.clear();
+            _pControl.disposeAndClear();
+            _pControlText.disposeAndClear();
         }
     }
 
@@ -1049,7 +1049,7 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType )
         if ( pFormatSample )
         {
             pFormatSample->Hide();
-            pFormatSample.clear();
+            pFormatSample.disposeAndClear();
         }
         break;
     case tpBoolDefault:
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 6f86962..77ac1b6 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -82,8 +82,8 @@ void OTableGrantControl::dispose()
         m_nDeactivateEvent = 0;
     }
 
-    m_pCheckCell.clear();
-    m_pEdit.clear();
+    m_pCheckCell.disposeAndClear();
+    m_pEdit.disposeAndClear();
 
     m_xTables       = NULL;
     ::svt::EditBrowseBox::dispose();
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index e30ab13..4fd8c02 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -46,7 +46,7 @@ OConnectionURLEdit::~OConnectionURLEdit()
 void OConnectionURLEdit::dispose()
 {
     SetSubEdit(nullptr);
-    m_pForcedPrefix.clear();
+    m_pForcedPrefix.disposeAndClear();
     Edit::dispose();
 }
 
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index c50eef0..2f2e8f3 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -114,10 +114,11 @@ namespace dbaui
 
     void OConnectionHelper::dispose()
     {
-        m_pFT_Connection.clear();
-        m_pConnectionURL.clear();
-        m_pPB_Connection.clear();
-        m_pPB_CreateDB.clear();
+        // FIXME: used to have an if (m_bDelete) ...
+        m_pFT_Connection.disposeAndClear();
+        m_pConnectionURL.disposeAndClear();
+        m_pPB_Connection.disposeAndClear();
+        m_pPB_CreateDB.disposeAndClear();
         OGenericAdministrationPage::dispose();
     }
 
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index a6aa0ab..36d3954 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -115,8 +115,8 @@ namespace dbaui
 
     void IndexFieldsControl::dispose()
     {
-        m_pSortingCell.clear();
-        m_pFieldNameCell.clear();
+        m_pSortingCell.disposeAndClear();
+        m_pFieldNameCell.disposeAndClear();
         ::svt::EditBrowseBox::dispose();
     }
 
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 887a1d0..68b5b59 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -710,11 +710,11 @@ void OCopyTableWizard::dispose()
     m_aTypeInfo.clear();
     m_aDestTypeInfoIndex.clear();
 
-    m_pbHelp.clear();
-    m_pbCancel.clear();
-    m_pbPrev.clear();
-    m_pbNext.clear();
-    m_pbFinish.clear();
+    m_pbHelp.disposeAndClear();
+    m_pbCancel.disposeAndClear();
+    m_pbPrev.disposeAndClear();
+    m_pbNext.disposeAndClear();
+    m_pbFinish.disposeAndClear();
     WizardDialog::dispose();
 }
 
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 0eb7d8f2..bcc5386 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::sdbc;
 OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar)
     : OFieldDescControl(pParent, pHelpBar)
 {
-
     m_pParentTabPage = pParentTabPage;
 }
 
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index de5b304..d9c0734 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -66,8 +66,8 @@ OJoinDesignView::~OJoinDesignView()
 
 void OJoinDesignView::dispose()
 {
-    m_pScrollWindow.clear();
-    m_pTableView.clear();
+    m_pScrollWindow.disposeAndClear();
+    m_pTableView.disposeAndClear();
     ODataView::dispose();
 }
 
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index ad15132..70adb51 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -96,7 +96,7 @@ void OScrollWindowHelper::dispose()
 {
     m_aHScrollBar.disposeAndClear();
     m_aVScrollBar.disposeAndClear();
-    m_pCornerWindow.clear();
+    m_pCornerWindow.disposeAndClear();
     m_pTableView.clear();
     vcl::Window::dispose();
 }
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 87ea89b..368f5c4 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -158,12 +158,12 @@ OSelectionBrowseBox::~OSelectionBrowseBox()
 
 void OSelectionBrowseBox::dispose()
 {
-    m_pTextCell.clear();
-    m_pVisibleCell.clear();
-    m_pFieldCell.clear();
-    m_pTableCell.clear();
-    m_pOrderCell.clear();
-    m_pFunctionCell.clear();
+    m_pTextCell.disposeAndClear();
+    m_pVisibleCell.disposeAndClear();
+    m_pFieldCell.disposeAndClear();
+    m_pTableCell.disposeAndClear();
+    m_pOrderCell.disposeAndClear();
+    m_pFunctionCell.disposeAndClear();
     ::svt::EditBrowseBox::dispose();
 }
 
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 71c037c..e9c63e0 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -139,7 +139,7 @@ throw (uno::RuntimeException, std::exception)
     svt::ToolboxController::dispose();
 
     SolarMutexGuard aSolarMutexGuard;
-    m_pLimitBox.clear();
+    m_pLimitBox.disposeAndClear();
 }
 
 /// XStatusListener
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 3face44..a02b527 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -274,10 +274,10 @@ void OTableEditorCtrl::dispose()
         Application::RemoveUserEvent( nInvalidateTypeEvent );
 
     // Delete the control types
-    pNameCell.clear();
-    pTypeCell.clear();
-    pDescrCell.clear();
-    pHelpTextCell.clear();
+    pNameCell.disposeAndClear();
+    pTypeCell.disposeAndClear();
+    pDescrCell.disposeAndClear();
+    pHelpTextCell.disposeAndClear();
     pDescrWin.clear();
     OTableRowView::dispose();
 }
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 403bd89..e450383 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -208,9 +208,9 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
 
 void ExtBoxWithBtns_Impl::dispose()
 {
-    m_pOptionsBtn.clear();
-    m_pEnableBtn.clear();
-    m_pRemoveBtn.clear();
+    m_pOptionsBtn.disposeAndClear();
+    m_pEnableBtn.disposeAndClear();
+    m_pRemoveBtn.disposeAndClear();
     m_pParent.clear();
     ExtensionBox_Impl::dispose();
 }
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 07a7d06..0432d5d 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -253,13 +253,13 @@ void ExtensionBox_Impl::dispose()
 
     for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
     {
-        (*iIndex)->m_pPublisher.clear();
+        (*iIndex)->m_pPublisher.disposeAndClear();
         (*iIndex)->m_xPackage->removeEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );
     }
 
     m_vEntries.clear();
 
-    m_pScrollBar.clear();
+    m_pScrollBar.disposeAndClear();
 
     m_xRemoveListener.clear();
 
@@ -435,7 +435,7 @@ void ExtensionBox_Impl::DeleteRemoved()
 
         for ( ITER iIndex = m_vRemovedEntries.begin(); iIndex < m_vRemovedEntries.end(); ++iIndex )
         {
-            (*iIndex)->m_pPublisher.clear();
+            (*iIndex)->m_pPublisher.disposeAndClear();
         }
 
         m_vRemovedEntries.clear();
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 07168b7..a031b47 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -169,7 +169,7 @@ sal_Int16 TheExtensionManager::execute()
     if ( m_pUpdReqDialog )
     {
         nRet = m_pUpdReqDialog->Execute();
-        m_pUpdReqDialog.clear();
+        m_pUpdReqDialog.disposeAndClear();
     }
 
     return nRet;
@@ -256,8 +256,8 @@ void TheExtensionManager::terminateDialog()
     if ( ! dp_misc::office_is_running() )
     {
         const SolarMutexGuard guard;
-        m_pExtMgrDialog.clear();
-        m_pUpdReqDialog.clear();
+        m_pExtMgrDialog.disposeAndClear();
+        m_pUpdReqDialog.disposeAndClear();
         Application::Quit();
     }
 }
@@ -421,8 +421,8 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt )
         if ( dp_misc::office_is_running() )
         {
             const SolarMutexGuard guard;
-            m_pExtMgrDialog.clear();
-            m_pUpdReqDialog.clear();
+            m_pExtMgrDialog.disposeAndClear();
+            m_pUpdReqDialog.disposeAndClear();
         }
         s_ExtMgr.clear();
     }
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index e7a6770..01af7a6 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -579,11 +579,11 @@ void UpdateDialog::dispose()
     {
         delete (*i);
     }
+    m_pUpdates.disposeAndClear();
     m_pchecking.clear();
     m_pthrobber.clear();
     m_pUpdate.clear();
     m_pContainer.clear();
-    m_pUpdates.clear();
     m_pAll.clear();
     m_pDescription.clear();
     m_pPublisherLabel.clear();
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 0174189..87abe11 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -217,17 +217,10 @@ namespace bib
         if ( pToolBar )
         {
             pDatMan->SetToolbar(0);
+            pToolBar.disposeAndClear();
         }
 
-        if( pGridWin )
-        {
-            BibGridwin* pDel = pGridWin;
-            pGridWin.clear();
-            pDel->disposeGridWin();
-            delete pDel;
-        }
-        pToolBar.clear();
-        pGridWin.clear();
+        pGridWin.disposeAndClear();
         BibSplitWindow::dispose();
     }
 
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index b6e65e1..34af38e 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -181,7 +181,7 @@ void BibBookContainer::createTopFrame( BibShortCutHandler* pWin )
     if(pTopWin)
     {
         RemoveItem(TOP_WINDOW);
-        pTopWin.clear();
+        pTopWin.disposeAndClear();
     }
     pTopWin=new BibWindowContainer(this,pWin);
     pTopWin->Show();
@@ -198,7 +198,7 @@ void BibBookContainer::createBottomFrame( BibShortCutHandler* pWin )
     if(pBottomWin)
     {
         RemoveItem(BOTTOM_WINDOW);
-        pBottomWin.clear();
+        pBottomWin.disposeAndClear();
     }
 
     pBottomWin=new BibWindowContainer(this,pWin);
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 3de62a1..ccc5b54 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -448,7 +448,7 @@ namespace pcr
         if ( rpButton )
         {
             rpButton->Hide();
-            rpButton.clear();
+            rpButton.disposeAndClear();
         }
 
         if ( _bReLayout )
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 11e6f71..9ff555c 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -266,7 +266,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing()
 {
     ::SolarMutexGuard aGuard;
 
-    mpDialog.clear();
+    mpDialog.disposeAndClear();
 
     if (pXSLTResMgr)
     {
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 5e88100..a6761a5 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1421,9 +1421,9 @@ SvxPathControl::~SvxPathControl()
 
 void SvxPathControl::dispose()
 {
-    m_pVBox.clear();
-    m_pFocusCtrl.clear();
-    m_pHeaderBar.clear();
+    m_pFocusCtrl.disposeAndClear();
+    m_pHeaderBar.disposeAndClear();
+    m_pVBox.disposeAndClear();
     vcl::Window::dispose();
 }
 
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index ea5a502..2b351e2 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -80,8 +80,8 @@ XMLFilterTabDialog::~XMLFilterTabDialog()
 
 void XMLFilterTabDialog::dispose()
 {
-    mpBasicPage.clear();
-    mpXSLTPage.clear();
+    mpBasicPage.disposeAndClear();
+    mpXSLTPage.disposeAndClear();
     delete mpNewInfo;
     m_pTabCtrl.clear();
     m_pOKBtn.clear();
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index ef2ccb5..b292f64 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -91,10 +91,10 @@ namespace frm
         m_pEngine->RemoveView( m_pView );
         m_pEngine->revokeEngineStatusListener( this );
         delete m_pView;
-        m_pViewport.clear();
-        m_pHScroll.clear();
-        m_pVScroll.clear();
-        m_pScrollCorner.clear();
+        m_pViewport.disposeAndClear();
+        m_pHScroll.disposeAndClear();
+        m_pVScroll.disposeAndClear();
+        m_pScrollCorner.disposeAndClear();
     }
 
 
@@ -344,7 +344,7 @@ namespace frm
         // create or delete the scrollbars, as necessary
         if ( !bNeedVScroll )
         {
-            m_pVScroll.clear();
+            m_pVScroll.disposeAndClear();
         }
         else
         {
@@ -355,7 +355,7 @@ namespace frm
 
         if ( !bNeedHScroll )
         {
-            m_pHScroll.clear();
+            m_pHScroll.disposeAndClear();
         }
         else
         {
@@ -366,13 +366,13 @@ namespace frm
 
         if ( m_pHScroll && m_pVScroll )
         {
-            m_pScrollCorner.clear();
+            m_pScrollCorner.disposeAndClear();
             m_pScrollCorner = new ScrollBarBox( m_pAntiImpl );
             m_pScrollCorner->Show();
         }
         else
         {
-            m_pScrollCorner.clear();
+            m_pScrollCorner.disposeAndClear();
         }
 
         layoutWindow();
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 73afd34..5e2f388 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -364,9 +364,9 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
     m_pTabCtrl->RemovePage(TP_FUNCTION);
     m_pTabCtrl->RemovePage(TP_STRUCT);
 
-    pStructPage.clear();
-    pFuncPage.clear();
-    pParaWin.clear();
+    pStructPage.disposeAndClear();
+    pFuncPage.disposeAndClear();
+    pParaWin.disposeAndClear();
     DeleteArgs();
 }
 
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index eef7e27..e609952 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -48,7 +48,7 @@ PlacesListBox_Impl::~PlacesListBox_Impl( )
 
 void PlacesListBox_Impl::dispose()
 {
-    mpHeaderBar.clear();
+    mpHeaderBar.disposeAndClear();
     mpParent.clear();
     SvHeaderTabListBox::dispose();
 }
@@ -93,9 +93,9 @@ PlacesListBox::~PlacesListBox( )
 
 void PlacesListBox::dispose()
 {
-    mpImpl.clear();
-    mpAddBtn.clear();
-    mpDelBtn.clear();
+    mpImpl.disposeAndClear();
+    mpAddBtn.disposeAndClear();
+    mpDelBtn.disposeAndClear();
     mpDlg.clear();
     Control::dispose();
 }
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 8243d51..95ee24b 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -123,7 +123,7 @@ namespace svt
                 m_pDlg->EndDialog( RET_CANCEL );
         }
 
-        m_pDlg.clear();
+        m_pDlg.disposeAndClear();
         m_xWindow = NULL;
         m_xDialogParent = NULL;
     }
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 5d93cb1..6c275e7 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -449,10 +449,10 @@ void SvtFileDialog::dispose()
     }
 
     delete _pImp;
-    _pFileView.clear();
-    _pSplitter.clear();
-    _pContainer.clear();
-    _pPrevBmp.clear();
+    _pFileView.disposeAndClear();
+    _pSplitter.disposeAndClear();
+    _pContainer.disposeAndClear();
+    _pPrevBmp.disposeAndClear();
     _pCbReadOnly.clear();
     _pCbLinkBox.clear();
     _pCbPreviewBox.clear();
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index c06d1bf..4a99899 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -251,10 +251,10 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits )   :
 
 SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl()
 {
-    _pBtnUp.clear();
+    _pBtnUp.disposeAndClear();
     delete _pUserFilter;
     delete _pFilter;
-    _pPlaces.clear();
+    _pPlaces.disposeAndClear();
 }
 
 
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 35d1779..b041482 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -87,6 +87,7 @@ struct TabEntry
 
     TabEntry( sal_Int32 nIndex, const OUString& sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) :
         m_nIndex( nIndex ), m_pPage( NULL ), m_sPageURL( sURL ), m_xEventHdl( rEventHdl ) {}
+    ~TabEntry() { m_pPage.disposeAndClear(); }
 };
 
 typedef std::vector< TabEntry* > TabEntryList;
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 9d3f151..963decb 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -91,7 +91,7 @@ void SAL_CALL VCLStatusIndicator::end()
         m_pStatusBar->EndProgressMode();
         m_pStatusBar->Show(false);
 
-        m_pStatusBar.clear();
+        m_pStatusBar.disposeAndClear();
     }
 }
 
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index bd4b368..84c8fcd 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -171,7 +171,7 @@ throw ( RuntimeException, std::exception )
     SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
-    m_pComboBox.clear();
+    m_pComboBox.disposeAndClear();
 
     ComplexToolbarController::dispose();
 }
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 5573c62..12e8dff 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -155,7 +155,7 @@ throw ( RuntimeException, std::exception )
     SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
-    m_pListBoxControl.clear();
+    m_pListBoxControl.disposeAndClear();
 
     ComplexToolbarController::dispose();
 }
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 56e9921..a75aaa3 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -152,7 +152,7 @@ throw ( RuntimeException, std::exception )
     SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
-    m_pEditControl.clear();
+    m_pEditControl.disposeAndClear();
 
     ComplexToolbarController::dispose();
 }
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 3a7de07..629e254 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -213,7 +213,7 @@ throw ( RuntimeException, std::exception )
     SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
-    m_pSpinfieldControl.clear();
+    m_pSpinfieldControl.disposeAndClear();
 
     ComplexToolbarController::dispose();
 }
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index b8ba5fb..f6bfb7e 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -214,7 +214,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exc
                 delete pUserData;
         }
 
-        m_pStatusBar.clear();
+        m_pStatusBar.disposeAndClear();
 
         if ( m_bFrameActionRegistered && m_xFrame.is() )
         {
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 469c7e4..359dac6 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -522,8 +522,8 @@ public:
         m_pDisclosureButton->SetToggleHdl(LINK(this, VclExpander, ClickHdl));
         m_pDisclosureButton->Show();
     }
-    virtual ~VclExpander() { dispose(); }
-    void dispose() SAL_OVERRIDE { m_pDisclosureButton.clear(); VclBin::dispose(); }
+    virtual ~VclExpander() { disposeOnce(); }
+    virtual void dispose() SAL_OVERRIDE { m_pDisclosureButton.disposeAndClear(); VclBin::dispose(); }
     virtual vcl::Window *get_child() SAL_OVERRIDE;
     virtual const vcl::Window *get_child() const SAL_OVERRIDE;
     virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 2da233a..bc60825 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -330,7 +330,7 @@ void Condition::dispose()
     m_pMoveDown.clear();
     m_pAddCondition.clear();
     m_pRemoveCondition.clear();
-    m_pColorFloat.clear();
+    m_pColorFloat.disposeAndClear();
     VclHBox::dispose();
 }
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index adbe69d..2b51436 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -230,7 +230,7 @@ void OFieldExpressionControl::dispose()
     if( m_nDeleteEvent )
         Application::RemoveUserEvent( m_nDeleteEvent );
 
-    m_pComboCell.clear();
+    m_pComboCell.disposeAndClear();
     m_pParent.clear();
     ::svt::EditBrowseBox::dispose();
 }
@@ -1028,7 +1028,7 @@ void OGroupsSortingDialog::dispose()
     m_pGroupIntervalEd.clear();
     m_pKeepTogetherLst.clear();
     m_pHelpWindow.clear();
-    m_pFieldExpression.clear();
+    m_pFieldExpression.disposeAndClear();
     FloatingWindow::dispose();
 }
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 958e194..44f6969 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -80,7 +80,7 @@ public:                                             \
 Class::~Class()                                     \
 {                                                   \
 }                                                   \
-short Class::Execute()                             \
+short Class::Execute()                              \
 {                                                   \
     return pDlg->Execute();                         \
 }
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 2669dd5..de5749a 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -142,7 +142,7 @@ void ScCondFormatManagerDlg::dispose()
     m_pBtnAdd.clear();
     m_pBtnRemove.clear();
     m_pBtnEdit.clear();
-    m_pCtrlManager.clear();
+    m_pCtrlManager.disposeAndClear();
     ModalDialog::dispose();
 }
 
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index 984f193..218f325 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -46,7 +46,7 @@ SearchResultsDlg::~SearchResultsDlg()
 
 void SearchResultsDlg::dispose()
 {
-    mpList.clear();
+    mpList.disposeAndClear();
     ModelessDialog::dispose();
 }
 
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 2b5d035..7c0b4f3 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -168,7 +168,7 @@ void ScAcceptChgDlg::dispose()
         pChanges->SetModifiedLink(aLink);
     }
 
-    m_pAcceptChgCtr.clear();
+    m_pAcceptChgCtr.disposeAndClear();
     pTPFilter.clear();
     pTPView.clear();
     pTheView.clear();
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 05a194f..abe3d1d 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -75,7 +75,7 @@ ScHighlightChgDlg::~ScHighlightChgDlg()
 void ScHighlightChgDlg::dispose()
 {
     SetDispatcherLock( false );
-    m_pFilterCtr.clear();
+    m_pFilterCtr.disposeAndClear();
     m_pHighlightBox.clear();
     m_pCbAccept.clear();
     m_pCbReject.clear();
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 5b04a22..4a2fd3a 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -113,7 +113,7 @@ ScShareDocumentDlg::~ScShareDocumentDlg()
 
 void ScShareDocumentDlg::dispose()
 {
-    m_pLbUsers.clear();
+    m_pLbUsers.disposeAndClear();
     m_pCbShare.clear();
     m_pFtWarning.clear();
     ModalDialog::dispose();
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 33e4cbd..71a3e38 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -107,7 +107,7 @@ ScNameDlg::~ScNameDlg()
 
 void ScNameDlg::dispose()
 {
-    m_pRangeManagerTable.clear();
+    m_pRangeManagerTable.disposeAndClear();
     m_pEdName.clear();
     m_pEdAssign.clear();
     m_pRbAssign.clear();
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index daf2b8e..13cef6a 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -70,10 +70,10 @@ ScNamePasteDlg::~ScNamePasteDlg()
 
 void ScNamePasteDlg::dispose()
 {
+    mpTable.disposeAndClear();
     m_pBtnPasteAll.clear();
     m_pBtnPaste.clear();
     m_pBtnClose.clear();
-    mpTable.clear();
     ModalDialog::dispose();
 }
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index d94b6f5..3ec7b48 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -196,10 +196,10 @@ ScPreviewShell::~ScPreviewShell()
     EndListening(*pDocShell);
 
     SetWindow(0);
-    pPreview.clear();
-    pHorScroll.clear();
-    pVerScroll.clear();
-    pCorner.clear();
+    pPreview.disposeAndClear();
+    pHorScroll.disposeAndClear();
+    pVerScroll.disposeAndClear();
+    pCorner.disposeAndClear();
 
     //  normal mode of operation is switching back to default view in the same frame,
     //  so there's no need to activate any other window here anymore
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index fd6a6c6..e651d9a 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -190,9 +190,9 @@ ScTabView::~ScTabView()
         delete pRowOutline[i];
     }
 
-    pHSplitter.clear();
-    pVSplitter.clear();
-    pTabControl.clear();
+    pHSplitter.disposeAndClear();
+    pVSplitter.disposeAndClear();
+    pTabControl.disposeAndClear();
 }
 
 void ScTabView::MakeDrawView( sal_uInt8 nForceDesignMode )
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index ce65a00..b493eca 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -159,7 +159,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
 
 PresetPropertyBox::~PresetPropertyBox()
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 Any PresetPropertyBox::getValue()
@@ -219,7 +219,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent
 
 ColorPropertyBox::~ColorPropertyBox()
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 void ColorPropertyBox::setValue( const Any& rValue, const OUString& )
@@ -303,7 +303,7 @@ void FontPropertyBox::setValue( const Any& rValue, const OUString& )
 
 FontPropertyBox::~FontPropertyBox()
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 Any FontPropertyBox::getValue()
@@ -357,7 +357,7 @@ DropdownMenuBox::~DropdownMenuBox()
 void DropdownMenuBox::dispose()
 {
     SetSubEdit(nullptr);
-    mpDropdownButton.clear();
+    mpDropdownButton.disposeAndClear();
     delete mpMenu;
     mpSubControl.disposeAndClear();
     Edit::dispose();
@@ -437,7 +437,7 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Windo
 
 CharHeightPropertyBox::~CharHeightPropertyBox()
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb )
@@ -528,7 +528,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::W
 
 TransparencyPropertyBox::~TransparencyPropertyBox()
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 void TransparencyPropertyBox::updateMenu()
@@ -626,7 +626,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* p
 
 RotationPropertyBox::~RotationPropertyBox()
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 void RotationPropertyBox::updateMenu()
@@ -751,7 +751,7 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent
 
 ScalePropertyBox::~ScalePropertyBox()
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 void ScalePropertyBox::updateMenu()
@@ -911,7 +911,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window*
 
 FontStylePropertyBox::~FontStylePropertyBox()
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 void FontStylePropertyBox::update()
@@ -2212,9 +2212,9 @@ CustomAnimationDialog::~CustomAnimationDialog()
 
 void CustomAnimationDialog::dispose()
 {
-    mpEffectTabPage.clear();
-    mpDurationTabPage.clear();
-    mpTextAnimTabPage.clear();
+    mpEffectTabPage.disposeAndClear();
+    mpDurationTabPage.disposeAndClear();
+    mpTextAnimTabPage.disposeAndClear();
 
     delete mpSet;
     delete mpResultSet;
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index c7bba27..e6fb265 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -224,7 +224,7 @@ void AnimationWindow::dispose()
     // delete the clones
     delete pMyDoc;
 
-    m_pCtlDisplay.clear();
+    m_pCtlDisplay.disposeAndClear();
     m_pBtnFirst.clear();
     m_pBtnReverse.clear();
     m_pBtnStop.clear();
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index bd6cad5..fa6b4e1 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -72,6 +72,8 @@ BreakDlg::~BreakDlg()
 
 void BreakDlg::dispose()
 {
+    mpProgress.disposeAndClear();
+    pProgrInfo.disposeAndClear();
     m_pFiObjInfo.clear();
     m_pFiActInfo.clear();
     m_pFiInsInfo.clear();
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index f2ea089..f82e75f 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -246,8 +246,8 @@ HeaderFooterDialog::~HeaderFooterDialog()
 
 void HeaderFooterDialog::dispose()
 {
-    mpSlideTabPage.clear();
-    mpNotesHandoutsTabPage.clear();
+    mpSlideTabPage.disposeAndClear();
+    mpNotesHandoutsTabPage.disposeAndClear();
     mpTabCtrl.clear();
     maPBApplyToAll.clear();
     maPBApply.clear();
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index ba1a013..7ef05cc 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -103,7 +103,7 @@ FullScreenPane::~FullScreenPane (void) throw()
 
 void SAL_CALL FullScreenPane::disposing (void)
 {
-    mpWindow.clear();
+    mpWindow.disposeAndClear();
 
     if (mpWorkWindow.get() != NULL)
     {
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 15b2bb3..3f87111 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -705,13 +705,12 @@ void SAL_CALL SlideshowImpl::disposing()
     }
 
     if( mpTimeButton )
-    {
         mpTimeButton->Hide();
-        mpTimeButton.clear();
-    }
+    mpTimeButton.disposeAndClear();
 
     if( mpShowWindow )
         mpShowWindow->Hide();
+    mpShowWindow.disposeAndClear();
 
     if ( mpViewShell )
     {
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 333e07b..5433024 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1977,11 +1977,11 @@ void SfxHelpTextWindow_Impl::dispose()
 
     bIsInClose = true;
     SvtMiscOptions().RemoveListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
-    pSrchDlg.clear();
+    pSrchDlg.disposeAndClear();
     aToolBox.disposeAndClear();
     aOnStartupCB.disposeAndClear();
     pHelpWin.clear();
-    pTextWin.clear();
+    pTextWin.disposeAndClear();
     vcl::Window::dispose();
 }
 
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 8dd755c..555e55f 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -78,7 +78,7 @@ void ThumbnailView::dispose()
     if (xComponent.is())
         xComponent->dispose ();
 
-    mpScrBar.clear();
+    mpScrBar.disposeAndClear();
     delete mpItemAttrs;
     delete mpProcessor;
 
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 3e2f0b0..8794ce0 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -730,7 +730,7 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage,
 
 {
     SetUniqId(nSettingsId);
-    pImpl->m_pSfxPage.clear();
+    pImpl->m_pSfxPage.disposeAndClear();
     pImpl->m_pSfxPage = pTabPage;
     fnGetRanges = pRangesFunc;
 
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 3daafd2..5c7160d 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -258,7 +258,7 @@ SfxTitleDockingWindow::~SfxTitleDockingWindow()
 
 void SfxTitleDockingWindow::dispose()
 {
-    m_pWrappedWindow.clear();
+    m_pWrappedWindow.disposeAndClear();
     SfxDockingWindow::dispose();
 }
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index b8f63d5..bd4a59c 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -409,6 +409,16 @@ void SfxTabDialog::dispose()
     delete pExampleSet;
     delete [] pRanges;
 
+    if (m_bOwnsBaseFmtBtn)
+        m_pBaseFmtBtn.disposeAndClear()
+    if (m_bOwnsResetBtn)
+        m_pResetBtn.disposeAndClear()
+    if (m_bOwnsHelpBtn)
+        m_pHelpBtn.disposeAndClear()
+    if (m_bOwnsCancelBtn)
+        m_pCancelBtn.disposeAndClear()
+    if (m_bOwnsOKBtn)
+        m_pOKBtn.disposeAndClear()
     m_pBox.clear();
     m_pTabCtrl.clear();
     m_pOKBtn.clear();
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 72fde22..9b728a0 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1531,7 +1531,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
     }
     else
     {
-        pTreeBox.clear();
+        pTreeBox.disposeAndClear();
         aFmtLb->Show();
         // If bHierarchical, then the family can have changed
         // minus one since hierarchical is inserted at the start
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index f746546..0b43ce0 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -335,7 +335,7 @@ SfxVersionDialog::~SfxVersionDialog()
 void SfxVersionDialog::dispose()
 {
     delete m_pTable;
-    m_pVersionBox.clear();
+    m_pVersionBox.disposeAndClear();
     m_pSaveButton.clear();
     m_pSaveCheckBox.clear();
     m_pOpenButton.clear();
@@ -592,7 +592,7 @@ SfxCmisVersionsDialog::~SfxCmisVersionsDialog()
 void SfxCmisVersionsDialog::dispose()
 {
     delete m_pTable;
-    m_pVersionBox.clear();
+    m_pVersionBox.disposeAndClear();
     m_pOpenButton.clear();
     m_pViewButton.clear();
     m_pDeleteButton.clear();
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index fdaaeb4..bbbd07e 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -81,7 +81,7 @@ SidebarPanelBase::~SidebarPanelBase (void)
 void SAL_CALL SidebarPanelBase::disposing (void)
     throw (css::uno::RuntimeException)
 {
-    mpControl.clear();
+    mpControl.disposeAndClear();
 
     if (mxFrame.is())
     {
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 6afaec6..c1df787 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -209,7 +209,7 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent
         if (( pWindow == mpFloatingWindow ) &&
             ( mpPopupWindow != nullptr ))
         {
-            mpPopupWindow.clear();
+            mpPopupWindow.disposeAndClear();
         }
     }
 
@@ -291,8 +291,8 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime
     pImpl->mxUIElement = 0;
 
     // Delete my popup windows
-    pImpl->mpFloatingWindow.clear();
-    pImpl->mpPopupWindow.clear();
+    pImpl->mpFloatingWindow.disposeAndClear();
+    pImpl->mpPopupWindow.disposeAndClear();
 }
 
 
@@ -862,7 +862,7 @@ IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl)
     {
         // Replace floating window with popup window and destroy
         // floating window instance.
-        pImpl->mpFloatingWindow.clear();
+        pImpl->mpFloatingWindow.disposeAndClear();
         pImpl->mpFloatingWindow = pImpl->mpPopupWindow;
         pImpl->mpPopupWindow.clear();
         // We also need to know when the user tries to use the
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 635ccf0..c9594f2 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -235,7 +235,7 @@ SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
 void SfxPrintOptionsDialog::dispose()
 {
     delete pDlgImpl;
-    pPage.clear();
+    pPage.disposeAndClear();
     delete pOptions;
     ModalDialog::dispose();
 }
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 0b472e2..0170bd7 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -676,7 +676,7 @@ SmElementsDockingWindow::~SmElementsDockingWindow ()
 
 void SmElementsDockingWindow::dispose()
 {
-    mpElementsControl.clear();
+    mpElementsControl.disposeAndClear();
     mpElementListBox.clear();
     SfxDockingWindow::dispose();
 }
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index dfd1595..18f8696 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -156,9 +156,9 @@ void SmEditWindow::dispose()
         pEditView = NULL;
     }
 
-    pHScrollBar.clear();
-    pVScrollBar.clear();
-    pScrollBox.clear();
+    pHScrollBar.disposeAndClear();
+    pVScrollBar.disposeAndClear();
+    pScrollBox.disposeAndClear();
 
     vcl::Window::dispose();
 }
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 0b514fd..7d14a1e 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -146,9 +146,8 @@ void SmToolBoxWindow::dispose()
 {
     int i;
     for (i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
-    {
-        vToolBoxCategories[i].clear();
-    }
+        vToolBoxCategories[i].disposeAndClear();
+
     pToolBoxCmd = 0;
     for (i = 0;  i < NUM_TBX_CATEGORIES + 1;  ++i)
     {
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 6650cbd..6c09611 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -153,10 +153,10 @@ void BrowseBox::dispose()
     }
 
     Hide();
-    getDataWindow()->pHeaderBar.clear();
-    getDataWindow()->pCornerWin.clear();
+    getDataWindow()->pHeaderBar.disposeAndClear();
+    getDataWindow()->pCornerWin.disposeAndClear();
     pDataWin.clear();
-    pVScroll.clear();
+    pVScroll.disposeAndClear();
     aHScroll.disposeAndClear();
 
     // free columns-space
@@ -2255,7 +2255,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
     MultiSelection *pOldRowSel = bMultiSelection ? uRow.pSel : 0;
     MultiSelection *pOldColSel = pColSel;
 
-    pVScroll.clear();
+    pVScroll.disposeAndClear();
 
     bThumbDragging = ( nMode & BROWSER_THUMBDRAGGING ) == BROWSER_THUMBDRAGGING;
     bMultiSelection = ( nMode & BROWSER_MULTISELECTION ) == BROWSER_MULTISELECTION;
@@ -2408,7 +2408,7 @@ BrowserHeader* BrowseBox::CreateHeaderBar( BrowseBox* pParent )
 
 void BrowseBox::SetHeaderBar( BrowserHeader* pHeaderBar )
 {
-    static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar.clear();
+    static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar.disposeAndClear();
     static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar = pHeaderBar;
     static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar->SetStartDragHdl( LINK( this, BrowseBox, StartDragHdl ) );
 }
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 532e340..9e00860 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -254,7 +254,7 @@ namespace svt
 
     void CheckBoxControl::dispose()
     {
-        pBox.clear();
+        pBox.disposeAndClear();
         Control::dispose();
     }
 
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 1dc9adf..c376113 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -195,7 +195,7 @@ namespace svt
         if (nCellModifiedEvent)
             Application::RemoveUserEvent(nCellModifiedEvent);
 
-        pCheckBoxPaint.clear();
+        pCheckBoxPaint.disposeAndClear();
         m_pFocusWhileRequest.clear();
         pHeader.clear();
         BrowseBox::dispose();
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index accd044..23a3172 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -642,7 +642,7 @@ void ViewTabListBox_Impl::dispose()
 {
     maResetQuickSearch.Stop();
 
-    mpHeaderBar.clear();
+    mpHeaderBar.disposeAndClear();
     SvHeaderTabListBox::dispose();
 }
 
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index ae35ee1..2555115 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -166,7 +166,7 @@ SvInplaceEdit2::~SvInplaceEdit2()
         Application::RemoveAccel( &aAccReturn );
         Application::RemoveAccel( &aAccEscape );
     }
-    pEdit.clear();
+    pEdit.disposeAndClear();
 }
 
 OUString SvInplaceEdit2::GetSavedValue() const
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 02a8e13..86271a9 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2229,9 +2229,9 @@ ImplCFieldFloatWin::~ImplCFieldFloatWin()
 
 void ImplCFieldFloatWin::dispose()
 {
-    mpTodayBtn.clear();
-    mpNoneBtn.clear();
-    mpFixedLine.clear();
+    mpTodayBtn.disposeAndClear();
+    mpNoneBtn.disposeAndClear();
+    mpFixedLine.disposeAndClear();
     mpCalendar.clear();
     FloatingWindow::dispose();
 }
@@ -2258,7 +2258,7 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( bool bEnable )
     }
     else
     {
-        mpTodayBtn.clear();
+        mpTodayBtn.disposeAndClear();
     }
 
     return mpTodayBtn;
@@ -2286,7 +2286,7 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( bool bEnable )
     }
     else
     {
-        mpNoneBtn.clear();
+        mpNoneBtn.disposeAndClear();
     }
 
     return mpNoneBtn;
@@ -2350,7 +2350,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
     }
     else
     {
-        mpFixedLine.clear();
+        mpFixedLine.disposeAndClear();
     }
 }
 
@@ -2388,8 +2388,8 @@ CalendarField::~CalendarField()
 
 void CalendarField::dispose()
 {
-    mpCalendar.clear();
-    mpFloatWin.clear();
+    mpCalendar.disposeAndClear();
+    mpFloatWin.disposeAndClear();
     mpTodayBtn.clear();
     mpNoneBtn.clear();
     DateField::dispose();
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 1cf6fc5..5f83f15 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -129,7 +129,7 @@ ToolbarMenuEntry::~ToolbarMenuEntry()
             xComponent->dispose();
         mxAccContext.clear();
     }
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 6cf4a62..e0cf0f9 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -207,11 +207,11 @@ namespace svt
 
     void OWizardMachine::dispose()
     {
-        m_pFinish.clear();
-        m_pCancel.clear();
-        m_pNextPage.clear();
-        m_pPrevPage.clear();
-        m_pHelp.clear();
+        m_pFinish.disposeAndClear();
+        m_pCancel.disposeAndClear();
+        m_pNextPage.disposeAndClear();
+        m_pPrevPage.disposeAndClear();
+        m_pHelp.disposeAndClear();
 
         for (WizardState i=0; i<m_pImpl->nFirstUnknownPage; ++i)
             delete GetPage(i);
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 4026b66..8c70e93 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -313,7 +313,7 @@ void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments )
 
 void OGenericUnoDialog::destroyDialog()
 {
-    m_pDialog.clear();
+    m_pDialog.disposeAndClear();
 }
 
 
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 5351336..2d528fd 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -491,11 +491,11 @@ SvxBmpMask::~SvxBmpMask()
 
 void SvxBmpMask::dispose()
 {
-    m_pQSet1.clear();
-    m_pQSet2.clear();
-    m_pQSet3.clear();
-    m_pQSet4.clear();
-    m_pCtlPipette.clear();
+    m_pQSet1.disposeAndClear();
+    m_pQSet2.disposeAndClear();
+    m_pQSet3.disposeAndClear();
+    m_pQSet4.disposeAndClear();
+    m_pCtlPipette.disposeAndClear();
     delete pData;
     m_pTbxPipette.clear();
     m_pBtnExec.clear();
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index b3e041e..2ed20df 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -301,7 +301,7 @@ void SvxSuperContourDlg::dispose()
 {
     SvtMiscOptions aMiscOptions;
     aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
-    m_pContourWnd.clear();
+    m_pContourWnd.disposeAndClear();
     m_pTbx1.clear();
     m_pMtfTolerance.clear();
     m_pStbStatus.clear();
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index ac7957d..81551a1 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -423,7 +423,7 @@ SvxTPView::~SvxTPView()
 
 void SvxTPView::dispose()
 {
-    m_pViewData.clear();
+    m_pViewData.disposeAndClear();
     m_pAccept.clear();
     m_pReject.clear();
     m_pAcceptAll.clear();
@@ -1119,8 +1119,8 @@ SvxAcceptChgCtr::~SvxAcceptChgCtr()
 void SvxAcceptChgCtr::dispose()
 {
     disposeBuilder();
-    pTPFilter.clear();
-    pTPView.clear();
+    pTPView.disposeAndClear();
+    pTPFilter.disposeAndClear();
     TabControl::dispose();
 }
 
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index a2e705e..3ddca61 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -163,14 +163,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow
 
     SfxChildWindow( _pParent, nId )
 {
-<<<<<<< HEAD
-    SvxFontWorkDialog* pDlg = new SvxFontWorkDialog(pBindings, this, _pParent);
-    pWindow = pDlg;
-=======
-    pWindow = new SvxFontWorkDialog( pBindings, this, _pParent,
-                                     SVX_RES( RID_SVXDLG_FONTWORK ) );
-    SvxFontWorkDialog* pDlg = static_cast<SvxFontWorkDialog*>(pWindow.get());
->>>>>>> 765a16f... vclwidget: change all vcl::window fields to be wrapped in VclPtr
+    pWindow = VclPtrInstance<SvxFontWorkDialog>(pBindings, this, _pParent);
 
     eChildAlignment = SfxChildAlignment::NOALIGNMENT;
 
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index b7a9c2e..2e545e0 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -223,7 +223,7 @@ SvxIMapDlg::~SvxIMapDlg()
 void SvxIMapDlg::dispose()
 {
     // Delete URL-List
-    pIMapWnd.clear();
+    pIMapWnd.disposeAndClear();
     delete pOwnData;
     m_pTbxIMapDlg1.clear();
     m_pFtURL.clear();
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index b6823a2..06d105e 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2948,7 +2948,7 @@ namespace svxform
 
     void NamespaceItemDialog::dispose()
     {
-        m_pNamespacesList.clear();
+        m_pNamespacesList.disposeAndClear();
         m_pAddNamespaceBtn.clear();
         m_pEditNamespaceBtn.clear();
         m_pDeleteNamespaceBtn.clear();
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index ccfce93..ec5bd20 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1872,7 +1872,7 @@ FmFilterNavigatorWin::~FmFilterNavigatorWin()
 
 void FmFilterNavigatorWin::dispose()
 {
-    m_pNavigator.clear();
+    m_pNavigator.disposeAndClear();
     SfxDockingWindow::dispose();
 }
 
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 635d53f..e69a7b5 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -519,7 +519,7 @@ namespace svxform
 
     void NavigatorFrame::dispose()
     {
-        m_pNavigatorTree.clear();
+        m_pNavigatorTree.disposeAndClear();
         SfxDockingWindow::dispose();
     }
 
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index e64bd9a..55c8009 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -152,7 +152,7 @@ GalleryBrowser1::~GalleryBrowser1()
 void GalleryBrowser1::dispose()
 {
     EndListening( *mpGallery );
-    mpThemes.clear();
+    mpThemes.disposeAndClear();
     delete mpExchangeData;
     mpExchangeData = NULL;
     maNewTheme.disposeAndClear();
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 15bfd36..3aae480 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -481,9 +481,9 @@ void GalleryBrowser2::dispose()
 {
     maMiscOptions.RemoveListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
 
-    mpPreview.clear();
-    mpListView.clear();
-    mpIconView.clear();
+    mpPreview.disposeAndClear();
+    mpListView.disposeAndClear();
+    mpIconView.disposeAndClear();
 
     if( mpCurTheme )
         mpGallery->ReleaseTheme( mpCurTheme, *this );
@@ -740,9 +740,9 @@ bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow )
 
 void GalleryBrowser2::SelectTheme( const OUString& rThemeName )
 {
-    mpIconView.clear();
-    mpListView.clear();
-    mpPreview.clear();
+    mpIconView.disposeAndClear();
+    mpListView.disposeAndClear();
+    mpPreview.disposeAndClear();
 
     if( mpCurTheme )
         mpGallery->ReleaseTheme( mpCurTheme, *this );
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index cc0b28d..42a9904 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -218,7 +218,7 @@ _SdrItemBrowserControl::~_SdrItemBrowserControl()
 
 void _SdrItemBrowserControl::dispose()
 {
-    pEditControl.clear();
+    pEditControl.disposeAndClear();
 
     delete pAktChangeEntry;
 
@@ -532,7 +532,7 @@ bool _SdrItemBrowserControl::EndChangeEntry()
     bool bRet = false;
     if (pEditControl!=nullptr) {
         aEntryChangedHdl.Call(this);
-        pEditControl.clear();
+        pEditControl.disposeAndClear();
         delete pAktChangeEntry;
         pAktChangeEntry=NULL;
         vcl::Window* pParent=GetParent();
@@ -546,7 +546,7 @@ bool _SdrItemBrowserControl::EndChangeEntry()
 void _SdrItemBrowserControl::BrkChangeEntry()
 {
     if (pEditControl!=nullptr) {
-        pEditControl.clear();
+        pEditControl.disposeAndClear();
         delete pAktChangeEntry;
         pAktChangeEntry=NULL;
         vcl::Window* pParent=GetParent();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index a30737b..7ee54bf 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -235,7 +235,7 @@ SdrPaintView::~SdrPaintView()
     ClearPageView();
 
 #ifdef DBG_UTIL
-    pItemBrowser.clear();
+    pItemBrowser.disposeAndClear();
 #endif
 
     // delete existing SdrPaintWindows
@@ -1132,7 +1132,7 @@ void SdrPaintView::ShowItemBrowser(bool bShow)
     } else {
         if (pItemBrowser!=nullptr) {
             pItemBrowser->Hide();
-            pItemBrowser.clear();
+            pItemBrowser.disposeAndClear();
         }
     }
 }
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index eb677739..775fc01 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -567,8 +567,8 @@ FillControl::~FillControl()
 
 void FillControl::dispose()
 {
-    mpLbFillType.clear();
-    mpLbFillAttr.clear();
+    mpLbFillType.disposeAndClear();
+    mpLbFillAttr.disposeAndClear();
     vcl::Window::dispose();
 }
 
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 18bb2ba..27611b0 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -343,7 +343,7 @@ throw (uno::RuntimeException, std::exception)
     svt::ToolboxController::dispose();
 
     SolarMutexGuard aSolarMutexGuard;
-    m_pBox.clear();
+    m_pBox.disposeAndClear();
 }
 
 // XStatusListener
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 1d175ff..d10d5b5 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -660,7 +660,7 @@ void SAL_CALL MatchCaseToolboxController::dispose() throw ( css::uno::RuntimeExc
 
     svt::ToolboxController::dispose();
 
-    m_pMatchCaseControl.clear();
+    m_pMatchCaseControl.disposeAndClear();
 }
 
 // XInitialization
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 7cdf4a9..5a2f76e 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -58,7 +58,7 @@ void ChineseTranslation_UnoDialog::impl_DeleteDialog()
     {
         if(m_pDialog->IsInExecute())
             m_pDialog->EndDialog(RET_CANCEL);
-        m_pDialog.clear();
+        m_pDialog.disposeAndClear();
     }
 }
 
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index feaaf3b..6c0f040 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -73,7 +73,7 @@ void ChineseTranslationDialog::dispose()
         if(m_pDictionaryDialog->IsInExecute())
             m_pDictionaryDialog->EndDialog();
     }
-    m_pDictionaryDialog.clear();
+    m_pDictionaryDialog.disposeAndClear();
     m_pRB_To_Simplified.clear();
     m_pRB_To_Traditional.clear();
     m_pCB_Translate_Commonterms.clear();
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 71d69b2..388c6d3 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -277,8 +277,8 @@ void SwAddressListDialog::dispose()
         delete pUserData;
         pEntry = m_pListLB->Next( pEntry );
     }
+    m_pListLB.disposeAndClear();
     m_pAddressPage.clear();
-    m_pListLB.clear();
     m_pDescriptionFI.clear();
     m_pLoadListPB.clear();
     m_pCreateListPB.clear();
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index d54a313..fb86a0e 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -507,7 +507,7 @@ void SwCreateAddressListDialog::dispose()
     m_pNextPB.clear();
     m_pEndPB.clear();
     m_pOK.clear();
-    m_pFindDlg.clear();
+    m_pFindDlg.disposeAndClear();
     SfxModalDialog::dispose();
 }
 
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index c31485a..eb99205 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -152,7 +152,7 @@ SwSelectDBTableDialog::~SwSelectDBTableDialog()
 
 void SwSelectDBTableDialog::dispose()
 {
-    m_pTable.clear();
+    m_pTable.disposeAndClear();
     m_pPreviewPB.clear();
     SfxModalDialog::dispose();
 }
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 01eab60..7a8e036 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -219,11 +219,11 @@ SwColumnDlg::~SwColumnDlg()
 
 void SwColumnDlg::dispose()
 {
+    pTabPage.disposeAndClear();
     delete pPageSet;
     delete pSectionSet;
     delete pSelectionSet;
     m_pApplyToLB.clear();
-    pTabPage.clear();
     SfxModalDialog::dispose();
 }
 
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 589d1a7..784cfc0 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -723,7 +723,7 @@ SwAddStylesDlg_Impl::~SwAddStylesDlg_Impl()
 
 void SwAddStylesDlg_Impl::dispose()
 {
-    m_pHeaderTree.clear();
+    m_pHeaderTree.disposeAndClear();
     m_pOk.clear();
     m_pLeftPB.clear();
     m_pRightPB.clear();
@@ -2767,10 +2767,9 @@ void SwTokenWindow::dispose()
 {
     for (ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it)
     {
-        Control* pControl = (*it);
-        pControl->SetGetFocusHdl( Link() );
-        pControl->SetLoseFocusHdl( Link() );
-        delete pControl;
+        it->SetGetFocusHdl( Link() );
+        it->SetLoseFocusHdl( Link() );
+        it->disposeAndClear();
     }
     aControlList.clear();
     disposeBuilder();
@@ -2790,6 +2789,8 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
     if(pForm)
     {
         //apply current level settings to the form
+        for (auto it = aControlList.begin(); it != aControlList.end(); ++it)
+             it->disposeAndClear();
         aControlList.clear();
     }
 
@@ -3133,7 +3134,7 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
     {
         iterActive = aControlList.erase(iterActive);
         pActiveCtrl->Hide();
-        pActiveCtrl.clear();
+        pActiveCtrl.disposeAndClear();
     }
 
     //now the new button
@@ -3198,7 +3199,7 @@ void SwTokenWindow::RemoveControl(SwTOXButton* pDel, bool bInternalCall )
 
     aControlList.erase(it);
     pActiveCtrl->Hide();
-    pActiveCtrl.clear();
+    pActiveCtrl.disposeAndClear();
 
     SetActiveControl(pLeftEdit);
     AdjustPositions();
@@ -4216,7 +4217,7 @@ SwAutoMarkDlg_Impl::~SwAutoMarkDlg_Impl()
 
 void SwAutoMarkDlg_Impl::dispose()
 {
-    m_pEntriesBB.clear();
+    m_pEntriesBB.disposeAndClear();
     m_pOKPB.clear();
     ModalDialog::dispose();
 }
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 75e48ab..653ba8b 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1534,11 +1534,11 @@ void SwCreateAuthEntryDlg_Impl::dispose()
 {
     for(int i = 0; i < AUTH_FIELD_END; i++)
     {
-        pFixedTexts[i].clear();
-        pEdits[i].clear();
+        pFixedTexts[i].disposeAndClear();
+        pEdits[i].disposeAndClear();
     }
-    pTypeListBox.clear();
-    pIdentifierBox.clear();
+    pTypeListBox.disposeAndClear();
+    pIdentifierBox.disposeAndClear();
     m_pOKBT.clear();
     ModalDialog::dispose();
 }
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 12d9586..c415f6e 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -175,7 +175,7 @@ SwHeaderFooterWin::~SwHeaderFooterWin( )
 void SwHeaderFooterWin::dispose()
 {
     delete m_pPopupMenu;
-    m_pLine.clear();
+    m_pLine.disposeAndClear();
     MenuButton::dispose();
 }
 
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index b8e459d..cc09543 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -126,12 +126,12 @@ void SwPageBreakWin::dispose()
     m_bDestroyed = true;
     m_aFadeTimer.Stop();
 
+    m_pLine.disposeAndClear();
     delete m_pPopupMenu;
     m_pPopupMenu = NULL;
     delete m_pMousePt;
     m_pMousePt = NULL;
 
-    m_pLine.clear();
     MenuButton::dispose();
 }
 
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 4db2d5d..296ba3b 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -157,7 +157,7 @@ void SwSidebarWin::dispose()
             mpOutlinerView->SetWindow( 0 );
         }
     }
-    mpSidebarTxtControl.clear();
+    mpSidebarTxtControl.disposeAndClear();
 
     if ( mpOutlinerView )
     {
@@ -175,19 +175,19 @@ void SwSidebarWin::dispose()
     {
         mpMetadataAuthor->RemoveEventListener( LINK( this, SwSidebarWin, WindowEventListener ) );
     }
-    mpMetadataAuthor.clear();
+    mpMetadataAuthor.disposeAndClear();
 
     if (mpMetadataDate)
     {
         mpMetadataDate->RemoveEventListener( LINK( this, SwSidebarWin, WindowEventListener ) );
     }
-    mpMetadataDate.clear();
+    mpMetadataDate.disposeAndClear();
 
     if (mpVScrollbar)
     {
         mpVScrollbar->RemoveEventListener( LINK( this, SwSidebarWin, WindowEventListener ) );
     }
-    mpVScrollbar.clear();
+    mpVScrollbar.disposeAndClear();
 
     RemoveEventListener( LINK( this, SwSidebarWin, WindowEventListener ) );
 
@@ -200,7 +200,7 @@ void SwSidebarWin::dispose()
     delete mpTextRangeOverlay;
     mpTextRangeOverlay = NULL;
 
-    mpMenuButton.clear();
+    mpMenuButton.disposeAndClear();
 
     if (mnEventId)
         Application::RemoveUserEvent( mnEventId );
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 0522f13..f46685b 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -292,9 +292,9 @@ void SwSrcEditWindow::dispose()
         delete pTextView;
         delete pTextEngine;
     }
-    pOutWin.clear();
-    pHScrollbar.clear();
-    pVScrollbar.clear();
+    pHScrollbar.disposeAndClear();
+    pVScrollbar.disposeAndClear();
+    pOutWin.disposeAndClear();
     vcl::Window::dispose();
 }
 
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index ca90595..4fb3b9f 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -453,7 +453,7 @@ SwScrollNaviPopup::~SwScrollNaviPopup()
 
 void SwScrollNaviPopup::dispose()
 {
-    m_pToolBox.clear();
+    m_pToolBox.disposeAndClear();
     m_pInfoField.clear();
     SfxPopupWindow::dispose();
 }
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index 6e9c39f..47a3477 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -82,7 +82,7 @@ PageColumnControl::~PageColumnControl(void)
 
 void PageColumnControl::dispose()
 {
-    mpColumnValueSet.clear();
+    mpColumnValueSet.disposeAndClear();
     maMoreButton.disposeAndClear();
     ::svx::sidebar::PopupControl::dispose();
 }
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 46eb396..14f6bef 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -138,7 +138,7 @@ PageMarginControl::~PageMarginControl()
 
 void PageMarginControl::dispose()
 {
-    mpMarginValueSet.clear();
+    mpMarginValueSet.disposeAndClear();
 
     StoreUserCustomValues();
 
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index c4d9357..2ca1375 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -68,7 +68,7 @@ PageOrientationControl::~PageOrientationControl(void)
 
 void PageOrientationControl::dispose()
 {
-    mpOrientationValueSet.clear();
+    mpOrientationValueSet.disposeAndClear();
     ::svx::sidebar::PopupControl::dispose();
 }
 
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 0906c8f..5218a78 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -148,7 +148,7 @@ PageSizeControl::~PageSizeControl()
 
 void PageSizeControl::dispose()
 {
-    mpSizeValueSet.clear();
+    mpSizeValueSet.disposeAndClear();
     maMoreButton.disposeAndClear();
     maWidthHeightField.disposeAndClear();
     ::svx::sidebar::PopupControl::dispose();
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 350cf29..77759cb 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1051,18 +1051,18 @@ SwView::~SwView()
     m_pViewImpl->Invalidate();
     EndListening(*GetViewFrame());
     EndListening(*GetDocShell());
-    m_pScrollFill.clear();
+    m_pScrollFill.disposeAndClear();
     delete m_pWrtShell;
     m_pWrtShell = 0;      // Set to 0, so that it is not accessible by the following dtors cannot.
     m_pShell = 0;
-    m_pHScrollbar.clear();
-    m_pVScrollbar.clear();
-    m_pHRuler.clear();
-    m_pVRuler.clear();
-    m_pTogglePageBtn.clear();
+    m_pHScrollbar.disposeAndClear();
+    m_pVScrollbar.disposeAndClear();
+    m_pHRuler.disposeAndClear();
+    m_pVRuler.disposeAndClear();
+    m_pTogglePageBtn.disposeAndClear();
     delete m_pGlosHdl;
     delete m_pViewImpl;
-    m_pEditWin.clear();
+    m_pEditWin.disposeAndClear();
     delete m_pFormatClipboard;
 }
 
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 98a9da9..35395a0 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -888,7 +888,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox )
 
 IMPL_LINK_NOARG(SwView, FieldPopupModeEndHdl)
 {
-    m_pFieldPopup.clear();
+    m_pFieldPopup.disposeAndClear();
     return 0;
 }
 
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index c1fbaec..0f50639 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -871,8 +871,8 @@ void SwNavigationPI::dispose()
     if ( IsBound() )
         rBindings.Release(*this);
 
-    pPopupWindow.clear();
-    pFloatingWindow.clear();
+    pPopupWindow.disposeAndClear();
+    pFloatingWindow.disposeAndClear();
     aContentToolBox.disposeAndClear();
     aGlobalToolBox.disposeAndClear();
     aContentTree.disposeAndClear();
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 5783908..a67c9de 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -101,8 +101,8 @@ void RTSDialog::dispose()
     m_pTabControl.clear();
     m_pOKButton.clear();
     m_pCancelButton.clear();
-    m_pPaperPage.clear();
-    m_pDevicePage.clear();
+    m_pPaperPage.disposeAndClear();
+    m_pDevicePage.disposeAndClear();
     TabDialog::dispose();
 }
 
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 89a2fe1..969cadc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -74,14 +74,9 @@ ComboBox::~ComboBox()
 void ComboBox::dispose()
 {
     mpSubEdit.disposeAndClear();
-
-    ImplListBox *pImplLB = mpImplLB;
-    mpImplLB = NULL;
-    delete pImplLB;
-
-    mpFloatWin.clear();
-    mpBtn.clear();
-    mpImplLB.clear();
+    mpImplLB.disposeAndClear();
+    mpFloatWin.disposeAndClear();
+    mpBtn.disposeAndClear();
     Edit::dispose();
 }
 
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 78e0146..1e50eee 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -77,10 +77,10 @@ void ListBox::dispose()
 {
     CallEventListeners( VCLEVENT_OBJECT_DYING );
 
-    mpFloatWin.clear();
-    mpImplWin.clear();
-    mpBtn.clear();
-    mpImplLB.clear();
+    mpImplLB.disposeAndClear();
+    mpFloatWin.disposeAndClear();
+    mpImplWin.disposeAndClear();
+    mpBtn.disposeAndClear();
 
     Control::dispose();
 }
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 60ade3a..9821154 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1331,7 +1331,7 @@ void PrinterController::abortJob()
     // applications (well, sw) depend on a page request with "IsLastPage" = true
     // to free resources, else they (well, sw) will crash eventually
     setLastPage( true );
-    mpImplData->mpProgress.clear();
+    mpImplData->mpProgress.disposeAndClear();
     GDIMetaFile aMtf;
     getPageFile( 0, aMtf, false );
 }
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 90b436e..ab5b04d 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -1185,7 +1185,7 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd)
     GetWindow()->SetParent( pRealParent );
     GetWindow()->mpWindowImpl->mpRealParent = pRealParent;
 
-    mpFloatWin.clear();
+    mpFloatWin.disposeAndClear();
 
     // call handler - which will destroy the window and thus the wrapper as well !
     GetWindow()->CallEventListeners( VCLEVENT_WINDOW_ENDPOPUPMODE, &aData );
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 743983c..853e759f 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -877,8 +877,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode )
                 mpWindowImpl->mpBorderWindow = mpOldBorderWin;
                 SetParent( pRealParent );
                 mpWindowImpl->mpRealParent = pRealParent;
-                mpFloatWin.clear();
-                mpFloatWin = NULL;
+                mpFloatWin.disposeAndClear();
                 SetPosPixel( maDockPos );
 
                 ToggleFloatingMode();
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 1d691c0..e763b77 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1478,6 +1478,12 @@ bool VclAlignment::set_property(const OString &rKey, const OString &rValue)
     return true;
 }
 
+void VclExpander::dispose()
+{
+    m_pDisclosureButton.disposeAndClear();
+    VclBin::dispose();
+}
+
 const vcl::Window *VclExpander::get_child() const
 {
     const WindowImpl* pWindowImpl = ImplGetWindowImpl();
@@ -1632,6 +1638,14 @@ VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent, WinBits nStyle)
     m_pHScroll->SetScrollHdl(aLink);
 }
 
+void VclScrolledWindow::dispose()
+{
+    m_pVScroll.disposeAndClear();
+    m_pHScroll.disposeAndClear();
+    m_aScrollBarBox.disposeAndClear();
+    VclBin::dispose();
+}
+
 IMPL_LINK_NOARG(VclScrolledWindow, ScrollBarHdl)
 {
     vcl::Window *pChild = get_child();
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 64bce64..5527aa5 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -156,9 +156,9 @@ MessBox::~MessBox()
 
 void MessBox::dispose()
 {
-    mpVCLMultiLineEdit.clear();
-    mpFixedImage.clear();
-    mpCheckBox.clear();
+    mpVCLMultiLineEdit.disposeAndClear();
+    mpFixedImage.disposeAndClear();
+    mpCheckBox.disposeAndClear();
     ButtonDialog::dispose();
 }
 
@@ -196,12 +196,12 @@ void MessBox::ImplPosControls()
     WinBits         nWinStyle = WB_LEFT | WB_NOLABEL;
     sal_uInt16          nTextStyle = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | TEXT_DRAW_LEFT;
 
-    mpVCLMultiLineEdit.clear();
-    mpFixedImage.clear();
+    mpVCLMultiLineEdit.disposeAndClear();
+    mpFixedImage.disposeAndClear();
     if ( mpCheckBox )
     {
         mbCheck = mpCheckBox->IsChecked();
-        mpCheckBox.clear();
+        mpCheckBox.disposeAndClear();
     }
 
     // Clean up message text with tabs
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 02220ba..4f52d5c 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -226,7 +226,7 @@ TabDialog::~TabDialog()
 
 void TabDialog::dispose()
 {
-    mpFixedLine.clear();
+    mpFixedLine.disposeAndClear();
     mpViewWindow.clear();
     Dialog::dispose();
 }
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index f6c8cc9..28050b6 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -86,7 +86,7 @@ CertificateChooser::~CertificateChooser()
 
 void CertificateChooser::dispose()
 {
-    m_pCertLB.clear();
+    m_pCertLB.disposeAndClear();
     m_pViewBtn.clear();
     m_pOKBtn.clear();
     ModalDialog::dispose();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 544e859..5c77f69 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -299,8 +299,8 @@ CertificateViewerDetailsTP::~CertificateViewerDetailsTP()
 void CertificateViewerDetailsTP::dispose()
 {
     Clear();
+    m_pElementsLB.disposeAndClear();
     m_pElementsLBContainer.clear();
-    m_pElementsLB.clear();
     m_pValueDetails.clear();
     CertificateViewerTP::dispose();
 }
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 03e9cfc..9cfde2b 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -240,10 +240,10 @@ DigitalSignaturesDialog::~DigitalSignaturesDialog()
 
 void DigitalSignaturesDialog::dispose()
 {
+    m_pSignaturesLB.disposeAndClear();
     m_pHintDocFT.clear();
     m_pHintBasicFT.clear();
     m_pHintPackageFT.clear();
-    m_pSignaturesLB.clear();
     m_pSigsValidImg.clear();
     m_pSigsValidFI.clear();
     m_pSigsInvalidImg.clear();
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 9a7a068..6ff60ac 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -435,7 +435,7 @@ MacroSecurityTrustedSourcesTP::~MacroSecurityTrustedSourcesTP()
 
 void MacroSecurityTrustedSourcesTP::dispose()
 {
-    m_pTrustCertLB.clear();
+    m_pTrustCertLB.disposeAndClear();
     m_pTrustCertROFI.clear();
     m_pViewCertPB.clear();
     m_pRemoveCertPB.clear();
commit 1c4025babd7037a3292aa530c7d45ab8d6ef6dcb
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Mar 9 14:29:30 2015 +0200

    vclwidget: change all vcl::window fields to be wrapped in VclPtr
    
    and update the VclWidget clang plugin to
    - warn about unconverted fields
    - .clear() all VclPtr fields in dispose() methods
    
    Change-Id: I6e657c215bc6807efd992555399b3b1fc16c89b5
    
    2	1	accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
    2	1	accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
    1	1	accessibility/inc/accessibility/extended/accessibletablistbox.hxx
    1	1	accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
    3	2	accessibility/inc/accessibility/extended/listboxaccessible.hxx
    1	1	accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
    2	1	accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
    2	1	accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
    4	4	accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
    2	1	accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
    2	1	accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
    3	2	accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
    7	6	accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
    3	3	accessibility/source/extended/AccessibleToolPanelDeck.cxx
    2	2	accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
    2	2	accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
    1	1	accessibility/source/extended/accessibleiconchoicectrlentry.cxx
    3	3	accessibility/source/extended/textwindowaccessibility.cxx
    3	3	accessibility/source/standard/vclxaccessibleradiobutton.cxx
    1	1	accessibility/source/standard/vclxaccessibletabpagewindow.cxx
    1	1	avmedia/inc/mediacontrol.hxx
    1	2	avmedia/source/framework/mediacontrol.cxx
    1	1	avmedia/source/framework/mediaplayer.cxx
    7	7	avmedia/source/viewer/mediaevent_impl.cxx
    2	1	avmedia/source/viewer/mediaevent_impl.hxx
    1	2	avmedia/source/viewer/mediawindow_impl.cxx
    1	1	avmedia/source/viewer/mediawindow_impl.hxx
    1	1	basctl/source/basicide/basicrenderable.hxx
    1	0	basctl/source/basicide/baside2.cxx
    7	5	basctl/source/basicide/baside2.hxx
    13	2	basctl/source/basicide/baside2b.cxx
    3	3	basctl/source/basicide/baside3.cxx
    14	14	basctl/source/basicide/basides1.cxx
    4	4	basctl/source/basicide/basides2.cxx
    2	2	basctl/source/basicide/basides3.cxx
    6	6	basctl/source/basicide/basidesh.cxx
    14	1	basctl/source/basicide/bastypes.cxx
    15	0	basctl/source/basicide/brkdlg.cxx
    8	6	basctl/source/basicide/brkdlg.hxx
    11	0	basctl/source/basicide/layout.cxx
    5	2	basctl/source/basicide/layout.hxx
    11	0	basctl/source/basicide/linenumberwindow.cxx
    3	1	basctl/source/basicide/linenumberwindow.hxx
    14	0	basctl/source/basicide/macrodlg.cxx
    15	15	basctl/source/basicide/macrodlg.hxx
    45	1	basctl/source/basicide/moduldl2.cxx
    32	1	basctl/source/basicide/moduldlg.cxx
    36	26	basctl/source/basicide/moduldlg.hxx
    20	0	basctl/source/dlged/managelang.cxx
    2	1	basctl/source/inc/accessibledialogcontrolshape.hxx
    2	1	basctl/source/inc/accessibledialogwindow.hxx
    2	2	basctl/source/inc/baside3.hxx
    4	4	basctl/source/inc/basidesh.hxx
    5	4	basctl/source/inc/bastypes.hxx
    3	2	basctl/source/inc/dlged.hxx
    12	10	basctl/source/inc/managelang.hxx
    1	1	chart2/inc/ChartModel.hxx
    2	1	chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
    2	2	chart2/source/controller/dialogs/ChartTypeDialogController.hxx
    1	2	chart2/source/controller/dialogs/dlg_ChartType.cxx
    2	10	chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
    1	0	chart2/source/controller/dialogs/dlg_DataEditor.cxx
    4	6	chart2/source/controller/dialogs/dlg_DataSource.cxx
    17	0	chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
    6	8	chart2/source/controller/dialogs/dlg_View3D.cxx
    2	2	chart2/source/controller/dialogs/res_BarGeometry.hxx
    19	19	chart2/source/controller/dialogs/res_DataLabel.hxx
    23	23	chart2/source/controller/dialogs/res_Trendline.hxx
    14	0	chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
    6	4	chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
    18	0	chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
    9	7	chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
    14	1	chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
    16	16	chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
    17	0	chart2/source/controller/dialogs/tp_AxisLabel.cxx
    17	17	chart2/source/controller/dialogs/tp_AxisLabel.hxx
    24	0	chart2/source/controller/dialogs/tp_AxisPositions.cxx
    20	18	chart2/source/controller/dialogs/tp_AxisPositions.hxx
    44	19	chart2/source/controller/dialogs/tp_ChartType.cxx
    3	3	chart2/source/controller/dialogs/tp_ChartType.hxx
    28	0	chart2/source/controller/dialogs/tp_DataSource.cxx
    22	20	chart2/source/controller/dialogs/tp_DataSource.hxx
    12	0	chart2/source/controller/dialogs/tp_LegendPosition.cxx
    3	1	chart2/source/controller/dialogs/tp_LegendPosition.hxx
    16	0	chart2/source/controller/dialogs/tp_PolarOptions.cxx
    8	6	chart2/source/controller/dialogs/tp_PolarOptions.hxx
    24	0	chart2/source/controller/dialogs/tp_RangeChooser.cxx
    15	13	chart2/source/controller/dialogs/tp_RangeChooser.hxx
    35	0	chart2/source/controller/dialogs/tp_Scale.cxx
    34	32	chart2/source/controller/dialogs/tp_Scale.hxx
    24	0	chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
    19	17	chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
    7	0	chart2/source/controller/dialogs/tp_TitleRotation.cxx
    7	7	chart2/source/controller/dialogs/tp_TitleRotation.hxx
    13	0	chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
    5	3	chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
    1	1	chart2/source/controller/inc/dlg_ChartType.hxx
    1	1	chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
    1	1	chart2/source/controller/inc/dlg_DataEditor.hxx
    4	4	chart2/source/controller/inc/dlg_DataSource.hxx
    8	6	chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
    4	4	chart2/source/controller/inc/dlg_View3D.hxx
    27	27	chart2/source/controller/inc/res_ErrorBar.hxx
    5	5	chart2/source/controller/inc/res_LegendPosition.hxx
    14	14	chart2/source/controller/inc/res_Titles.hxx
    1	1	chart2/source/controller/main/ChartController.hxx
    2	3	chart2/source/controller/main/ChartWindow.cxx
    1	1	chart2/source/controller/main/ChartWindow.hxx
    6	6	chart2/source/controller/main/ShapeController.cxx
    1	1	chart2/source/view/charttypes/GL3DBarChart.cxx
    1	1	chart2/source/view/inc/GL3DBarChart.hxx
    1	1	chart2/source/view/main/ChartView.cxx
    155	50	compilerplugins/clang/vclwidgets.cxx
    23	0	cui/source/customize/acccfg.cxx
    95	20	cui/source/customize/cfg.cxx
    1	0	cui/source/customize/cfgutil.cxx
    1	0	cui/source/customize/eventdlg.cxx
    1	1	cui/source/customize/eventdlg.hxx
    12	0	cui/source/customize/macropg.cxx
    8	6	cui/source/customize/macropg_impl.hxx
    17	0	cui/source/customize/selector.cxx
    20	0	cui/source/dialogs/SpellDialog.cxx
    17	0	cui/source/dialogs/about.cxx
    56	26	cui/source/dialogs/colorpicker.cxx
    19	0	cui/source/dialogs/cuicharmap.cxx
    29	1	cui/source/dialogs/cuifmsearch.cxx
    84	2	cui/source/dialogs/cuigaldlg.cxx
    72	0	cui/source/dialogs/cuigrfflt.cxx
    15	0	cui/source/dialogs/cuiimapwnd.cxx
    11	0	cui/source/dialogs/cuitbxform.cxx
    41	0	cui/source/dialogs/dlgname.cxx
    79	5	cui/source/dialogs/hangulhanjadlg.cxx
    5	0	cui/source/dialogs/hldocntp.cxx
    15	0	cui/source/dialogs/hldoctp.cxx
    20	1	cui/source/dialogs/hlinettp.cxx
    14	0	cui/source/dialogs/hlmailtp.cxx
    15	0	cui/source/dialogs/hlmarkwn.cxx
    9	5	cui/source/dialogs/hltpbase.cxx
    18	0	cui/source/dialogs/hyphen.cxx
    18	2	cui/source/dialogs/iconcdlg.cxx
    45	0	cui/source/dialogs/insdlg.cxx
    13	0	cui/source/dialogs/insrc.cxx
    20	0	cui/source/dialogs/linkdlg.cxx
    13	8	cui/source/dialogs/multipat.cxx
    12	0	cui/source/dialogs/newtabledlg.cxx
    9	9	cui/source/dialogs/passwdomdlg.cxx
    13	0	cui/source/dialogs/pastedlg.cxx
    7	0	cui/source/dialogs/postdlg.cxx
    18	0	cui/source/dialogs/scriptdlg.cxx
    11	0	cui/source/dialogs/showcols.cxx
    14	0	cui/source/dialogs/splitcelldlg.cxx
    25	0	cui/source/dialogs/srchxtra.cxx
    39	0	cui/source/dialogs/thesdlg.cxx
    13	0	cui/source/dialogs/zoom.cxx
    29	0	cui/source/factory/cuiexp.cxx
    0	2	cui/source/factory/dlgfact.cxx
    2	3	cui/source/factory/dlgfact.hxx
    3	1	cui/source/inc/ControlFocusHelper.hxx
    20	20	cui/source/inc/SpellDialog.hxx
    9	7	cui/source/inc/about.hxx
    14	12	cui/source/inc/acccfg.hxx
    26	26	cui/source/inc/align.hxx
    62	52	cui/source/inc/autocdlg.hxx
    29	29	cui/source/inc/backgrnd.hxx
    34	32	cui/source/inc/border.hxx
    44	33	cui/source/inc/cfg.hxx
    1	1	cui/source/inc/cfgutil.hxx
    95	85	cui/source/inc/chardlg.hxx
    14	12	cui/source/inc/connect.hxx
    12	10	cui/source/inc/cuicharmap.hxx
    27	27	cui/source/inc/cuifmsearch.hxx
    41	29	cui/source/inc/cuigaldlg.hxx
    24	10	cui/source/inc/cuigrfflt.hxx
    1	1	cui/source/inc/cuihyperdlg.hxx

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list