[Libreoffice-commits] core.git: 279 commits - accessibility/inc accessibility/source avmedia/inc avmedia/source basctl/source basic/source canvas/source chart2/inc chart2/source compilerplugins/clang connectivity/source cppcanvas/qa cppcanvas/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source extensions/workben filter/source forms/source formula/source fpicker/source fpicker/test framework/inc framework/source include/avmedia include/dbaccess include/drawinglayer include/editeng include/formula include/rtl include/sfx2 include/svtools include/svx include/toolkit include/tools include/vcl lotuswordpro/source mysqlc/source odk/examples reportdesign/source sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source slideshow/source starmath/inc starmath/qa starmath/source svtools/inc svtools/source svx/inc svx/source svx/workben sw/inc sw/qa sw/source toolkit/source tools/source UnoControls/source uui/source vcl/CppunitTest_vcl_lifecycle.mk vcl/generic v cl/inc vcl/Module_vcl.mk vcl/osx vcl/qa vcl/quartz vcl/README.lifecycle vcl/source vcl/unx vcl/win vcl/workben writerperfect/source xmlsecurity/inc xmlsecurity/source

Michael Meeks michael.meeks at collabora.com
Tue Apr 28 07:10:19 PDT 2015


 UnoControls/source/controls/progressmonitor.cxx                            |    2 
 UnoControls/source/controls/statusindicator.cxx                            |    2 
 UnoControls/source/inc/progressbar.hxx                                     |    2 
 accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx      |    6 
 accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx |    3 
 accessibility/inc/accessibility/extended/accessiblelistbox.hxx             |    2 
 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/accessibleiconchoicectrl.cxx                 |    5 
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx            |    2 
 accessibility/source/extended/accessiblelistbox.cxx                        |   10 
 accessibility/source/extended/textwindowaccessibility.cxx                  |    6 
 accessibility/source/helper/acc_factory.cxx                                |    4 
 accessibility/source/standard/vclxaccessiblebox.cxx                        |   24 
 accessibility/source/standard/vclxaccessiblebutton.cxx                     |   10 
 accessibility/source/standard/vclxaccessiblecheckbox.cxx                   |    4 
 accessibility/source/standard/vclxaccessiblecombobox.cxx                   |    9 
 accessibility/source/standard/vclxaccessibledropdowncombobox.cxx           |    8 
 accessibility/source/standard/vclxaccessibledropdownlistbox.cxx            |    9 
 accessibility/source/standard/vclxaccessibleedit.cxx                       |    8 
 accessibility/source/standard/vclxaccessiblelist.cxx                       |   22 
 accessibility/source/standard/vclxaccessiblelistbox.cxx                    |   12 
 accessibility/source/standard/vclxaccessibleradiobutton.cxx                |    8 
 accessibility/source/standard/vclxaccessiblescrollbar.cxx                  |    2 
 accessibility/source/standard/vclxaccessiblestatusbar.cxx                  |    2 
 accessibility/source/standard/vclxaccessibletabcontrol.cxx                 |    2 
 accessibility/source/standard/vclxaccessibletabpagewindow.cxx              |    4 
 accessibility/source/standard/vclxaccessibletextcomponent.cxx              |    4 
 accessibility/source/standard/vclxaccessibletextfield.cxx                  |   10 
 accessibility/source/standard/vclxaccessibletoolbox.cxx                    |   44 
 avmedia/inc/mediacontrol.hxx                                               |   15 
 avmedia/source/framework/mediacontrol.cxx                                  |  278 +--
 avmedia/source/framework/mediaplayer.cxx                                   |   10 
 avmedia/source/framework/mediatoolbox.cxx                                  |   11 
 avmedia/source/viewer/mediaevent_impl.cxx                                  |   14 
 avmedia/source/viewer/mediaevent_impl.hxx                                  |    3 
 avmedia/source/viewer/mediawindow.cxx                                      |    7 
 avmedia/source/viewer/mediawindow_impl.cxx                                 |   32 
 avmedia/source/viewer/mediawindow_impl.hxx                                 |    7 
 basctl/source/basicide/basdoc.cxx                                          |    7 
 basctl/source/basicide/basdoc.hxx                                          |    7 
 basctl/source/basicide/basicbox.cxx                                        |   36 
 basctl/source/basicide/basicbox.hxx                                        |   11 
 basctl/source/basicide/basicrenderable.cxx                                 |    8 
 basctl/source/basicide/basicrenderable.hxx                                 |    4 
 basctl/source/basicide/baside2.cxx                                         |   79 
 basctl/source/basicide/baside2.hxx                                         |   72 
 basctl/source/basicide/baside2b.cxx                                        |  323 ++-
 basctl/source/basicide/baside3.cxx                                         |   26 
 basctl/source/basicide/basides1.cxx                                        |   54 
 basctl/source/basicide/basides2.cxx                                        |   14 
 basctl/source/basicide/basides3.cxx                                        |   10 
 basctl/source/basicide/basidesh.cxx                                        |   69 
 basctl/source/basicide/basobj2.cxx                                         |   10 
 basctl/source/basicide/basobj3.cxx                                         |    8 
 basctl/source/basicide/bastype2.cxx                                        |    9 
 basctl/source/basicide/bastype2.hxx                                        |    1 
 basctl/source/basicide/bastypes.cxx                                        |   39 
 basctl/source/basicide/brkdlg.cxx                                          |   16 
 basctl/source/basicide/brkdlg.hxx                                          |   14 
 basctl/source/basicide/layout.cxx                                          |   31 
 basctl/source/basicide/layout.hxx                                          |   13 
 basctl/source/basicide/linenumberwindow.cxx                                |   10 
 basctl/source/basicide/linenumberwindow.hxx                                |    3 
 basctl/source/basicide/macrodlg.cxx                                        |   25 
 basctl/source/basicide/macrodlg.hxx                                        |   29 
 basctl/source/basicide/moduldl2.cxx                                        |   94 -
 basctl/source/basicide/moduldlg.cxx                                        |   81 
 basctl/source/basicide/moduldlg.hxx                                        |   66 
 basctl/source/basicide/objdlg.cxx                                          |   49 
 basctl/source/basicide/objdlg.hxx                                          |    7 
 basctl/source/basicide/tbxctl.cxx                                          |    2 
 basctl/source/basicide/tbxctl.hxx                                          |    2 
 basctl/source/dlged/managelang.cxx                                         |   36 
 basctl/source/dlged/propbrw.cxx                                            |    6 
 basctl/source/inc/accessibledialogcontrolshape.hxx                         |    3 
 basctl/source/inc/accessibledialogwindow.hxx                               |    3 
 basctl/source/inc/baside3.hxx                                              |    8 
 basctl/source/inc/basidesh.hxx                                             |   30 
 basctl/source/inc/bastypes.hxx                                             |   10 
 basctl/source/inc/dlged.hxx                                                |    5 
 basctl/source/inc/managelang.hxx                                           |   23 
 basctl/source/inc/propbrw.hxx                                              |    1 
 basic/source/runtime/inputbox.cxx                                          |   65 
 basic/source/runtime/iosys.cxx                                             |   44 
 basic/source/runtime/methods.cxx                                           |   12 
 canvas/source/cairo/cairo_canvasfont.cxx                                   |    2 
 canvas/source/cairo/cairo_canvashelper.cxx                                 |    4 
 canvas/source/cairo/cairo_canvashelper.hxx                                 |    4 
 canvas/source/cairo/cairo_canvashelper_text.cxx                            |    4 
 canvas/source/cairo/cairo_devicehelper.cxx                                 |    2 
 canvas/source/cairo/cairo_devicehelper.hxx                                 |    2 
 canvas/source/cairo/cairo_textlayout.cxx                                   |   10 
 canvas/source/directx/dx_9rm.cxx                                           |    3 
 canvas/source/directx/dx_devicehelper.cxx                                  |    6 
 canvas/source/directx/dx_devicehelper.hxx                                  |    5 
 canvas/source/opengl/ogl_canvashelper.cxx                                  |   12 
 canvas/source/vcl/backbuffer.cxx                                           |   12 
 canvas/source/vcl/backbuffer.hxx                                           |    3 
 canvas/source/vcl/bitmapbackbuffer.cxx                                     |    7 
 canvas/source/vcl/bitmapbackbuffer.hxx                                     |    2 
 canvas/source/vcl/canvasfont.cxx                                           |    6 
 canvas/source/vcl/canvashelper_texturefill.cxx                             |   14 
 canvas/source/vcl/impltools.hxx                                            |    2 
 canvas/source/vcl/spritecanvashelper.cxx                                   |   10 
 canvas/source/vcl/spritecanvashelper.hxx                                   |    4 
 canvas/source/vcl/textlayout.cxx                                           |   26 
 chart2/inc/ChartModel.hxx                                                  |    2 
 chart2/source/controller/accessibility/AccessibleViewForwarder.hxx         |    3 
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx             |    4 
 chart2/source/controller/dialogs/DataBrowser.cxx                           |   74 
 chart2/source/controller/dialogs/DataBrowser.hxx                           |    5 
 chart2/source/controller/dialogs/TextDirectionListBox.cxx                  |    4 
 chart2/source/controller/dialogs/dlg_ChartType.cxx                         |   11 
 chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx                     |    4 
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx                    |   16 
 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx                |   14 
 chart2/source/controller/dialogs/dlg_DataEditor.cxx                        |   10 
 chart2/source/controller/dialogs/dlg_DataSource.cxx                        |   21 
 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx                   |   17 
 chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx                   |    4 
 chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx                   |    4 
 chart2/source/controller/dialogs/dlg_NumberFormat.cxx                      |    4 
 chart2/source/controller/dialogs/dlg_NumberFormat.hxx                      |    3 
 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx                  |    8 
 chart2/source/controller/dialogs/dlg_View3D.cxx                            |   21 
 chart2/source/controller/dialogs/res_BarGeometry.hxx                       |    4 
 chart2/source/controller/dialogs/res_DataLabel.cxx                         |    8 
 chart2/source/controller/dialogs/res_DataLabel.hxx                         |   38 
 chart2/source/controller/dialogs/res_Trendline.hxx                         |   46 
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx                 |   13 
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx                 |    9 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx                   |   14 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx                   |   15 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx               |   26 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx               |   28 
 chart2/source/controller/dialogs/tp_AxisLabel.cxx                          |   32 
 chart2/source/controller/dialogs/tp_AxisLabel.hxx                          |   37 
 chart2/source/controller/dialogs/tp_AxisPositions.cxx                      |   28 
 chart2/source/controller/dialogs/tp_AxisPositions.hxx                      |   40 
 chart2/source/controller/dialogs/tp_ChartType.cxx                          |   82 
 chart2/source/controller/dialogs/tp_ChartType.hxx                          |    7 
 chart2/source/controller/dialogs/tp_DataLabel.cxx                          |    8 
 chart2/source/controller/dialogs/tp_DataLabel.hxx                          |    3 
 chart2/source/controller/dialogs/tp_DataSource.cxx                         |   27 
 chart2/source/controller/dialogs/tp_DataSource.hxx                         |   41 
 chart2/source/controller/dialogs/tp_ErrorBars.cxx                          |    4 
 chart2/source/controller/dialogs/tp_ErrorBars.hxx                          |    2 
 chart2/source/controller/dialogs/tp_LegendPosition.cxx                     |   16 
 chart2/source/controller/dialogs/tp_LegendPosition.hxx                     |    6 
 chart2/source/controller/dialogs/tp_PointGeometry.cxx                      |   13 
 chart2/source/controller/dialogs/tp_PointGeometry.hxx                      |    3 
 chart2/source/controller/dialogs/tp_PolarOptions.cxx                       |   16 
 chart2/source/controller/dialogs/tp_PolarOptions.hxx                       |   15 
 chart2/source/controller/dialogs/tp_RangeChooser.cxx                       |   20 
 chart2/source/controller/dialogs/tp_RangeChooser.hxx                       |   29 
 chart2/source/controller/dialogs/tp_Scale.cxx                              |   39 
 chart2/source/controller/dialogs/tp_Scale.hxx                              |   68 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx                       |   25 
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx                       |   37 
 chart2/source/controller/dialogs/tp_TitleRotation.cxx                      |   26 
 chart2/source/controller/dialogs/tp_TitleRotation.hxx                      |   19 
 chart2/source/controller/dialogs/tp_Trendline.cxx                          |    8 
 chart2/source/controller/dialogs/tp_Trendline.hxx                          |    3 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx            |   13 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx            |    8 
 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx          |    6 
 chart2/source/controller/inc/TextDirectionListBox.hxx                      |    1 
 chart2/source/controller/inc/dlg_ChartType.hxx                             |    3 
 chart2/source/controller/inc/dlg_ChartType_UNO.hxx                         |    2 
 chart2/source/controller/inc/dlg_CreationWizard.hxx                        |    5 
 chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx                    |    2 
 chart2/source/controller/inc/dlg_DataEditor.hxx                            |    5 
 chart2/source/controller/inc/dlg_DataSource.hxx                            |    9 
 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx                       |   14 
 chart2/source/controller/inc/dlg_InsertDataLabel.hxx                       |    3 
 chart2/source/controller/inc/dlg_InsertErrorBars.hxx                       |    1 
 chart2/source/controller/inc/dlg_ObjectProperties.hxx                      |    1 
 chart2/source/controller/inc/dlg_View3D.hxx                                |    9 
 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.cxx                          |   10 
 chart2/source/controller/main/ChartController.hxx                          |    2 
 chart2/source/controller/main/ChartController_EditData.cxx                 |    7 
 chart2/source/controller/main/ChartController_Insert.cxx                   |   64 
 chart2/source/controller/main/ChartController_Properties.cxx               |   19 
 chart2/source/controller/main/ChartWindow.cxx                              |   12 
 chart2/source/controller/main/ChartWindow.hxx                              |    3 
 chart2/source/controller/main/ElementSelector.cxx                          |    6 
 chart2/source/controller/main/ElementSelector.hxx                          |    3 
 chart2/source/controller/main/ShapeController.cxx                          |   24 
 chart2/source/controller/main/ShapeToolbarController.cxx                   |    2 
 chart2/source/inc/chartview/DrawModelWrapper.hxx                           |    2 
 chart2/source/view/charttypes/GL3DBarChart.cxx                             |    2 
 chart2/source/view/inc/GL3DBarChart.hxx                                    |    2 
 chart2/source/view/main/3DChartObjects.cxx                                 |   16 
 chart2/source/view/main/ChartView.cxx                                      |    2 
 chart2/source/view/main/DrawModelWrapper.cxx                               |    4 
 chart2/source/view/main/DummyXShape.cxx                                    |   16 
 chart2/source/view/main/OpenGLRender.cxx                                   |   16 
 compilerplugins/clang/vclwidgets.cxx                                       |  458 +++++
 connectivity/source/drivers/file/fcomp.cxx                                 |    2 
 cppcanvas/qa/unit/test.cxx                                                 |    2 
 cppcanvas/source/mtfrenderer/implrenderer.cxx                              |   12 
 cppcanvas/source/mtfrenderer/transparencygroupaction.cxx                   |   12 
 cui/source/customize/acccfg.cxx                                            |   31 
 cui/source/customize/cfg.cxx                                               |  250 ++
 cui/source/customize/cfgutil.cxx                                           |   13 
 cui/source/customize/eventdlg.cxx                                          |    7 
 cui/source/customize/eventdlg.hxx                                          |    3 
 cui/source/customize/macropg.cxx                                           |   82 
 cui/source/customize/macropg_impl.hxx                                      |   13 
 cui/source/customize/selector.cxx                                          |   25 
 cui/source/dialogs/SpellDialog.cxx                                         |   59 
 cui/source/dialogs/about.cxx                                               |   23 
 cui/source/dialogs/colorpicker.cxx                                         |  104 -
 cui/source/dialogs/cuicharmap.cxx                                          |   25 
 cui/source/dialogs/cuifmsearch.cxx                                         |   45 
 cui/source/dialogs/cuigaldlg.cxx                                           |  120 +
 cui/source/dialogs/cuigrfflt.cxx                                           |   72 
 cui/source/dialogs/cuihyperdlg.cxx                                         |   10 
 cui/source/dialogs/cuiimapwnd.cxx                                          |   15 
 cui/source/dialogs/cuitbxform.cxx                                          |   11 
 cui/source/dialogs/dlgname.cxx                                             |   48 
 cui/source/dialogs/hangulhanjadlg.cxx                                      |  191 +-
 cui/source/dialogs/hldocntp.cxx                                            |   31 
 cui/source/dialogs/hldoctp.cxx                                             |   17 
 cui/source/dialogs/hlinettp.cxx                                            |   23 
 cui/source/dialogs/hlmailtp.cxx                                            |   16 
 cui/source/dialogs/hlmarkwn.cxx                                            |   21 
 cui/source/dialogs/hltpbase.cxx                                            |   30 
 cui/source/dialogs/hyphen.cxx                                              |   15 
 cui/source/dialogs/iconcdlg.cxx                                            |   46 
 cui/source/dialogs/insdlg.cxx                                              |   54 
 cui/source/dialogs/insrc.cxx                                               |   22 
 cui/source/dialogs/linkdlg.cxx                                             |   24 
 cui/source/dialogs/multipat.cxx                                            |   41 
 cui/source/dialogs/newtabledlg.cxx                                         |   15 
 cui/source/dialogs/passwdomdlg.cxx                                         |   30 
 cui/source/dialogs/pastedlg.cxx                                            |   17 
 cui/source/dialogs/postdlg.cxx                                             |   13 
 cui/source/dialogs/scriptdlg.cxx                                           |   69 
 cui/source/dialogs/showcols.cxx                                            |   11 
 cui/source/dialogs/splitcelldlg.cxx                                        |   32 
 cui/source/dialogs/srchxtra.cxx                                            |   32 
 cui/source/dialogs/thesdlg.cxx                                             |   55 
 cui/source/dialogs/zoom.cxx                                                |   23 
 cui/source/factory/cuiexp.cxx                                              |   29 
 cui/source/factory/dlgfact.cxx                                             |  163 -
 cui/source/factory/dlgfact.hxx                                             |    8 
 cui/source/factory/init.cxx                                                |    2 
 cui/source/inc/ControlFocusHelper.hxx                                      |    4 
 cui/source/inc/SpellDialog.hxx                                             |   42 
 cui/source/inc/about.hxx                                                   |   16 
 cui/source/inc/acccfg.hxx                                                  |   27 
 cui/source/inc/align.hxx                                                   |   55 
 cui/source/inc/autocdlg.hxx                                                |  141 -
 cui/source/inc/backgrnd.hxx                                                |   61 
 cui/source/inc/border.hxx                                                  |   69 
 cui/source/inc/cfg.hxx                                                     |   82 
 cui/source/inc/cfgutil.hxx                                                 |    4 
 cui/source/inc/chardlg.hxx                                                 |  194 +-
 cui/source/inc/connect.hxx                                                 |   28 
 cui/source/inc/cuicharmap.hxx                                              |   24 
 cui/source/inc/cuifmsearch.hxx                                             |   55 
 cui/source/inc/cuigaldlg.hxx                                               |   78 
 cui/source/inc/cuigrfflt.hxx                                               |   34 
 cui/source/inc/cuihyperdlg.hxx                                             |    3 
 cui/source/inc/cuiimapwnd.hxx                                              |   12 
 cui/source/inc/cuioptgenrl.hxx                                             |    7 
 cui/source/inc/cuisrchdlg.hxx                                              |    6 
 cui/source/inc/cuitabarea.hxx                                              |  297 +--
 cui/source/inc/cuitabline.hxx                                              |  117 -
 cui/source/inc/cuitbxform.hxx                                              |    4 
 cui/source/inc/dbregister.hxx                                              |   14 
 cui/source/inc/dlgname.hxx                                                 |   30 
 cui/source/inc/dstribut.hxx                                                |   28 
 cui/source/inc/grfpage.hxx                                                 |   45 
 cui/source/inc/hangulhanjadlg.hxx                                          |  100 -
 cui/source/inc/headertablistbox.hxx                                        |   10 
 cui/source/inc/hldocntp.hxx                                                |   13 
 cui/source/inc/hldoctp.hxx                                                 |   15 
 cui/source/inc/hlinettp.hxx                                                |   23 
 cui/source/inc/hlmailtp.hxx                                                |   13 
 cui/source/inc/hlmarkwn.hxx                                                |   13 
 cui/source/inc/hltpbase.hxx                                                |   15 
 cui/source/inc/hyphen.hxx                                                  |   17 
 cui/source/inc/iconcdlg.hxx                                                |   32 
 cui/source/inc/insdlg.hxx                                                  |   55 
 cui/source/inc/insrc.hxx                                                   |   12 
 cui/source/inc/labdlg.hxx                                                  |   24 
 cui/source/inc/linkdlg.hxx                                                 |   21 
 cui/source/inc/macroass.hxx                                                |    3 
 cui/source/inc/macropg.hxx                                                 |    1 
 cui/source/inc/measure.hxx                                                 |   37 
 cui/source/inc/multipat.hxx                                                |   14 
 cui/source/inc/newtabledlg.hxx                                             |    8 
 cui/source/inc/numfmt.hxx                                                  |   63 
 cui/source/inc/numpages.hxx                                                |  168 +-
 cui/source/inc/optasian.hxx                                                |   32 
 cui/source/inc/optdict.hxx                                                 |   29 
 cui/source/inc/optlingu.hxx                                                |   40 
 cui/source/inc/optpath.hxx                                                 |   11 
 cui/source/inc/page.hxx                                                    |   63 
 cui/source/inc/paragrph.hxx                                                |  140 -
 cui/source/inc/passwdomdlg.hxx                                             |    1 
 cui/source/inc/pastedlg.hxx                                                |    9 
 cui/source/inc/postdlg.hxx                                                 |   15 
 cui/source/inc/radiobtnbox.hxx                                             |    1 
 cui/source/inc/scriptdlg.hxx                                               |   20 
 cui/source/inc/selector.hxx                                                |   20 
 cui/source/inc/showcols.hxx                                                |    6 
 cui/source/inc/splitcelldlg.hxx                                            |   13 
 cui/source/inc/srchxtra.hxx                                                |   17 
 cui/source/inc/swpossizetabpage.hxx                                        |   55 
 cui/source/inc/tabstpge.hxx                                                |   58 
 cui/source/inc/textanim.hxx                                                |   39 
 cui/source/inc/textattr.hxx                                                |   36 
 cui/source/inc/thesdlg.hxx                                                 |   24 
 cui/source/inc/transfrm.hxx                                                |   69 
 cui/source/inc/treeopt.hxx                                                 |   12 
 cui/source/inc/zoom.hxx                                                    |   27 
 cui/source/options/certpath.cxx                                            |   13 
 cui/source/options/certpath.hxx                                            |    9 
 cui/source/options/connpooloptions.cxx                                     |   20 
 cui/source/options/connpooloptions.hxx                                     |   24 
 cui/source/options/cuisrchdlg.cxx                                          |   16 
 cui/source/options/dbregister.cxx                                          |   36 
 cui/source/options/doclinkdialog.cxx                                       |   26 
 cui/source/options/doclinkdialog.hxx                                       |   10 
 cui/source/options/fontsubs.cxx                                            |   27 
 cui/source/options/fontsubs.hxx                                            |   25 
 cui/source/options/optaboutconfig.cxx                                      |   30 
 cui/source/options/optaboutconfig.hxx                                      |   18 
 cui/source/options/optaccessibility.cxx                                    |   20 
 cui/source/options/optaccessibility.hxx                                    |   24 
 cui/source/options/optasian.cxx                                            |   24 
 cui/source/options/optbasic.cxx                                            |   16 
 cui/source/options/optbasic.hxx                                            |   15 
 cui/source/options/optchart.cxx                                            |   34 
 cui/source/options/optchart.hxx                                            |   13 
 cui/source/options/optcolor.cxx                                            |  157 +
 cui/source/options/optcolor.hxx                                            |   11 
 cui/source/options/optctl.cxx                                              |   16 
 cui/source/options/optctl.hxx                                              |   20 
 cui/source/options/optdict.cxx                                             |   41 
 cui/source/options/optfltr.cxx                                             |   42 
 cui/source/options/optfltr.hxx                                             |   37 
 cui/source/options/optgdlg.cxx                                             |   82 
 cui/source/options/optgdlg.hxx                                             |   99 -
 cui/source/options/optgenrl.cxx                                            |   21 
 cui/source/options/opthtml.cxx                                             |   28 
 cui/source/options/opthtml.hxx                                             |   41 
 cui/source/options/optinet2.cxx                                            |   91 -
 cui/source/options/optinet2.hxx                                            |   86 -
 cui/source/options/optjava.cxx                                             |   83 
 cui/source/options/optjava.hxx                                             |   47 
 cui/source/options/optjsearch.cxx                                          |   29 
 cui/source/options/optjsearch.hxx                                          |   50 
 cui/source/options/optlingu.cxx                                            |   78 
 cui/source/options/optmemory.cxx                                           |   19 
 cui/source/options/optmemory.hxx                                           |   17 
 cui/source/options/optopencl.cxx                                           |   65 
 cui/source/options/optopencl.hxx                                           |   43 
 cui/source/options/optpath.cxx                                             |   31 
 cui/source/options/optsave.cxx                                             |   33 
 cui/source/options/optsave.hxx                                             |   41 
 cui/source/options/optupdt.cxx                                             |   27 
 cui/source/options/optupdt.hxx                                             |   23 
 cui/source/options/personalization.cxx                                     |   45 
 cui/source/options/personalization.hxx                                     |   37 
 cui/source/options/radiobtnbox.cxx                                         |    4 
 cui/source/options/securityoptions.cxx                                     |   13 
 cui/source/options/securityoptions.hxx                                     |   17 
 cui/source/options/treeopt.cxx                                             |   53 
 cui/source/options/tsaurls.cxx                                             |   11 
 cui/source/options/tsaurls.hxx                                             |   10 
 cui/source/options/webconninfo.cxx                                         |   12 
 cui/source/options/webconninfo.hxx                                         |    9 
 cui/source/tabpages/align.cxx                                              |   36 
 cui/source/tabpages/autocdlg.cxx                                           |  198 +-
 cui/source/tabpages/backgrnd.cxx                                           |   66 
 cui/source/tabpages/border.cxx                                             |   42 
 cui/source/tabpages/chardlg.cxx                                            |  153 +
 cui/source/tabpages/connect.cxx                                            |   42 
 cui/source/tabpages/dstribut.cxx                                           |   38 
 cui/source/tabpages/grfpage.cxx                                            |   45 
 cui/source/tabpages/labdlg.cxx                                             |   26 
 cui/source/tabpages/macroass.cxx                                           |   32 
 cui/source/tabpages/measure.cxx                                            |   41 
 cui/source/tabpages/numfmt.cxx                                             |   52 
 cui/source/tabpages/numpages.cxx                                           |  154 +
 cui/source/tabpages/page.cxx                                               |   42 
 cui/source/tabpages/paragrph.cxx                                           |   99 +
 cui/source/tabpages/swpossizetabpage.cxx                                   |   45 
 cui/source/tabpages/tabarea.cxx                                            |    4 
 cui/source/tabpages/tabline.cxx                                            |    6 
 cui/source/tabpages/tabstpge.cxx                                           |   41 
 cui/source/tabpages/textanim.cxx                                           |   34 
 cui/source/tabpages/textattr.cxx                                           |   37 
 cui/source/tabpages/tparea.cxx                                             |   82 
 cui/source/tabpages/tpbitmap.cxx                                           |   55 
 cui/source/tabpages/tpcolor.cxx                                            |   79 
 cui/source/tabpages/tpgradnt.cxx                                           |   58 
 cui/source/tabpages/tphatch.cxx                                            |   51 
 cui/source/tabpages/tpline.cxx                                             |   67 
 cui/source/tabpages/tplnedef.cxx                                           |   62 
 cui/source/tabpages/tplneend.cxx                                           |   63 
 cui/source/tabpages/tpshadow.cxx                                           |   23 
 cui/source/tabpages/transfrm.cxx                                           |   76 
 dbaccess/source/core/dataaccess/databasedocument.cxx                       |    1 
 dbaccess/source/ext/macromigration/macromigrationdialog.cxx                |    4 
 dbaccess/source/ext/macromigration/macromigrationpages.cxx                 |   64 
 dbaccess/source/ext/macromigration/macromigrationpages.hxx                 |   43 
 dbaccess/source/ext/macromigration/macromigrationwizard.cxx                |    6 
 dbaccess/source/ext/macromigration/rangeprogressbar.hxx                    |    2 
 dbaccess/source/ui/app/AppController.cxx                                   |   13 
 dbaccess/source/ui/app/AppControllerDnD.cxx                                |   23 
 dbaccess/source/ui/app/AppControllerGen.cxx                                |   14 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                             |  150 -
 dbaccess/source/ui/app/AppDetailPageHelper.hxx                             |   19 
 dbaccess/source/ui/app/AppDetailView.cxx                                   |  146 -
 dbaccess/source/ui/app/AppDetailView.hxx                                   |   24 
 dbaccess/source/ui/app/AppIconControl.cxx                                  |    7 
 dbaccess/source/ui/app/AppIconControl.hxx                                  |    1 
 dbaccess/source/ui/app/AppSwapWindow.cxx                                   |   44 
 dbaccess/source/ui/app/AppSwapWindow.hxx                                   |   10 
 dbaccess/source/ui/app/AppTitleWindow.cxx                                  |   33 
 dbaccess/source/ui/app/AppTitleWindow.hxx                                  |    9 
 dbaccess/source/ui/app/AppView.cxx                                         |   41 
 dbaccess/source/ui/app/AppView.hxx                                         |   10 
 dbaccess/source/ui/app/subcomponentmanager.cxx                             |    1 
 dbaccess/source/ui/browser/brwctrlr.cxx                                    |   26 
 dbaccess/source/ui/browser/brwview.cxx                                     |   34 
 dbaccess/source/ui/browser/dataview.cxx                                    |   28 
 dbaccess/source/ui/browser/dbtreeview.cxx                                  |   11 
 dbaccess/source/ui/browser/dbtreeview.hxx                                  |    3 
 dbaccess/source/ui/browser/genericcontroller.cxx                           |   13 
 dbaccess/source/ui/browser/sbagrid.cxx                                     |   32 
 dbaccess/source/ui/browser/unodatbr.cxx                                    |    4 
 dbaccess/source/ui/control/ColumnControlWindow.cxx                         |    5 
 dbaccess/source/ui/control/FieldDescControl.cxx                            |  155 +
 dbaccess/source/ui/control/RelationControl.cxx                             |   11 
 dbaccess/source/ui/control/TableGrantCtrl.cxx                              |   14 
 dbaccess/source/ui/control/VertSplitView.cxx                               |   10 
 dbaccess/source/ui/control/charsetlistbox.cxx                              |    4 
 dbaccess/source/ui/control/curledit.cxx                                    |   17 
 dbaccess/source/ui/control/dbtreelistbox.cxx                               |    6 
 dbaccess/source/ui/control/marktree.cxx                                    |    7 
 dbaccess/source/ui/control/sqledit.cxx                                     |    7 
 dbaccess/source/ui/control/toolboxcontroller.cxx                           |    6 
 dbaccess/source/ui/dlg/CollectionView.cxx                                  |   17 
 dbaccess/source/ui/dlg/ConnectionHelper.cxx                                |   37 
 dbaccess/source/ui/dlg/ConnectionHelper.hxx                                |   10 
 dbaccess/source/ui/dlg/ConnectionPage.cxx                                  |   24 
 dbaccess/source/ui/dlg/ConnectionPage.hxx                                  |   27 
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx                             |   28 
 dbaccess/source/ui/dlg/ConnectionPageSetup.hxx                             |   17 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx                          |  186 +-
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx                          |  138 -
 dbaccess/source/ui/dlg/DbAdminImpl.hxx                                     |    3 
 dbaccess/source/ui/dlg/DriverSettings.hxx                                  |   27 
 dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx                           |    9 
 dbaccess/source/ui/dlg/RelationDlg.cxx                                     |   24 
 dbaccess/source/ui/dlg/TablesSingleDlg.cxx                                 |    8 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx                            |   26 
 dbaccess/source/ui/dlg/TextConnectionHelper.hxx                            |   39 
 dbaccess/source/ui/dlg/UserAdmin.cxx                                       |   85 -
 dbaccess/source/ui/dlg/UserAdmin.hxx                                       |   13 
 dbaccess/source/ui/dlg/UserAdminDlg.cxx                                    |    8 
 dbaccess/source/ui/dlg/admincontrols.cxx                                   |   18 
 dbaccess/source/ui/dlg/admincontrols.hxx                                   |   26 
 dbaccess/source/ui/dlg/adminpages.cxx                                      |   16 
 dbaccess/source/ui/dlg/adminpages.hxx                                      |    2 
 dbaccess/source/ui/dlg/adtabdlg.cxx                                        |   12 
 dbaccess/source/ui/dlg/advancedsettings.cxx                                |   65 
 dbaccess/source/ui/dlg/advancedsettings.hxx                                |   58 
 dbaccess/source/ui/dlg/dbadmin.cxx                                         |    7 
 dbaccess/source/ui/dlg/dbfindex.cxx                                        |   19 
 dbaccess/source/ui/dlg/dbfindex.hxx                                        |   20 
 dbaccess/source/ui/dlg/dbwiz.cxx                                           |   18 
 dbaccess/source/ui/dlg/dbwizsetup.cxx                                      |   31 
 dbaccess/source/ui/dlg/detailpages.cxx                                     |  192 +-
 dbaccess/source/ui/dlg/detailpages.hxx                                     |   98 -
 dbaccess/source/ui/dlg/directsql.cxx                                       |   18 
 dbaccess/source/ui/dlg/dlgattr.cxx                                         |    7 
 dbaccess/source/ui/dlg/dlgsave.cxx                                         |   22 
 dbaccess/source/ui/dlg/dlgsize.cxx                                         |   13 
 dbaccess/source/ui/dlg/dsselect.cxx                                        |   10 
 dbaccess/source/ui/dlg/dsselect.hxx                                        |   10 
 dbaccess/source/ui/dlg/generalpage.cxx                                     |   30 
 dbaccess/source/ui/dlg/generalpage.hxx                                     |   27 
 dbaccess/source/ui/dlg/indexdialog.cxx                                     |   38 
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx                              |   13 
 dbaccess/source/ui/dlg/paramdialog.cxx                                     |   12 
 dbaccess/source/ui/dlg/queryfilter.cxx                                     |   17 
 dbaccess/source/ui/dlg/queryorder.cxx                                      |   14 
 dbaccess/source/ui/dlg/sqlmessage.cxx                                      |   82 
 dbaccess/source/ui/dlg/tablespage.cxx                                      |   14 
 dbaccess/source/ui/dlg/tablespage.hxx                                      |    7 
 dbaccess/source/ui/dlg/textconnectionsettings.cxx                          |   10 
 dbaccess/source/ui/inc/CollectionView.hxx                                  |   14 
 dbaccess/source/ui/inc/ColumnControlWindow.hxx                             |    1 
 dbaccess/source/ui/inc/ConnectionLine.hxx                                  |    5 
 dbaccess/source/ui/inc/ConnectionLineAccess.hxx                            |    3 
 dbaccess/source/ui/inc/FieldDescControl.hxx                                |   75 
 dbaccess/source/ui/inc/JAccess.hxx                                         |    3 
 dbaccess/source/ui/inc/JoinController.hxx                                  |    2 
 dbaccess/source/ui/inc/JoinDesignView.hxx                                  |    5 
 dbaccess/source/ui/inc/JoinTableView.hxx                                   |   35 
 dbaccess/source/ui/inc/LimitBox.hxx                                        |    1 
 dbaccess/source/ui/inc/QueryDesignView.hxx                                 |    9 
 dbaccess/source/ui/inc/QueryPropertiesDialog.hxx                           |    8 
 dbaccess/source/ui/inc/QueryTableView.hxx                                  |    3 
 dbaccess/source/ui/inc/QueryTextView.hxx                                   |    3 
 dbaccess/source/ui/inc/QueryViewSwitch.hxx                                 |    4 
 dbaccess/source/ui/inc/RelationControl.hxx                                 |    6 
 dbaccess/source/ui/inc/RelationDesignView.hxx                              |    1 
 dbaccess/source/ui/inc/RelationDlg.hxx                                     |   21 
 dbaccess/source/ui/inc/RelationTableView.hxx                               |    5 
 dbaccess/source/ui/inc/TableConnection.hxx                                 |    3 
 dbaccess/source/ui/inc/TableDesignControl.hxx                              |    1 
 dbaccess/source/ui/inc/TableDesignHelpBar.hxx                              |    3 
 dbaccess/source/ui/inc/TableDesignView.hxx                                 |   10 
 dbaccess/source/ui/inc/TableFieldDescription.hxx                           |    3 
 dbaccess/source/ui/inc/TableGrantCtrl.hxx                                  |    5 
 dbaccess/source/ui/inc/TableWindow.hxx                                     |   11 
 dbaccess/source/ui/inc/TableWindowAccess.hxx                               |    3 
 dbaccess/source/ui/inc/TableWindowListBox.hxx                              |    5 
 dbaccess/source/ui/inc/TableWindowTitle.hxx                                |    3 
 dbaccess/source/ui/inc/TablesSingleDlg.hxx                                 |    1 
 dbaccess/source/ui/inc/TokenWriter.hxx                                     |    2 
 dbaccess/source/ui/inc/UserAdminDlg.hxx                                    |    1 
 dbaccess/source/ui/inc/VertSplitView.hxx                                   |    7 
 dbaccess/source/ui/inc/WCPage.hxx                                          |   23 
 dbaccess/source/ui/inc/WColumnSelect.hxx                                   |   13 
 dbaccess/source/ui/inc/WCopyTable.hxx                                      |   11 
 dbaccess/source/ui/inc/WExtendPages.hxx                                    |    8 
 dbaccess/source/ui/inc/WNameMatch.hxx                                      |   22 
 dbaccess/source/ui/inc/WTabPage.hxx                                        |    4 
 dbaccess/source/ui/inc/WTypeSelect.hxx                                     |   24 
 dbaccess/source/ui/inc/adtabdlg.hxx                                        |   13 
 dbaccess/source/ui/inc/advancedsettingsdlg.hxx                             |    1 
 dbaccess/source/ui/inc/brwview.hxx                                         |   11 
 dbaccess/source/ui/inc/charsetlistbox.hxx                                  |    1 
 dbaccess/source/ui/inc/curledit.hxx                                        |    3 
 dbaccess/source/ui/inc/datasourceconnector.hxx                             |    7 
 dbaccess/source/ui/inc/dbadmin.hxx                                         |    1 
 dbaccess/source/ui/inc/dbtreelistbox.hxx                                   |    1 
 dbaccess/source/ui/inc/dbwiz.hxx                                           |    3 
 dbaccess/source/ui/inc/dbwizsetup.hxx                                      |    9 
 dbaccess/source/ui/inc/directsql.hxx                                       |   15 
 dbaccess/source/ui/inc/dlgattr.hxx                                         |    1 
 dbaccess/source/ui/inc/dlgsave.hxx                                         |    1 
 dbaccess/source/ui/inc/dlgsize.hxx                                         |    6 
 dbaccess/source/ui/inc/indexdialog.hxx                                     |   19 
 dbaccess/source/ui/inc/indexfieldscontrol.hxx                              |    5 
 dbaccess/source/ui/inc/linkeddocuments.hxx                                 |    3 
 dbaccess/source/ui/inc/marktree.hxx                                        |    1 
 dbaccess/source/ui/inc/paramdialog.hxx                                     |   11 
 dbaccess/source/ui/inc/querycontainerwindow.hxx                            |    5 
 dbaccess/source/ui/inc/queryfilter.hxx                                     |   23 
 dbaccess/source/ui/inc/queryorder.hxx                                      |   19 
 dbaccess/source/ui/inc/queryview.hxx                                       |    1 
 dbaccess/source/ui/inc/sbagrid.hxx                                         |    5 
 dbaccess/source/ui/inc/sqledit.hxx                                         |    3 
 dbaccess/source/ui/inc/sqlmessage.hxx                                      |    7 
 dbaccess/source/ui/inc/textconnectionsettings.hxx                          |    5 
 dbaccess/source/ui/inc/undosqledit.hxx                                     |    3 
 dbaccess/source/ui/inc/unodatbr.hxx                                        |   10 
 dbaccess/source/ui/inc/unosqlmessage.hxx                                   |    2 
 dbaccess/source/ui/misc/DExport.cxx                                        |   24 
 dbaccess/source/ui/misc/RowSetDrop.cxx                                     |    4 
 dbaccess/source/ui/misc/ToolBoxHelper.cxx                                  |    2 
 dbaccess/source/ui/misc/UITools.cxx                                        |   31 
 dbaccess/source/ui/misc/WCPage.cxx                                         |   19 
 dbaccess/source/ui/misc/WColumnSelect.cxx                                  |   23 
 dbaccess/source/ui/misc/WCopyTable.cxx                                     |   46 
 dbaccess/source/ui/misc/WNameMatch.cxx                                     |   16 
 dbaccess/source/ui/misc/WTypeSelect.cxx                                    |   58 
 dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx                       |    4 
 dbaccess/source/ui/misc/singledoccontroller.cxx                            |    1 
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx                    |   14 
 dbaccess/source/ui/querydesign/JoinController.cxx                          |    9 
 dbaccess/source/ui/querydesign/JoinDesignView.cxx                          |   14 
 dbaccess/source/ui/querydesign/JoinTableView.cxx                           |   85 -
 dbaccess/source/ui/querydesign/LimitBox.cxx                                |    7 
 dbaccess/source/ui/querydesign/QTableConnection.cxx                        |    4 
 dbaccess/source/ui/querydesign/QTableConnection.hxx                        |    1 
 dbaccess/source/ui/querydesign/QTableWindow.cxx                            |   10 
 dbaccess/source/ui/querydesign/QTableWindow.hxx                            |    1 
 dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx                 |    2 
 dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx                   |    3 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx                         |  105 -
 dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx                  |    2 
 dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx                  |    2 
 dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx                  |   19 
 dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx                  |    2 
 dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx                      |   10 
 dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx                      |    6 
 dbaccess/source/ui/querydesign/QueryTableView.cxx                          |   92 -
 dbaccess/source/ui/querydesign/QueryTextView.cxx                           |   11 
 dbaccess/source/ui/querydesign/QueryViewSwitch.cxx                         |   12 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx                      |   43 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx                      |   15 
 dbaccess/source/ui/querydesign/TableConnection.cxx                         |    2 
 dbaccess/source/ui/querydesign/TableFieldDescription.cxx                   |    1 
 dbaccess/source/ui/querydesign/TableWindow.cxx                             |   48 
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx                       |    8 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx                      |    8 
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx                        |   14 
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx                      |   10 
 dbaccess/source/ui/querydesign/limitboxcontroller.hxx                      |    3 
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx                    |   15 
 dbaccess/source/ui/querydesign/querycontroller.cxx                         |   38 
 dbaccess/source/ui/querydesign/querydlg.cxx                                |   11 
 dbaccess/source/ui/querydesign/querydlg.hxx                                |   11 
 dbaccess/source/ui/querydesign/queryview.cxx                               |    5 
 dbaccess/source/ui/relationdesign/RTableConnection.cxx                     |    4 
 dbaccess/source/ui/relationdesign/RTableConnection.hxx                     |    1 
 dbaccess/source/ui/relationdesign/RelationController.cxx                   |   12 
 dbaccess/source/ui/relationdesign/RelationDesignView.cxx                   |    6 
 dbaccess/source/ui/relationdesign/RelationTableView.cxx                    |   61 
 dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx                         |   12 
 dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx                         |    3 
 dbaccess/source/ui/tabledesign/TEditControl.cxx                            |   23 
 dbaccess/source/ui/tabledesign/TEditControl.hxx                            |   13 
 dbaccess/source/ui/tabledesign/TableController.cxx                         |   58 
 dbaccess/source/ui/tabledesign/TableDesignControl.cxx                      |    5 
 dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx                      |   11 
 dbaccess/source/ui/tabledesign/TableDesignView.cxx                         |   55 
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx                       |   27 
 dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx                       |    7 
 dbaccess/source/ui/tabledesign/TableUndo.hxx                               |    7 
 dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx                             |    7 
 dbaccess/source/ui/uno/ColumnPeer.cxx                                      |   13 
 dbaccess/source/ui/uno/DBTypeWizDlg.cxx                                    |    5 
 dbaccess/source/ui/uno/DBTypeWizDlg.hxx                                    |    2 
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx                               |    6 
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx                               |    2 
 dbaccess/source/ui/uno/TableFilterDlg.cxx                                  |    5 
 dbaccess/source/ui/uno/TableFilterDlg.hxx                                  |    2 
 dbaccess/source/ui/uno/UserSettingsDlg.cxx                                 |    5 
 dbaccess/source/ui/uno/UserSettingsDlg.hxx                                 |    2 
 dbaccess/source/ui/uno/admindlg.cxx                                        |    5 
 dbaccess/source/ui/uno/admindlg.hxx                                        |    2 
 dbaccess/source/ui/uno/composerdialogs.cxx                                 |   16 
 dbaccess/source/ui/uno/composerdialogs.hxx                                 |    8 
 dbaccess/source/ui/uno/copytablewizard.cxx                                 |    8 
 dbaccess/source/ui/uno/dbinteraction.cxx                                   |   16 
 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx                      |    6 
 dbaccess/source/ui/uno/unoDirectSql.cxx                                    |    4 
 dbaccess/source/ui/uno/unoDirectSql.hxx                                    |    2 
 dbaccess/source/ui/uno/unosqlmessage.cxx                                   |    6 
 desktop/source/app/app.cxx                                                 |   10 
 desktop/source/app/cmdlinehelp.hxx                                         |    8 
 desktop/source/app/lockfile2.cxx                                           |   12 
 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                           |  111 -
 desktop/source/deployment/gui/dp_gui_dialog2.hxx                           |   44 
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx                 |   28 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx                        |   24 
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx                        |    7 
 desktop/source/deployment/gui/dp_gui_service.cxx                           |    5 
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx                         |   23 
 desktop/source/deployment/gui/dp_gui_theextmgr.hxx                         |    6 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx                      |   27 
 desktop/source/deployment/gui/dp_gui_updatedialog.hxx                      |   33 
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx               |   17 
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx               |   15 
 desktop/source/deployment/gui/license_dialog.cxx                           |   41 
 desktop/source/lib/init.cxx                                                |   22 
 desktop/source/pkgchk/unopkg/unopkg_misc.cxx                               |    8 
 desktop/source/splash/splash.cxx                                           |  141 +
 drawinglayer/source/primitive2d/controlprimitive2d.cxx                     |    8 
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx               |   48 
 drawinglayer/source/primitive2d/textlayoutdevice.cxx                       |    6 
 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx                  |   10 
 drawinglayer/source/processor2d/vclhelperbufferdevice.hxx                  |    6 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx                 |   40 
 drawinglayer/source/processor2d/vclprocessor2d.hxx                         |    3 
 drawinglayer/source/tools/converters.cxx                                   |   24 
 editeng/source/editeng/editeng.cxx                                         |    4 
 editeng/source/editeng/impedit.cxx                                         |    2 
 editeng/source/editeng/impedit.hxx                                         |   19 
 editeng/source/editeng/impedit2.cxx                                        |    6 
 editeng/source/editeng/impedit3.cxx                                        |    2 
 editeng/source/editeng/textconv.hxx                                        |    3 
 editeng/source/items/svxfont.cxx                                           |    2 
 editeng/source/misc/hangulhanja.cxx                                        |    2 
 editeng/source/misc/splwrap.cxx                                            |    8 
 extensions/source/abpilot/abpfinalpage.cxx                                 |   12 
 extensions/source/abpilot/abpfinalpage.hxx                                 |   14 
 extensions/source/abpilot/abspilot.cxx                                     |   17 
 extensions/source/abpilot/abspilot.hxx                                     |    4 
 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                            |   21 
 extensions/source/abpilot/typeselectionpage.hxx                            |   26 
 extensions/source/abpilot/unodialogabp.cxx                                 |    6 
 extensions/source/abpilot/unodialogabp.hxx                                 |    2 
 extensions/source/bibliography/bibbeam.cxx                                 |   32 
 extensions/source/bibliography/bibbeam.hxx                                 |    5 
 extensions/source/bibliography/bibcont.cxx                                 |   44 
 extensions/source/bibliography/bibcont.hxx                                 |   10 
 extensions/source/bibliography/bibload.cxx                                 |    2 
 extensions/source/bibliography/bibmod.cxx                                  |    1 
 extensions/source/bibliography/bibshortcuthandler.hxx                      |    4 
 extensions/source/bibliography/bibview.cxx                                 |   45 
 extensions/source/bibliography/bibview.hxx                                 |   37 
 extensions/source/bibliography/datman.cxx                                  |  124 +
 extensions/source/bibliography/datman.hxx                                  |    5 
 extensions/source/bibliography/framectr.cxx                                |    1 
 extensions/source/bibliography/general.cxx                                 |   68 
 extensions/source/bibliography/general.hxx                                 |   99 -
 extensions/source/bibliography/toolbar.cxx                                 |   79 
 extensions/source/bibliography/toolbar.hxx                                 |   17 
 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                                  |   24 
 extensions/source/dbpilots/gridwizard.hxx                                  |   16 
 extensions/source/dbpilots/groupboxwiz.cxx                                 |   62 
 extensions/source/dbpilots/groupboxwiz.hxx                                 |   30 
 extensions/source/dbpilots/listcombowizard.cxx                             |   47 
 extensions/source/dbpilots/listcombowizard.hxx                             |   20 
 extensions/source/dbpilots/unoautopilot.hxx                                |    2 
 extensions/source/dbpilots/unoautopilot.inl                                |    4 
 extensions/source/plugin/base/plctrl.cxx                                   |    2 
 extensions/source/plugin/inc/plugin/plctrl.hxx                             |   13 
 extensions/source/propctrlr/MasterDetailLinkDialog.cxx                     |    4 
 extensions/source/propctrlr/MasterDetailLinkDialog.hxx                     |    2 
 extensions/source/propctrlr/browserline.cxx                                |   37 
 extensions/source/propctrlr/browserline.hxx                                |   12 
 extensions/source/propctrlr/browserlistbox.cxx                             |  123 -
 extensions/source/propctrlr/browserlistbox.hxx                             |    8 
 extensions/source/propctrlr/browserpage.cxx                                |   22 
 extensions/source/propctrlr/browserpage.hxx                                |    7 
 extensions/source/propctrlr/browserview.cxx                                |   13 
 extensions/source/propctrlr/browserview.hxx                                |    3 
 extensions/source/propctrlr/commoncontrol.cxx                              |   15 
 extensions/source/propctrlr/commoncontrol.hxx                              |    2 
 extensions/source/propctrlr/controlfontdialog.cxx                          |    7 
 extensions/source/propctrlr/controlfontdialog.hxx                          |    2 
 extensions/source/propctrlr/formcomponenthandler.cxx                       |   29 
 extensions/source/propctrlr/formlinkdialog.cxx                             |   41 
 extensions/source/propctrlr/formlinkdialog.hxx                             |   19 
 extensions/source/propctrlr/inspectorhelpwindow.cxx                        |   47 
 extensions/source/propctrlr/inspectorhelpwindow.hxx                        |    6 
 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/pcrunodialogs.cxx                              |    4 
 extensions/source/propctrlr/pcrunodialogs.hxx                              |    2 
 extensions/source/propctrlr/propcontroller.cxx                             |    5 
 extensions/source/propctrlr/propcontroller.hxx                             |    4 
 extensions/source/propctrlr/propertyeditor.cxx                             |  131 -
 extensions/source/propctrlr/propertyeditor.hxx                             |    9 
 extensions/source/propctrlr/selectlabeldialog.cxx                          |   10 
 extensions/source/propctrlr/selectlabeldialog.hxx                          |    7 
 extensions/source/propctrlr/standardcontrol.cxx                            |   56 
 extensions/source/propctrlr/standardcontrol.hxx                            |    7 
 extensions/source/propctrlr/taborder.cxx                                   |   12 
 extensions/source/propctrlr/taborder.hxx                                   |   11 
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx               |   10 
 extensions/source/scanner/grid.cxx                                         |   21 
 extensions/source/scanner/grid.hxx                                         |   11 
 extensions/source/scanner/sanedlg.cxx                                      |   67 
 extensions/source/scanner/sanedlg.hxx                                      |   49 
 extensions/source/scanner/scanunx.cxx                                      |    6 
 extensions/workben/testframecontrol.cxx                                    |    2 
 filter/source/flash/impswfdialog.cxx                                       |   13 
 filter/source/flash/impswfdialog.hxx                                       |   17 
 filter/source/flash/swfdialog.cxx                                          |    9 
 filter/source/flash/swfdialog.hxx                                          |    2 
 filter/source/flash/swfwriter.cxx                                          |    3 
 filter/source/flash/swfwriter.hxx                                          |    3 
 filter/source/graphic/GraphicExportDialog.cxx                              |    6 
 filter/source/graphicfilter/eos2met/eos2met.cxx                            |   39 
 filter/source/graphicfilter/epict/epict.cxx                                |   41 
 filter/source/graphicfilter/eps/eps.cxx                                    |   42 
 filter/source/graphicfilter/icgm/cgm.cxx                                   |    2 
 filter/source/graphicfilter/icgm/cgm.hxx                                   |    3 
 filter/source/graphicfilter/idxf/dxf2mtf.cxx                               |    2 
 filter/source/graphicfilter/idxf/dxf2mtf.hxx                               |    2 
 filter/source/graphicfilter/ieps/ieps.cxx                                  |   36 
 filter/source/graphicfilter/ios2met/ios2met.cxx                            |    6 
 filter/source/graphicfilter/ipict/ipict.cxx                                |    6 
 filter/source/msfilter/escherex.cxx                                        |   18 
 filter/source/msfilter/msdffimp.cxx                                        |    6 
 filter/source/pdf/impdialog.cxx                                            |  194 +-
 filter/source/pdf/impdialog.hxx                                            |  206 +-
 filter/source/pdf/pdfdialog.cxx                                            |   14 
 filter/source/pdf/pdfdialog.hxx                                            |    2 
 filter/source/pdf/pdffilter.cxx                                            |    4 
 filter/source/pdf/pdfinteract.cxx                                          |    4 
 filter/source/svg/impsvgdialog.cxx                                         |   91 -
 filter/source/svg/impsvgdialog.hxx                                         |   19 
 filter/source/svg/svgdialog.cxx                                            |   11 
 filter/source/svg/svgdialog.hxx                                            |    2 
 filter/source/svg/svgfontexport.cxx                                        |   24 
 filter/source/svg/svgwriter.cxx                                            |    2 
 filter/source/svg/svgwriter.hxx                                            |    4 
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx                      |   12 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx                       |   71 
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx                       |   31 
 filter/source/xsltdialog/xmlfiltertabdialog.cxx                            |   20 
 filter/source/xsltdialog/xmlfiltertabdialog.hxx                            |    9 
 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                           |   22 
 filter/source/xsltdialog/xmlfiltertestdialog.hxx                           |   31 
 forms/source/richtext/richtextcontrol.cxx                                  |   14 
 forms/source/richtext/richtextimplcontrol.cxx                              |   27 
 forms/source/richtext/richtextimplcontrol.hxx                              |   14 
 forms/source/richtext/richtextvclcontrol.cxx                               |    6 
 forms/source/richtext/richtextvclcontrol.hxx                               |    1 
 forms/source/runtime/formoperations.cxx                                    |    4 
 forms/source/solar/component/navbarcontrol.cxx                             |   10 
 forms/source/solar/control/navtoolbar.cxx                                  |   31 
 forms/source/solar/inc/navtoolbar.hxx                                      |    6 
 formula/source/ui/dlg/ControlHelper.hxx                                    |   19 
 formula/source/ui/dlg/formula.cxx                                          |   72 
 formula/source/ui/dlg/funcpage.cxx                                         |   12 
 formula/source/ui/dlg/funcpage.hxx                                         |    6 
 formula/source/ui/dlg/funcutl.cxx                                          |   69 
 formula/source/ui/dlg/parawin.cxx                                          |   26 
 formula/source/ui/dlg/parawin.hxx                                          |   51 
 formula/source/ui/dlg/structpg.cxx                                         |   11 
 formula/source/ui/dlg/structpg.hxx                                         |    4 
 fpicker/source/office/OfficeControlAccess.hxx                              |    2 
 fpicker/source/office/OfficeFilePicker.cxx                                 |    4 
 fpicker/source/office/OfficeFilePicker.hxx                                 |    2 
 fpicker/source/office/OfficeFolderPicker.cxx                               |    4 
 fpicker/source/office/OfficeFolderPicker.hxx                               |    2 
 fpicker/source/office/PlacesListBox.cxx                                    |   39 
 fpicker/source/office/PlacesListBox.hxx                                    |   14 
 fpicker/source/office/QueryFolderName.hxx                                  |    8 
 fpicker/source/office/asyncfilepicker.hxx                                  |    5 
 fpicker/source/office/commonpicker.cxx                                     |   12 
 fpicker/source/office/commonpicker.hxx                                     |    5 
 fpicker/source/office/iodlg.cxx                                            |   87 -
 fpicker/source/office/iodlg.hxx                                            |   23 
 fpicker/source/office/iodlgimp.cxx                                         |   11 
 fpicker/source/office/iodlgimp.hxx                                         |   51 
 fpicker/test/svdem.cxx                                                     |    3 
 framework/inc/classes/fwktabwindow.hxx                                     |   13 
 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/statusbar.hxx                                      |    1 
 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/classes/fwktabwindow.cxx                                  |   51 
 framework/source/helper/vclstatusindicator.cxx                             |    5 
 framework/source/layoutmanager/layoutmanager.cxx                           |    2 
 framework/source/layoutmanager/toolbarlayoutmanager.cxx                    |   14 
 framework/source/services/autorecovery.cxx                                 |    8 
 framework/source/services/tabwindowservice.cxx                             |    8 
 framework/source/uielement/addonstoolbarwrapper.cxx                        |    2 
 framework/source/uielement/buttontoolbarcontroller.cxx                     |    2 
 framework/source/uielement/comboboxtoolbarcontroller.cxx                   |   13 
 framework/source/uielement/complextoolbarcontroller.cxx                    |    2 
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx                |   13 
 framework/source/uielement/edittoolbarcontroller.cxx                       |   13 
 framework/source/uielement/fontsizemenucontroller.cxx                      |    4 
 framework/source/uielement/generictoolbarcontroller.cxx                    |    2 
 framework/source/uielement/popuptoolbarcontroller.cxx                      |    6 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx                  |   13 
 framework/source/uielement/statusbar.cxx                                   |    4 
 framework/source/uielement/statusbarmanager.cxx                            |   51 
 framework/source/uielement/statusbarwrapper.cxx                            |    2 
 framework/source/uielement/toolbarmanager.cxx                              |    8 
 framework/source/uielement/toolbarwrapper.cxx                              |    2 
 include/avmedia/mediaplayer.hxx                                            |    1 
 include/avmedia/mediatoolbox.hxx                                           |    2 
 include/avmedia/mediawindow.hxx                                            |    3 
 include/dbaccess/ToolBoxHelper.hxx                                         |    3 
 include/dbaccess/dataview.hxx                                              |    7 
 include/dbaccess/genericcontroller.hxx                                     |    7 
 include/drawinglayer/processor2d/canvasprocessor.hxx                       |    2 
 include/editeng/outliner.hxx                                               |    3 
 include/editeng/splwrap.hxx                                                |    3 
 include/formula/funcutl.hxx                                                |    7 
 include/rtl/ref.hxx                                                        |    8 
 include/sfx2/basedlgs.hxx                                                  |   20 
 include/sfx2/checkin.hxx                                                   |    8 
 include/sfx2/childwin.hxx                                                  |    8 
 include/sfx2/ctrlitem.hxx                                                  |    1 
 include/sfx2/dinfdlg.hxx                                                   |  159 -
 include/sfx2/dockwin.hxx                                                   |    1 
 include/sfx2/fcontnr.hxx                                                   |    5 
 include/sfx2/frame.hxx                                                     |    3 
 include/sfx2/infobar.hxx                                                   |   19 
 include/sfx2/ipclient.hxx                                                  |    4 
 include/sfx2/mgetempl.hxx                                                  |   31 
 include/sfx2/module.hxx                                                    |    2 
 include/sfx2/new.hxx                                                       |    1 
 include/sfx2/newstyle.hxx                                                  |    7 
 include/sfx2/objsh.hxx                                                     |    3 
 include/sfx2/passwd.hxx                                                    |   30 
 include/sfx2/printer.hxx                                                   |    5 
 include/sfx2/printopt.hxx                                                  |   46 
 include/sfx2/prnmon.hxx                                                    |    3 
 include/sfx2/recentdocsview.hxx                                            |    1 
 include/sfx2/securitypage.hxx                                              |    6 
 include/sfx2/sidebar/ControlFactory.hxx                                    |    5 
 include/sfx2/sidebar/ControllerItem.hxx                                    |    3 
 include/sfx2/sidebar/SidebarPanelBase.hxx                                  |    3 
 include/sfx2/sidebar/SidebarToolBox.hxx                                    |    1 
 include/sfx2/stbitem.hxx                                                   |    6 
 include/sfx2/styledlg.hxx                                                  |    1 
 include/sfx2/tabdlg.hxx                                                    |   24 
 include/sfx2/taskpane.hxx                                                  |    6 
 include/sfx2/tbxctrl.hxx                                                   |   11 
 include/sfx2/templateabstractview.hxx                                      |    7 
 include/sfx2/templatedefaultview.hxx                                       |    1 
 include/sfx2/templatedlg.hxx                                               |   21 
 include/sfx2/templateinfodlg.hxx                                           |   11 
 include/sfx2/templatelocalview.hxx                                         |    1 
 include/sfx2/templateremoteview.hxx                                        |    2 
 include/sfx2/templdlg.hxx                                                  |    3 
 include/sfx2/thumbnailview.hxx                                             |    3 
 include/sfx2/thumbnailviewitem.hxx                                         |    2 
 include/sfx2/titledockwin.hxx                                              |   14 
 include/sfx2/viewsh.hxx                                                    |    9 
 include/svtools/DocumentInfoPreview.hxx                                    |    5 
 include/svtools/GraphicExportOptionsDialog.hxx                             |    8 
 include/svtools/PlaceEditDialog.hxx                                        |   16 
 include/svtools/ServerDetailsControls.hxx                                  |   26 
 include/svtools/accessibleruler.hxx                                        |    3 
 include/svtools/addresstemplate.hxx                                        |    9 
 include/svtools/brwbox.hxx                                                 |   24 
 include/svtools/brwhead.hxx                                                |    5 
 include/svtools/calendar.hxx                                               |   16 
 include/svtools/colrdlg.hxx                                                |    8 
 include/svtools/ctrlbox.hxx                                                |    7 
 include/svtools/ctrltool.hxx                                               |    4 
 include/svtools/editbrowsebox.hxx                                          |   16 
 include/svtools/editsyntaxhighlighter.hxx                                  |    1 
 include/svtools/filectrl.hxx                                               |   21 
 include/svtools/fileview.hxx                                               |    5 
 include/svtools/fmtfield.hxx                                               |    2 
 include/svtools/generictoolboxcontroller.hxx                               |    4 
 include/svtools/genericunodialog.hxx                                       |    5 
 include/svtools/headbar.hxx                                                |    1 
 include/svtools/hyperlabel.hxx                                             |    3 
 include/svtools/inettbc.hxx                                                |    1 
 include/svtools/ivctrl.hxx                                                 |    1 
 include/svtools/popupwindowcontroller.hxx                                  |    3 
 include/svtools/prnsetup.hxx                                               |   23 
 include/svtools/roadmapwizard.hxx                                          |    7 
 include/svtools/ruler.hxx                                                  |    3 
 include/svtools/scrwin.hxx                                                 |    9 
 include/svtools/simptabl.hxx                                               |   11 
 include/svtools/svmedit.hxx                                                |    1 
 include/svtools/svmedit2.hxx                                               |    3 
 include/svtools/svtabbx.hxx                                                |    4 
 include/svtools/tabbar.hxx                                                 |    3 
 include/svtools/toolbarmenu.hxx                                            |    3 
 include/svtools/toolpanel/drawerlayouter.hxx                               |    6 
 include/svtools/toolpanel/paneltabbar.hxx                                  |    1 
 include/svtools/toolpanel/toolpaneldeck.hxx                                |    1 
 include/svtools/treelistbox.hxx                                            |   11 
 include/svtools/valueset.hxx                                               |    7 
 include/svtools/wizardmachine.hxx                                          |   17 
 include/svtools/wizdlg.hxx                                                 |   11 
 include/svx/AccessibleShapeTreeInfo.hxx                                    |    3 
 include/svx/ParaLineSpacingPopup.hxx                                       |    2 
 include/svx/bmpmask.hxx                                                    |   51 
 include/svx/charmap.hxx                                                    |    7 
 include/svx/checklbx.hxx                                                   |    1 
 include/svx/clipboardctl.hxx                                               |    2 
 include/svx/colrctrl.hxx                                                   |    4 
 include/svx/compressgraphicdialog.hxx                                      |   34 
 include/svx/connctrl.hxx                                                   |    1 
 include/svx/contdlg.hxx                                                    |    7 
 include/svx/ctredlin.hxx                                                   |   59 
 include/svx/dialcontrol.hxx                                                |   10 
 include/svx/dlgctl3d.hxx                                                   |   17 
 include/svx/dlgctrl.hxx                                                    |   13 
 include/svx/fillctrl.hxx                                                   |   13 
 include/svx/float3d.hxx                                                    |  175 +-
 include/svx/fmgridcl.hxx                                                   |    3 
 include/svx/fmgridif.hxx                                                   |    2 
 include/svx/fmshell.hxx                                                    |    2 
 include/svx/fntctrl.hxx                                                    |    1 
 include/svx/fontwork.hxx                                                   |   23 
 include/svx/fontworkgallery.hxx                                            |   11 
 include/svx/frmdirlbox.hxx                                                 |    1 
 include/svx/frmsel.hxx                                                     |    2 
 include/svx/galctrl.hxx                                                    |    2 
 include/svx/grafctrl.hxx                                                   |    6 
 include/svx/graphctl.hxx                                                   |    5 
 include/svx/gridctrl.hxx                                                   |   31 
 include/svx/hdft.hxx                                                       |   47 
 include/svx/imapdlg.hxx                                                    |   19 
 include/svx/itemwin.hxx                                                    |    4 
 include/svx/langbox.hxx                                                    |    2 
 include/svx/layctrl.hxx                                                    |    4 
 include/svx/lboxctrl.hxx                                                   |    6 
 include/svx/linectrl.hxx                                                   |   11 
 include/svx/linkwarn.hxx                                                   |    3 
 include/svx/measctrl.hxx                                                   |    1 
 include/svx/numvset.hxx                                                    |   28 
 include/svx/optgrid.hxx                                                    |   42 
 include/svx/pagectrl.hxx                                                   |    1 
 include/svx/passwd.hxx                                                     |   15 
 include/svx/prtqry.hxx                                                     |    1 
 include/svx/rubydialog.hxx                                                 |   49 
 include/svx/ruler.hxx                                                      |    3 
 include/svx/sdrpaintwindow.hxx                                             |    6 
 include/svx/sidebar/PanelLayout.hxx                                        |    2 
 include/svx/sidebar/Popup.hxx                                              |   14 
 include/svx/sidebar/PopupControl.hxx                                       |    1 
 include/svx/sidebar/SidebarDialControl.hxx                                 |    1 
 include/svx/sidebar/ValueSetWithTextControl.hxx                            |    2 
 include/svx/srchdlg.hxx                                                    |  101 -
 include/svx/stddlg.hxx                                                     |    1 
 include/svx/subtoolboxcontrol.hxx                                          |    2 
 include/svx/svdedxv.hxx                                                    |    4 
 include/svx/svdmodel.hxx                                                   |    4 
 include/svx/svdobj.hxx                                                     |    3 
 include/svx/svdpntv.hxx                                                    |    8 
 include/svx/svxdlg.hxx                                                     |    4 
 include/svx/swframeexample.hxx                                             |    1 
 include/svx/tbcontrl.hxx                                                   |   10 
 include/svx/tbxalign.hxx                                                   |    2 
 include/svx/tbxcolorupdate.hxx                                             |    7 
 include/svx/tbxcustomshapes.hxx                                            |    2 
 include/svx/txencbox.hxx                                                   |    1 
 include/toolkit/awt/scrollabledialog.hxx                                   |    5 
 include/toolkit/awt/vclxaccessiblecomponent.hxx                            |    7 
 include/toolkit/awt/vclxdevice.hxx                                         |   19 
 include/toolkit/awt/vclxgraphics.hxx                                       |    3 
 include/toolkit/awt/vclxprinter.hxx                                        |    4 
 include/toolkit/awt/vclxwindow.hxx                                         |    8 
 include/toolkit/controls/accessiblecontrolcontext.hxx                      |    3 
 include/toolkit/helper/vclunohelper.hxx                                    |    9 
 include/tools/errinf.hxx                                                   |   10 
 include/vcl/animate.hxx                                                    |    9 
 include/vcl/btndlg.hxx                                                     |    1 
 include/vcl/builder.hxx                                                    |   40 
 include/vcl/button.hxx                                                     |   21 
 include/vcl/cairo.hxx                                                      |    3 
 include/vcl/combobox.hxx                                                   |   24 
 include/vcl/controllayout.hxx                                              |    7 
 include/vcl/ctrl.hxx                                                       |    1 
 include/vcl/cursor.hxx                                                     |    3 
 include/vcl/decoview.hxx                                                   |    3 
 include/vcl/dialog.hxx                                                     |   16 
 include/vcl/dockingarea.hxx                                                |    1 
 include/vcl/dockwin.hxx                                                    |   15 
 include/vcl/edit.hxx                                                       |    6 
 include/vcl/event.hxx                                                      |   26 
 include/vcl/field.hxx                                                      |   14 
 include/vcl/fixed.hxx                                                      |    5 
 include/vcl/fixedhyper.hxx                                                 |    5 
 include/vcl/floatwin.hxx                                                   |    5 
 include/vcl/fltcall.hxx                                                    |    2 
 include/vcl/gdimtf.hxx                                                     |    3 
 include/vcl/introwin.hxx                                                   |    6 
 include/vcl/layout.hxx                                                     |   63 
 include/vcl/lazydelete.hxx                                                 |   11 
 include/vcl/longcurr.hxx                                                   |    2 
 include/vcl/lstbox.hxx                                                     |    9 
 include/vcl/menu.hxx                                                       |    2 
 include/vcl/menubtn.hxx                                                    |    1 
 include/vcl/morebtn.hxx                                                    |    3 
 include/vcl/msgbox.hxx                                                     |   19 
 include/vcl/oldprintadaptor.hxx                                            |    2 
 include/vcl/opengl/OpenGLContext.hxx                                       |    7 
 include/vcl/openglwin.hxx                                                  |    6 
 include/vcl/outdev.hxx                                                     |   38 
 include/vcl/popupmenuwindow.hxx                                            |    1 
 include/vcl/prgsbar.hxx                                                    |    5 
 include/vcl/print.hxx                                                      |   15 
 include/vcl/scrbar.hxx                                                     |    3 
 include/vcl/seleng.hxx                                                     |    2 
 include/vcl/spin.hxx                                                       |    1 
 include/vcl/spinfld.hxx                                                    |    6 
 include/vcl/split.hxx                                                      |    3 
 include/vcl/splitwin.hxx                                                   |    3 
 include/vcl/status.hxx                                                     |    9 
 include/vcl/syschild.hxx                                                   |    1 
 include/vcl/syswin.hxx                                                     |    6 
 include/vcl/tabctrl.hxx                                                    |    7 
 include/vcl/tabdlg.hxx                                                     |    7 
 include/vcl/tabpage.hxx                                                    |    2 
 include/vcl/taskpanelist.hxx                                               |    2 
 include/vcl/texteng.hxx                                                    |    3 
 include/vcl/throbber.hxx                                                   |    1 
 include/vcl/toolbox.hxx                                                    |    7 
 include/vcl/vclevent.hxx                                                   |    9 
 include/vcl/vclmedit.hxx                                                   |    7 
 include/vcl/vclptr.hxx                                                     |  357 ++++
 include/vcl/virdev.hxx                                                     |    5 
 include/vcl/waitobj.hxx                                                    |    2 
 include/vcl/window.hxx                                                     |   46 
 include/vcl/wrkwin.hxx                                                     |    1 
 lotuswordpro/source/filter/lwppagelayout.cxx                               |    8 
 mysqlc/source/mysqlc_connection.cxx                                        |    2 
 mysqlc/source/mysqlc_resultset.cxx                                         |    2 
 mysqlc/source/mysqlc_statement.cxx                                         |    2 
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx       |    2 
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx        |    2 
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx        |    2 
 reportdesign/source/ui/dlg/AddField.cxx                                    |   89 -
 reportdesign/source/ui/dlg/CondFormat.cxx                                  |   15 
 reportdesign/source/ui/dlg/Condition.cxx                                   |   75 
 reportdesign/source/ui/dlg/Condition.hxx                                   |   33 
 reportdesign/source/ui/dlg/DateTime.cxx                                    |   13 
 reportdesign/source/ui/dlg/Formula.cxx                                     |   13 
 reportdesign/source/ui/dlg/GroupsSorting.cxx                               |   91 -
 reportdesign/source/ui/dlg/Navigator.cxx                                   |   13 
 reportdesign/source/ui/dlg/PageNumber.cxx                                  |   12 
 reportdesign/source/ui/inc/AddField.hxx                                    |   17 
 reportdesign/source/ui/inc/ColorChanger.hxx                                |    2 
 reportdesign/source/ui/inc/ColorListener.hxx                               |    1 
 reportdesign/source/ui/inc/CondFormat.hxx                                  |   15 
 reportdesign/source/ui/inc/DateTime.hxx                                    |   15 
 reportdesign/source/ui/inc/DesignView.hxx                                  |   21 
 reportdesign/source/ui/inc/Formula.hxx                                     |    7 
 reportdesign/source/ui/inc/GroupsSorting.hxx                               |   21 
 reportdesign/source/ui/inc/MarkedSection.hxx                               |    2 
 reportdesign/source/ui/inc/PageNumber.hxx                                  |   13 
 reportdesign/source/ui/inc/ReportController.hxx                            |    4 
 reportdesign/source/ui/inc/ReportSection.hxx                               |    3 
 reportdesign/source/ui/inc/ReportWindow.hxx                                |   15 
 reportdesign/source/ui/inc/ScrollHelper.hxx                                |   27 
 reportdesign/source/ui/inc/SectionView.hxx                                 |    4 
 reportdesign/source/ui/inc/SectionWindow.hxx                               |   17 
 reportdesign/source/ui/inc/StartMarker.hxx                                 |    9 
 reportdesign/source/ui/inc/ViewsWindow.hxx                                 |   22 
 reportdesign/source/ui/inc/dlgedfunc.hxx                                   |    2 
 reportdesign/source/ui/inc/propbrw.hxx                                     |    3 
 reportdesign/source/ui/misc/ColorListener.cxx                              |    6 
 reportdesign/source/ui/misc/UITools.cxx                                    |   17 
 reportdesign/source/ui/misc/statusbarcontroller.cxx                        |    2 
 reportdesign/source/ui/misc/toolboxcontroller.cxx                          |    2 
 reportdesign/source/ui/report/DesignView.cxx                               |  155 -
 reportdesign/source/ui/report/FixedTextColor.cxx                           |    2 
 reportdesign/source/ui/report/FormattedFieldBeautifier.cxx                 |    2 
 reportdesign/source/ui/report/ReportController.cxx                         |   61 
 reportdesign/source/ui/report/ReportSection.cxx                            |    7 
 reportdesign/source/ui/report/ReportWindow.cxx                             |  147 -
 reportdesign/source/ui/report/ScrollHelper.cxx                             |  134 -
 reportdesign/source/ui/report/SectionWindow.cxx                            |  133 -
 reportdesign/source/ui/report/StartMarker.cxx                              |   94 -
 reportdesign/source/ui/report/ViewsWindow.cxx                              |   37 
 reportdesign/source/ui/report/propbrw.cxx                                  |    9 
 sc/inc/AccessibleFilterMenu.hxx                                            |    3 
 sc/inc/AccessibleFilterMenuItem.hxx                                        |    3 
 sc/inc/dociter.hxx                                                         |    3 
 sc/inc/document.hxx                                                        |    6 
 sc/inc/editutil.hxx                                                        |    9 
 sc/inc/rowheightcontext.hxx                                                |    6 
 sc/inc/scmod.hxx                                                           |    6 
 sc/inc/scopetools.hxx                                                      |    3 
 sc/inc/waitoff.hxx                                                         |    2 
 sc/source/core/data/documen2.cxx                                           |    4 
 sc/source/core/data/documen8.cxx                                           |   15 
 sc/source/core/data/dpobject.cxx                                           |    6 
 sc/source/core/data/global.cxx                                             |   10 
 sc/source/core/data/validat.cxx                                            |   12 
 sc/source/core/tool/editutil.cxx                                           |    8 
 sc/source/filter/inc/htmlexp.hxx                                           |    2 
 sc/source/filter/oox/workbookhelper.cxx                                    |    8 
 sc/source/filter/rtf/eeimpars.cxx                                          |    4 
 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/inputwin.cxx                                              |  175 +-
 sc/source/ui/app/scmod.cxx                                                 |   20 
 sc/source/ui/app/transobj.cxx                                              |   20 
 sc/source/ui/attrdlg/scdlgfact.cxx                                         |  114 -
 sc/source/ui/attrdlg/scdlgfact.hxx                                         |   10 
 sc/source/ui/attrdlg/scuiexp.cxx                                           |   30 
 sc/source/ui/attrdlg/tabpages.cxx                                          |   18 
 sc/source/ui/cctrl/checklistmenu.cxx                                       |  250 +-
 sc/source/ui/cctrl/tbinsert.cxx                                            |    2 
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx                                    |   17 
 sc/source/ui/condformat/colorformat.cxx                                    |   28 
 sc/source/ui/condformat/condformatdlg.cxx                                  |  123 -
 sc/source/ui/condformat/condformatdlgentry.cxx                             |  835 +++++-----
 sc/source/ui/condformat/condformatmgr.cxx                                  |   21 
 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                                             |   23 
 sc/source/ui/dbgui/csvcontrol.cxx                                          |    6 
 sc/source/ui/dbgui/csvgrid.cxx                                             |  142 -
 sc/source/ui/dbgui/csvruler.cxx                                            |   60 
 sc/source/ui/dbgui/csvtablebox.cxx                                         |  155 +
 sc/source/ui/dbgui/dapidata.cxx                                            |   13 
 sc/source/ui/dbgui/dapitype.cxx                                            |   23 
 sc/source/ui/dbgui/dbnamdlg.cxx                                            |   25 
 sc/source/ui/dbgui/dpgroupdlg.cxx                                          |   39 
 sc/source/ui/dbgui/filtdlg.cxx                                             |   38 
 sc/source/ui/dbgui/pfiltdlg.cxx                                            |   24 
 sc/source/ui/dbgui/pvfundlg.cxx                                            |   80 
 sc/source/ui/dbgui/scendlg.cxx                                             |   18 
 sc/source/ui/dbgui/scuiasciiopt.cxx                                        |   28 
 sc/source/ui/dbgui/scuiimoptdlg.cxx                                        |   18 
 sc/source/ui/dbgui/sfiltdlg.cxx                                            |   25 
 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                                              |   49 
 sc/source/ui/dbgui/tpsubt.cxx                                              |   42 
 sc/source/ui/dbgui/validate.cxx                                            |   75 
 sc/source/ui/dialogs/searchresults.cxx                                     |   12 
 sc/source/ui/docshell/arealink.cxx                                         |    6 
 sc/source/ui/docshell/dbdocfun.cxx                                         |   20 
 sc/source/ui/docshell/dbdocimp.cxx                                         |    4 
 sc/source/ui/docshell/docfunc.cxx                                          |    9 
 sc/source/ui/docshell/docsh.cxx                                            |   36 
 sc/source/ui/docshell/docsh3.cxx                                           |   22 
 sc/source/ui/docshell/docsh4.cxx                                           |   60 
 sc/source/ui/docshell/docsh5.cxx                                           |   16 
 sc/source/ui/docshell/docsh6.cxx                                           |    4 
 sc/source/ui/docshell/documentlinkmgr.cxx                                  |    4 
 sc/source/ui/docshell/externalrefmgr.cxx                                   |    4 
 sc/source/ui/docshell/impex.cxx                                            |    8 
 sc/source/ui/docshell/sizedev.cxx                                          |    2 
 sc/source/ui/docshell/tablink.cxx                                          |    6 
 sc/source/ui/docshell/tpstat.cxx                                           |   14 
 sc/source/ui/drawfunc/fuins1.cxx                                           |    4 
 sc/source/ui/drawfunc/fupoor.cxx                                           |    3 
 sc/source/ui/drawfunc/graphsh.cxx                                          |    6 
 sc/source/ui/formdlg/dwfunctr.cxx                                          |  259 +--
 sc/source/ui/formdlg/formula.cxx                                           |    6 
 sc/source/ui/inc/AccessibleCsvControl.hxx                                  |    3 
 sc/source/ui/inc/AccessibleEditObject.hxx                                  |    3 
 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                                              |    9 
 sc/source/ui/inc/anyrefdg.hxx                                              |   18 
 sc/source/ui/inc/areasdlg.hxx                                              |   26 
 sc/source/ui/inc/autofmt.hxx                                               |    3 
 sc/source/ui/inc/cbutton.hxx                                               |    3 
 sc/source/ui/inc/checklistmenu.hxx                                         |   34 
 sc/source/ui/inc/colorformat.hxx                                           |   30 
 sc/source/ui/inc/condformatdlg.hxx                                         |   25 
 sc/source/ui/inc/condformatdlgentry.hxx                                    |  103 -
 sc/source/ui/inc/condformatmgr.hxx                                         |    9 
 sc/source/ui/inc/conflictsdlg.hxx                                          |   13 
 sc/source/ui/inc/consdlg.hxx                                               |   35 
 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/csvcontrol.hxx                                            |    1 
 sc/source/ui/inc/csvgrid.hxx                                               |    5 
 sc/source/ui/inc/csvruler.hxx                                              |    5 
 sc/source/ui/inc/csvtablebox.hxx                                           |   15 
 sc/source/ui/inc/dapidata.hxx                                              |    8 
 sc/source/ui/inc/dapitype.hxx                                              |   23 
 sc/source/ui/inc/datafdlg.hxx                                              |   25 
 sc/source/ui/inc/datastreamdlg.hxx                                         |   36 
 sc/source/ui/inc/dbnamdlg.hxx                                              |   37 
 sc/source/ui/inc/delcldlg.hxx                                              |   10 
 sc/source/ui/inc/delcodlg.hxx                                              |   19 
 sc/source/ui/inc/docsh.hxx                                                 |    2 
 sc/source/ui/inc/dpcontrol.hxx                                             |    3 
 sc/source/ui/inc/dpgroupdlg.hxx                                            |   55 
 sc/source/ui/inc/drawview.hxx                                              |    2 
 sc/source/ui/inc/dwfunctr.hxx                                              |   15 
 sc/source/ui/inc/filldlg.hxx                                               |   41 
 sc/source/ui/inc/filtdlg.hxx                                               |  122 -
 sc/source/ui/inc/foptmgr.hxx                                               |   24 
 sc/source/ui/inc/formula.hxx                                               |    1 
 sc/source/ui/inc/fupoor.hxx                                                |    4 
 sc/source/ui/inc/gridmerg.hxx                                              |    2 
 sc/source/ui/inc/gridwin.hxx                                               |    9 
 sc/source/ui/inc/groupdlg.hxx                                              |    6 
 sc/source/ui/inc/highred.hxx                                               |   15 
 sc/source/ui/inc/inputhdl.hxx                                              |    9 
 sc/source/ui/inc/inputwin.hxx                                              |   22 
 sc/source/ui/inc/inscldlg.hxx                                              |    9 
 sc/source/ui/inc/inscodlg.hxx                                              |   53 
 sc/source/ui/inc/instbdlg.hxx                                              |   27 
 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                                               |   29 
 sc/source/ui/inc/namemgrtable.hxx                                          |    1 
 sc/source/ui/inc/namepast.hxx                                              |    9 
 sc/source/ui/inc/navipi.hxx                                                |   26 
 sc/source/ui/inc/notemark.hxx                                              |    8 
 sc/source/ui/inc/olinewin.hxx                                              |    1 
 sc/source/ui/inc/opredlin.hxx                                              |   12 
 sc/source/ui/inc/optsolver.hxx                                             |  131 -
 sc/source/ui/inc/output.hxx                                                |    6 
 sc/source/ui/inc/pfiltdlg.hxx                                              |   43 
 sc/source/ui/inc/preview.hxx                                               |    1 
 sc/source/ui/inc/prevloc.hxx                                               |    2 
 sc/source/ui/inc/prevwsh.hxx                                               |   12 
 sc/source/ui/inc/printfun.hxx                                              |    4 
 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                                          |   45 
 sc/source/ui/inc/scuiautofmt.hxx                                           |   28 
 sc/source/ui/inc/scuiimoptdlg.hxx                                          |   25 
 sc/source/ui/inc/scuitphfedit.hxx                                          |   51 
 sc/source/ui/inc/searchresults.hxx                                         |    3 
 sc/source/ui/inc/sharedocdlg.hxx                                           |    7 
 sc/source/ui/inc/shtabdlg.hxx                                              |    6 
 sc/source/ui/inc/simpref.hxx                                               |   11 
 sc/source/ui/inc/sizedev.hxx                                               |   12 
 sc/source/ui/inc/solveroptions.hxx                                         |   19 
 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                                              |   13 
 sc/source/ui/inc/tabview.hxx                                               |   38 
 sc/source/ui/inc/tabvwsh.hxx                                               |    2 
 sc/source/ui/inc/tbinsert.hxx                                              |    2 
 sc/source/ui/inc/tbzoomsliderctrl.hxx                                      |    3 
 sc/source/ui/inc/textimportoptions.hxx                                     |   12 
 sc/source/ui/inc/tpcalc.hxx                                                |   35 
 sc/source/ui/inc/tpcompatibility.hxx                                       |    8 
 sc/source/ui/inc/tpdefaults.hxx                                            |    7 
 sc/source/ui/inc/tpformula.hxx                                             |   26 
 sc/source/ui/inc/tphf.hxx                                                  |   17 
 sc/source/ui/inc/tphfedit.hxx                                              |    1 
 sc/source/ui/inc/tpprint.hxx                                               |   12 
 sc/source/ui/inc/tpsort.hxx                                                |   39 
 sc/source/ui/inc/tpstat.hxx                                                |   12 
 sc/source/ui/inc/tpsubt.hxx                                                |   35 
 sc/source/ui/inc/tptable.hxx                                               |   50 
 sc/source/ui/inc/tpusrlst.hxx                                              |   27 
 sc/source/ui/inc/tpview.hxx                                                |   93 -
 sc/source/ui/inc/validate.hxx                                              |   72 
 sc/source/ui/inc/viewfunc.hxx                                              |    2 
 sc/source/ui/inc/xmlsourcedlg.hxx                                          |   20 
 sc/source/ui/miscdlgs/acredlin.cxx                                         |   13 
 sc/source/ui/miscdlgs/anyrefdg.cxx                                         |   18 
 sc/source/ui/miscdlgs/autofmt.cxx                                          |   38 
 sc/source/ui/miscdlgs/conflictsdlg.cxx                                     |   14 
 sc/source/ui/miscdlgs/crdlg.cxx                                            |   15 
 sc/source/ui/miscdlgs/crnrdlg.cxx                                          |   20 
 sc/source/ui/miscdlgs/datafdlg.cxx                                         |   56 
 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                                          |   16 
 sc/source/ui/miscdlgs/inscldlg.cxx                                         |   18 
 sc/source/ui/miscdlgs/inscodlg.cxx                                         |   28 
 sc/source/ui/miscdlgs/instbdlg.cxx                                         |   19 
 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                                        |  131 +
 sc/source/ui/miscdlgs/protectiondlg.cxx                                    |   13 
 sc/source/ui/miscdlgs/retypepassdlg.cxx                                    |   49 
 sc/source/ui/miscdlgs/scuiautofmt.cxx                                      |   43 
 sc/source/ui/miscdlgs/sharedocdlg.cxx                                      |   12 
 sc/source/ui/miscdlgs/shtabdlg.cxx                                         |   12 
 sc/source/ui/miscdlgs/simpref.cxx                                          |   11 
 sc/source/ui/miscdlgs/solveroptions.cxx                                    |   53 
 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                                           |   23 
 sc/source/ui/namedlg/namemgrtable.cxx                                      |    6 
 sc/source/ui/namedlg/namepast.cxx                                          |   13 
 sc/source/ui/navipi/content.cxx                                            |    7 
 sc/source/ui/navipi/navcitem.cxx                                           |    2 
 sc/source/ui/navipi/navipi.cxx                                             |  211 +-
 sc/source/ui/navipi/scenwnd.cxx                                            |   50 
 sc/source/ui/optdlg/calcoptionsdlg.cxx                                     |   20 
 sc/source/ui/optdlg/calcoptionsdlg.hxx                                     |   33 
 sc/source/ui/optdlg/opredlin.cxx                                           |   14 
 sc/source/ui/optdlg/tpcalc.cxx                                             |   26 
 sc/source/ui/optdlg/tpcompatibility.cxx                                    |   11 
 sc/source/ui/optdlg/tpdefaults.cxx                                         |   12 
 sc/source/ui/optdlg/tpformula.cxx                                          |   27 
 sc/source/ui/optdlg/tpprint.cxx                                            |   13 
 sc/source/ui/optdlg/tpusrlst.cxx                                           |   22 
 sc/source/ui/optdlg/tpview.cxx                                             |   61 
 sc/source/ui/pagedlg/areasdlg.cxx                                          |   18 
 sc/source/ui/pagedlg/scuitphfedit.cxx                                      |   42 
 sc/source/ui/pagedlg/tphf.cxx                                              |   18 
 sc/source/ui/pagedlg/tphfedit.cxx                                          |    6 
 sc/source/ui/pagedlg/tptable.cxx                                           |   31 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx                            |   30 
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx                            |   33 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx                       |   26 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx                       |   25 
 sc/source/ui/sidebar/CellBorderStyleControl.cxx                            |  119 -
 sc/source/ui/sidebar/CellBorderStyleControl.hxx                            |   11 
 sc/source/ui/sidebar/CellLineStyleControl.cxx                              |   78 
 sc/source/ui/sidebar/CellLineStyleControl.hxx                              |   10 
 sc/source/ui/sidebar/CellLineStyleValueSet.cxx                             |    8 
 sc/source/ui/sidebar/CellLineStyleValueSet.hxx                             |    3 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx                         |   24 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx                         |   28 
 sc/source/ui/sidebar/ScPanelFactory.cxx                                    |   46 
 sc/source/ui/undo/undobase.cxx                                             |    8 
 sc/source/ui/undo/undoblk.cxx                                              |    4 
 sc/source/ui/undo/undoblk3.cxx                                             |    6 
 sc/source/ui/undo/undostyl.cxx                                             |    6 
 sc/source/ui/unoobj/confuno.cxx                                            |    4 
 sc/source/ui/unoobj/styleuno.cxx                                           |   24 
 sc/source/ui/vba/vbaeventshelper.cxx                                       |    8 
 sc/source/ui/view/cellsh1.cxx                                              |   20 
 sc/source/ui/view/cellsh2.cxx                                              |    8 
 sc/source/ui/view/cellsh3.cxx                                              |    4 
 sc/source/ui/view/dbfunc.cxx                                               |    4 
 sc/source/ui/view/gridwin.cxx                                              |   62 
 sc/source/ui/view/gridwin2.cxx                                             |    4 
 sc/source/ui/view/gridwin4.cxx                                             |    2 
 sc/source/ui/view/olinewin.cxx                                             |    6 
 sc/source/ui/view/preview.cxx                                              |    6 
 sc/source/ui/view/prevwsh.cxx                                              |   25 
 sc/source/ui/view/printfun.cxx                                             |    2 
 sc/source/ui/view/reffact.cxx                                              |   37 
 sc/source/ui/view/spelleng.cxx                                             |    4 
 sc/source/ui/view/tabview.cxx                                              |  162 -
 sc/source/ui/view/tabview2.cxx                                             |    4 
 sc/source/ui/view/tabview3.cxx                                             |    2 
 sc/source/ui/view/tabview4.cxx                                             |   16 
 sc/source/ui/view/tabview5.cxx                                             |   47 
 sc/source/ui/view/tabvwsh3.cxx                                             |    8 
 sc/source/ui/view/tabvwsh4.cxx                                             |    7 
 sc/source/ui/view/tabvwshc.cxx                                             |   60 
 sc/source/ui/view/tabvwshh.cxx                                             |    2 
 sc/source/ui/view/viewfun2.cxx                                             |    8 
 sc/source/ui/view/viewfun3.cxx                                             |   14 
 sc/source/ui/view/viewfun4.cxx                                             |    8 
 sc/source/ui/view/viewfunc.cxx                                             |   12 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx                                    |   21 
 sd/inc/Outliner.hxx                                                        |    2 
 sd/inc/sdmod.hxx                                                           |    4 
 sd/source/core/drawdoc3.cxx                                                |    4 
 sd/source/filter/eppt/epptbase.hxx                                         |    5 
 sd/source/filter/eppt/pptx-text.cxx                                        |    2 
 sd/source/filter/grf/sdgrffilter.cxx                                       |    4 
 sd/source/filter/html/buttonset.cxx                                        |   12 
 sd/source/filter/html/htmlex.cxx                                           |    6 
 sd/source/filter/html/pubdlg.cxx                                           |  118 +
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx                   |   16 
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx                    |   50 
 sd/source/ui/animations/CustomAnimationCreateDialog.hxx                    |    7 
 sd/source/ui/animations/CustomAnimationDialog.cxx                          |  270 ++-
 sd/source/ui/animations/CustomAnimationDialog.hxx                          |   10 
 sd/source/ui/animations/CustomAnimationList.cxx                            |    8 
 sd/source/ui/animations/CustomAnimationList.hxx                            |    1 
 sd/source/ui/animations/CustomAnimationPane.cxx                            |   35 
 sd/source/ui/animations/CustomAnimationPane.hxx                            |   35 
 sd/source/ui/animations/SlideTransitionPane.cxx                            |   29 
 sd/source/ui/animations/SlideTransitionPane.hxx                            |   27 
 sd/source/ui/annotations/annotationmanager.cxx                             |    7 
 sd/source/ui/annotations/annotationtag.cxx                                 |   22 
 sd/source/ui/annotations/annotationtag.hxx                                 |    4 
 sd/source/ui/annotations/annotationwindow.cxx                              |   25 
 sd/source/ui/annotations/annotationwindow.hxx                              |   10 
 sd/source/ui/app/sdmod.cxx                                                 |    2 
 sd/source/ui/app/sdmod2.cxx                                                |    4 
 sd/source/ui/app/sdxfer.cxx                                                |    4 
 sd/source/ui/app/tbxww.cxx                                                 |    2 
 sd/source/ui/controller/slidelayoutcontroller.cxx                          |   19 
 sd/source/ui/controller/slidelayoutcontroller.hxx                          |    2 
 sd/source/ui/dlg/AnimationChildWindow.cxx                                  |    2 
 sd/source/ui/dlg/LayerTabBar.cxx                                           |    4 
 sd/source/ui/dlg/NavigatorChildWindow.cxx                                  |    3 
 sd/source/ui/dlg/PaneChildWindows.cxx                                      |    7 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx                                      |   25 
 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.cxx                                 |   88 -
 sd/source/ui/dlg/RemoteDialogClientBox.hxx                                 |   13 
 sd/source/ui/dlg/animobjs.cxx                                              |   51 
 sd/source/ui/dlg/assclass.cxx                                              |    4 
 sd/source/ui/dlg/brkdlg.cxx                                                |   16 
 sd/source/ui/dlg/copydlg.cxx                                               |   39 
 sd/source/ui/dlg/custsdlg.cxx                                              |   41 
 sd/source/ui/dlg/diactrl.cxx                                               |    4 
 sd/source/ui/dlg/dlgass.cxx                                                |  128 -
 sd/source/ui/dlg/dlgassim.cxx                                              |    6 
 sd/source/ui/dlg/dlgassim.hxx                                              |    1 
 sd/source/ui/dlg/dlgctrls.cxx                                              |    6 
 sd/source/ui/dlg/dlgfield.cxx                                              |   15 
 sd/source/ui/dlg/dlgolbul.cxx                                              |    6 
 sd/source/ui/dlg/dlgsnap.cxx                                               |   19 
 sd/source/ui/dlg/docprev.cxx                                               |   24 
 sd/source/ui/dlg/gluectrl.cxx                                              |    8 
 sd/source/ui/dlg/headerfooterdlg.cxx                                       |   76 
 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/navigatr.cxx                                              |  253 +--
 sd/source/ui/dlg/paragr.cxx                                                |   22 
 sd/source/ui/dlg/present.cxx                                               |   33 
 sd/source/ui/dlg/prltempl.cxx                                              |    6 
 sd/source/ui/dlg/prntopts.cxx                                              |   33 
 sd/source/ui/dlg/sddlgfact.cxx                                             |   48 
 sd/source/ui/dlg/sddlgfact.hxx                                             |    3 
 sd/source/ui/dlg/sdpreslt.cxx                                              |   12 
 sd/source/ui/dlg/sdtreelb.cxx                                              |   14 
 sd/source/ui/dlg/sduiexp.cxx                                               |   15 
 sd/source/ui/dlg/tpaction.cxx                                              |   31 
 sd/source/ui/dlg/tpoption.cxx                                              |   65 
 sd/source/ui/dlg/vectdlg.cxx                                               |   16 
 sd/source/ui/docshell/docshel2.cxx                                         |   20 
 sd/source/ui/docshell/docshel4.cxx                                         |   20 
 sd/source/ui/docshell/docshell.cxx                                         |    2 
 sd/source/ui/framework/factories/BasicViewFactory.cxx                      |    2 
 sd/source/ui/framework/factories/BasicViewFactory.hxx                      |    3 
 sd/source/ui/framework/factories/ChildWindowPane.cxx                       |    2 
 sd/source/ui/framework/factories/FullScreenPane.cxx                        |   21 
 sd/source/ui/framework/factories/FullScreenPane.hxx                        |    2 
 sd/source/ui/framework/factories/Pane.cxx                                  |    2 
 sd/source/ui/func/fuinsert.cxx                                             |    4 
 sd/source/ui/func/fuinsfil.cxx                                             |   12 
 sd/source/ui/func/fulinend.cxx                                             |    4 
 sd/source/ui/func/fupage.cxx                                               |    6 
 sd/source/ui/func/fupoor.cxx                                               |   11 
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx                            |    2 
 sd/source/ui/inc/AccessibleSlideSorterView.hxx                             |    3 
 sd/source/ui/inc/BreakDlg.hxx                                              |    9 
 sd/source/ui/inc/DrawDocShell.hxx                                          |    4 
 sd/source/ui/inc/DrawViewShell.hxx                                         |    6 
 sd/source/ui/inc/FormShellManager.hxx                                      |    3 
 sd/source/ui/inc/OutlineBulletDlg.hxx                                      |    1 
 sd/source/ui/inc/PreviewRenderer.hxx                                       |    2 
 sd/source/ui/inc/Ruler.hxx                                                 |    3 
 sd/source/ui/inc/SlideSorter.hxx                                           |   35 
 sd/source/ui/inc/View.hxx                                                  |    4 
 sd/source/ui/inc/ViewShell.hxx                                             |   18 
 sd/source/ui/inc/ViewTabBar.hxx                                            |    6 
 sd/source/ui/inc/Window.hxx                                                |    5 
 sd/source/ui/inc/WindowUpdater.hxx                                         |    3 
 sd/source/ui/inc/animobjs.hxx                                              |   47 
 sd/source/ui/inc/assclass.hxx                                              |    2 
 sd/source/ui/inc/copydlg.hxx                                               |   23 
 sd/source/ui/inc/createtabledesignpanel.hxx                                |    3 
 sd/source/ui/inc/custsdlg.hxx                                              |   41 
 sd/source/ui/inc/diactrl.hxx                                               |    2 
 sd/source/ui/inc/dlgass.hxx                                                |    1 
 sd/source/ui/inc/dlgctrls.hxx                                              |    3 
 sd/source/ui/inc/dlgfield.hxx                                              |   11 
 sd/source/ui/inc/dlgsnap.hxx                                               |   20 
 sd/source/ui/inc/docprev.hxx                                               |    1 
 sd/source/ui/inc/drawview.hxx                                              |    2 
 sd/source/ui/inc/framework/Pane.hxx                                        |    3 
 sd/source/ui/inc/fupoor.hxx                                                |    6 
 sd/source/ui/inc/gluectrl.hxx                                              |    2 
 sd/source/ui/inc/headerfooterdlg.hxx                                       |   13 
 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                                              |    7 
 sd/source/ui/inc/navigatr.hxx                                              |   11 
 sd/source/ui/inc/present.hxx                                               |   48 
 sd/source/ui/inc/prltempl.hxx                                              |    1 
 sd/source/ui/inc/prntopts.hxx                                              |   41 
 sd/source/ui/inc/pubdlg.hxx                                                |  169 +-
 sd/source/ui/inc/sdpreslt.hxx                                              |   10 
 sd/source/ui/inc/sdtreelb.hxx                                              |    5 
 sd/source/ui/inc/sdxfer.hxx                                                |    2 
 sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx                      |    2 
 sd/source/ui/inc/tbx_ww.hxx                                                |    2 
 sd/source/ui/inc/tpaction.hxx                                              |   33 
 sd/source/ui/inc/tpoption.hxx                                              |   68 
 sd/source/ui/inc/vectdlg.hxx                                               |   21 
 sd/source/ui/presenter/PresenterHelper.cxx                                 |    4 
 sd/source/ui/presenter/PresenterTextView.cxx                               |   11 
 sd/source/ui/sidebar/AllMasterPagesSelector.cxx                            |    7 
 sd/source/ui/sidebar/AllMasterPagesSelector.hxx                            |    2 
 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx                        |   14 
 sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx                        |    3 
 sd/source/ui/sidebar/LayoutMenu.cxx                                        |    6 
 sd/source/ui/sidebar/LayoutMenu.hxx                                        |    1 
 sd/source/ui/sidebar/MasterPagesSelector.cxx                               |    6 
 sd/source/ui/sidebar/MasterPagesSelector.hxx                               |    1 
 sd/source/ui/sidebar/NavigatorWrapper.cxx                                  |   25 
 sd/source/ui/sidebar/NavigatorWrapper.hxx                                  |    4 
 sd/source/ui/sidebar/PanelBase.cxx                                         |   14 
 sd/source/ui/sidebar/PanelBase.hxx                                         |    3 
 sd/source/ui/sidebar/PanelFactory.cxx                                      |   14 
 sd/source/ui/sidebar/RecentMasterPagesSelector.cxx                         |   13 
 sd/source/ui/sidebar/RecentMasterPagesSelector.hxx                         |    3 
 sd/source/ui/slideshow/showwin.cxx                                         |   22 
 sd/source/ui/slideshow/showwindow.hxx                                      |    1 
 sd/source/ui/slideshow/slideshow.cxx                                       |    4 
 sd/source/ui/slideshow/slideshowimpl.cxx                                   |   22 
 sd/source/ui/slideshow/slideshowimpl.hxx                                   |   12 
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx              |   16 
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx                       |    6 
 sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx              |    2 
 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx                |   34 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx               |    4 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx                     |   14 
 sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx              |    4 
 sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx            |    9 
 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx                      |    2 
 sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx                          |    4 
 sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx                |    4 
 sd/source/ui/slidesorter/shell/SlideSorter.cxx                             |   60 
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx                    |    2 
 sd/source/ui/slidesorter/view/SlideSorterView.cxx                          |   28 
 sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx                        |   10 
 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx             |   18 
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx                         |   26 
 sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx                         |    8 
 sd/source/ui/slidesorter/view/SlsLayouter.cxx                              |   20 
 sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx                    |    6 
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx                     |    6 
 sd/source/ui/slidesorter/view/SlsToolTip.cxx                               |    8 
 sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx                      |    2 
 sd/source/ui/table/TableDesignPane.cxx                                     |    6 
 sd/source/ui/table/TableDesignPane.hxx                                     |    4 
 sd/source/ui/tools/PreviewRenderer.cxx                                     |    2 
 sd/source/ui/unoidl/UnoDocumentSettings.cxx                                |    2 
 sd/source/ui/unoidl/unomodel.cxx                                           |    4 
 sd/source/ui/view/DocumentRenderer.cxx                                     |   19 
 sd/source/ui/view/FormShellManager.cxx                                     |    4 
 sd/source/ui/view/Outliner.cxx                                             |   24 
 sd/source/ui/view/ViewShellBase.cxx                                        |   17 
 sd/source/ui/view/ViewTabBar.cxx                                           |    6 
 sd/source/ui/view/drawview.cxx                                             |    5 
 sd/source/ui/view/drviews1.cxx                                             |   64 
 sd/source/ui/view/drviews2.cxx                                             |   20 
 sd/source/ui/view/drviews3.cxx                                             |    2 
 sd/source/ui/view/drviews4.cxx                                             |    2 
 sd/source/ui/view/drviews5.cxx                                             |    4 
 sd/source/ui/view/drviews6.cxx                                             |    4 
 sd/source/ui/view/drviews7.cxx                                             |    2 
 sd/source/ui/view/drviews9.cxx                                             |   10 
 sd/source/ui/view/drviewsa.cxx                                             |    8 
 sd/source/ui/view/drviewsb.cxx                                             |    4 
 sd/source/ui/view/drviewse.cxx                                             |    2 
 sd/source/ui/view/drviewsi.cxx                                             |    4 
 sd/source/ui/view/grviewsh.cxx                                             |    2 
 sd/source/ui/view/sdruler.cxx                                              |    7 
 sd/source/ui/view/sdview2.cxx                                              |    2 
 sd/source/ui/view/sdwindow.cxx                                             |    7 
 sd/source/ui/view/viewshe2.cxx                                             |    2 
 sd/source/ui/view/viewshel.cxx                                             |   18 
 sfx2/inc/inettbc.hxx                                                       |    2 
 sfx2/inc/srchdlg.hxx                                                       |   19 
 sfx2/source/appl/appopen.cxx                                               |   10 
 sfx2/source/appl/appserv.cxx                                               |   12 
 sfx2/source/appl/childwin.cxx                                              |   24 
 sfx2/source/appl/fileobj.hxx                                               |    2 
 sfx2/source/appl/helpinterceptor.hxx                                       |    3 
 sfx2/source/appl/impldde.cxx                                               |   30 
 sfx2/source/appl/lnkbase2.cxx                                              |    4 
 sfx2/source/appl/module.cxx                                                |    5 
 sfx2/source/appl/newhelp.cxx                                               |  285 ++-
 sfx2/source/appl/newhelp.hxx                                               |   93 -
 sfx2/source/appl/opengrf.cxx                                               |    4 
 sfx2/source/appl/openuriexternally.cxx                                     |    6 
 sfx2/source/appl/sfxhelp.cxx                                               |   12 
 sfx2/source/appl/workwin.cxx                                               |   29 
 sfx2/source/bastyp/fltfnc.cxx                                              |    4 
 sfx2/source/control/ctrlitem.cxx                                           |    9 
 sfx2/source/control/recentdocsview.cxx                                     |    4 
 sfx2/source/control/templateabstractview.cxx                               |   36 
 sfx2/source/control/templatedefaultview.cxx                                |    4 
 sfx2/source/control/templatelocalview.cxx                                  |   18 
 sfx2/source/control/templateremoteview.cxx                                 |    6 
 sfx2/source/control/templatesearchview.cxx                                 |    4 
 sfx2/source/control/thumbnailview.cxx                                      |   14 
 sfx2/source/control/thumbnailviewacc.cxx                                   |    2 
 sfx2/source/control/thumbnailviewacc.hxx                                   |    3 
 sfx2/source/control/thumbnailviewitem.cxx                                  |   13 
 sfx2/source/dialog/alienwarn.cxx                                           |    9 
 sfx2/source/dialog/backingcomp.cxx                                         |   12 
 sfx2/source/dialog/backingwindow.cxx                                       |   44 
 sfx2/source/dialog/backingwindow.hxx                                       |   47 
 sfx2/source/dialog/basedlgs.cxx                                            |   56 
 sfx2/source/dialog/checkin.cxx                                             |   13 
 sfx2/source/dialog/dinfdlg.cxx                                             |  478 +++--
 sfx2/source/dialog/dockwin.cxx                                             |   27 
 sfx2/source/dialog/documentfontsdialog.cxx                                 |   15 
 sfx2/source/dialog/filedlgimpl.hxx                                         |    2 
 sfx2/source/dialog/infobar.cxx                                             |   71 
 sfx2/source/dialog/inputdlg.cxx                                            |   14 
 sfx2/source/dialog/mailmodel.cxx                                           |    4 
 sfx2/source/dialog/mgetempl.cxx                                            |   52 
 sfx2/source/dialog/navigat.cxx                                             |    4 
 sfx2/source/dialog/newstyle.cxx                                            |   15 
 sfx2/source/dialog/partwnd.cxx                                             |   16 
 sfx2/source/dialog/passwd.cxx                                              |   26 
 sfx2/source/dialog/printopt.cxx                                            |   30 
 sfx2/source/dialog/recfloat.cxx                                            |   17 
 sfx2/source/dialog/securitypage.cxx                                        |   30 
 sfx2/source/dialog/splitwin.cxx                                            |   30 
 sfx2/source/dialog/srchdlg.cxx                                             |   12 
 sfx2/source/dialog/styledlg.cxx                                            |    5 
 sfx2/source/dialog/tabdlg.cxx                                              |   64 
 sfx2/source/dialog/taskpane.cxx                                            |   63 
 sfx2/source/dialog/templateinfodlg.cxx                                     |   12 
 sfx2/source/dialog/templdlg.cxx                                            |  265 +--
 sfx2/source/dialog/titledockwin.cxx                                        |   45 
 sfx2/source/dialog/versdlg.cxx                                             |   53 
 sfx2/source/doc/QuerySaveDocument.cxx                                      |    6 
 sfx2/source/doc/docinsert.cxx                                              |    8 
 sfx2/source/doc/doctemplates.cxx                                           |   14 
 sfx2/source/doc/guisaveas.cxx                                              |    8 
 sfx2/source/doc/iframe.cxx                                                 |    2 
 sfx2/source/doc/new.cxx                                                    |   28 
 sfx2/source/doc/objcont.cxx                                                |   20 
 sfx2/source/doc/objserv.cxx                                                |   28 
 sfx2/source/doc/objstor.cxx                                                |    4 
 sfx2/source/doc/plugin.cxx                                                 |    2 
 sfx2/source/doc/printhelper.cxx                                            |    6 
 sfx2/source/doc/templatedlg.cxx                                            |   84 -
 sfx2/source/inc/alienwarn.hxx                                              |    7 
 sfx2/source/inc/documentfontsdialog.hxx                                    |    6 
 sfx2/source/inc/inputdlg.hxx                                               |   10 
 sfx2/source/inc/partwnd.hxx                                                |    1 
 sfx2/source/inc/recfloat.hxx                                               |    3 
 sfx2/source/inc/splitwin.hxx                                               |   11 
 sfx2/source/inc/templatesearchview.hxx                                     |    2 
 sfx2/source/inc/templdgi.hxx                                               |   17 
 sfx2/source/inc/versdlg.hxx                                                |   42 
 sfx2/source/inc/workwin.hxx                                                |   14 
 sfx2/source/inet/inettbc.cxx                                               |    7 
 sfx2/source/sidebar/ControlFactory.cxx                                     |    8 
 sfx2/source/sidebar/ControllerItem.cxx                                     |    8 
 sfx2/source/sidebar/Deck.cxx                                               |   67 
 sfx2/source/sidebar/Deck.hxx                                               |   16 
 sfx2/source/sidebar/DeckLayouter.cxx                                       |    4 
 sfx2/source/sidebar/DeckTitleBar.cxx                                       |   14 
 sfx2/source/sidebar/DeckTitleBar.hxx                                       |    1 
 sfx2/source/sidebar/FocusManager.cxx                                       |   24 
 sfx2/source/sidebar/FocusManager.hxx                                       |   10 
 sfx2/source/sidebar/MenuButton.cxx                                         |    4 
 sfx2/source/sidebar/MenuButton.hxx                                         |    1 
 sfx2/source/sidebar/Panel.cxx                                              |   10 
 sfx2/source/sidebar/Panel.hxx                                              |    8 
 sfx2/source/sidebar/PanelTitleBar.cxx                                      |   31 
 sfx2/source/sidebar/PanelTitleBar.hxx                                      |    3 
 sfx2/source/sidebar/SidebarChildWindow.cxx                                 |    6 
 sfx2/source/sidebar/SidebarController.cxx                                  |   83 
 sfx2/source/sidebar/SidebarController.hxx                                  |   12 
 sfx2/source/sidebar/SidebarDockingWindow.cxx                               |    6 
 sfx2/source/sidebar/SidebarDockingWindow.hxx                               |    1 
 sfx2/source/sidebar/SidebarPanelBase.cxx                                   |   16 
 sfx2/source/sidebar/SidebarToolBox.cxx                                     |    8 
 sfx2/source/sidebar/TabBar.cxx                                             |   25 
 sfx2/source/sidebar/TabBar.hxx                                             |    7 
 sfx2/source/sidebar/TabItem.cxx                                            |    4 
 sfx2/source/sidebar/TabItem.hxx                                            |    1 
 sfx2/source/sidebar/TitleBar.cxx                                           |   21 
 sfx2/source/sidebar/TitleBar.hxx                                           |    7 
 sfx2/source/statbar/stbitem.cxx                                            |    2 
 sfx2/source/toolbox/imgmgr.cxx                                             |    2 
 sfx2/source/toolbox/tbxitem.cxx                                            |   48 
 sfx2/source/view/frame.cxx                                                 |    2 
 sfx2/source/view/frame2.cxx                                                |    9 
 sfx2/source/view/impframe.hxx                                              |   14 
 sfx2/source/view/impviewframe.hxx                                          |    4 
 sfx2/source/view/printer.cxx                                               |   27 
 sfx2/source/view/sfxbasecontroller.cxx                                     |    2 
 sfx2/source/view/viewfrm.cxx                                               |   20 
 sfx2/source/view/viewprn.cxx                                               |   57 
 sfx2/source/view/viewsh.cxx                                                |   12 
 slideshow/source/engine/rehearsetimingsactivity.cxx                        |   40 
 slideshow/source/engine/shapes/gdimtftools.cxx                             |   42 
 slideshow/source/engine/shapes/viewmediashape.cxx                          |    6 
 slideshow/source/engine/shapes/viewmediashape.hxx                          |    5 
 starmath/inc/ElementsDockingWindow.hxx                                     |    8 
 starmath/inc/dialog.hxx                                                    |  182 +-
 starmath/inc/document.hxx                                                  |   12 
 starmath/inc/edit.hxx                                                      |    7 
 starmath/inc/smmod.hxx                                                     |    4 
 starmath/inc/toolbox.hxx                                                   |    7 
 starmath/inc/view.hxx                                                      |   18 
 starmath/inc/visitors.hxx                                                  |    2 
 starmath/qa/cppunit/test_nodetotextvisitors.cxx                            |   32 
 starmath/qa/cppunit/test_starmath.cxx                                      |   12 
 starmath/source/ElementsDockingWindow.cxx                                  |   24 
 starmath/source/accessibility.hxx                                          |    4 
 starmath/source/dialog.cxx                                                 |  187 ++
 starmath/source/document.cxx                                               |   16 
 starmath/source/edit.cxx                                                   |   26 
 starmath/source/smmod.cxx                                                  |    7 
 starmath/source/toolbox.cxx                                                |   24 
 starmath/source/unomodel.cxx                                               |   10 
 starmath/source/view.cxx                                                   |   62 
 svtools/inc/roadmap.hxx                                                    |    1 
 svtools/inc/table/tablecontrol.hxx                                         |    1 
 svtools/inc/vclxaccessibleheaderbar.hxx                                    |    2 
 svtools/inc/vclxaccessibleheaderbaritem.hxx                                |    3 
 svtools/source/brwbox/brwbox1.cxx                                          |   79 
 svtools/source/brwbox/brwbox2.cxx                                          |   74 
 svtools/source/brwbox/brwhead.cxx                                          |   12 
 svtools/source/brwbox/datwin.cxx                                           |   20 
 svtools/source/brwbox/datwin.hxx                                           |   13 
 svtools/source/brwbox/ebbcontrols.cxx                                      |   10 
 svtools/source/brwbox/editbrowsebox.cxx                                    |   21 
 svtools/source/contnr/DocumentInfoPreview.cxx                              |   42 
 svtools/source/contnr/fileview.cxx                                         |   54 
 svtools/source/contnr/imivctl.hxx                                          |   19 
 svtools/source/contnr/imivctl1.cxx                                         |  173 +-
 svtools/source/contnr/ivctrl.cxx                                           |   23 
 svtools/source/contnr/simptabl.cxx                                         |  110 -
 svtools/source/contnr/svimpbox.cxx                                         |  191 +-
 svtools/source/contnr/svtabbx.cxx                                          |   14 
 svtools/source/contnr/treelistbox.cxx                                      |   85 -
 svtools/source/control/calendar.cxx                                        |   75 
 svtools/source/control/ctrlbox.cxx                                         |   71 
 svtools/source/control/ctrltool.cxx                                        |    2 
 svtools/source/control/filectrl.cxx                                        |   54 
 svtools/source/control/fmtfield.cxx                                        |   10 
 svtools/source/control/headbar.cxx                                         |   19 
 svtools/source/control/hyperlabel.cxx                                      |    6 
 svtools/source/control/inettbc.cxx                                         |   14 
 svtools/source/control/roadmap.cxx                                         |   34 
 svtools/source/control/ruler.cxx                                           |  109 -
 svtools/source/control/scrwin.cxx                                          |   89 -
 svtools/source/control/tabbar.cxx                                          |   64 
 svtools/source/control/toolbarmenu.cxx                                     |   22 
 svtools/source/control/toolbarmenuimp.hxx                                  |    2 
 svtools/source/control/valueacc.cxx                                        |    2 
 svtools/source/control/valueimp.hxx                                        |    2 
 svtools/source/control/valueset.cxx                                        |   94 -
 svtools/source/control/vclxaccessibleheaderbar.cxx                         |    3 
 svtools/source/dialogs/PlaceEditDialog.cxx                                 |   12 
 svtools/source/dialogs/addresstemplate.cxx                                 |   42 
 svtools/source/dialogs/colrdlg.cxx                                         |    1 
 svtools/source/dialogs/prnsetup.cxx                                        |   37 
 svtools/source/dialogs/restartdialog.cxx                                   |   15 
 svtools/source/dialogs/roadmapwizard.cxx                                   |   19 
 svtools/source/dialogs/wizardmachine.cxx                                   |   34 
 svtools/source/dialogs/wizdlg.cxx                                          |   15 
 svtools/source/edit/editsyntaxhighlighter.cxx                              |    4 
 svtools/source/edit/svmedit2.cxx                                           |    6 
 svtools/source/filter/GraphicExportOptionsDialog.cxx                       |   12 
 svtools/source/filter/exportdialog.cxx                                     |   39 
 svtools/source/filter/exportdialog.hxx                                     |   73 
 svtools/source/graphic/grfmgr2.cxx                                         |   16 
 svtools/source/graphic/provider.cxx                                        |   16 
 svtools/source/hatchwindow/hatchwindow.cxx                                 |    4 
 svtools/source/inc/hatchwindow.hxx                                         |    2 
 svtools/source/inc/renderer.hxx                                            |    2 
 svtools/source/inc/svimpbox.hxx                                            |   12 
 svtools/source/inc/unoiface.hxx                                            |    9 
 svtools/source/java/javainteractionhandler.cxx                             |   28 
 svtools/source/misc/dialogcontrolling.cxx                                  |    4 
 svtools/source/misc/ehdl.cxx                                               |   10 
 svtools/source/misc/sampletext.cxx                                         |   14 
 svtools/source/table/gridtablerenderer.cxx                                 |    8 
 svtools/source/table/tablecontrol.cxx                                      |    6 
 svtools/source/table/tablecontrol_impl.cxx                                 |   31 
 svtools/source/table/tablecontrol_impl.hxx                                 |    9 
 svtools/source/table/tabledatawindow.cxx                                   |    6 
 svtools/source/table/tabledatawindow.hxx                                   |    1 
 svtools/source/toolpanel/drawerlayouter.cxx                                |   14 
 svtools/source/toolpanel/paneltabbar.cxx                                   |   84 -
 svtools/source/toolpanel/paneltabbarpeer.cxx                               |    4 
 svtools/source/toolpanel/paneltabbarpeer.hxx                               |    2 
 svtools/source/toolpanel/tablayouter.cxx                                   |    4 
 svtools/source/toolpanel/toolpaneldeck.cxx                                 |   27 
 svtools/source/toolpanel/toolpaneldeckpeer.cxx                             |    4 
 svtools/source/toolpanel/toolpaneldeckpeer.hxx                             |    2 
 svtools/source/toolpanel/toolpaneldrawer.cxx                               |   26 
 svtools/source/toolpanel/toolpaneldrawer.hxx                               |    7 
 svtools/source/toolpanel/toolpaneldrawerpeer.cxx                           |    2 
 svtools/source/uno/addrtempuno.cxx                                         |   10 
 svtools/source/uno/generictoolboxcontroller.cxx                            |    6 
 svtools/source/uno/genericunodialog.cxx                                    |    5 
 svtools/source/uno/popupwindowcontroller.cxx                               |   10 
 svtools/source/uno/statusbarcontroller.cxx                                 |    2 
 svtools/source/uno/svtxgridcontrol.cxx                                     |   58 
 svtools/source/uno/svtxgridcontrol.hxx                                     |    2 
 svtools/source/uno/toolboxcontroller.cxx                                   |    2 
 svtools/source/uno/treecontrolpeer.cxx                                     |   11 
 svtools/source/uno/treecontrolpeer.hxx                                     |    4 
 svtools/source/uno/unoiface.cxx                                            |  221 +-
 svtools/source/uno/wizard/unowizard.cxx                                    |   28 
 svtools/source/uno/wizard/wizardshell.cxx                                  |   16 
 svtools/source/uno/wizard/wizardshell.hxx                                  |    5 
 svx/inc/GalleryControl.hxx                                                 |    9 
 svx/inc/extrusiondepthdialog.hxx                                           |    4 
 svx/inc/galbrws2.hxx                                                       |   16 
 svx/inc/sdr/overlay/overlaymanagerbuffered.hxx                             |    4 
 svx/inc/svdibrow.hxx                                                       |   13 
 svx/inc/tbunosearchcontrollers.hxx                                         |    5 
 svx/source/accessibility/AccessibleShapeTreeInfo.cxx                       |    1 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx                     |    6 
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx                    |   30 
 svx/source/customshapes/tbxcustomshapes.cxx                                |    2 
 svx/source/dialog/_bmpmask.cxx                                             |   66 
 svx/source/dialog/_contdlg.cxx                                             |   72 
 svx/source/dialog/charmap.cxx                                              |   55 
 svx/source/dialog/checklbx.cxx                                             |    6 
 svx/source/dialog/compressgraphicdialog.cxx                                |   31 
 svx/source/dialog/connctrl.cxx                                             |    6 
 svx/source/dialog/contimp.hxx                                              |    9 
 svx/source/dialog/contwnd.cxx                                              |    4 
 svx/source/dialog/contwnd.hxx                                              |    1 
 svx/source/dialog/ctredlin.cxx                                             |   76 
 svx/source/dialog/dialcontrol.cxx                                          |   10 
 svx/source/dialog/dlgctl3d.cxx                                             |  134 -
 svx/source/dialog/dlgctrl.cxx                                              |   88 -
 svx/source/dialog/docrecovery.cxx                                          |   73 
 svx/source/dialog/fntctrl.cxx                                              |   12 
 svx/source/dialog/fontwork.cxx                                             |   22 
 svx/source/dialog/frmdirlbox.cxx                                           |    4 
 svx/source/dialog/frmsel.cxx                                               |   39 
 svx/source/dialog/graphctl.cxx                                             |    6 
 svx/source/dialog/hdft.cxx                                                 |   30 
 svx/source/dialog/imapdlg.cxx                                              |   30 
 svx/source/dialog/imapwnd.cxx                                              |    6 
 svx/source/dialog/imapwnd.hxx                                              |    1 
 svx/source/dialog/langbox.cxx                                              |   10 
 svx/source/dialog/linkwarn.cxx                                             |    7 
 svx/source/dialog/measctrl.cxx                                             |    6 
 svx/source/dialog/optgrid.cxx                                              |   31 
 svx/source/dialog/orienthelper.cxx                                         |    2 
 svx/source/dialog/pagectrl.cxx                                             |    6 
 svx/source/dialog/passwd.cxx                                               |   14 
 svx/source/dialog/prtqry.cxx                                               |    5 
 svx/source/dialog/rubydialog.cxx                                           |   41 
 svx/source/dialog/srchdlg.cxx                                              |   52 
 svx/source/dialog/stddlg.cxx                                               |    4 
 svx/source/dialog/svxbmpnumvalueset.cxx                                    |   16 
 svx/source/dialog/svxruler.cxx                                             |   32 
 svx/source/dialog/swframeexample.cxx                                       |    4 
 svx/source/dialog/txencbox.cxx                                             |    6 
 svx/source/engine3d/float3d.cxx                                            |   21 
 svx/source/fmcomp/fmgridcl.cxx                                             |   11 
 svx/source/fmcomp/fmgridif.cxx                                             |   61 
 svx/source/fmcomp/gridcell.cxx                                             |  381 ++--
 svx/source/fmcomp/gridctrl.cxx                                             |  339 ++--
 svx/source/form/databaselocationinput.cxx                                  |    4 
 svx/source/form/datanavi.cxx                                               |  370 +++-
 svx/source/form/filtnav.cxx                                                |   20 
 svx/source/form/fmPropBrw.cxx                                              |   13 
 svx/source/form/fmexpl.cxx                                                 |   14 
 svx/source/form/fmobj.cxx                                                  |    4 
 svx/source/form/fmshell.cxx                                                |    7 
 svx/source/form/fmtextcontrolshell.cxx                                     |    8 
 svx/source/form/navigatortree.cxx                                          |    6 
 svx/source/form/tabwin.cxx                                                 |   22 
 svx/source/form/tbxform.cxx                                                |   27 
 svx/source/form/xfm_addcondition.cxx                                       |    6 
 svx/source/gallery2/GalleryControl.cxx                                     |   31 
 svx/source/gallery2/galbrws1.cxx                                           |   34 
 svx/source/gallery2/galbrws1.hxx                                           |    7 
 svx/source/gallery2/galbrws2.cxx                                           |  140 -
 svx/source/gallery2/galctrl.cxx                                            |    8 
 svx/source/gallery2/galobj.cxx                                             |    4 
 svx/source/gallery2/galtheme.cxx                                           |    6 
 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                                                |  143 -
 svx/source/inc/docrecovery.hxx                                             |   46 
 svx/source/inc/filtnav.hxx                                                 |    4 
 svx/source/inc/fmPropBrw.hxx                                               |    1 
 svx/source/inc/fmexch.hxx                                                  |    7 
 svx/source/inc/fmexpl.hxx                                                  |    4 
 svx/source/inc/fmobj.hxx                                                   |    2 
 svx/source/inc/fmvwimp.hxx                                                 |    3 
 svx/source/inc/frmselimpl.hxx                                              |    2 
 svx/source/inc/gridcell.hxx                                                |   22 
 svx/source/inc/svxrectctaccessiblecontext.hxx                              |    3 
 svx/source/inc/tabwin.hxx                                                  |    6 
 svx/source/inc/tbxform.hxx                                                 |   13 
 svx/source/inc/xfm_addcondition.hxx                                        |    2 
 svx/source/mnuctrls/clipboardctl.cxx                                       |    2 
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx                   |    6 
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx                          |   94 -
 svx/source/sidebar/EmptyPanel.cxx                                          |   17 
 svx/source/sidebar/EmptyPanel.hxx                                          |    3 
 svx/source/sidebar/PanelFactory.cxx                                        |   12 
 svx/source/sidebar/PanelLayout.cxx                                         |    7 
 svx/source/sidebar/area/AreaPropertyPanel.cxx                              |   41 
 svx/source/sidebar/area/AreaPropertyPanel.hxx                              |   37 
 svx/source/sidebar/area/AreaTransparencyGradientControl.cxx                |  274 +--
 svx/source/sidebar/area/AreaTransparencyGradientControl.hxx                |   29 
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx                        |   35 
 svx/source/sidebar/graphic/GraphicPropertyPanel.hxx                        |   34 
 svx/source/sidebar/insert/InsertPropertyPanel.cxx                          |   15 
 svx/source/sidebar/insert/InsertPropertyPanel.hxx                          |    5 
 svx/source/sidebar/line/LinePropertyPanel.cxx                              |   39 
 svx/source/sidebar/line/LinePropertyPanel.hxx                              |   46 
 svx/source/sidebar/line/LineWidthControl.cxx                               |  153 -
 svx/source/sidebar/line/LineWidthControl.hxx                               |   11 
 svx/source/sidebar/line/LineWidthValueSet.cxx                              |   11 
 svx/source/sidebar/line/LineWidthValueSet.hxx                              |    3 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx                    |   25 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx                    |   19 
 svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx                      |    4 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx                         |   45 
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx                         |   38 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx                        |   50 
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx                        |   48 
 svx/source/sidebar/possize/SidebarDialControl.cxx                          |    4 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx                    |  235 +-
 svx/source/sidebar/text/TextCharacterSpacingControl.hxx                    |   13 
 svx/source/sidebar/text/TextCharacterSpacingPopup.cxx                      |    2 
 svx/source/sidebar/text/TextCharacterSpacingPopup.hxx                      |    2 
 svx/source/sidebar/text/TextPropertyPanel.cxx                              |   36 
 svx/source/sidebar/text/TextPropertyPanel.hxx                              |   33 
 svx/source/sidebar/text/TextUnderlineControl.cxx                           |  178 +-
 svx/source/sidebar/text/TextUnderlineControl.hxx                           |    6 
 svx/source/sidebar/tools/Popup.cxx                                         |    8 
 svx/source/sidebar/tools/PopupContainer.cxx                                |    7 
 svx/source/sidebar/tools/PopupControl.cxx                                  |   10 
 svx/source/sidebar/tools/ValueSetWithTextControl.cxx                       |    6 
 svx/source/svdraw/sdrpaintwindow.cxx                                       |   38 
 svx/source/svdraw/svdedxv.cxx                                              |   30 
 svx/source/svdraw/svdfmtf.cxx                                              |   54 
 svx/source/svdraw/svdfmtf.hxx                                              |   36 
 svx/source/svdraw/svdibrow.cxx                                             |   51 
 svx/source/svdraw/svdmrkv.cxx                                              |    2 
 svx/source/svdraw/svdmrkv1.cxx                                             |    2 
 svx/source/svdraw/svdograf.cxx                                             |   10 
 svx/source/svdraw/svdotext.cxx                                             |    8 
 svx/source/svdraw/svdpntv.cxx                                              |   26 
 svx/source/svdraw/svdtrans.cxx                                             |   16 
 svx/source/svdraw/svdview.cxx                                              |   18 
 svx/source/svdraw/svdxcgv.cxx                                              |   22 
 svx/source/tbxctrls/SvxColorChildWindow.cxx                                |    3 
 svx/source/tbxctrls/bulletsnumbering.cxx                                   |   23 
 svx/source/tbxctrls/colorwindow.hxx                                        |   15 
 svx/source/tbxctrls/colrctrl.cxx                                           |   71 
 svx/source/tbxctrls/extrusioncontrols.cxx                                  |   49 
 svx/source/tbxctrls/extrusioncontrols.hxx                                  |   16 
 svx/source/tbxctrls/fillctrl.cxx                                           |   22 
 svx/source/tbxctrls/fontworkgallery.cxx                                    |   48 
 svx/source/tbxctrls/grafctrl.cxx                                           |   73 
 svx/source/tbxctrls/itemwin.cxx                                            |   24 
 svx/source/tbxctrls/layctrl.cxx                                            |   44 
 svx/source/tbxctrls/lboxctrl.cxx                                           |   35 
 svx/source/tbxctrls/linectrl.cxx                                           |   85 -
 svx/source/tbxctrls/subtoolboxcontrol.cxx                                  |    2 
 svx/source/tbxctrls/tbcontrl.cxx                                           |  223 +-
 svx/source/tbxctrls/tbunocontroller.cxx                                    |    8 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx                             |   16 
 svx/source/tbxctrls/tbxalign.cxx                                           |    2 
 svx/source/toolbars/extrusionbar.cxx                                       |    6 
 svx/source/toolbars/fontworkbar.cxx                                        |   10 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx      |   41 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx      |   41 
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx |    5 
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx |    3 
 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx     |   15 
 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx     |   13 
 svx/source/unodraw/UnoGraphicExporter.cxx                                  |   52 
 svx/source/unodraw/recoveryui.cxx                                          |    6 
 svx/source/unodraw/unoshape.cxx                                            |    6 
 svx/source/unodraw/unoshtxt.cxx                                            |    2 
 svx/source/xoutdev/_xoutbmp.cxx                                            |   38 
 svx/source/xoutdev/xattrbmp.cxx                                            |   24 
 svx/source/xoutdev/xtabdash.cxx                                            |   16 
 svx/source/xoutdev/xtabgrdt.cxx                                            |   10 
 svx/source/xoutdev/xtabhtch.cxx                                            |   16 
 svx/source/xoutdev/xtablend.cxx                                            |   16 
 svx/workben/msview/msview.cxx                                              |    2 
 svx/workben/pixelctl.cxx                                                   |   23 
 sw/inc/AnnotationWin.hxx                                                   |    3 
 sw/inc/PostItMgr.hxx                                                       |    5 
 sw/inc/SidebarWin.hxx                                                      |   13 
 sw/inc/colwd.hxx                                                           |    6 
 sw/inc/docsh.hxx                                                           |    2 
 sw/inc/hhcwrp.hxx                                                          |    2 
 sw/inc/hints.hxx                                                           |    5 
 sw/inc/postithelper.hxx                                                    |    6 
 sw/inc/printdata.hxx                                                       |    2 
 sw/inc/swmodule.hxx                                                        |    2 
 sw/inc/viewsh.hxx                                                          |   14 
 sw/qa/tiledrendering/tiledrendering.cxx                                    |  215 ++
 sw/source/core/access/accdoc.hxx                                           |    2 
 sw/source/core/access/accfrmobj.cxx                                        |    2 
 sw/source/core/access/accfrmobj.hxx                                        |    3 
 sw/source/core/attr/hints.cxx                                              |    2 
 sw/source/core/doc/DocumentDeviceManager.cxx                               |   37 
 sw/source/core/doc/DocumentRedlineManager.cxx                              |    4 
 sw/source/core/draw/dflyobj.cxx                                            |    2 
 sw/source/core/fields/postithelper.cxx                                     |    4 
 sw/source/core/frmedt/fecopy.cxx                                           |   20 
 sw/source/core/inc/DocumentDeviceManager.hxx                               |    6 
 sw/source/core/inc/drawfont.hxx                                            |    5 
 sw/source/core/inc/fntcache.hxx                                            |    5 
 sw/source/core/layout/paintfrm.cxx                                         |   26 
 sw/source/core/layout/virtoutp.cxx                                         |    5 
 sw/source/core/layout/virtoutp.hxx                                         |    6 
 sw/source/core/text/inftxt.hxx                                             |    4 
 sw/source/core/text/itratr.cxx                                             |    6 
 sw/source/core/text/itratr.hxx                                             |    2 
 sw/source/core/text/itrtxt.hxx                                             |    2 
 sw/source/core/text/txtpaint.hxx                                           |    4 
 sw/source/core/txtnode/fntcache.cxx                                        |   10 
 sw/source/core/view/printdata.cxx                                          |    8 
 sw/source/core/view/viewsh.cxx                                             |   24 
 sw/source/core/view/vnew.cxx                                               |    2 
 sw/source/core/view/vprint.cxx                                             |    2 
 sw/source/filter/ww8/wrtww8gr.cxx                                          |   12 
 sw/source/ui/chrdlg/break.cxx                                              |   21 
 sw/source/ui/chrdlg/chardlg.cxx                                            |   22 
 sw/source/ui/chrdlg/drpcps.cxx                                             |   41 
 sw/source/ui/chrdlg/numpara.cxx                                            |   29 
 sw/source/ui/chrdlg/swuiccoll.cxx                                          |   21 
 sw/source/ui/config/mailconfigpage.cxx                                     |  141 +
 sw/source/ui/config/optcomp.cxx                                            |   20 
 sw/source/ui/config/optload.cxx                                            |   62 
 sw/source/ui/config/optpage.cxx                                            |  230 ++
 sw/source/ui/dbui/addresslistdialog.cxx                                    |   30 
 sw/source/ui/dbui/addresslistdialog.hxx                                    |   19 
 sw/source/ui/dbui/createaddresslistdialog.cxx                              |   95 -
 sw/source/ui/dbui/createaddresslistdialog.hxx                              |   39 
 sw/source/ui/dbui/customizeaddresslistdialog.cxx                           |   33 
 sw/source/ui/dbui/customizeaddresslistdialog.hxx                           |   20 
 sw/source/ui/dbui/dbinsdlg.cxx                                             |   39 
 sw/source/ui/dbui/dbtablepreviewdialog.cxx                                 |    8 
 sw/source/ui/dbui/dbtablepreviewdialog.hxx                                 |    5 
 sw/source/ui/dbui/mailmergewizard.cxx                                      |   20 
 sw/source/ui/dbui/mmaddressblockpage.cxx                                   |  266 ++-
 sw/source/ui/dbui/mmaddressblockpage.hxx                                   |   99 -
 sw/source/ui/dbui/mmdocselectpage.cxx                                      |   17 
 sw/source/ui/dbui/mmdocselectpage.hxx                                      |   19 
 sw/source/ui/dbui/mmgreetingspage.cxx                                      |   29 
 sw/source/ui/dbui/mmgreetingspage.hxx                                      |   52 
 sw/source/ui/dbui/mmlayoutpage.cxx                                         |   18 
 sw/source/ui/dbui/mmlayoutpage.hxx                                         |   23 
 sw/source/ui/dbui/mmmergepage.cxx                                          |   19 
 sw/source/ui/dbui/mmmergepage.hxx                                          |   18 
 sw/source/ui/dbui/mmoutputpage.cxx                                         |  116 -
 sw/source/ui/dbui/mmoutputpage.hxx                                         |   88 -
 sw/source/ui/dbui/mmoutputtypepage.cxx                                     |   48 
 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                                  |   13 
 sw/source/ui/dbui/selectdbtabledialog.hxx                                  |    5 
 sw/source/ui/dialog/abstract.cxx                                           |   12 
 sw/source/ui/dialog/ascfldlg.cxx                                           |   21 
 sw/source/ui/dialog/docstdlg.cxx                                           |   23 
 sw/source/ui/dialog/swdlgfact.cxx                                          |  145 -
 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                                         |  134 +
 sw/source/ui/dialog/wordcountdialog.cxx                                    |   19 
 sw/source/ui/dochdl/selglos.cxx                                            |   11 
 sw/source/ui/envelp/envfmt.cxx                                             |   27 
 sw/source/ui/envelp/envfmt.hxx                                             |   27 
 sw/source/ui/envelp/envlop1.cxx                                            |   24 
 sw/source/ui/envelp/envprt.cxx                                             |   23 
 sw/source/ui/envelp/envprt.hxx                                             |   23 
 sw/source/ui/envelp/label1.cxx                                             |  130 +
 sw/source/ui/envelp/labfmt.cxx                                             |   51 
 sw/source/ui/envelp/labfmt.hxx                                             |   46 
 sw/source/ui/envelp/labprt.cxx                                             |   23 
 sw/source/ui/envelp/labprt.hxx                                             |   28 
 sw/source/ui/envelp/mailmrge.cxx                                           |   60 
 sw/source/ui/envelp/swuilabimp.hxx                                         |  131 -
 sw/source/ui/fldui/DropDownFieldDialog.cxx                                 |   14 
 sw/source/ui/fldui/changedb.cxx                                            |   12 
 sw/source/ui/fldui/flddb.cxx                                               |   24 
 sw/source/ui/fldui/flddb.hxx                                               |   27 
 sw/source/ui/fldui/flddinf.cxx                                             |   18 
 sw/source/ui/fldui/flddinf.hxx                                             |   15 
 sw/source/ui/fldui/flddok.cxx                                              |   27 
 sw/source/ui/fldui/flddok.hxx                                              |   31 
 sw/source/ui/fldui/fldedt.cxx                                              |   28 
 sw/source/ui/fldui/fldfunc.cxx                                             |   37 
 sw/source/ui/fldui/fldfunc.hxx                                             |   53 
 sw/source/ui/fldui/fldref.cxx                                              |   21 
 sw/source/ui/fldui/fldref.hxx                                              |   21 
 sw/source/ui/fldui/fldvar.cxx                                              |   28 
 sw/source/ui/fldui/fldvar.hxx                                              |   35 
 sw/source/ui/fldui/inpdlg.cxx                                              |   14 
 sw/source/ui/fldui/javaedit.cxx                                            |   16 
 sw/source/ui/fmtui/tmpdlg.cxx                                              |   12 
 sw/source/ui/frmdlg/column.cxx                                             |   45 
 sw/source/ui/frmdlg/cption.cxx                                             |   67 
 sw/source/ui/frmdlg/frmpage.cxx                                            |  117 +
 sw/source/ui/frmdlg/wrap.cxx                                               |   26 
 sw/source/ui/index/cnttab.cxx                                              |  304 ++-
 sw/source/ui/index/multmrk.cxx                                             |   13 
 sw/source/ui/index/swuiidxmrk.cxx                                          |   59 
 sw/source/ui/misc/bookmark.cxx                                             |    9 
 sw/source/ui/misc/docfnote.cxx                                             |   39 
 sw/source/ui/misc/glosbib.cxx                                              |   16 
 sw/source/ui/misc/glossary.cxx                                             |   61 
 sw/source/ui/misc/impfnote.hxx                                             |   39 
 sw/source/ui/misc/insfnote.cxx                                             |   17 
 sw/source/ui/misc/linenum.cxx                                              |   22 
 sw/source/ui/misc/num.cxx                                                  |   52 
 sw/source/ui/misc/outline.cxx                                              |   55 
 sw/source/ui/misc/pgfnote.cxx                                              |   20 
 sw/source/ui/misc/pggrid.cxx                                               |   35 
 sw/source/ui/misc/srtdlg.cxx                                               |   35 
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx                              |    6 
 sw/source/ui/misc/titlepage.cxx                                            |   18 
 sw/source/ui/table/colwd.cxx                                               |   12 
 sw/source/ui/table/convert.cxx                                             |   20 
 sw/source/ui/table/instable.cxx                                            |   17 
 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                                            |   90 -
 sw/source/ui/table/tautofmt.cxx                                            |  103 -
 sw/source/ui/utlui/swrenamexnameddlg.cxx                                   |   12 
 sw/source/uibase/app/appopt.cxx                                            |    4 
 sw/source/uibase/app/docsh2.cxx                                            |   16 
 sw/source/uibase/app/docst.cxx                                             |    3 
 sw/source/uibase/dbui/dbmgr.cxx                                            |   16 
 sw/source/uibase/dbui/dbtree.cxx                                           |    8 
 sw/source/uibase/dbui/dbui.cxx                                             |   36 
 sw/source/uibase/dbui/mailmergechildwindow.cxx                             |   15 
 sw/source/uibase/dbui/mailmergehelper.cxx                                  |   49 
 sw/source/uibase/dochdl/swdtflvr.cxx                                       |    6 
 sw/source/uibase/docvw/AnnotationMenuButton.cxx                            |    6 
 sw/source/uibase/docvw/AnnotationMenuButton.hxx                            |    1 
 sw/source/uibase/docvw/AnnotationWin.cxx                                   |   10 
 sw/source/uibase/docvw/FrameControlsManager.cxx                            |    5 
 sw/source/uibase/docvw/HeaderFooterWin.cxx                                 |   10 
 sw/source/uibase/docvw/PageBreakWin.cxx                                    |   17 
 sw/source/uibase/docvw/PostItMgr.cxx                                       |   14 
 sw/source/uibase/docvw/SidebarTxtControl.cxx                               |    6 
 sw/source/uibase/docvw/SidebarTxtControl.hxx                               |    1 
 sw/source/uibase/docvw/SidebarWin.cxx                                      |   35 
 sw/source/uibase/docvw/edtwin.cxx                                          |   24 
 sw/source/uibase/docvw/frmsidebarwincontainer.cxx                          |    2 
 sw/source/uibase/docvw/srcedtw.cxx                                         |   21 
 sw/source/uibase/envelp/syncbtn.cxx                                        |   15 
 sw/source/uibase/frmdlg/colex.cxx                                          |    6 
 sw/source/uibase/inc/DropDownFieldDialog.hxx                               |   10 
 sw/source/uibase/inc/FrameControl.hxx                                      |    2 
 sw/source/uibase/inc/FrameControlsManager.hxx                              |    5 
 sw/source/uibase/inc/HeaderFooterWin.hxx                                   |    5 
 sw/source/uibase/inc/PageBreakWin.hxx                                      |    3 
 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                                          |   11 
 sw/source/uibase/inc/chrdlg.hxx                                            |   27 
 sw/source/uibase/inc/colex.hxx                                             |    1 
 sw/source/uibase/inc/column.hxx                                            |   63 
 sw/source/uibase/inc/conttree.hxx                                          |    8 
 sw/source/uibase/inc/convert.hxx                                           |   29 
 sw/source/uibase/inc/cption.hxx                                            |   31 
 sw/source/uibase/inc/dbinsdlg.hxx                                          |   51 
 sw/source/uibase/inc/dbtree.hxx                                            |    1 
 sw/source/uibase/inc/dbui.hxx                                              |   18 
 sw/source/uibase/inc/docstdlg.hxx                                          |   25 
 sw/source/uibase/inc/drawbase.hxx                                          |    2 
 sw/source/uibase/inc/drpcps.hxx                                            |   36 
 sw/source/uibase/inc/edtwin.hxx                                            |    2 
 sw/source/uibase/inc/envlop.hxx                                            |   27 
 sw/source/uibase/inc/fldedt.hxx                                            |    9 
 sw/source/uibase/inc/fldmgr.hxx                                            |    3 
 sw/source/uibase/inc/formedt.hxx                                           |   35 
 sw/source/uibase/inc/frmpage.hxx                                           |  183 +-
 sw/source/uibase/inc/glosbib.hxx                                           |   13 
 sw/source/uibase/inc/glossary.hxx                                          |   25 
 sw/source/uibase/inc/inpdlg.hxx                                            |   10 
 sw/source/uibase/inc/inputwin.hxx                                          |    9 
 sw/source/uibase/inc/insfnote.hxx                                          |   21 
 sw/source/uibase/inc/instable.hxx                                          |   23 
 sw/source/uibase/inc/javaedit.hxx                                          |   21 
 sw/source/uibase/inc/label.hxx                                             |    3 
 sw/source/uibase/inc/linenum.hxx                                           |   31 
 sw/source/uibase/inc/mailconfigpage.hxx                                    |   25 
 sw/source/uibase/inc/mailmergechildwindow.hxx                              |    4 
 sw/source/uibase/inc/mailmergehelper.hxx                                   |    6 
 sw/source/uibase/inc/mailmergewizard.hxx                                   |    2 
 sw/source/uibase/inc/mailmrge.hxx                                          |   90 -
 sw/source/uibase/inc/mergetbl.hxx                                          |    4 
 sw/source/uibase/inc/multmrk.hxx                                           |    5 
 sw/source/uibase/inc/navipi.hxx                                            |   17 
 sw/source/uibase/inc/num.hxx                                               |   53 
 sw/source/uibase/inc/numberingtypelistbox.hxx                              |    1 
 sw/source/uibase/inc/numfmtlb.hxx                                          |    1 
 sw/source/uibase/inc/numpara.hxx                                           |   37 
 sw/source/uibase/inc/optcomp.hxx                                           |   11 
 sw/source/uibase/inc/optload.hxx                                           |   79 
 sw/source/uibase/inc/optpage.hxx                                           |  310 +--
 sw/source/uibase/inc/outline.hxx                                           |   36 
 sw/source/uibase/inc/pgfnote.hxx                                           |   29 
 sw/source/uibase/inc/pggrid.hxx                                            |   51 
 sw/source/uibase/inc/prcntfld.hxx                                          |    2 
 sw/source/uibase/inc/pview.hxx                                             |   14 
 sw/source/uibase/inc/redlndlg.hxx                                          |   12 
 sw/source/uibase/inc/regionsw.hxx                                          |  136 -
 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                                           |    7 
 sw/source/uibase/inc/srcview.hxx                                           |    6 
 sw/source/uibase/inc/srtdlg.hxx                                            |   51 
 sw/source/uibase/inc/swmessdialog.hxx                                      |   12 
 sw/source/uibase/inc/swmodalredlineacceptdlg.hxx                           |    1 
 sw/source/uibase/inc/swrenamexnameddlg.hxx                                 |    6 
 sw/source/uibase/inc/swruler.hxx                                           |    5 
 sw/source/uibase/inc/swuiccoll.hxx                                         |   23 
 sw/source/uibase/inc/swuicnttab.hxx                                        |  228 +-
 sw/source/uibase/inc/swuiidxmrk.hxx                                        |   90 -
 sw/source/uibase/inc/syncbtn.hxx                                           |    4 
 sw/source/uibase/inc/tautofmt.hxx                                          |   27 
 sw/source/uibase/inc/tblctrl.hxx                                           |    2 
 sw/source/uibase/inc/tbxanchr.hxx                                          |    2 
 sw/source/uibase/inc/titlepage.hxx                                         |   25 
 sw/source/uibase/inc/unotools.hxx                                          |    2 
 sw/source/uibase/inc/view.hxx                                              |   28 
 sw/source/uibase/inc/wordcountdialog.hxx                                   |   27 
 sw/source/uibase/inc/workctrl.hxx                                          |   19 
 sw/source/uibase/inc/wrap.hxx                                              |   33 
 sw/source/uibase/lingu/olmenu.cxx                                          |    6 
 sw/source/uibase/misc/glshell.cxx                                          |    2 
 sw/source/uibase/misc/numberingtypelistbox.cxx                             |    6 
 sw/source/uibase/misc/redlndlg.cxx                                         |   31 
 sw/source/uibase/misc/swruler.cxx                                          |   45 
 sw/source/uibase/ribbar/inputwin.cxx                                       |   81 
 sw/source/uibase/ribbar/tblctrl.cxx                                        |    2 
 sw/source/uibase/ribbar/tbxanchr.cxx                                       |    2 
 sw/source/uibase/ribbar/workctrl.cxx                                       |   39 
 sw/source/uibase/shells/grfsh.cxx                                          |    8 
 sw/source/uibase/shells/tabsh.cxx                                          |    4 
 sw/source/uibase/shells/textsh1.cxx                                        |   20 
 sw/source/uibase/shells/txtattr.cxx                                        |    1 
 sw/source/uibase/shells/txtcrsr.cxx                                        |    1 
 sw/source/uibase/sidebar/PageColumnControl.cxx                             |   15 
 sw/source/uibase/sidebar/PageColumnControl.hxx                             |    5 
 sw/source/uibase/sidebar/PageMarginControl.cxx                             |  149 +
 sw/source/uibase/sidebar/PageMarginControl.hxx                             |   29 
 sw/source/uibase/sidebar/PageOrientationControl.cxx                        |    8 
 sw/source/uibase/sidebar/PageOrientationControl.hxx                        |    3 
 sw/source/uibase/sidebar/PagePropertyPanel.cxx                             |   61 
 sw/source/uibase/sidebar/PagePropertyPanel.hxx                             |   21 
 sw/source/uibase/sidebar/PageSizeControl.cxx                               |   46 
 sw/source/uibase/sidebar/PageSizeControl.hxx                               |    7 
 sw/source/uibase/sidebar/StylePresetsPanel.cxx                             |   12 
 sw/source/uibase/sidebar/StylePresetsPanel.hxx                             |    5 
 sw/source/uibase/sidebar/SwPanelFactory.cxx                                |   12 
 sw/source/uibase/sidebar/ThemePanel.cxx                                    |   14 
 sw/source/uibase/sidebar/ThemePanel.hxx                                    |    9 
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx                             |   30 
 sw/source/uibase/sidebar/WrapPropertyPanel.hxx                             |   22 
 sw/source/uibase/table/tablepg.hxx                                         |   93 -
 sw/source/uibase/uiview/pview.cxx                                          |   49 
 sw/source/uibase/uiview/srcview.cxx                                        |   66 
 sw/source/uibase/uiview/view.cxx                                           |   22 
 sw/source/uibase/uiview/view2.cxx                                          |   46 
 sw/source/uibase/uiview/viewdraw.cxx                                       |    6 
 sw/source/uibase/uiview/viewfunc.hxx                                       |    2 
 sw/source/uibase/uiview/viewling.cxx                                       |   41 
 sw/source/uibase/uiview/viewmdi.cxx                                        |   16 
 sw/source/uibase/uiview/viewprt.cxx                                        |   23 
 sw/source/uibase/uno/SwXDocumentSettings.cxx                               |   13 
 sw/source/uibase/uno/SwXDocumentSettings.hxx                               |    2 
 sw/source/uibase/uno/unotxdoc.cxx                                          |   16 
 sw/source/uibase/utlui/content.cxx                                         |   31 
 sw/source/uibase/utlui/glbltree.cxx                                        |   22 
 sw/source/uibase/utlui/gloslst.cxx                                         |   33 
 sw/source/uibase/utlui/navipi.cxx                                          |  348 ++--
 sw/source/uibase/utlui/numfmtlb.cxx                                        |    6 
 sw/source/uibase/utlui/unotools.cxx                                        |   16 
 toolkit/source/awt/animatedimagespeer.cxx                                  |   39 
 toolkit/source/awt/scrollabledialog.cxx                                    |   47 
 toolkit/source/awt/vclxaccessiblecomponent.cxx                             |   21 
 toolkit/source/awt/vclxdevice.cxx                                          |   25 
 toolkit/source/awt/vclxprinter.cxx                                         |    2 
 toolkit/source/awt/vclxspinbutton.cxx                                      |    2 
 toolkit/source/awt/vclxtabpagecontainer.cxx                                |   31 
 toolkit/source/awt/vclxtoolkit.cxx                                         |  130 -
 toolkit/source/awt/vclxwindow.cxx                                          |    9 
 toolkit/source/awt/vclxwindows.cxx                                         |  515 ++----
 toolkit/source/controls/accessiblecontrolcontext.cxx                       |   11 
 toolkit/source/helper/unowrapper.cxx                                       |   28 
 toolkit/source/helper/vclunohelper.cxx                                     |   12 
 tools/source/ref/errinf.cxx                                                |   29 
 uui/source/authfallbackdlg.cxx                                             |   15 
 uui/source/authfallbackdlg.hxx                                             |   12 
 uui/source/fltdlg.cxx                                                      |   16 
 uui/source/fltdlg.hxx                                                      |    6 
 uui/source/iahndl-authentication.cxx                                       |   22 
 uui/source/iahndl-errorhandler.cxx                                         |   12 
 uui/source/iahndl-filter.cxx                                               |    3 
 uui/source/iahndl-locking.cxx                                              |   18 
 uui/source/iahndl-ssl.cxx                                                  |    6 
 uui/source/iahndl.cxx                                                      |   22 
 uui/source/logindlg.cxx                                                    |   25 
 uui/source/logindlg.hxx                                                    |   32 
 uui/source/masterpasscrtdlg.cxx                                            |   17 
 uui/source/masterpasscrtdlg.hxx                                            |    8 
 uui/source/masterpassworddlg.cxx                                           |   16 
 uui/source/masterpassworddlg.hxx                                           |    6 
 uui/source/nameclashdlg.cxx                                                |   19 
 uui/source/nameclashdlg.hxx                                                |   12 
 uui/source/passworddlg.cxx                                                 |   23 
 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/CppunitTest_vcl_lifecycle.mk                                           |   52 
 vcl/Module_vcl.mk                                                          |    1 
 vcl/README.lifecycle                                                       |  261 +++
 vcl/generic/print/genprnpsp.cxx                                            |   22 
 vcl/generic/print/prtsetup.cxx                                             |   50 
 vcl/generic/print/prtsetup.hxx                                             |   43 
 vcl/inc/brdwin.hxx                                                         |   19 
 vcl/inc/controldata.hxx                                                    |    2 
 vcl/inc/dndevdis.hxx                                                       |    4 
 vcl/inc/helpwin.hxx                                                        |    7 
 vcl/inc/ilstbox.hxx                                                        |  115 -
 vcl/inc/outdev.h                                                           |    3 
 vcl/inc/printdlg.hxx                                                       |  118 -
 vcl/inc/salframe.hxx                                                       |    9 
 vcl/inc/svdata.hxx                                                         |   67 
 vcl/inc/toolbox.h                                                          |    2 
 vcl/inc/unx/i18n_status.hxx                                                |    3 
 vcl/inc/window.h                                                           |   65 
 vcl/osx/a11ylistener.cxx                                                   |    2 
 vcl/osx/salprn.cxx                                                         |    2 
 vcl/qa/cppunit/complextext.cxx                                             |    6 
 vcl/qa/cppunit/lifecycle.cxx                                               |  150 +
 vcl/qa/cppunit/outdev.cxx                                                  |   30 
 vcl/quartz/cairo_quartz_cairo.cxx                                          |    6 
 vcl/quartz/cairo_quartz_cairo.hxx                                          |    2 
 vcl/source/app/dbggui.cxx                                                  |  163 +
 vcl/source/app/help.cxx                                                    |   20 
 vcl/source/app/salvtables.cxx                                              |    9 
 vcl/source/app/stdtext.cxx                                                 |    4 
 vcl/source/app/svapp.cxx                                                   |   39 
 vcl/source/app/svdata.cxx                                                  |   18 
 vcl/source/app/svmain.cxx                                                  |    6 
 vcl/source/app/vclevent.cxx                                                |    9 
 vcl/source/control/button.cxx                                              |   64 
 vcl/source/control/combobox.cxx                                            |   84 -
 vcl/source/control/ctrl.cxx                                                |   18 
 vcl/source/control/edit.cxx                                                |   26 
 vcl/source/control/field.cxx                                               |   24 
 vcl/source/control/field2.cxx                                              |   24 
 vcl/source/control/fixed.cxx                                               |   15 
 vcl/source/control/fixedhyper.cxx                                          |    4 
 vcl/source/control/ilstbox.cxx                                             |  113 -
 vcl/source/control/longcurr.cxx                                            |    8 
 vcl/source/control/lstbox.cxx                                              |   96 -
 vcl/source/control/menubtn.cxx                                             |    6 
 vcl/source/control/morebtn.cxx                                             |    8 
 vcl/source/control/prgsbar.cxx                                             |    4 
 vcl/source/control/scrbar.cxx                                              |    8 
 vcl/source/control/spinbtn.cxx                                             |    4 
 vcl/source/control/spinfld.cxx                                             |   15 
 vcl/source/control/tabctrl.cxx                                             |   38 
 vcl/source/control/throbber.cxx                                            |    6 
 vcl/source/edit/texteng.cxx                                                |    2 
 vcl/source/edit/textview.cxx                                               |    9 
 vcl/source/edit/vclmedit.cxx                                               |   64 
 vcl/source/filter/graphicfilter.cxx                                        |   16 
 vcl/source/filter/sgfbram.cxx                                              |   14 
 vcl/source/filter/sgvmain.cxx                                              |    4 
 vcl/source/filter/sgvtext.cxx                                              |   16 
 vcl/source/filter/wmf/emfwr.cxx                                            |  114 -
 vcl/source/filter/wmf/emfwr.hxx                                            |    5 
 vcl/source/filter/wmf/winmtf.cxx                                           |   43 
 vcl/source/filter/wmf/wmfwr.cxx                                            |    2 
 vcl/source/filter/wmf/wmfwr.hxx                                            |    2 
 vcl/source/gdi/animate.cxx                                                 |    6 
 vcl/source/gdi/bitmapex.cxx                                                |   14 
 vcl/source/gdi/cvtsvm.cxx                                                  |   26 
 vcl/source/gdi/gdimetafiletools.cxx                                        |   20 
 vcl/source/gdi/gdimtf.cxx                                                  |  180 +-
 vcl/source/gdi/impanmvw.cxx                                                |   22 
 vcl/source/gdi/impanmvw.hxx                                                |    6 
 vcl/source/gdi/impgraph.cxx                                                |   16 
 vcl/source/gdi/impvect.cxx                                                 |    4 
 vcl/source/gdi/oldprintadaptor.cxx                                         |    6 
 vcl/source/gdi/pdfwriter_impl.cxx                                          |   16 
 vcl/source/gdi/pdfwriter_impl.hxx                                          |    2 
 vcl/source/gdi/pdfwriter_impl2.cxx                                         |    6 
 vcl/source/gdi/print.cxx                                                   |   19 
 vcl/source/gdi/print2.cxx                                                  |   94 -
 vcl/source/gdi/print3.cxx                                                  |   37 
 vcl/source/gdi/virdev.cxx                                                  |   13 
 vcl/source/helper/lazydelete.cxx                                           |   13 
 vcl/source/opengl/OpenGLContext.cxx                                        |   13 
 vcl/source/outdev/bitmap.cxx                                               |   10 
 vcl/source/outdev/font.cxx                                                 |    5 
 vcl/source/outdev/map.cxx                                                  |    6 
 vcl/source/outdev/outdev.cxx                                               |   31 
 vcl/source/outdev/outdevstate.cxx                                          |    1 
 vcl/source/outdev/text.cxx                                                 |   58 
 vcl/source/outdev/transparent.cxx                                          |   16 
 vcl/source/outdev/wallpaper.cxx                                            |   10 
 vcl/source/uipreviewer/previewer.cxx                                       |    5 
 vcl/source/window/accel.cxx                                                |    1 
 vcl/source/window/accessibility.cxx                                        |    7 
 vcl/source/window/brdwin.cxx                                               |   18 
 vcl/source/window/btndlg.cxx                                               |   40 
 vcl/source/window/builder.cxx                                              |   78 
 vcl/source/window/clipping.cxx                                             |   10 
 vcl/source/window/cursor.cxx                                               |    4 
 vcl/source/window/decoview.cxx                                             |    2 
 vcl/source/window/dialog.cxx                                               |   51 
 vcl/source/window/dlgctrl.cxx                                              |   20 
 vcl/source/window/dndevdis.cxx                                             |    6 
 vcl/source/window/dockingarea.cxx                                          |    6 
 vcl/source/window/dockmgr.cxx                                              |   43 
 vcl/source/window/dockwin.cxx                                              |   43 
 vcl/source/window/event.cxx                                                |   28 
 vcl/source/window/floatwin.cxx                                             |   40 
 vcl/source/window/introwin.cxx                                             |   11 
 vcl/source/window/layout.cxx                                               |  136 +
 vcl/source/window/menu.cxx                                                 |   29 
 vcl/source/window/menubarwindow.cxx                                        |  135 -
 vcl/source/window/menubarwindow.hxx                                        |   28 
 vcl/source/window/menufloatingwindow.cxx                                   |   11 
 vcl/source/window/menufloatingwindow.hxx                                   |    3 
 vcl/source/window/mouse.cxx                                                |   28 
 vcl/source/window/msgbox.cxx                                               |   29 
 vcl/source/window/openglwin.cxx                                            |   14 
 vcl/source/window/paint.cxx                                                |    6 
 vcl/source/window/popupmenuwindow.cxx                                      |    6 
 vcl/source/window/printdlg.cxx                                             |  137 +
 vcl/source/window/scrwnd.cxx                                               |    8 
 vcl/source/window/scrwnd.hxx                                               |    3 
 vcl/source/window/settings.cxx                                             |    8 
 vcl/source/window/split.cxx                                                |   15 
 vcl/source/window/splitwin.cxx                                             |   15 
 vcl/source/window/stacking.cxx                                             |   45 
 vcl/source/window/status.cxx                                               |   12 
 vcl/source/window/syschild.cxx                                             |    8 
 vcl/source/window/syswin.cxx                                               |   35 
 vcl/source/window/tabdlg.cxx                                               |   11 
 vcl/source/window/tabpage.cxx                                              |   11 
 vcl/source/window/taskpanelist.cxx                                         |   19 
 vcl/source/window/toolbox.cxx                                              |   34 
 vcl/source/window/toolbox2.cxx                                             |   18 
 vcl/source/window/window.cxx                                               |  178 +-
 vcl/source/window/window2.cxx                                              |  116 -
 vcl/source/window/winproc.cxx                                              |   17 
 vcl/source/window/wrkwin.cxx                                               |    8 
 vcl/unx/generic/app/i18n_status.cxx                                        |   81 
 vcl/unx/generic/gdi/cairo_xlib_cairo.cxx                                   |    6 
 vcl/unx/generic/gdi/cairo_xlib_cairo.hxx                                   |    2 
 vcl/unx/generic/printer/cupsmgr.cxx                                        |   30 
 vcl/unx/gtk/a11y/atkutil.cxx                                               |    2 
 vcl/unx/gtk3/gdi/cairo_gtk3_cairo.cxx                                      |    4 
 vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx                                      |    2 
 vcl/unx/x11/x11sys.cxx                                                     |   12 
 vcl/win/source/gdi/cairo_win32_cairo.cxx                                   |    8 
 vcl/win/source/gdi/cairo_win32_cairo.hxx                                   |    2 
 vcl/workben/icontest.cxx                                                   |    9 
 vcl/workben/mtfdemo.cxx                                                    |    4 
 vcl/workben/outdevgrind.cxx                                                |    5 
 vcl/workben/svdem.cxx                                                      |    6 
 vcl/workben/svpclient.cxx                                                  |   77 
 vcl/workben/svptest.cxx                                                    |    7 
 vcl/workben/vcldemo.cxx                                                    |   97 -
 writerperfect/source/writer/WordPerfectImportFilter.cxx                    |   16 
 xmlsecurity/inc/xmlsecurity/certificatechooser.hxx                         |    7 
 xmlsecurity/inc/xmlsecurity/certificateviewer.hxx                          |   41 
 xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx                    |   37 
 xmlsecurity/inc/xmlsecurity/macrosecurity.hxx                              |   42 
 xmlsecurity/source/component/documentdigitalsignatures.cxx                 |   33 
 xmlsecurity/source/dialogs/certificatechooser.cxx                          |   16 
 xmlsecurity/source/dialogs/certificateviewer.cxx                           |   78 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx                     |   39 
 xmlsecurity/source/dialogs/macrosecurity.cxx                               |   65 
 2632 files changed, 41659 insertions(+), 24794 deletions(-)

New commits:
commit ce82146a6be87b239a0bde0b59fddf8865290b99
Merge: a31991c e8b97a5
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Apr 28 15:14:11 2015 +0100

    Merge remote-tracking branch 'origin/feature/vclptrmerge2'

commit e8b97a52c96df9c8e8055407b1e40ed7cb9cfc67
Merge: 2b0be6c 0cde74f
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Apr 28 11:41:31 2015 +0100

    Merge remote-tracking branch 'origin/feature/vclptr'
    
    Resolve several thousand lines of conflicts.
    
    Conflicts:
    	accessibility/source/extended/accessiblelistbox.cxx
    	accessibility/source/standard/vclxaccessiblecombobox.cxx
    	accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
    	accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
    	accessibility/source/standard/vclxaccessiblelistbox.cxx
    	accessibility/source/standard/vclxaccessibletextfield.cxx
    	basctl/source/basicide/basidesh.cxx
    	cui/source/inc/chardlg.hxx
    	cui/source/tabpages/tpbitmap.cxx
    	dbaccess/source/ui/dlg/UserAdmin.cxx
    	dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
    	extensions/source/propctrlr/propertyeditor.hxx
    	extensions/source/scanner/sanedlg.cxx
    	filter/source/pdf/impdialog.cxx
    	include/sfx2/mgetempl.hxx
    	include/sfx2/sidebar/SidebarToolBox.hxx
    	include/sfx2/viewsh.hxx
    	include/svtools/brwbox.hxx
    	include/svtools/filectrl.hxx
    	include/svtools/scrwin.hxx
    	include/svx/dlgctrl.hxx
    	include/svx/sidebar/Popup.hxx
    	include/svx/sidebar/PopupContainer.hxx
    	include/svx/sidebar/PopupControl.hxx
    	include/svx/sidebar/SidebarDialControl.hxx
    	include/svx/sidebar/ValueSetWithTextControl.hxx
    	sc/source/ui/condformat/condformatdlgentry.cxx
    	sc/source/ui/navipi/navipi.cxx
    	sc/source/ui/sidebar/CellBorderStyleControl.hxx
    	sd/source/ui/animations/CustomAnimationDialog.cxx
    	sd/source/ui/inc/DrawViewShell.hxx
    	sd/source/ui/inc/Ruler.hxx
    	sd/source/ui/inc/SlideSorter.hxx
    	sd/source/ui/inc/ViewTabBar.hxx
    	sd/source/ui/inc/Window.hxx
    	sd/source/ui/inc/morphdlg.hxx
    	sd/source/ui/inc/sdpreslt.hxx
    	sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
    	sd/source/ui/sidebar/LayoutMenu.hxx
    	sd/source/ui/sidebar/MasterPagesSelector.hxx
    	sd/source/ui/sidebar/NavigatorWrapper.hxx
    	sd/source/ui/sidebar/PanelBase.hxx
    	sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
    	sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
    	sd/source/ui/slideshow/showwindow.hxx
    	sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
    	sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
    	sd/source/ui/view/ViewShellBase.cxx
    	sd/source/ui/view/drviewsa.cxx
    	sfx2/source/appl/fileobj.hxx
    	sfx2/source/appl/opengrf.cxx
    	sfx2/source/control/thumbnailviewacc.hxx
    	sfx2/source/dialog/securitypage.cxx
    	sfx2/source/dialog/templdlg.cxx
    	sfx2/source/doc/docinsert.cxx
    	sfx2/source/doc/guisaveas.cxx
    	sfx2/source/inc/alienwarn.hxx
    	sfx2/source/sidebar/Deck.cxx
    	sfx2/source/sidebar/Deck.hxx
    	sfx2/source/sidebar/DeckTitleBar.cxx
    	sfx2/source/sidebar/DeckTitleBar.hxx
    	sfx2/source/sidebar/MenuButton.cxx
    	sfx2/source/sidebar/MenuButton.hxx
    	sfx2/source/sidebar/Panel.cxx
    	sfx2/source/sidebar/Panel.hxx
    	sfx2/source/sidebar/PanelTitleBar.hxx
    	sfx2/source/sidebar/SidebarDockingWindow.hxx
    	sfx2/source/sidebar/SidebarToolBox.cxx
    	sfx2/source/sidebar/TabBar.hxx
    	sfx2/source/sidebar/TabItem.cxx
    	sfx2/source/sidebar/TabItem.hxx
    	sfx2/source/sidebar/TitleBar.hxx
    	sfx2/source/toolbox/imgmgr.cxx
    	starmath/inc/edit.hxx
    	starmath/inc/smmod.hxx
    	starmath/qa/cppunit/test_starmath.cxx
    	starmath/source/edit.cxx
    	starmath/source/smmod.cxx
    	svtools/source/brwbox/brwbox1.cxx
    	svtools/source/brwbox/datwin.hxx
    	svtools/source/contnr/fileview.cxx
    	svtools/source/contnr/simptabl.cxx
    	svtools/source/control/filectrl.cxx
    	svtools/source/control/valueimp.hxx
    	svx/inc/GalleryControl.hxx
    	svx/source/dialog/dlgctrl.cxx
    	svx/source/dialog/swframeexample.cxx
    	svx/source/fmcomp/fmgridif.cxx
    	svx/source/gallery2/GalleryControl.cxx
    	svx/source/sidebar/EmptyPanel.hxx
    	svx/source/sidebar/area/AreaPropertyPanel.hxx
    	svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
    	svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
    	svx/source/sidebar/insert/InsertPropertyPanel.cxx
    	svx/source/sidebar/insert/InsertPropertyPanel.hxx
    	svx/source/sidebar/line/LinePropertyPanel.hxx
    	svx/source/sidebar/line/LineWidthControl.cxx
    	svx/source/sidebar/line/LineWidthControl.hxx
    	svx/source/sidebar/line/LineWidthValueSet.hxx
    	svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
    	svx/source/sidebar/possize/SidebarDialControl.cxx
    	svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
    	svx/source/sidebar/text/TextPropertyPanel.hxx
    	svx/source/sidebar/tools/PopupContainer.cxx
    	svx/source/sidebar/tools/PopupControl.cxx
    	svx/source/sidebar/tools/ValueSetWithTextControl.cxx
    	svx/source/svdraw/svdfmtf.hxx
    	svx/source/svdraw/svdibrow.cxx
    	svx/source/tbxctrls/colrctrl.cxx
    	svx/source/tbxctrls/tbcontrl.cxx
    	sw/source/ui/dbui/mmaddressblockpage.cxx
    	sw/source/ui/dialog/uiregionsw.cxx
    	sw/source/ui/index/cnttab.cxx
    	sw/source/uibase/inc/drpcps.hxx
    	sw/source/uibase/sidebar/PageColumnControl.hxx
    	sw/source/uibase/sidebar/PageMarginControl.hxx
    	sw/source/uibase/sidebar/PageOrientationControl.hxx
    	sw/source/uibase/sidebar/PagePropertyPanel.hxx
    	sw/source/uibase/sidebar/PageSizeControl.hxx
    	sw/source/uibase/uiview/view2.cxx
    	sw/source/uibase/utlui/navipi.cxx
    	vcl/inc/svdata.hxx
    	vcl/source/control/combobox.cxx
    	vcl/source/control/lstbox.cxx
    	vcl/source/window/dockwin.cxx
    	vcl/source/window/winproc.cxx
    
    Change-Id: I056cf3026ff17d65cca0b6e6588bda4a88fa8d95

diff --cc accessibility/source/standard/vclxaccessiblebox.cxx
index 95d8258,6db5a54..1e801a8
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@@ -543,11 -543,11 +543,11 @@@ void VCLXAccessibleBox::FillAccessibleS
          if ( sText.isEmpty() && nEntryCount > 0 )
              rStateSet.AddState(AccessibleStateType::INDETERMINATE);
      }
 -    else if (m_aBoxType == LISTBOX && m_bIsDropDownBox == true)
 +    else if (m_aBoxType == LISTBOX && m_bIsDropDownBox)
      {
          sal_Int32 nSelectedEntryCount = 0;
-         ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
-         if (pListBox != NULL && pListBox->GetEntryCount() > 0)
+         VclPtr< ListBox > pListBox = GetAs< ListBox >();
+         if (pListBox != nullptr && pListBox->GetEntryCount() > 0)
          {
              nSelectedEntryCount = pListBox->GetSelectEntryCount();
              if ( nSelectedEntryCount == 0)
diff --cc accessibility/source/standard/vclxaccessiblecombobox.cxx
index 25ed8f6,f24ef8a..de97daa
--- a/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@@ -43,18 -43,11 +43,11 @@@ VCLXAccessibleComboBox::~VCLXAccessible
  {
  }
  
- 
- 
- 
 -bool VCLXAccessibleComboBox::IsValid (void) const
 +bool VCLXAccessibleComboBox::IsValid() const
  {
-     return static_cast<ComboBox*>(GetWindow()) != NULL;
- 
+     return GetWindow().get() != NULL;
  }
  
- 
- 
- 
  void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
  {
      VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
diff --cc accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 9659e5e,64a3625..0e50ac8
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@@ -57,17 -57,11 +57,11 @@@ VCLXAccessibleDropDownComboBox::~VCLXAc
  {
  }
  
- 
- 
 -bool VCLXAccessibleDropDownComboBox::IsValid (void) const
 +bool VCLXAccessibleDropDownComboBox::IsValid() const
  {
-     return static_cast<ComboBox*>(GetWindow()) != NULL;
- 
+     return GetWindow().get() != NULL;
  }
  
- 
- 
- 
  void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
  {
      switch ( rVclWindowEvent.GetId() )
diff --cc accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 23e44f0,41b5787..2875852
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@@ -56,18 -56,11 +56,11 @@@ VCLXAccessibleDropDownListBox::~VCLXAcc
  {
  }
  
- 
- 
- 
 -bool VCLXAccessibleDropDownListBox::IsValid (void) const
 +bool VCLXAccessibleDropDownListBox::IsValid() const
  {
-     return static_cast<ListBox*>(GetWindow()) != NULL;
- 
+     return GetWindow().get() != NULL;
  }
  
- 
- 
- 
  void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
  {
      VCLXAccessibleBox::ProcessWindowEvent (rVclWindowEvent);
diff --cc accessibility/source/standard/vclxaccessiblelistbox.cxx
index 3fb9b1b,bd39b61..bc48680
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@@ -54,29 -54,19 +54,19 @@@ VCLXAccessibleListBox::~VCLXAccessibleL
  {
  }
  
- 
- 
- 
 -bool VCLXAccessibleListBox::IsValid (void) const
 +bool VCLXAccessibleListBox::IsValid() const
  {
-     return static_cast<ListBox*>(GetWindow()) != NULL;
- 
+     return GetWindow().get() != NULL;
  }
  
- 
- 
- 
  void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
  {
      VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
  }
  
- 
- 
- 
  //=====  XServiceInfo  ========================================================
  
 -OUString VCLXAccessibleListBox::getImplementationName (void)
 +OUString VCLXAccessibleListBox::getImplementationName()
      throw (RuntimeException, std::exception)
  {
      return OUString( "com.sun.star.comp.toolkit.AccessibleListBox" );
diff --cc accessibility/source/standard/vclxaccessibletextfield.cxx
index 82e27f8,17a7981..4446122
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@@ -53,14 -53,11 +53,11 @@@ VCLXAccessibleTextField::~VCLXAccessibl
  {
  }
  
- 
- 
- 
 -OUString VCLXAccessibleTextField::implGetText (void)
 +OUString VCLXAccessibleTextField::implGetText()
  {
      OUString aText;
-     ListBox* pListBox = static_cast<ListBox*>(GetWindow());
-     if (pListBox!=NULL && !pListBox->IsInDropDown())
+     VclPtr< ListBox > pListBox = GetAs< ListBox >();
+     if (pListBox && !pListBox->IsInDropDown())
          aText = pListBox->GetSelectEntry();
  
      return aText;
diff --cc basctl/source/basicide/baside2.hxx
index a5c3b91,82e2825..2d5afed
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@@ -383,13 -388,13 +388,13 @@@ public
  
      void            ShowCursor( bool bOn );
  
 -    virtual sal_uInt16  GetSearchOptions() SAL_OVERRIDE;
 +    virtual SearchOptionFlags GetSearchOptions() SAL_OVERRIDE;
      virtual sal_uInt16  StartSearchAndReplace (SvxSearchItem const&, bool bFromStart = false) SAL_OVERRIDE;
  
-     EditorWindow&       GetEditorWindow()       { return aXEditorWindow.GetEdtWindow(); }
-     BreakPointWindow&   GetBreakPointWindow()   { return aXEditorWindow.GetBrkWindow(); }
-     LineNumberWindow&   GetLineNumberWindow()   { return aXEditorWindow.GetLineNumberWindow(); }
-     ScrollBar&          GetEditVScrollBar()     { return aXEditorWindow.GetEWVScrollBar(); }
+     EditorWindow&       GetEditorWindow()       { return aXEditorWindow->GetEdtWindow(); }
+     BreakPointWindow&   GetBreakPointWindow()   { return aXEditorWindow->GetBrkWindow(); }
+     LineNumberWindow&   GetLineNumberWindow()   { return aXEditorWindow->GetLineNumberWindow(); }
+     ScrollBar&          GetEditVScrollBar()     { return aXEditorWindow->GetEWVScrollBar(); }
      ExtTextEngine*      GetEditEngine()         { return GetEditorWindow().GetEditEngine(); }
      ExtTextView*        GetEditView()           { return GetEditorWindow().GetEditView(); }
      BreakPointList&     GetBreakPoints()        { return GetBreakPointWindow().GetBreakPoints(); }
diff --cc basctl/source/basicide/basidesh.cxx
index dce1ea4,1a72774..214c5b6
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@@ -146,13 -146,20 +146,13 @@@ void basctl_Shell::InitInterface_Impl(
  unsigned Shell::nShellCount = 0;
  
  Shell::Shell( SfxViewFrame* pFrame_, SfxViewShell* /* pOldShell */ ) :
 -    SfxViewShell( pFrame_, ShellFlags ),
 +    SfxViewShell( pFrame_, SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::NO_NEWWINDOW ),
      m_aCurDocument( ScriptDocument::getApplicationScriptDocument() ),
-     aHScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_HSCROLL | WB_DRAG ) ),
-     aVScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_VSCROLL | WB_DRAG ) ),
-     aScrollBarBox( &GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE ) ),
+     aHScrollBar( VclPtr<ScrollBar>::Create(&GetViewFrame()->GetWindow(), WinBits( WB_HSCROLL | WB_DRAG )) ),
+     aVScrollBar( VclPtr<ScrollBar>::Create(&GetViewFrame()->GetWindow(), WinBits( WB_VSCROLL | WB_DRAG )) ),
+     aScrollBarBox( VclPtr<ScrollBarBox>::Create(&GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE )) ),
      pLayout(0),
-     aObjectCatalog(&GetViewFrame()->GetWindow()),
+     aObjectCatalog(VclPtr<ObjectCatalog>::Create(&GetViewFrame()->GetWindow())),
      m_bAppBasicModified( false ),
      m_aNotifier( *this )
  {
@@@ -615,8 -625,8 +618,8 @@@ void Shell::CheckWindows(
  
  void Shell::RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName, bool bDestroy )
  {
-     bool bChangeCurWindow = pCurWin == nullptr;
-     std::vector<BaseWindow*> aDeleteVec;
 -    bool bChangeCurWindow = pCurWin ? false : true;
++    bool bChangeCurWindow = pCurWin;
+     std::vector<VclPtr<BaseWindow> > aDeleteVec;
      for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
      {
          BaseWindow* pWin = it->second;
@@@ -640,10 -650,10 +643,10 @@@
  void Shell::UpdateWindows()
  {
      // remove all windows that may not be displayed
 -    bool bChangeCurWindow = pCurWin ? false : true;
 +    bool bChangeCurWindow = pCurWin == nullptr;
      if ( !m_aCurLibName.isEmpty() )
      {
-         std::vector<BaseWindow*> aDeleteVec;
+         std::vector<VclPtr<BaseWindow> > aDeleteVec;
          for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
          {
              BaseWindow* pWin = it->second;
diff --cc basctl/source/inc/dlged.hxx
index 81e9f61,18883da..af9ad3c
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@@ -103,11 -104,11 +104,11 @@@ public
  private:
      DECL_LINK(MarkTimeout, void *);
  
 -    void Print( Printer* pPrinter, const OUString& rTitle );
 +    static void Print( Printer* pPrinter, const OUString& rTitle );
  
  private:
-     ScrollBar*          pHScroll;
-     ScrollBar*          pVScroll;
+     VclPtr<ScrollBar>          pHScroll;
+     VclPtr<ScrollBar>          pVScroll;
      boost::scoped_ptr<DlgEdModel> pDlgEdModel; // never nullptr
      DlgEdPage*          pDlgEdPage;  // never nullptr
      boost::scoped_ptr<DlgEdView> pDlgEdView; // never nullptr
diff --cc basic/source/runtime/methods.cxx
index 2cc26f7,226c5ad..8b40e36
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@@ -4619,22 -4615,26 +4619,22 @@@ RTLFUNC(MsgBox
      switch( nType )
      {
      case 16:
-         pBox.reset(new ErrorBox( pParent, nWinBits, aMsg ));
+         pBox.reset(VclPtr<ErrorBox>::Create( pParent, nWinBits, aMsg ));
          break;
      case 32:
-         pBox.reset(new QueryBox( pParent, nWinBits, aMsg ));
+         pBox.reset(VclPtr<QueryBox>::Create( pParent, nWinBits, aMsg ));
          break;
      case 48:
-         pBox.reset(new WarningBox( pParent, nWinBits, aMsg ));
+         pBox.reset(VclPtr<WarningBox>::Create( pParent, nWinBits, aMsg ));
          break;
      case 64:
-         pBox.reset(new InfoBox( pParent, nWinBits, aMsg ));
+         pBox.reset(VclPtr<InfoBox>::Create( pParent, nWinBits, aMsg ));
          break;
      default:
-         pBox.reset(new MessBox( pParent, nWinBits, aTitle, aMsg ));
+         pBox.reset(VclPtr<MessBox>::Create( pParent, nWinBits, aTitle, aMsg ));
      }
      pBox->SetText( aTitle );
 -    sal_uInt16 nRet = (sal_uInt16)pBox->Execute();
 -    if( nRet == sal_True )
 -    {
 -        nRet = 1;
 -    }
 +    short nRet = pBox->Execute();
      sal_Int16 nMappedRet;
      if( nStyle == 2 )
      {
diff --cc cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 8237a12,51a8c32b..a943e36
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@@ -350,9 -350,9 +350,9 @@@ namespace cppcanva
  
  
                      // update buffered bitmap and transformation
 -                    BitmapSharedPtr aBmp( VCLFactory::getInstance().createBitmap(
 +                    BitmapSharedPtr aBmp( VCLFactory::createBitmap(
                                                mpCanvas,
-                                               aVDev.GetBitmapEx(
+                                               aVDev->GetBitmapEx(
                                                    aEmptyPoint,
                                                    aBitmapSizePixel ) ) );
                      mxBufferBitmap = aBmp->getUNOBitmap();
diff --cc cui/source/customize/macropg.cxx
index dec5a9f,cc1956a..fc5194a
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@@ -169,10 -181,10 +181,10 @@@ void MacroEventListBox::Resize(
      // calc pos and size of ListBox
      aPnt.Y() += aSize.Height();
      aSize.Height() = aCtrlSize.Height() - aSize.Height();
-     maListBox.SetPosSizePixel( aPnt, aSize );
+     maListBox->SetPosSizePixel( aPnt, aSize );
  }
  
 -void MacroEventListBox::ConnectElements( void )
 +void MacroEventListBox::ConnectElements()
  {
      Resize();
  
diff --cc cui/source/customize/macropg_impl.hxx
index dd79092,d99a971..f80697f
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@@ -50,8 -50,9 +50,9 @@@ private
  public:
      AssignComponentDialog( vcl::Window * pParent, const OUString& rURL );
      virtual ~AssignComponentDialog();
+     virtual void dispose() SAL_OVERRIDE;
  
 -    OUString getURL( void ) const
 +    OUString getURL() const
          { return maURL; }
  };
  
diff --cc cui/source/dialogs/hangulhanjadlg.cxx
index ade5858,29008b2..5fea052
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@@ -1769,11 -1845,26 +1845,26 @@@ namespace sv
  
      HangulHanjaEditDictDialog::~HangulHanjaEditDictDialog()
      {
-         if( m_pSuggestions )
-             delete m_pSuggestions;
+         disposeOnce();
+     }
+ 
+     void HangulHanjaEditDictDialog::dispose()
+     {
+         delete m_pSuggestions;
+         m_pSuggestions = NULL;
+         m_aBookLB.clear();
+         m_aOriginalLB.clear();
+         m_aEdit1.clear();
+         m_aEdit2.clear();
+         m_aEdit3.clear();
+         m_aEdit4.clear();
+         m_aScrollSB.clear();
+         m_aNewPB.clear();
+         m_aDeletePB.clear();
+         ModalDialog::dispose();
      }
  
 -    void HangulHanjaEditDictDialog::UpdateScrollbar( void )
 +    void HangulHanjaEditDictDialog::UpdateScrollbar()
      {
          sal_uInt16  nPos = sal_uInt16( m_aScrollSB->GetThumbPos() );
          m_nTopPos = nPos;
diff --cc cui/source/dialogs/insrc.cxx
index ef1eecf,f628d99..13f18c3
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@@ -38,16 -38,24 +38,24 @@@ SvxInsRowColDlg::SvxInsRowColDlg(vcl::W
      , aCol(CUI_RESSTR(RID_SVXSTR_COL))
      , bColumn(bCol)
  {
-     get(m_pCountEdit, "insert_number");
-     get(m_pBeforeBtn, "insert_before");
-     get(m_pAfterBtn,  "insert_after");
-     SetText( bColumn ? aCol : aRow );
-     SetHelpId( sHelpId );
+     m_pDialog->get(m_pCountEdit, "insert_number");
+     m_pDialog->get(m_pBeforeBtn, "insert_before");
+     m_pDialog->get(m_pAfterBtn,  "insert_after");
+     m_pDialog->SetText( bColumn ? aCol : aRow );
+     m_pDialog->SetHelpId( sHelpId );
+ }
+ 
+ SvxInsRowColDlg::~SvxInsRowColDlg()
+ {
+     m_pCountEdit.clear();
+     m_pBeforeBtn.clear();
+     m_pAfterBtn.clear();
+     m_pDialog.disposeAndClear();
  }
  
 -short SvxInsRowColDlg::Execute(void)
 +short SvxInsRowColDlg::Execute()
  {
-     return ModalDialog::Execute();
+     return m_pDialog->Execute();
  }
  
  /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc cui/source/dialogs/newtabledlg.cxx
index ae6a0e7,04b2fd3..a83e11a
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@@ -22,15 -22,22 +22,22 @@@
  #include "newtabledlg.hxx"
  
  SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent )
- : ModalDialog( pParent, "NewTableDialog", "cui/ui/newtabledialog.ui" )
+     : m_pDialog( VclPtr<ModalDialog>::Create( pParent, "NewTableDialog", "cui/ui/newtabledialog.ui" ) )
  {
-     get(mpNumRows, "rows");
-     get(mpNumColumns, "columns");
+     m_pDialog->get(mpNumRows, "rows");
+     m_pDialog->get(mpNumColumns, "columns");
+ }
+ 
+ SvxNewTableDialog::~SvxNewTableDialog()
+ {
+     mpNumColumns.clear();
+     mpNumRows.clear();
+     m_pDialog.disposeAndClear();
  }
  
 -short SvxNewTableDialog::Execute(void)
 +short SvxNewTableDialog::Execute()
  {
-     return ModalDialog::Execute();
+     return m_pDialog->Execute();
  }
  
  sal_Int32 SvxNewTableDialog::getRows() const
diff --cc cui/source/inc/chardlg.hxx
index 9a471ff,8b185cd..fad03f1
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@@ -228,12 -229,14 +229,14 @@@ private
      DECL_LINK(          ColorBoxSelectHdl_Impl, ColorListBox* );
  
  public:
-     using SfxTabPage::DeactivatePage;
+     virtual ~SvxCharEffectsPage();
+     virtual void dispose() SAL_OVERRIDE;
  
+     using SfxTabPage::DeactivatePage;
 -    virtual int         DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
  
  public:
-     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+     static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
      static const sal_uInt16* GetRanges() { return pEffectsRanges; }
  
      virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@@ -355,10 -362,9 +362,9 @@@ public
      using SfxTabPage::DeactivatePage;
  
      virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
 -    virtual int         DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
  
- public:
-     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+     static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
      static const sal_uInt16*  GetRanges() { return pTwoLinesRanges; }
  
      virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --cc cui/source/inc/hangulhanjadlg.hxx
index cb228da,6018b0f..2aa203c8
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@@ -312,8 -319,9 +319,9 @@@ namespace sv
      public:
                          HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict );
                          virtual ~HangulHanjaEditDictDialog();
+         virtual void    dispose() SAL_OVERRIDE;
  
 -        void            UpdateScrollbar( void );
 +        void            UpdateScrollbar();
      };
  
  
diff --cc cui/source/inc/headertablistbox.hxx
index d368d4d,5a4bfed..f63eba3
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@@ -45,10 -47,10 +47,10 @@@ public
  
      HeaderBar& GetHeaderBar()
      {
-         return maHeaderBar;
+         return *maHeaderBar.get();
      }
  
 -    void                        ConnectElements( void );/**< should be called after all manipulations on elements are done
 +    void                        ConnectElements();/**< should be called after all manipulations on elements are done
                                                               calcs real sizes depending on sizes of this */
      void                        Show( bool bVisible = true, sal_uInt16 nFlags = 0 );    ///< same meaning as Windows::Show()
      void                        Enable( bool bEnable = true, bool bChild = true );  ///< same meaning as Windows::Enable()
diff --cc cui/source/inc/insrc.hxx
index a6e215e,4985062..0e66966
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@@ -43,8 -44,9 +44,9 @@@ class SvxInsRowColDlg : public SvxAbstr
  
  public:
      SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId );
+     virtual ~SvxInsRowColDlg();
  
 -    virtual short Execute(void) SAL_OVERRIDE;
 +    virtual short Execute() SAL_OVERRIDE;
  
      virtual bool isInsertBefore() const SAL_OVERRIDE;
      virtual sal_uInt16 getInsertCount() const SAL_OVERRIDE;
diff --cc cui/source/inc/newtabledlg.hxx
index 109d62f,5df04b5..394d042
--- a/cui/source/inc/newtabledlg.hxx
+++ b/cui/source/inc/newtabledlg.hxx
@@@ -34,8 -35,9 +35,9 @@@ private
  
  public:
      SvxNewTableDialog( vcl::Window* pWindow );
+     virtual ~SvxNewTableDialog();
  
 -    virtual short Execute(void) SAL_OVERRIDE;
 +    virtual short Execute() SAL_OVERRIDE;
  
      virtual sal_Int32 getRows() const SAL_OVERRIDE;
      virtual sal_Int32 getColumns() const SAL_OVERRIDE;
diff --cc cui/source/inc/numpages.hxx
index 739249f,f996305..108f9e3
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@@ -448,9 -453,10 +453,10 @@@ public
          SvxNumPositionTabPage(vcl::Window* pParent,
                                 const SfxItemSet& rSet);
          virtual ~SvxNumPositionTabPage();
+     virtual void dispose() SAL_OVERRIDE;
  
      virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
 -    virtual int         DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
      virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
      virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
  
diff --cc cui/source/inc/page.hxx
index 90dadae,24e14ce..f68bf33
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@@ -185,10 -185,10 +185,10 @@@ private
  
  protected:
      virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
 -    virtual int         DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
  
  public:
-     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+     static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
      // returns the range of the Which values
      static const sal_uInt16* GetRanges() { return pRanges; }
  
diff --cc cui/source/inc/paragrph.hxx
index e0ca89f,7f7bf66..80b2536
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@@ -156,13 -157,15 +157,15 @@@ class SvxParaAlignTabPage : public SfxT
      void                    UpdateExample_Impl( bool bAll = false );
  
                              SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
-     virtual                 ~SvxParaAlignTabPage();
  
  protected:
 -    virtual int             DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 +    virtual sfxpg           DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
  
  public:
-     static SfxTabPage*      Create( vcl::Window* pParent, const SfxItemSet* rSet );
+     virtual ~SvxParaAlignTabPage();
+     virtual void dispose() SAL_OVERRIDE;
+ 
+     static VclPtr<SfxTabPage>      Create( vcl::Window* pParent, const SfxItemSet* rSet );
      static const sal_uInt16* GetRanges() { return pAlignRanges; }
  
      virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --cc cui/source/options/optinet2.hxx
index 2d137ba,ee9b46a..d1b4362
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@@ -171,10 -172,10 +172,10 @@@ private
  
  protected:
      virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
 -    virtual int         DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
  
  public:
-     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
+     static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
      virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
      virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
  };
diff --cc cui/source/tabpages/paragrph.cxx
index 527f4f7,e84a6e1..56b1345
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@@ -1018,9 -1041,30 +1041,30 @@@ SvxParaAlignTabPage::SvxParaAlignTabPag
  
  SvxParaAlignTabPage::~SvxParaAlignTabPage()
  {
+     disposeOnce();
+ }
+ 
+ void SvxParaAlignTabPage::dispose()
+ {
+     m_pLeft.clear();
+     m_pRight.clear();
+     m_pCenter.clear();
+     m_pJustify.clear();
+     m_pLeftBottom.clear();
+     m_pRightTop.clear();
+     m_pLastLineFT.clear();
+     m_pLastLineLB.clear();
+     m_pExpandCB.clear();
+     m_pSnapToGridCB.clear();
+     m_pExampleWin.clear();
+     m_pVertAlignFL.clear();
+     m_pVertAlignLB.clear();
+     m_pPropertiesFL.clear();
+     m_pTextDirectionLB.clear();
+     SfxTabPage::dispose();
  }
  
 -int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
 +SfxTabPage::sfxpg SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
  {
      if ( _pSet )
          FillItemSet( _pSet );
diff --cc cui/source/tabpages/tpbitmap.cxx
index 3ce5ff5,1848967..e75afb7
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@@ -969,7 -988,7 +988,7 @@@ void SvxBitmapTabPage::PointChanged( vc
  vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const
  {
      if (pLabeled == m_pLbBitmaps)
-         return m_pLbBitmapsHidden;
 -        return const_cast<FixedText*>(m_pLbBitmapsHidden.get());
++        return m_pLbBitmapsHidden.get();
      else
          return SvxTabPage::GetParentLabeledBy (pLabeled);
  }
diff --cc dbaccess/source/ui/app/AppDetailView.cxx
index aebcd5d,fb04e6d..5ef2b69
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@@ -639,10 -659,11 +659,10 @@@ void OApplicationDetailView::impl_creat
  
      // enable the pane as a whole, depending on the availability of the first command
      OSL_ENSURE( !rData.aTasks.empty(), "OApplicationDetailView::impl_createPage: no tasks at all!?" );
 -    bool bEnabled = rData.aTasks.empty()
 -                ?   false
 -                :   getBorderWin().getView()->getCommandController().isCommandEnabled( rData.aTasks[0].sUNOCommand );
 +    bool bEnabled = !rData.aTasks.empty()
 +                && getBorderWin().getView()->getCommandController().isCommandEnabled( rData.aTasks[0].sUNOCommand );
      getTasksWindow().Enable( bEnabled );
-     m_aContainer.setTitle( rData.nTitleId );
+     m_aContainer->setTitle( rData.nTitleId );
  
      // let our helper create the object list
      if ( _eType == E_TABLE )
diff --cc dbaccess/source/ui/browser/dbtreeview.cxx
index 9dba9af,f87ba85..bc0b441
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@@ -36,9 -36,9 +36,9 @@@ DBTreeView::DBTreeView( vcl::Window* pP
                      , m_pTreeListBox(NULL)
  {
  
-     m_pTreeListBox = new DBTreeListBox(this, WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
+     m_pTreeListBox = VclPtr<DBTreeListBox>::Create(this, WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
      m_pTreeListBox->EnableCheckButton(NULL);
 -    m_pTreeListBox->SetDragDropMode( 0 );
 +    m_pTreeListBox->SetDragDropMode( DragDropMode::NONE );
      m_pTreeListBox->EnableInplaceEditing( true );
      m_pTreeListBox->SetHelpId(HID_TLB_TREELISTBOX);
      m_pTreeListBox->Show();
diff --cc dbaccess/source/ui/control/RelationControl.cxx
index 0a7035d,09be082..f011e06
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@@ -170,16 -166,16 +167,16 @@@ namespace dbau
              InsertDataColumn( DEST_COLUMN, m_pConnData->getReferencedTable()->GetWinName(), 100);
              // If the Defs do not yet exits, we need to set them with SetSource-/-DestDef
  
-             m_pListCell.reset( new ListBoxControl( &GetDataWindow() ) );
+             m_pListCell.reset( VclPtr<ListBoxControl>::Create( &GetDataWindow() ) );
  
              // set browse mode
 -            SetMode(    BROWSER_COLUMNSELECTION |
 -                        BROWSER_HLINESFULL      |
 -                        BROWSER_VLINESFULL      |
 -                        BROWSER_HIDECURSOR      |
 -                        BROWSER_HIDESELECT      |
 -                        BROWSER_AUTO_HSCROLL    |
 -                        BROWSER_AUTO_VSCROLL);
 +            SetMode(    BrowserMode::COLUMNSELECTION |
 +                        BrowserMode::HLINES      |
 +                        BrowserMode::VLINES      |
 +                        BrowserMode::HIDECURSOR      |
 +                        BrowserMode::HIDESELECT      |
 +                        BrowserMode::AUTO_HSCROLL    |
 +                        BrowserMode::AUTO_VSCROLL);
          }
          else
              // not the first call
diff --cc dbaccess/source/ui/dlg/UserAdmin.cxx
index 66556c6,9438194..ee25dd3
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@@ -192,9 -213,9 +213,9 @@@ IMPL_LINK( OUserAdmin, UserHdl, PushBut
      {
          if(pButton == m_pNEWUSER)
          {
-             SfxPasswordDialog aPwdDlg(this);
-             aPwdDlg.ShowExtras(SfxShowExtras::ALL);
-             if(aPwdDlg.Execute())
+             ScopedVclPtrInstance< SfxPasswordDialog > aPwdDlg(this);
 -            aPwdDlg->ShowExtras(SHOWEXTRAS_ALL);
++            aPwdDlg->ShowExtras(SfxShowExtras::ALL);
+             if(aPwdDlg->Execute())
              {
                  Reference<XDataDescriptorFactory> xUserFactory(m_xUsers,UNO_QUERY);
                  Reference<XPropertySet> xNewUser = xUserFactory->createDataDescriptor();
diff --cc dbaccess/source/ui/dlg/dbwiz.cxx
index f39d0db,f4eb2ff..566c30a
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@@ -284,11 -290,11 +290,11 @@@ VclPtr<TabPage> ODbTypeWizDialog::creat
      // register ourself as modified listener
      if ( pPage )
      {
-         static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory( m_pImpl->getORB() );
-         static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this);
+         static_cast<OGenericAdministrationPage*>(pPage.get())->SetServiceFactory( m_pImpl->getORB() );
+         static_cast<OGenericAdministrationPage*>(pPage.get())->SetAdminDialog(this,this);
          pPage->SetText(ModuleRes(nStringId));
          defaultButton( _nState == START_PAGE ? WZB_NEXT : WZB_FINISH );
 -        enableButtons( WZB_FINISH, _nState == START_PAGE ? sal_False : sal_True);
 +        enableButtons( WZB_FINISH, _nState != START_PAGE);
          pPage->Show();
      }
      return pPage;
diff --cc dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index dc0d7a4,474230d..a236e46
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@@ -238,9 -243,9 +243,9 @@@ namespace dbau
              nSortOrderColumnWidth = nSortOrderColumnWidth > nOther ? nSortOrderColumnWidth : nOther;
              // (plus some additional space)
              nSortOrderColumnWidth += GetTextWidth(OUString('0')) * 2;
 -            InsertDataColumn(COLUMN_ID_ORDER, sColumnName, nSortOrderColumnWidth, HIB_STDSTYLE, 1);
 +            InsertDataColumn(COLUMN_ID_ORDER, sColumnName, nSortOrderColumnWidth, HeaderBarItemBits::STDSTYLE, 1);
  
-             m_pSortingCell = new ListBoxControl(&GetDataWindow());
+             m_pSortingCell = VclPtr<ListBoxControl>::Create(&GetDataWindow());
              m_pSortingCell->InsertEntry(m_sAscendingText);
              m_pSortingCell->InsertEntry(m_sDescendingText);
              m_pSortingCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_SORTORDER );
diff --cc dbaccess/source/ui/inc/JAccess.hxx
index 2306dfe,59c1c1f..11604c2
--- a/dbaccess/source/ui/inc/JAccess.hxx
+++ b/dbaccess/source/ui/inc/JAccess.hxx
@@@ -32,8 -33,13 +33,8 @@@ namespace dbau
      */
      class OJoinDesignViewAccess     :   public VCLXAccessibleComponent, public OJoinDesignViewAccess_BASE
      {
-         OJoinTableView* m_pTableView; // the window which I should give accessibility to
+         VclPtr<OJoinTableView> m_pTableView; // the window which I should give accessibility to
  
 -    protected:
 -        /** isEditable returns the current editable state
 -            @return true if the controller is not readonly otherwise false
 -        */
 -        bool isEditable() const;
      public:
          /** OJoinDesignViewAccess needs a valid view
          */
diff --cc dbaccess/source/ui/inc/WCopyTable.hxx
index 32fa0a7,479947d..8a10f01
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@@ -323,8 -323,9 +323,9 @@@ namespace dbau
          );
  
          virtual ~OCopyTableWizard();
+         virtual void        dispose() SAL_OVERRIDE;
  
 -        virtual long        DeactivatePage() SAL_OVERRIDE;
 +        virtual bool        DeactivatePage() SAL_OVERRIDE;
          OKButton&           GetOKButton() { return static_cast<OKButton&>(*m_pbFinish); }
          Wizard_Button_Style GetPressedButton() const { return m_ePressed; }
          void                EnableButton(Wizard_Button_Style eStyle, bool bEnable);
diff --cc dbaccess/source/ui/inc/sbagrid.hxx
index 443ed27,940f1b1..25292c9
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@@ -124,10 -124,10 +124,10 @@@ namespace dbau
          virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
  
          // ::com::sun::star::lang::XComponent
 -        virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 +        virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
  
      protected:
-         virtual FmGridControl*  imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE;
+         virtual VclPtr<FmGridControl>  imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE;
  #ifdef _MSC_VER
          typedef ::com::sun::star::frame::XStatusListener xstlist_type;
          typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type;
diff --cc dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index e58d60f,cb5d413..9b584be
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@@ -169,9 -180,19 +169,15 @@@ namespace dbau
      }
      OTableConnection::~OTableConnection()
      {
+         disposeOnce();
+     }
+     void OTableConnection::dispose()
+     {
          // clear vector
          clearLineData();
+         m_pParent.clear();
+         vcl::Window::dispose();
      }
 -    bool OConnectionLineAccess::isEditable() const
 -    {
 -        return m_pLine ? !m_pLine->GetParent()->getDesignView()->getController().isReadOnly() : sal_False;
 -    }
      Reference< XAccessibleContext > SAL_CALL OConnectionLineAccess::getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException, std::exception)
      {
          return this;
diff --cc dbaccess/source/ui/querydesign/JoinTableView.cxx
index 8b0c63d,ed5b079..efc7980
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@@ -1183,10 -1200,10 +1200,10 @@@ OTableConnection* OJoinTableView::GetTa
  
      if ((!pLhs || pLhs->ExistsAConn()) && (!pRhs || pRhs->ExistsAConn()))
      {
 -        bool bFoundStart = _rpFirstAfter ? sal_False : sal_True;
 +        bool bFoundStart = _rpFirstAfter == nullptr;
  
-         ::std::vector<OTableConnection*>::const_iterator aIter = m_vTableConnection.begin();
-         ::std::vector<OTableConnection*>::const_iterator aEnd = m_vTableConnection.end();
+         auto aIter = m_vTableConnection.begin();
+         auto aEnd = m_vTableConnection.end();
          for(;aIter != aEnd;++aIter)
          {
              OTableConnection* pData = *aIter;
diff --cc dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index b628238,0b0c4c8..05d3d05
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@@ -112,17 -111,17 +112,17 @@@ OSelectionBrowseBox::OSelectionBrowseBo
  {
      SetHelpId(HID_CTL_QRYDGNCRIT);
  
 -    m_nMode =       BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT
 -                |   BROWSER_KEEPSELECTION   | BROWSER_HIDECURSOR
 -                |   BROWSER_HLINESFULL      | BROWSER_VLINESFULL
 -                |   BROWSER_HEADERBAR_NEW   ;
 +    m_nMode =       BrowserMode::COLUMNSELECTION | BrowserMode::HIDESELECT
 +                |   BrowserMode::KEEPHIGHLIGHT   | BrowserMode::HIDECURSOR
 +                |   BrowserMode::HLINES      | BrowserMode::VLINES
 +                |   BrowserMode::HEADERBAR_NEW   ;
  
-     m_pTextCell     = new Edit(&GetDataWindow(), 0);
-     m_pVisibleCell  = new CheckBoxControl(&GetDataWindow());
-     m_pTableCell    = new ListBoxControl(&GetDataWindow());     m_pTableCell->SetDropDownLineCount( 20 );
-     m_pFieldCell    = new ComboBoxControl(&GetDataWindow());    m_pFieldCell->SetDropDownLineCount( 20 );
-     m_pOrderCell    = new ListBoxControl(&GetDataWindow());
-     m_pFunctionCell = new ListBoxControl(&GetDataWindow());     m_pFunctionCell->SetDropDownLineCount( 20 );
+     m_pTextCell     = VclPtr<Edit>::Create(&GetDataWindow(), 0);
+     m_pVisibleCell  = VclPtr<CheckBoxControl>::Create(&GetDataWindow());
+     m_pTableCell    = VclPtr<ListBoxControl>::Create(&GetDataWindow());     m_pTableCell->SetDropDownLineCount( 20 );
+     m_pFieldCell    = VclPtr<ComboBoxControl>::Create(&GetDataWindow());    m_pFieldCell->SetDropDownLineCount( 20 );
+     m_pOrderCell    = VclPtr<ListBoxControl>::Create(&GetDataWindow());
+     m_pFunctionCell = VclPtr<ListBoxControl>::Create(&GetDataWindow());     m_pFunctionCell->SetDropDownLineCount( 20 );
  
      m_pVisibleCell->SetHelpId(HID_QRYDGN_ROW_VISIBLE);
      m_pTableCell->SetHelpId(HID_QRYDGN_ROW_TABLE);
diff --cc desktop/source/app/cmdlinehelp.hxx
index 07b4f52,7837dc3..d7b7233
--- a/desktop/source/app/cmdlinehelp.hxx
+++ b/desktop/source/app/cmdlinehelp.hxx
@@@ -32,12 -32,12 +32,12 @@@ namespace deskto
      class CmdlineHelpDialog : public ModalDialog
      {
      public:
 -        CmdlineHelpDialog ( void );
 +        CmdlineHelpDialog();
  
-         FixedText*   m_pftHead;
-         FixedText*   m_pftLeft;
-         FixedText*   m_pftRight;
-         FixedText*   m_pftBottom;
+         VclPtr<FixedText>   m_pftHead;
+         VclPtr<FixedText>   m_pftLeft;
+         VclPtr<FixedText>   m_pftRight;
+         VclPtr<FixedText>   m_pftBottom;
      };
  #endif
  }
diff --cc extensions/source/dbpilots/controlwizard.hxx
index 879520d,81016f5..529e94b
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@@ -75,9 -75,10 +75,10 @@@ namespace db
      public:
          OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription );
          virtual ~OControlWizardPage();
+         virtual void dispose() SAL_OVERRIDE;
  
      protected:
 -        void fillListBox(
 +        static void fillListBox(
              ListBox& _rList,
              const ::com::sun::star::uno::Sequence< OUString >& _rItems,
              bool _bClear = true);
diff --cc extensions/source/propctrlr/controlfontdialog.cxx
index 675f2aa,21ec3d2..54ae273
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@@ -167,9 -166,9 +166,9 @@@ namespace pc
      void OControlFontDialog::executedDialog(sal_Int16 _nExecutionResult)
      {
          OSL_ENSURE(m_pDialog, "OControlFontDialog::executedDialog: no dialog anymore?!!");
 -        if (m_pDialog && (sal_True == _nExecutionResult) && m_xControlModel.is())
 +        if (m_pDialog && (RET_OK == _nExecutionResult) && m_xControlModel.is())
          {
-             const SfxItemSet* pOutput = static_cast<ControlCharacterDialog*>(m_pDialog)->GetOutputItemSet();
+             const SfxItemSet* pOutput = static_cast<ControlCharacterDialog*>(m_pDialog.get())->GetOutputItemSet();
              if (pOutput)
                  ControlCharacterDialog::translateItemsToProperties( *pOutput, m_xControlModel );
          }
diff --cc extensions/source/propctrlr/propertyeditor.cxx
index 5fcafaf,3f8675c..daa9e8c
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@@ -340,15 -347,7 +347,15 @@@ namespace pc
  
      void OPropertyEditor::SetHelpText( const OUString& _rHelpText )
      {
-         sal_uInt16 nCount = m_aTabControl.GetPageCount();
 -        forEachPage( &OPropertyEditor::setHelpSectionText, &_rHelpText );
++        sal_uInt16 nCount = m_aTabControl->GetPageCount();
 +        for ( sal_uInt16 i=0; i<nCount; ++i )
 +        {
-             sal_uInt16 nID = m_aTabControl.GetPageId(i);
-             OBrowserPage* pPage = static_cast< OBrowserPage* >( m_aTabControl.GetTabPage( nID ) );
++            sal_uInt16 nID = m_aTabControl->GetPageId(i);
++            OBrowserPage* pPage = static_cast< OBrowserPage* >( m_aTabControl->GetTabPage( nID ) );
 +            if ( !pPage )
 +                continue;
 +            setHelpSectionText( *pPage, &_rHelpText );
 +        }
      }
  
  
diff --cc extensions/source/propctrlr/propertyeditor.hxx
index 1886182,a43ee8d..3a86838
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@@ -24,13 -24,15 +24,13 @@@
  
  #include <com/sun/star/inspection/XPropertyControl.hpp>
  #include <vcl/tabctrl.hxx>
+ #include <vcl/vclptr.hxx>
+ #include <boost/mem_fn.hpp>
  #include <map>
  
  namespace pcr
  {
  
--
      class IPropertyLineListener;
      class IPropertyControlObserver;
      class OBrowserPage;
diff --cc extensions/source/scanner/sanedlg.cxx
index ae9c4d5,9034f00..384be4d
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@@ -256,9 -291,9 +291,9 @@@ short SaneDlg::Execute(
  {
      if( ! Sane::IsSane() )
      {
-         MessageDialog aErrorBox(NULL, SaneResId(STR_COULD_NOT_BE_INIT));
-         aErrorBox.Execute();
+         ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SaneResId(STR_COULD_NOT_BE_INIT));
+         aErrorBox->Execute();
 -        return sal_False;
 +        return RET_CANCEL;
      }
      LoadState();
      return ModalDialog::Execute();
diff --cc filter/source/pdf/impdialog.cxx
index 9851aa8,0fe010a..af2e7e7
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@@ -1191,17 -1291,17 +1291,17 @@@ void ImpPDFTabSecurityPage::SetFilterCo
  
  IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl)
  {
-     SfxPasswordDialog aPwdDialog( this, &msUserPwdTitle );
-     aPwdDialog.SetMinLen( 0 );
-     aPwdDialog.ShowMinLengthText(false);
-     aPwdDialog.ShowExtras( SfxShowExtras::CONFIRM | SfxShowExtras::PASSWORD2 | SfxShowExtras::CONFIRM2 );
-     aPwdDialog.SetText(msStrSetPwd);
-     aPwdDialog.SetGroup2Text(msOwnerPwdTitle);
-     aPwdDialog.AllowAsciiOnly();
-     if( aPwdDialog.Execute() == RET_OK )  //OK issued get password and set it
+     ScopedVclPtrInstance< SfxPasswordDialog > aPwdDialog( this, &msUserPwdTitle );
+     aPwdDialog->SetMinLen( 0 );
+     aPwdDialog->ShowMinLengthText(false);
 -    aPwdDialog->ShowExtras( SHOWEXTRAS_CONFIRM | SHOWEXTRAS_PASSWORD2 | SHOWEXTRAS_CONFIRM2 );
++    aPwdDialog->ShowExtras( SfxShowExtras::CONFIRM | SfxShowExtras::PASSWORD2 | SfxShowExtras::CONFIRM2 );
+     aPwdDialog->SetText(msStrSetPwd);
+     aPwdDialog->SetGroup2Text(msOwnerPwdTitle);
+     aPwdDialog->AllowAsciiOnly();
+     if( aPwdDialog->Execute() == RET_OK )  //OK issued get password and set it
      {
-         OUString aUserPW( aPwdDialog.GetPassword() );
-         OUString aOwnerPW( aPwdDialog.GetPassword2() );
+         OUString aUserPW( aPwdDialog->GetPassword() );
+         OUString aOwnerPW( aPwdDialog->GetPassword2() );
  
          mbHaveUserPassword = !aUserPW.isEmpty();
          mbHaveOwnerPassword = !aOwnerPW.isEmpty();
diff --cc fpicker/source/office/PlacesListBox.cxx
index d5baa25,24ef105..5d75edd
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@@ -179,10 -192,10 +192,10 @@@ IMPL_LINK ( PlacesListBox, DoubleClick
  {
      sal_uInt16 nSelected = mpImpl->GetCurrRow();
      PlacePtr pPlace = maPlaces[nSelected];
 -    if ( pPlace->IsEditable() == true && !pPlace->IsLocal( ) )
 +    if ( pPlace->IsEditable() && !pPlace->IsLocal( ) )
      {
-         PlaceEditDialog aDlg( mpDlg, pPlace );
-         short aRetCode = aDlg.Execute();
+         ScopedVclPtrInstance< PlaceEditDialog > aDlg(mpDlg, pPlace);
+         short aRetCode = aDlg->Execute();
          switch(aRetCode) {
              case RET_OK :
              {
diff --cc include/sfx2/dinfdlg.hxx
index 58c874c,6e2ed62..babea56
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@@ -518,10 -525,11 +525,11 @@@ protected
  
      virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
      virtual void        Reset( const SfxItemSet* ) SAL_OVERRIDE;
 -    virtual int         DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
  
  public:
-     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* );
+     SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
+     static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
  };
  
  struct CmisValue : public VclBuilderContainer
@@@ -636,14 -644,13 +644,13 @@@ private
      DECL_LINK(UpdateHdl, void *);
  
  protected:
-     SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
- 
      virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
      virtual void        Reset( const SfxItemSet* ) SAL_OVERRIDE;
 -    virtual int         DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
  
  public:
-     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* );
+     SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
+     static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
  };
  
  #endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX
diff --cc include/sfx2/mgetempl.hxx
index 6b5ba43,cc0f615..f8f4b55
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@@ -94,7 -94,10 +94,10 @@@ protected
      using TabPage::ActivatePage;
          virtual void        ActivatePage(const SfxItemSet &) SAL_OVERRIDE;
          using TabPage::DeactivatePage;
 -    virtual int     DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE;
 +    virtual sfxpg DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE;
+ 
+ public:
+     SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet );
  };
  
  #endif
diff --cc include/sfx2/objsh.hxx
index 041631e,67e134f..b9d20fe
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@@ -365,12 -337,12 +366,12 @@@ public
      bool                        ExportTo( SfxMedium &rMedium );
  
      // xmlsec05, check with SFX team
 -    sal_uInt16                  GetDocumentSignatureState();
 +    SignatureState              GetDocumentSignatureState();
      void                        SignDocumentContent();
 -    sal_uInt16                  GetScriptingSignatureState();
 +    SignatureState              GetScriptingSignatureState();
      void                        SignScriptingContent();
  
-     virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
+     virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(
                                          vcl::Window *pParent, const SfxItemSet& );
  
      ErrCode                     CallBasic( const OUString& rMacro, const OUString& rBasicName,
diff --cc include/sfx2/sidebar/SidebarToolBox.hxx
index a19e182,4bb527a..129940d
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@@ -40,7 -40,8 +40,8 @@@ class SFX2_DLLPUBLIC SidebarToolBo
  {
  public:
      SidebarToolBox(vcl::Window* pParentWindow);
 -    virtual ~SidebarToolBox (void);
 +    virtual ~SidebarToolBox();
+     virtual void dispose() SAL_OVERRIDE;
  
      using ToolBox::InsertItem;
      virtual void InsertItem(const OUString& rCommand,
diff --cc include/sfx2/templdlg.hxx
index 280610f,0d121da..4e9ada8
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@@ -47,10 -48,10 +48,10 @@@ public
      virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE;
      virtual void Resize() SAL_OVERRIDE;
      virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
 -    void FreeResource (void);
 +    void FreeResource();
  
  private:
-     const std::unique_ptr<SfxTemplateDialog_Impl> pImpl;
+     std::unique_ptr<SfxTemplateDialog_Impl> pImpl;
      SfxBindings* mpBindings;
  };
  
diff --cc include/sfx2/viewsh.hxx
index c0f38d1,df3bbc3..39effbb
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@@ -233,8 -229,8 +234,8 @@@ public
      virtual SfxPrinter*         GetPrinter( bool bCreate = false );
      virtual sal_uInt16          SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
      virtual bool                HasPrintOptionsPage() const;
-     virtual SfxTabPage*         CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions );
+     virtual VclPtr<SfxTabPage>  CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions );
 -    JobSetup                    GetJobSetup() const;
 +    static JobSetup             GetJobSetup();
      Printer*                    GetActivePrinter() const;
  
      // Working set
diff --cc include/svtools/brwbox.hxx
index 8ad76b8,86cde1a..fb8fc3a
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@@ -420,10 -423,11 +421,11 @@@ protected
  
  public:
                      BrowseBox( vcl::Window* pParent, WinBits nBits = 0,
 -                               BrowserMode nMode = 0 );
 +                               BrowserMode nMode = BrowserMode::NONE );
                      BrowseBox( vcl::Window* pParent, const ResId& rId,
 -                               BrowserMode nMode = 0 );
 +                               BrowserMode nMode = BrowserMode::NONE );
-                     virtual ~BrowseBox();
+     virtual         ~BrowseBox();
+     virtual void    dispose() SAL_OVERRIDE;
  
      // override inherited handler
      virtual void    StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
diff --cc include/svtools/editbrowsebox.hxx
index 43320ef,a62f2b4..dbc921b
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@@ -491,9 -487,9 +492,9 @@@ namespace sv
          mutable bool    bPaintStatus : 1;   // paint a status (image) in the handle column
          bool            bActiveBeforeTracking;
  
-         CheckBoxControl* pCheckBoxPaint;
+         VclPtr<CheckBoxControl> pCheckBoxPaint;
  
 -        sal_Int32   m_nBrowserFlags;
 +        EditBrowseBoxFlags  m_nBrowserFlags;
          ImageList   m_aStatusImages;
          ::std::unique_ptr< EditBrowseBoxImpl> m_aImpl;
  
@@@ -595,9 -591,10 +596,10 @@@
              // secure starting of StartEditHdl
  
      public:
 -        EditBrowseBox(vcl::Window* pParent, sal_Int32 nBrowserFlags = EBBF_NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = 0 );
 -        EditBrowseBox(vcl::Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags = EBBF_NONE, BrowserMode nMode = 0 );
 +        EditBrowseBox(vcl::Window* pParent, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = BrowserMode::NONE );
 +        EditBrowseBox(vcl::Window* pParent, const ResId& rId, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, BrowserMode nMode = BrowserMode::NONE );
          virtual ~EditBrowseBox();
+         virtual void dispose() SAL_OVERRIDE;
  
          bool IsEditing() const {return aController.Is();}
          void InvalidateStatusCell(long nRow) {RowModified(nRow, 0);}
diff --cc include/svtools/filectrl.hxx
index 53486c0,09e5fe6..20506db
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@@ -76,11 -64,12 +76,12 @@@ protected
      DECL_DLLPRIVATE_LINK( ButtonHdl, void* );
  
  public:
 -                    FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode = 0 );
 +                    FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode = FileControlMode::NONE );
-                     virtual ~FileControl();
+     virtual         ~FileControl();
+     virtual void    dispose() SAL_OVERRIDE;
  
-     Edit&           GetEdit() { return maEdit; }
-     PushButton&     GetButton() { return maButton; }
+     Edit&           GetEdit() { return *maEdit.get(); }
+     PushButton&     GetButton() { return *maButton.get(); }
  
      void            Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE;
  
diff --cc include/svtools/scrwin.hxx
index 4e034e6,2eac598..2396725
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@@ -22,7 -22,7 +22,8 @@@
  
  #include <svtools/svtdllapi.h>
  #include <vcl/scrbar.hxx>
 +#include <o3tl/typed_flags_set.hxx>
+ #include <vcl/vclptr.hxx>
  
  class DataChangedEvent;
  
@@@ -68,7 -63,9 +69,9 @@@ private
  
  public:
                      ScrollableWindow( vcl::Window* pParent, WinBits nBits = 0,
 -                                      ScrollableWindowFlags = SCRWIN_DEFAULT );
 +                                      ScrollableWindowFlags = ScrollableWindowFlags::DEFAULT );
+     virtual         ~ScrollableWindow();
+     virtual void    dispose() SAL_OVERRIDE;
  
      virtual void    Resize() SAL_OVERRIDE;
      virtual void    Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
diff --cc include/svx/charmap.hxx
index fd9a1d0,c877be2..cf05bf2
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@@ -68,10 -71,10 +71,10 @@@ public
      void                        DeSelect();
      inline bool                 IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; }
      inline sal_uInt16           GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); }
 -    sal_uInt16                  GetRowPos(sal_uInt16 _nPos) const;
 -    sal_uInt16                  GetColumnPos(sal_uInt16 _nPos) const;
 +    static sal_uInt16           GetRowPos(sal_uInt16 _nPos);
 +    static sal_uInt16           GetColumnPos(sal_uInt16 _nPos);
  
-     ScrollBar&                  getScrollBar() { return aVscrollSB;}
+     ScrollBar&                  getScrollBar() { return *aVscrollSB.get();}
      void                        ReleaseAccessible();
      sal_Int32                   getMaxCharCount() const;
  
diff --cc include/svx/compressgraphicdialog.hxx
index 17aa10a,7cbf1b2..ba5e51a
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@@ -30,25 -30,25 +30,25 @@@
  
  class SdrGrafObj;
  
 -class SVX_DLLPUBLIC CompressGraphicsDialog : public ModalDialog
 +class SVX_DLLPUBLIC SAL_WARN_UNUSED CompressGraphicsDialog : public ModalDialog
  {
  private:
-     FixedText*       m_pLabelGraphicType;
-     FixedText*       m_pFixedText2;
-     FixedText*       m_pFixedText3;
-     FixedText*       m_pFixedText5;
-     FixedText*       m_pFixedText6;
- 
-     CheckBox*        m_pReduceResolutionCB;
-     NumericField*    m_pMFNewWidth;
-     NumericField*    m_pMFNewHeight;
-     ComboBox*        m_pResolutionLB;
-     RadioButton*     m_pLosslessRB;
-     RadioButton*     m_pJpegCompRB;
-     NumericField*    m_pCompressionMF;
-     NumericField*    m_pQualityMF;
-     PushButton*      m_pBtnCalculate;
-     ListBox*         m_pInterpolationCombo;
+     VclPtr<FixedText>       m_pLabelGraphicType;
+     VclPtr<FixedText>       m_pFixedText2;
+     VclPtr<FixedText>       m_pFixedText3;
+     VclPtr<FixedText>       m_pFixedText5;
+     VclPtr<FixedText>       m_pFixedText6;
+ 
+     VclPtr<CheckBox>        m_pReduceResolutionCB;
+     VclPtr<NumericField>    m_pMFNewWidth;
+     VclPtr<NumericField>    m_pMFNewHeight;
+     VclPtr<ComboBox>        m_pResolutionLB;
+     VclPtr<RadioButton>     m_pLosslessRB;
+     VclPtr<RadioButton>     m_pJpegCompRB;
+     VclPtr<NumericField>    m_pCompressionMF;
+     VclPtr<NumericField>    m_pQualityMF;
+     VclPtr<PushButton>      m_pBtnCalculate;
+     VclPtr<ListBox>         m_pInterpolationCombo;
  
      SdrGrafObj*     m_pGraphicObj;
      Graphic         m_aGraphic;
diff --cc include/svx/dlgctrl.hxx
index 9571373,9dd1241..119aafa
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@@ -350,16 -350,16 +350,15 @@@ public
  };
  
  
--
  class SdrObject;
  class SdrPathObj;
  class SdrModel;
  
 -class SvxPreviewBase : public Control
 +class SAL_WARN_UNUSED SvxPreviewBase : public Control
  {
  private:
-     SdrModel*                                       mpModel;
-     VirtualDevice*                                  mpBufferDevice;
+     SdrModel*             mpModel;
+     VclPtr<VirtualDevice> mpBufferDevice;
  
  protected:
      void InitSettings(bool bForeground, bool bBackground);
diff --cc include/svx/fontworkgallery.hxx
index 56787ec,a8314ec..dfae49d
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@@ -57,12 -57,14 +57,12 @@@ public
  
      virtual void                Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
      virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
-     virtual SfxPopupWindow*     CreatePopupWindow() SAL_OVERRIDE;
+     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
  };
  
 -
 -
 -class FontworkCharacterSpacingDialog : public ModalDialog
 +class SAL_WARN_UNUSED FontworkCharacterSpacingDialog : public ModalDialog
  {
-     MetricField* m_pMtrScale;
+     VclPtr<MetricField> m_pMtrScale;
  
  public:
      FontworkCharacterSpacingDialog( vcl::Window* pParent, sal_Int32 nScale );
@@@ -70,10 -74,11 +72,10 @@@
      sal_Int32 getScale() const;
  };
  
 -
 -class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
 +class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkGalleryDialog : public ModalDialog
  {
-     ValueSet*           mpCtlFavorites;
-     OKButton*           mpOKButton;
+     VclPtr<ValueSet>    mpCtlFavorites;
+     VclPtr<OKButton>    mpOKButton;
  
      sal_uInt16          mnThemeId;
  
diff --cc include/svx/optgrid.hxx
index 02c74ca,438ade2..9aeee8d
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@@ -108,33 -110,33 +110,33 @@@ public
      virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
  
      virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
 -    virtual int         DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
  
  private:
-     CheckBox*            pCbxUseGridsnap;
-     CheckBox*            pCbxGridVisible;
+     VclPtr<CheckBox>            pCbxUseGridsnap;
+     VclPtr<CheckBox>            pCbxGridVisible;
  
-     MetricField*         pMtrFldDrawX;
-     MetricField*         pMtrFldDrawY;
+     VclPtr<MetricField>         pMtrFldDrawX;
+     VclPtr<MetricField>         pMtrFldDrawY;
  
-     NumericField*        pNumFldDivisionX;
-     NumericField*        pNumFldDivisionY;
+     VclPtr<NumericField>        pNumFldDivisionX;
+     VclPtr<NumericField>        pNumFldDivisionY;
  
-     CheckBox*            pCbxSynchronize;
+     VclPtr<CheckBox>            pCbxSynchronize;
  protected:
      //these controls are used in draw and impress
-     VclContainer*    pSnapFrames;
-     CheckBox*        pCbxSnapHelplines;
-     CheckBox*        pCbxSnapBorder;
-     CheckBox*        pCbxSnapFrame;
-     CheckBox*        pCbxSnapPoints;
-     MetricField*     pMtrFldSnapArea;
- 
-     CheckBox*        pCbxOrtho;
-     CheckBox*        pCbxBigOrtho;
-     CheckBox*        pCbxRotate;
-     MetricField*     pMtrFldAngle;
-     MetricField*     pMtrFldBezAngle;
+     VclPtr<VclContainer>    pSnapFrames;
+     VclPtr<CheckBox>        pCbxSnapHelplines;
+     VclPtr<CheckBox>        pCbxSnapBorder;
+     VclPtr<CheckBox>        pCbxSnapFrame;
+     VclPtr<CheckBox>        pCbxSnapPoints;
+     VclPtr<MetricField>     pMtrFldSnapArea;
+ 
+     VclPtr<CheckBox>        pCbxOrtho;
+     VclPtr<CheckBox>        pCbxBigOrtho;
+     VclPtr<CheckBox>        pCbxRotate;
+     VclPtr<MetricField>     pMtrFldAngle;
+     VclPtr<MetricField>     pMtrFldBezAngle;
  
  private:
      bool                bAttrModified;
diff --cc include/svx/sidebar/Popup.hxx
index 7f0d804,acf4c43..4fd74d1
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@@ -73,10 -73,10 +73,10 @@@ public 
      /** If you want to be informed when the popup closes then add a
          callback that is called after that.
      */
 -    void SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback);
 +    void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback);
  
  protected:
-     std::unique_ptr<PopupControl> mxControl;
+     VclPtr<PopupControl> mxControl;
  
      /** Make sure that both PopupContainer and PopupControl objects
          exist.  Calls the maControlCreator functor if necessary.
@@@ -86,14 -86,14 +86,14 @@@
      /** A derived specialisation class can override this method to do
          additional work.
      */
 -    void CreateContainerAndControl (void);
 +    void CreateContainerAndControl();
  
  private:
-     vcl::Window* mpParent;
-     ::boost::function<PopupControl*(PopupContainer*)> maControlCreator;
+     VclPtr<vcl::Window> mpParent;
+     ::boost::function<VclPtr<PopupControl>(PopupContainer*)> maControlCreator;
 -    ::boost::function<void(void)> maPopupModeEndCallback;
 +    ::boost::function<void()> maPopupModeEndCallback;
      const ::rtl::OUString msAccessibleName;
-     std::unique_ptr<PopupContainer> mxContainer;
+     VclPtr<PopupContainer> mxContainer;
  
      DECL_LINK(PopupModeEndHandler, void*);
  };
diff --cc include/vcl/combobox.hxx
index 95ec9bc,678dbc5..a835a40
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@@ -88,9 -84,10 +84,10 @@@ protected
      SAL_DLLPRIVATE long     getMaxWidthScrollBarAndDownButton() const;
  
  protected:
 -    bool            IsDropDownBox() const { return mpFloatWin ? true : false; }
 +    bool            IsDropDownBox() const { return mpFloatWin != nullptr; }
  
-     virtual void  FillLayoutData() const SAL_OVERRIDE;
+     virtual void    FillLayoutData() const SAL_OVERRIDE;
+ 
  public:
      explicit        ComboBox( vcl::Window* pParent, WinBits nStyle = 0 );
      explicit        ComboBox( vcl::Window* pParent, const ResId& );
diff --cc include/vcl/openglwin.hxx
index dfeb95c,ac59a6e..e8c2a1e
--- a/include/vcl/openglwin.hxx
+++ b/include/vcl/openglwin.hxx
@@@ -30,11 -30,13 +30,13 @@@ public
  };
  
  // pImpl Pattern to avoid linking against OpenGL libs when using the class without the context
 -class VCLOPENGL_DLLPUBLIC OpenGLWindow : public vcl::Window
 +class VCL_DLLPUBLIC OpenGLWindow : public vcl::Window
  {
  public:
-     OpenGLWindow(vcl::Window* pParent);
-     virtual ~OpenGLWindow();
+                    OpenGLWindow(vcl::Window* pParent);
+     virtual        ~OpenGLWindow();
+     virtual void   dispose() SAL_OVERRIDE;
+ 
      OpenGLContext& getContext();
  
      void setRenderer(IRenderer* pRenderer);
diff --cc reportdesign/source/ui/dlg/GroupsSorting.cxx
index d420b36,bf29504..5b65fc9
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@@ -163,11 -180,24 +180,25 @@@ public
  
  };
  
+ 
+ void OFieldExpressionControlContainerListener::disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception )
+ { mpParent->disposing(Source); }
+ 
+ void OFieldExpressionControlContainerListener::elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ { mpParent->elementInserted(rEvent); }
+ 
+ void OFieldExpressionControlContainerListener::elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ { mpParent->elementReplaced(rEvent); }
+ 
+ void OFieldExpressionControlContainerListener::elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ { mpParent->elementRemoved(rEvent); }
+ 
+ 
  // class OFieldExpressionControl
  OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent)
 -    :EditBrowseBox( _pParent, EBBF_NONE, WB_TABSTOP | BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL |
 -                              BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL)
 +    :EditBrowseBox( _pParent, EditBrowseBoxFlags::NONE, WB_TABSTOP,
 +                    BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::AUTOSIZE_LASTCOL |
 +                              BrowserMode::KEEPHIGHLIGHT | BrowserMode::HLINES | BrowserMode::VLINES)
      ,m_aGroupPositions(GROUPS_START_LEN,-1)
      ,m_pComboCell(NULL)
      ,m_nDataPos(-1)
@@@ -365,12 -404,12 +405,12 @@@ void OFieldExpressionControl::lateInit(
  
  
          // set browse mode
 -        BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION  | BROWSER_KEEPSELECTION |
 -                          BROWSER_HLINESFULL | BROWSER_VLINESFULL       | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL);
 +        BrowserMode nMode(BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION  | BrowserMode::KEEPHIGHLIGHT |
 +                          BrowserMode::HLINES | BrowserMode::VLINES       | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::AUTO_VSCROLL | BrowserMode::AUTO_HSCROLL);
          if( m_pParent->isReadOnly() )
 -            nMode |= BROWSER_HIDECURSOR;
 +            nMode |= BrowserMode::HIDECURSOR;
          SetMode(nMode);
-         xGroups->addContainerListener(this);
+         xGroups->addContainerListener(&aContainerListener);
      }
      else
          // not the first call
diff --cc sc/source/ui/condformat/condformatdlgentry.cxx
index 4a8160b,ac0bd52..aa37bdf
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@@ -295,15 -341,28 +321,15 @@@ IMPL_LINK(ScConditionFrmtEntry, OnEdCha
      }
  
      // Recognized col/row name or string token, warn the user
 -    bool bContainsColumnLabel = containsOnlyColumnLabel(pEdit, ta.get());;
 -    if (!bContainsColumnLabel)
 -    {
 -        ScCompiler aComp2( mpDoc, maPos );
 -        aComp2.SetGrammar( mpDoc->GetGrammar() );
 -        if (maEdVal1 == pEdit)
 -        {
 -            OUString aFormula2 = maEdVal2->GetText();
 -            boost::scoped_ptr<ScTokenArray> pArr2(aComp2.CompileString(aFormula2));
 -            bContainsColumnLabel = containsOnlyColumnLabel(maEdVal2, pArr2.get());
 -        }
 -        else
 -        {
 -            OUString aFormula1 = maEdVal1->GetText();
 -            boost::scoped_ptr<ScTokenArray> pArr1(aComp2.CompileString(aFormula1));
 -            bContainsColumnLabel = containsOnlyColumnLabel(maEdVal1, pArr1.get());
 -        }
 -    }
 -
 -    if (bContainsColumnLabel)
 +    formula::FormulaToken* token = ta->First();
 +    formula::StackVar t = token->GetType();
 +    OpCode op = token->GetOpCode();
 +    if( ( op == ocColRowName ) ||
 +        ( ( op == ocBad ) && ( t == formula::svString ) )
 +      )
      {
 +        pEdit->SetControlBackground(COL_YELLOW);
-         maFtVal.SetText(ScGlobal::GetRscString(STR_UNQUOTED_STRING));
+         maFtVal->SetText(ScGlobal::GetRscString(STR_UNQUOTED_STRING));
          return 0;
      }
  
@@@ -446,10 -505,10 +472,10 @@@ void ScConditionFrmtEntry::Notify(SfxBr
          return;
  
      sal_uInt16 nHint = pHint->GetHint();
 -    if(nHint == SFX_STYLESHEET_MODIFIED)
 +    if(nHint == SfxStyleSheetHintId::MODIFIED)
      {
          if(!mbIsInStyleCreate)
-             UpdateStyleList(maLbStyle, mpDoc);
+             UpdateStyleList(*maLbStyle.get(), mpDoc);
      }
  }
  
@@@ -1273,10 -1413,10 +1380,10 @@@ void ScDateFrmtEntry::Notify( SfxBroadc
          return;
  
      sal_uInt16 nHint = pHint->GetHint();
 -    if(nHint == SFX_STYLESHEET_MODIFIED)
 +    if(nHint == SfxStyleSheetHintId::MODIFIED)
      {
          if(!mbIsInStyleCreate)
-             UpdateStyleList(maLbStyle, mpDoc);
+             UpdateStyleList(*maLbStyle.get(), mpDoc);
      }
  }
  
diff --cc sc/source/ui/inc/prevwsh.hxx
index b17ff47,fd49a0f..448b3f5
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@@ -40,14 -40,14 +40,14 @@@ class ScPreviewShell: public SfxViewShe
  {
      ScDocShell*     pDocShell;
  
-     SystemWindow*   mpFrameWindow;
-     ScPreview*      pPreview;               // Output window
-     ScrollBar*      pHorScroll;
-     ScrollBar*      pVerScroll;
-     vcl::Window*         pCorner;
+     VclPtr<SystemWindow>   mpFrameWindow;
+     VclPtr<ScPreview>      pPreview;               // Output window
+     VclPtr<ScrollBar>      pHorScroll;
+     VclPtr<ScrollBar>      pVerScroll;
+     VclPtr<vcl::Window>    pCorner;
  
      ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData;  // ViewData
 -    sal_uInt8           nSourceDesignMode;      // form design mode from TabView
 +    TriState        nSourceDesignMode;      // form design mode from TabView
      SvxZoomType     eZoom;
      long            nMaxVertPos;
  
diff --cc sc/source/ui/inc/tabpages.hxx
index 69f12bd,777390c..c2f9c38
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@@ -34,9 -34,12 +34,12 @@@ public
      virtual bool        FillItemSet     ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
      virtual void        Reset           ( const SfxItemSet* ) SAL_OVERRIDE;
  
+     virtual ~ScTabPageProtection();
+     virtual void dispose() SAL_OVERRIDE;
+ 
  protected:
      using SfxTabPage::DeactivatePage;
 -    virtual int         DeactivatePage  ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage  ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
  
  private:
                  ScTabPageProtection( vcl::Window*            pParent,
diff --cc sc/source/ui/inc/tpcompatibility.hxx
index 5ab6e54,5c58a40..550bd9b
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@@ -23,14 -23,14 +23,14 @@@ public
  
      virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE;
      virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE;
 -    virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
 +    virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
  
+     virtual ~ScTpCompatOptions();
+     virtual void dispose() SAL_OVERRIDE;
  private:
      explicit ScTpCompatOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs);
-     virtual ~ScTpCompatOptions();
- 
  private:
-     ListBox*   m_pLbKeyBindings;
+     VclPtr<ListBox>   m_pLbKeyBindings;
  };
  
  #endif
diff --cc sc/source/ui/inc/tphf.hxx
index c16d69b,5fdfd20..da972cb
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@@ -43,14 -44,14 +44,14 @@@ protected
      virtual void    ActivatePage() SAL_OVERRIDE;
      virtual void    DeactivatePage() SAL_OVERRIDE;
      virtual void    ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
 -    virtual int     DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 +    virtual sfxpg   DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
  
  private:
-     PushButton*         m_pBtnEdit;
-     SfxItemSet          aDataSet;
-     OUString            aStrPageStyle;
-     sal_uInt16          nPageUsage;
-     const ScStyleDlg*   pStyleDlg;
+     VclPtr<PushButton>   m_pBtnEdit;
+     SfxItemSet           aDataSet;
+     OUString             aStrPageStyle;
+     sal_uInt16           nPageUsage;
+     VclPtr<ScStyleDlg>   pStyleDlg;
  
      DECL_LINK(BtnHdl, void *);
      DECL_LINK( HFEditHdl, void* );
diff --cc sc/source/ui/inc/tptable.hxx
index a1021b3,3920d82a..e135c91
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@@ -35,13 -35,13 +35,13 @@@ public
      virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
      virtual void        Reset           ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
      using SfxTabPage::DeactivatePage;
 -    virtual int         DeactivatePage  ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 +    virtual sfxpg       DeactivatePage  ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
      virtual void        DataChanged     ( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
  
+     virtual         ~ScTablePage();
+     virtual void    dispose() SAL_OVERRIDE;
  private:
                      ScTablePage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
-     virtual         ~ScTablePage();
- 
      void            ShowImage();
  
  private:
diff --cc sc/source/ui/miscdlgs/namecrea.cxx
index 4ae99df,1db6193..09c821c
--- a/sc/source/ui/miscdlgs/namecrea.cxx
+++ b/sc/source/ui/miscdlgs/namecrea.cxx
@@@ -29,12 -29,26 +29,26 @@@ ScNameCreateDlg::ScNameCreateDlg( vcl::
      get(m_pLeftBox, "left");
      get(m_pBottomBox, "bottom");
      get(m_pRightBox, "right");
 -    m_pTopBox->Check   ( (nFlags & NAME_TOP)   ? true : false );
 -    m_pLeftBox->Check  ( (nFlags & NAME_LEFT)  ? true : false );
 -    m_pBottomBox->Check( (nFlags & NAME_BOTTOM)? true : false );
 -    m_pRightBox->Check ( (nFlags & NAME_RIGHT) ? true : false );
 +    m_pTopBox->Check   ( (nFlags & NAME_TOP) != 0 );
 +    m_pLeftBox->Check  ( (nFlags & NAME_LEFT) != 0 );
 +    m_pBottomBox->Check( (nFlags & NAME_BOTTOM) != 0 );
 +    m_pRightBox->Check ( (nFlags & NAME_RIGHT) != 0 );
  }
  
+ ScNameCreateDlg::~ScNameCreateDlg()
+ {
+     disposeOnce();
+ }
+ 
+ void ScNameCreateDlg::dispose()
+ {
+     m_pTopBox.clear();
+     m_pLeftBox.clear();
+     m_pBottomBox.clear();
+     m_pRightBox.clear();
+     ModalDialog::dispose();
+ }
+ 
  sal_uInt16 ScNameCreateDlg::GetFlags() const
  {
      sal_uInt16  nResult = 0;
diff --cc sc/source/ui/navipi/navipi.cxx
index d3c47cc,687128e..49f516c
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@@ -629,15 -629,15 +629,15 @@@ ScNavigatorDlg::ScNavigatorDlg( SfxBind
      StartListening( *(SfxGetpApp()) );
      StartListening( rBindings );
  
-     aLbDocuments.Hide();        // does not exist at NAV_LMODE_NONE
+     aLbDocuments->Hide();        // does not exist at NAV_LMODE_NONE
  
-     aLbEntries.InitWindowBits(true);
+     aLbEntries->InitWindowBits(true);
  
-     aLbEntries.SetSpaceBetweenEntries(0);
-     aLbEntries.SetSelectionMode( SINGLE_SELECTION );
-     aLbEntries.SetDragDropMode(     DragDropMode::CTRL_MOVE |
-                                     DragDropMode::CTRL_COPY |
-                                     DragDropMode::ENABLE_TOP );
+     aLbEntries->SetSpaceBetweenEntries(0);
+     aLbEntries->SetSelectionMode( SINGLE_SELECTION );
 -    aLbEntries->SetDragDropMode(     SV_DRAGDROP_CTRL_MOVE |
 -                                    SV_DRAGDROP_CTRL_COPY |
 -                                    SV_DRAGDROP_ENABLE_TOP );
++    aLbEntries->SetDragDropMode( DragDropMode::CTRL_MOVE |
++                                 DragDropMode::CTRL_COPY |
++                                 DragDropMode::ENABLE_TOP );
  
      //  was a category chosen as root?
      sal_uInt16 nLastRoot = rCfg.GetRootType();
diff --cc sc/source/ui/optdlg/tpprint.cxx
index c3f640c,8768b92..e38c830
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@@ -41,14 -41,23 +41,23 @@@ ScTpPrintOptions::ScTpPrintOptions( vcl
  
  ScTpPrintOptions::~ScTpPrintOptions()
  {
+     disposeOnce();
  }
  
- SfxTabPage* ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+ void ScTpPrintOptions::dispose()
  {
-     return new ScTpPrintOptions( pParent, *rAttrSet );
+     m_pSkipEmptyPagesCB.clear();
+     m_pSelectedSheetsCB.clear();
+     m_pForceBreaksCB.clear();
+     SfxTabPage::dispose();
+ }
+ 
+ VclPtr<SfxTabPage> ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+ {
+     return VclPtr<SfxTabPage>(new ScTpPrintOptions( pParent, *rAttrSet ), SAL_NO_ACQUIRE);
  }
  
 -int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP )
 +SfxTabPage::sfxpg ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP )
  {
      if ( pSetP )
          FillItemSet( pSetP );
diff --cc sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index eb9e7dc,816db4d..fc03956
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@@ -143,15 -151,8 +151,8 @@@ private
  
      // for CellBorderStyle popup
      svx::sidebar::PopupControl* CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent);
 -    void EndCellBorderStylePopupMode(void);
 +    void EndCellBorderStylePopupMode();
  
-     // constructor/destuctor
-     CellAppearancePropertyPanel(
-         vcl::Window* pParent,
-         const css::uno::Reference<css::frame::XFrame>& rxFrame,
-         SfxBindings* pBindings);
-     virtual ~CellAppearancePropertyPanel();
- 
      void Initialize();
      void SetStyleIcon();
      void UpdateControlState();
diff --cc sc/source/ui/sidebar/CellBorderStyleControl.cxx
index ad6507d,4f8a467..ff09bcf
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@@ -56,9 -56,20 +56,20 @@@ CellBorderStyleControl::CellBorderStyle
      FreeResource();
  }
  
 -CellBorderStyleControl::~CellBorderStyleControl(void)
 +CellBorderStyleControl::~CellBorderStyleControl()
  {
+     disposeOnce();
+ }
+ 
+ void CellBorderStyleControl::dispose()
+ {
      delete[] mpImageList;
+     maTBBorder1.disposeAndClear();
+     maTBBorder2.disposeAndClear();
+     maTBBorder3.disposeAndClear();
+     maFL1.disposeAndClear();
+     maFL2.disposeAndClear();
+     svx::sidebar::PopupControl::dispose();
  }
  
  void CellBorderStyleControl::Initialize()
diff --cc sc/source/ui/view/tabview5.cxx
index 033fae3,6bb12f6..07262e1
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@@ -184,19 -184,26 +184,26 @@@ ScTabView::~ScTabView(
  
      for (i=0; i<2; i++)
      {
-         delete pColBar[i];
-         delete pRowBar[i];
-         delete pColOutline[i];
-         delete pRowOutline[i];
+         pColBar[i].disposeAndClear();
+         pRowBar[i].disposeAndClear();
+         pColOutline[i].disposeAndClear();
+         pRowOutline[i].disposeAndClear();
      }
  
-     delete pHSplitter;
-     delete pVSplitter;
- 
-     delete pTabControl;
+     aScrollBarBox.disposeAndClear();
+     aCornerButton.disposeAndClear();
+     aTopButton.disposeAndClear();
+     aHScrollLeft.disposeAndClear();
+     aHScrollRight.disposeAndClear();
+     aVScrollTop.disposeAndClear();
+     aVScrollBottom.disposeAndClear();
+ 
+     pHSplitter.disposeAndClear();
+     pVSplitter.disposeAndClear();
+     pTabControl.disposeAndClear();
  }
  
 -void ScTabView::MakeDrawView( sal_uInt8 nForceDesignMode )
 +void ScTabView::MakeDrawView( TriState nForceDesignMode )
  {
      if (!pDrawView)
      {
diff --cc sd/source/ui/dlg/PaneChildWindows.cxx
index 364a4dc,7007a77..b004e76
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@@ -72,10 -73,10 +73,10 @@@ PaneChildWindow::PaneChildWindow 
      }
  }
  
 -PaneChildWindow::~PaneChildWindow (void)
 +PaneChildWindow::~PaneChildWindow()
  {
      ViewShellBase* pBase = NULL;
-     PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(pWindow);
+     PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(pWindow.get());
      if (pDockingWindow != NULL)
          pBase = ViewShellBase::GetViewShellBase(
              pDockingWindow->GetBindings().GetDispatcher()->GetFrame());
diff --cc sd/source/ui/framework/factories/ChildWindowPane.cxx
index 69e7983,d0c0766..9f70355
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@@ -185,10 -185,10 +185,10 @@@ void SAL_CALL ChildWindowPane::disposin
      return mpWindow;
  }
  
 -Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void)
 +Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow()
      throw (RuntimeException, std::exception)
  {
-     if (mpWindow == NULL || ! mxWindow.is())
+     if (mpWindow == nullptr || ! mxWindow.is())
          GetWindow();
      return Pane::getWindow();
  }
diff --cc sd/source/ui/framework/factories/FullScreenPane.cxx
index 0099754,f8428e1..ba793b2
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@@ -101,13 -102,9 +102,9 @@@ FullScreenPane::~FullScreenPane() throw
  {
  }
  
 -void SAL_CALL FullScreenPane::disposing (void)
 +void SAL_CALL FullScreenPane::disposing()
  {
-     // We have created the window pointed to by mpWindow, we delete it.
-     if (mpWindow != NULL)
-     {
-         delete mpWindow;
-     }
+     mpWindow.disposeAndClear();
  
      if (mpWorkWindow.get() != NULL)
      {
diff --cc sd/source/ui/framework/factories/Pane.cxx
index 0fd14c6,9a9f04d..696724e
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@@ -175,10 -175,10 +175,10 @@@ Reference<rendering::XCanvas> Pane::Cre
  {
      Reference<rendering::XCanvas> xCanvas;
  
-     if (mpWindow != NULL)
+     if (mpWindow != nullptr)
      {
          ::cppcanvas::SpriteCanvasSharedPtr pCanvas (
 -            ::cppcanvas::VCLFactory::getInstance().createSpriteCanvas(*mpWindow));
 +            cppcanvas::VCLFactory::createSpriteCanvas(*mpWindow));
          if (pCanvas.get() != NULL)
              xCanvas = Reference<rendering::XCanvas>(pCanvas->getUNOSpriteCanvas(), UNO_QUERY);
      }
diff --cc sd/source/ui/inc/Ruler.hxx
index 64d214f,efaa152..9186ebd
--- a/sd/source/ui/inc/Ruler.hxx
+++ b/sd/source/ui/inc/Ruler.hxx
@@@ -40,7 -40,8 +40,8 @@@ public
          sal_uInt16 nRulerFlags,
          SfxBindings& rBindings,
          WinBits nWinStyle);
 -    virtual ~Ruler (void);
 +    virtual ~Ruler();
+     virtual void dispose() SAL_OVERRIDE;
  
      void SetNullOffset(const Point& rOffset);
  
diff --cc sd/source/ui/inc/SlideSorter.hxx
index 8854e24,a95c96c..940ec90
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@@ -29,6 -29,6 +29,7 @@@
  #include <boost/shared_ptr.hpp>
  #include <boost/scoped_ptr.hpp>
  #include <boost/current_function.hpp>
++#include <vcl/scrbar.hxx>
  
  class ScrollBar;
  class ScrollBarBox;
@@@ -120,27 -118,27 +119,27 @@@ public
  
      /** Return the control of the vertical scroll bar.
      */
-     ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar() const { return mpVerticalScrollBar;}
 -    ScrollBar* GetVerticalScrollBar (void) const { return mpVerticalScrollBar;}
++    VclPtr<ScrollBar> GetVerticalScrollBar() const { return mpVerticalScrollBar;}
  
      /** Return the control of the horizontal scroll bar.
      */
-     ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar() const { return mpHorizontalScrollBar;}
 -    ScrollBar* GetHorizontalScrollBar (void) const { return mpHorizontalScrollBar;}
++    VclPtr<ScrollBar> GetHorizontalScrollBar() const { return mpHorizontalScrollBar;}
  
      /** Return the scroll bar filler that paints the little square that is
          enclosed by the two scroll bars.
      */
-     ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller() const { return mpScrollBarBox;}
 -    ScrollBarBox* GetScrollBarFiller (void) const { return mpScrollBarBox;}
++    VclPtr<ScrollBarBox> GetScrollBarFiller (void) const { return mpScrollBarBox;}
  
      /** Return the content window.  This is a sibling and is geometrically
          enclosed by the scroll bars.
      */
-     SharedSdWindow GetContentWindow() const { return mpContentWindow;}
 -    sd::Window* GetContentWindow (void) const { return mpContentWindow;}
++    VclPtr<sd::Window> GetContentWindow() const { return mpContentWindow;}
  
 -    model::SlideSorterModel& GetModel (void) const;
 +    model::SlideSorterModel& GetModel() const;
  
 -    view::SlideSorterView& GetView (void) const;
 +    view::SlideSorterView& GetView() const;
  
 -    controller::SlideSorterController& GetController (void) const;
 +    controller::SlideSorterController& GetController() const;
  
      /** Return the view shell that was given at construction.
          @return
diff --cc sd/source/ui/inc/ViewTabBar.hxx
index f3b4069,3c73bd9..82ed1d5
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@@ -63,13 -63,13 +63,13 @@@ public
              com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId,
          const ::com::sun::star::uno::Reference<
          ::com::sun::star::frame::XController>& rxController);
 -    virtual ~ViewTabBar (void);
 +    virtual ~ViewTabBar();
  
 -    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 +    virtual void SAL_CALL disposing() SAL_OVERRIDE;
  
-     ::boost::shared_ptr< ::TabControl> GetTabControl() const { return mpTabControl;}
 -    ::TabControl* GetTabControl (void) const { return mpTabControl;}
++    VclPtr<::TabControl> GetTabControl() const { return mpTabControl;}
  
 -    bool ActivatePage (void);
 +    bool ActivatePage();
  
      //----- drawing::framework::XConfigurationChangeListener ------------------
  
@@@ -146,10 -146,10 +146,10 @@@
      bool HasTabBarButton (
          const ::com::sun::star::drawing::framework::TabBarButton& rButton);
      ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton>
 -        GetTabBarButtons (void);
 +        GetTabBarButtons();
  
  private:
-     ::boost::shared_ptr< ::TabControl> mpTabControl;
+     VclPtr< ::TabControl> mpTabControl;
      ::com::sun::star::uno::Reference<
          ::com::sun::star::frame::XController> mxController;
      ::com::sun::star::uno::Reference<
diff --cc sd/source/ui/inc/Window.hxx
index 718c178,9586e61..bd83e21
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@@ -45,7 -45,8 +45,8 @@@ class Windo
  {
  public:
      Window (vcl::Window* pParent);
-     virtual ~Window();
 -    virtual ~Window (void);
++    virtual ~Window ();
+     virtual void dispose() SAL_OVERRIDE;
  
      void    SetViewShell (ViewShell* pViewSh);
  
diff --cc sd/source/ui/inc/sdpreslt.hxx
index bef6400,7afb5a8..69093c6
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@@ -41,8 -41,9 +41,8 @@@ public
          ::sd::DrawDocShell* pDocShell,
          vcl::Window* pWindow,
          const SfxItemSet& rInAttrs);
--
      virtual ~SdPresLayoutDlg();
+     virtual void dispose() SAL_OVERRIDE;
  
      void                GetAttr(SfxItemSet& rOutAttrs);
  
diff --cc sd/source/ui/presenter/PresenterTextView.cxx
index 7fde4a4,70854f5..0df3b85
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@@ -261,10 -261,10 +261,10 @@@ PresenterTextView::Implementation::~Imp
  {
      delete mpEditEngine;
      SfxItemPool::Free(mpEditEngineItemPool);
-     delete mpOutputDevice;
+     mpOutputDevice.disposeAndClear();
  }
  
 -EditEngine * PresenterTextView::Implementation::GetEditEngine (void)
 +EditEngine * PresenterTextView::Implementation::GetEditEngine()
  {
      if (mpEditEngine == NULL)
          mpEditEngine = CreateEditEngine ();
diff --cc sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index 8e40ef1,fc30395..1ab67e2
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@@ -74,10 -74,10 +74,10 @@@ class AllMasterPagesSelector::SortedMas
      : public ::std::set<SharedMasterPageDescriptor,MasterPageDescriptorOrder>
  {
  public:
 -    SortedMasterPageDescriptorList (void) {}
 +    SortedMasterPageDescriptorList() {}
  };
  
- MasterPagesSelector* AllMasterPagesSelector::Create (
+ VclPtr<vcl::Window> AllMasterPagesSelector::Create (
      vcl::Window* pParent,
      ViewShellBase& rViewShellBase,
      const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
diff --cc sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 5e8bdad,16081f2..de51f26
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@@ -89,8 -90,13 +90,13 @@@ CurrentMasterPagesSelector::CurrentMast
          | sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED);
  }
  
 -CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void)
 +CurrentMasterPagesSelector::~CurrentMasterPagesSelector()
  {
+     disposeOnce();
+ }
+ 
+ void CurrentMasterPagesSelector::dispose()
+ {
      if (mrDocument.GetDocSh() != NULL)
      {
          EndListening(*mrDocument.GetDocSh());
@@@ -102,9 -108,11 +108,11 @@@
  
      Link aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
      mrBase.GetEventMultiplexer()->RemoveEventListener(aLink);
+ 
+     MasterPagesSelector::dispose();
  }
  
 -void CurrentMasterPagesSelector::LateInit (void)
 +void CurrentMasterPagesSelector::LateInit()
  {
      MasterPagesSelector::LateInit();
      MasterPagesSelector::Fill();
diff --cc sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index e9a3cbe,29d26cb..9443b99
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@@ -67,9 -67,10 +67,10 @@@ private
          ViewShellBase& rBase,
          const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
          const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
 -    virtual ~CurrentMasterPagesSelector (void);
 +    virtual ~CurrentMasterPagesSelector();
+     virtual void dispose() SAL_OVERRIDE;
  
 -    virtual void LateInit (void) SAL_OVERRIDE;
 +    virtual void LateInit() SAL_OVERRIDE;
  
      DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent*);
  };
diff --cc sd/source/ui/sidebar/LayoutMenu.cxx
index 1306ffb,1871c13..c304b98
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@@ -192,13 -192,19 +192,19 @@@ void LayoutMenu::implConstruct( DrawDoc
      GetParent()->AddEventListener(aWindowEventHandlerLink);
  }
  
 -LayoutMenu::~LayoutMenu (void)
 +LayoutMenu::~LayoutMenu()
  {
+     disposeOnce();
+ }
+ 
+ void LayoutMenu::dispose()
+ {
      SAL_INFO("sd.ui", "destroying LayoutMenu at " << this);
      Dispose();
+     ValueSet::dispose();
  }
  
 -void LayoutMenu::Dispose (void)
 +void LayoutMenu::Dispose()
  {
      if (mbIsDisposed)
          return;
diff --cc sd/source/ui/sidebar/LayoutMenu.hxx
index 32c5819,c0fd975..94e16a4
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@@ -72,9 -72,10 +72,10 @@@ public
          vcl::Window* pParent,
          ViewShellBase& rViewShellBase,
          const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
 -    virtual ~LayoutMenu (void);
 +    virtual ~LayoutMenu();
+     virtual void dispose() SAL_OVERRIDE;
  
 -    void Dispose (void);
 +    void Dispose();
  
      /** Return a numerical value representing the currently selected
          layout.
diff --cc sd/source/ui/sidebar/MasterPagesSelector.cxx
index 28d3abd,53a1aca..f17c15a
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@@ -102,16 -102,22 +102,22 @@@ MasterPagesSelector::MasterPagesSelecto
      mpContainer->AddChangeListener(aChangeListener);
  }
  
 -MasterPagesSelector::~MasterPagesSelector (void)
 +MasterPagesSelector::~MasterPagesSelector()
  {
+     disposeOnce();
+ }
+ 
+ void MasterPagesSelector::dispose()
+ {
      Clear();
      UpdateLocks(ItemList());
  
      Link aChangeListener (LINK(this,MasterPagesSelector,ContainerChangeListener));
      mpContainer->RemoveChangeListener(aChangeListener);
+     PreviewValueSet::dispose();
  }
  
 -void MasterPagesSelector::LateInit (void)
 +void MasterPagesSelector::LateInit()
  {
  }
  
diff --cc sd/source/ui/sidebar/MasterPagesSelector.hxx
index eab3854,7c642d8..e512179
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@@ -62,9 -62,10 +62,10 @@@ public
          ViewShellBase& rBase,
          const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
          const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
 -    virtual ~MasterPagesSelector (void);
 +    virtual ~MasterPagesSelector();
+     virtual void dispose() SAL_OVERRIDE;
  
 -    virtual void LateInit (void);
 +    virtual void LateInit();
  
      /** Return the height that this control needs to show all of its lines.
      */
diff --cc sd/source/ui/sidebar/NavigatorWrapper.cxx
index 6df0a2e,c42e47f..376d22b
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@@ -33,27 -33,34 +33,34 @@@ NavigatorWrapper::NavigatorWrapper 
      SfxBindings* pBindings)
      : Control(pParent, 0),
        mrViewShellBase(rViewShellBase),
-       maNavigator(
+       maNavigator(VclPtr<SdNavigatorWin>::Create(
          this,
-         NULL,
+         (::sd::NavigatorChildWindow*)NULL,
          SdResId(FLT_NAVIGATOR),
          pBindings,
-         ::boost::bind(&NavigatorWrapper::UpdateNavigator, this))
+         ::boost::bind(&NavigatorWrapper::UpdateNavigator, this)))
  {
-     maNavigator.SetPosSizePixel(
+     maNavigator->SetPosSizePixel(
          Point(0,0),
          GetSizePixel());
-     maNavigator.SetBackground(sfx2::sidebar::Theme::GetWallpaper(sfx2::sidebar::Theme::Paint_PanelBackground));
-     maNavigator.Show();
+     maNavigator->SetBackground(sfx2::sidebar::Theme::GetWallpaper(sfx2::sidebar::Theme::Paint_PanelBackground));

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list