vclwidget: change all vcl::window fields to be wrapped in VclPtr

and update the VclWidget clang plugin to
- warn about unconverted fields
- .clear() all VclPtr fields in dispose() methods

Change-Id: I6e657c215bc6807efd992555399b3b1fc16c89b5

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

66 files changed, 658 insertions, 334 deletions

diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 2a904ca2421c..1ec9b03fcd02 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -199,7 +199,6 @@ void SfxChildWindow::Destroy()
 SfxChildWindow::~SfxChildWindow()
 {
     delete pContext;
-    delete pWindow;
     delete pImp;
 }
 
@@ -336,16 +335,16 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
         sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
         if ( pWindow->GetStyle() & WB_SIZEABLE )
             nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
-        aInfo.aWinState = static_cast<SystemWindow*>(pWindow)->GetWindowState( nMask );
+        aInfo.aWinState = static_cast<SystemWindow*>(pWindow.get())->GetWindowState( nMask );
     }
     else if ( pWindow->GetType() == RSC_DOCKINGWINDOW )
     {
-        if (static_cast<DockingWindow*>(pWindow)->GetFloatingWindow() )
-            aInfo.aWinState = static_cast<DockingWindow*>(pWindow)->GetFloatingWindow()->GetWindowState();
+        if (static_cast<DockingWindow*>(pWindow.get())->GetFloatingWindow() )
+            aInfo.aWinState = static_cast<DockingWindow*>(pWindow.get())->GetFloatingWindow()->GetWindowState();
         else
         {
             SfxChildWinInfo aTmpInfo;
-            static_cast<SfxDockingWindow*>(pWindow)->FillInfo( aTmpInfo );
+            static_cast<SfxDockingWindow*>(pWindow.get())->FillInfo( aTmpInfo );
             aInfo.aExtraString = aTmpInfo.aExtraString;
         }
     }
@@ -518,7 +517,6 @@ SfxChildWindowContext::SfxChildWindowContext( sal_uInt16 nId )
 
 SfxChildWindowContext::~SfxChildWindowContext()
 {
-    delete pWindow;
 }
 
 FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const
@@ -654,10 +652,10 @@ void SfxChildWindow::Hide()
     switch ( pWindow->GetType() )
     {
         case RSC_DOCKINGWINDOW :
-            static_cast<DockingWindow*>(pWindow)->Hide();
+            static_cast<DockingWindow*>(pWindow.get())->Hide();
             break;
         case RSC_TOOLBOX :
-            static_cast<ToolBox*>(pWindow)->Hide();
+            static_cast<ToolBox*>(pWindow.get())->Hide();
             break;
         default:
             pWindow->Hide();
@@ -670,10 +668,10 @@ void SfxChildWindow::Show( sal_uInt16 nFlags )
     switch ( pWindow->GetType() )
     {
         case RSC_DOCKINGWINDOW :
-            static_cast<DockingWindow*>(pWindow)->Show( true, nFlags );
+            static_cast<DockingWindow*>(pWindow.get())->Show( true, nFlags );
             break;
         case RSC_TOOLBOX :
-            static_cast<ToolBox*>(pWindow)->Show( true, nFlags );
+            static_cast<ToolBox*>(pWindow.get())->Show( true, nFlags );
             break;
         default:
             pWindow->Show( true, nFlags );
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 78aa1fb4cef4..87ae93d9ef93 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -33,7 +33,7 @@ class SvFileObject : public sfx2::SvLinkSource
     OUString            sReferer;
     Link                aEndEditLink;
     SfxMediumRef        xMed;
-    vcl::Window*             pOldParent;
+    VclPtr<vcl::Window> pOldParent;
 
     sal_uInt8 nType;
 
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index e34686e7b40d..a990518bc7a4 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -28,6 +28,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <tools/link.hxx>
+#include <vcl/vclptr.hxx>
 #include <vector>
 
 struct HelpHistoryEntry_Impl
@@ -63,7 +64,7 @@ friend class SfxHelpWindow_Impl;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > m_xListener;
 
     HelpHistoryList_Impl*       m_pHistory;
-    SfxHelpWindow_Impl*         m_pWindow;
+    VclPtr<SfxHelpWindow_Impl>  m_pWindow;
     sal_uIntPtr                 m_nCurPos;
     OUString                    m_aCurrentURL;
     com::sun::star::uno::Any    m_aViewData;
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index f66a2b0a3d6e..ecc5208f2fff 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -57,14 +57,16 @@ namespace sfx2
 
 class SvDDELinkEditDialog : public ModalDialog
 {
-    Edit            *m_pEdDdeApp;
-    Edit            *m_pEdDdeTopic;
-    Edit            *m_pEdDdeItem;
-    OKButton        *m_pOKButton;
+    VclPtr<Edit>            m_pEdDdeApp;
+    VclPtr<Edit>            m_pEdDdeTopic;
+    VclPtr<Edit>            m_pEdDdeItem;
+    VclPtr<OKButton>        m_pOKButton;
 
     DECL_STATIC_LINK( SvDDELinkEditDialog, EditHdl_Impl, Edit* );
 public:
     SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* );
+    virtual ~SvDDELinkEditDialog();
+    virtual void dispose() SAL_OVERRIDE;
     OUString GetCmd() const;
 };
 
@@ -90,6 +92,20 @@ SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLin
     m_pOKButton->Enable( !sServer.isEmpty() && !sTopic.isEmpty() && !sItem.isEmpty() );
 }
 
+SvDDELinkEditDialog::~SvDDELinkEditDialog()
+{
+    dispose();
+}
+
+void SvDDELinkEditDialog::dispose()
+{
+    m_pEdDdeApp.clear();
+    m_pEdDdeTopic.clear();
+    m_pEdDdeItem.clear();
+    m_pOKButton.clear();
+    ModalDialog::dispose();
+}
+
 OUString SvDDELinkEditDialog::GetCmd() const
 {
     OUString sCmd( m_pEdDdeApp->GetText() ), sRet;
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 4f0aa7382a6b..2de98192935b 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -45,8 +45,8 @@ class  ImplDdeItem;
 struct BaseLink_Impl
 {
     Link                m_aEndEditLink;
-    LinkManager*      m_pLinkMgr;
-    vcl::Window*             m_pParentWin;
+    LinkManager*        m_pLinkMgr;
+    VclPtr<vcl::Window> m_pParentWin;
     FileDialogHelper*   m_pFileDlg;
     bool                m_bIsConnect;
 
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 78c2df24484b..333e07bc9ad0 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -432,6 +432,17 @@ HelpTabPage_Impl::HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl
 {
 }
 
+HelpTabPage_Impl::~HelpTabPage_Impl()
+{
+    dispose();
+}
+
+void HelpTabPage_Impl::dispose()
+{
+    m_pIdxWin.clear();
+    TabPage::dispose();
+}
+
 // class ContentTabPage_Impl ---------------------------------------------
 ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
     : HelpTabPage_Impl(pParent, _pIdxWin, "HelpContentPage",
@@ -443,6 +454,17 @@ ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindo
     m_pContentBox->set_height_request(aSize.Height());
 }
 
+ContentTabPage_Impl::~ContentTabPage_Impl()
+{
+    dispose();
+}
+
+void ContentTabPage_Impl::dispose()
+{
+    m_pContentBox.clear();
+    HelpTabPage_Impl::dispose();
+}
+
 void ContentTabPage_Impl::ActivatePage()
 {
     if ( !m_pIdxWin->WasCursorLeftOrRight() )
@@ -557,6 +579,8 @@ IndexTabPage_Impl::~IndexTabPage_Impl()
 void IndexTabPage_Impl::dispose()
 {
     ClearIndex();
+    m_pIndexCB.clear();
+    m_pOpenBtn.clear();
     HelpTabPage_Impl::dispose();
 }
 
@@ -984,6 +1008,13 @@ void SearchTabPage_Impl::dispose()
     aUserData = comphelper::string::stripEnd(aUserData, ';');
     Any aUserItem = makeAny( OUString( aUserData ) );
     aViewOpt.SetUserItem( USERITEM_NAME, aUserItem );
+
+    m_pSearchED.clear();
+    m_pSearchBtn.clear();
+    m_pFullWordsCB.clear();
+    m_pScopeCB.clear();
+    m_pResultsLB.clear();
+    m_pOpenBtn.clear();
     HelpTabPage_Impl::dispose();
 }
 
@@ -1295,6 +1326,17 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl(vcl::Window* pParent, SfxHelpIndexW
     }
 }
 
+BookmarksTabPage_Impl::~BookmarksTabPage_Impl()
+{
+    dispose();
+}
+
+void BookmarksTabPage_Impl::dispose()
+{
+    m_pBookmarksBox.clear();
+    m_pBookmarksPB.clear();
+    HelpTabPage_Impl::dispose();
+}
 
 
 IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl)
@@ -1447,10 +1489,10 @@ void SfxHelpIndexWindow_Impl::dispose()
 {
     sfx2::RemoveFromTaskPaneList( this );
 
-    DELETEZ( pCPage );
-    DELETEZ( pIPage );
-    DELETEZ( pSPage );
-    DELETEZ( pBPage );
+    pCPage.clear();
+    pIPage.clear();
+    pSPage.clear();
+    pBPage.clear();
 
     for ( sal_uInt16 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
         delete static_cast<OUString*>(m_pActiveLB->GetEntryData(i));
@@ -1459,7 +1501,9 @@ void SfxHelpIndexWindow_Impl::dispose()
     aViewOpt.SetPageID( (sal_Int32)m_pTabCtrl->GetCurPageId() );
 
     disposeBuilder();
-
+    m_pActiveLB.clear();
+    m_pTabCtrl.clear();
+    pParentWin.clear();
     vcl::Window::dispose();
 }
 
@@ -1933,9 +1977,11 @@ void SfxHelpTextWindow_Impl::dispose()
 
     bIsInClose = true;
     SvtMiscOptions().RemoveListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
-    delete pSrchDlg;
+    pSrchDlg.clear();
     aToolBox.disposeAndClear();
     aOnStartupCB.disposeAndClear();
+    pHelpWin.clear();
+    pTextWin.clear();
     vcl::Window::dispose();
 }
 
@@ -2308,11 +2354,9 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg )
 
 
 
-IMPL_LINK( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, pDlg )
+IMPL_LINK( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, /*pDlg*/ )
 {
-    if ( pDlg )
-        delete pSrchDlg;
-    pSrchDlg = NULL;
+    pSrchDlg.clear();
     return 0;
 }
 
@@ -3036,12 +3080,10 @@ SfxHelpWindow_Impl::~SfxHelpWindow_Impl()
 void SfxHelpWindow_Impl::dispose()
 {
     SaveConfig();
-    vcl::Window* pDel = pIndexWin;
-    pIndexWin = NULL;
-    delete pDel;
+    pIndexWin.clear();
 
     pTextWin->CloseFrame();
-    delete pTextWin;
+    pTextWin.clear();
     SplitWindow::dispose();
 }
 
@@ -3249,7 +3291,16 @@ SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window* pParen
         SetText(get<FixedText>("alttitle")->GetText());
 }
 
+SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl()
+{
+    dispose();
+}
 
+void SfxAddHelpBookmarkDialog_Impl::dispose()
+{
+    m_pTitleED.clear();
+    ModalDialog::dispose();
+}
 
 void SfxAddHelpBookmarkDialog_Impl::SetTitle( const OUString& rTitle )
 {
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 38d15e84e025..45ceb3007468 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -76,11 +76,13 @@ class SfxHelpIndexWindow_Impl;
 class HelpTabPage_Impl : public TabPage
 {
 protected:
-    SfxHelpIndexWindow_Impl*    m_pIdxWin;
+    VclPtr<SfxHelpIndexWindow_Impl>    m_pIdxWin;
 
 public:
     HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin,
         const OString& rID, const OUString& rUIXMLDescription);
+    virtual ~HelpTabPage_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual Control*    GetLastFocusControl() = 0;
 };
@@ -90,10 +92,12 @@ public:
 class ContentTabPage_Impl : public HelpTabPage_Impl
 {
 private:
-    ContentListBox_Impl* m_pContentBox;
+    VclPtr<ContentListBox_Impl> m_pContentBox;
 
 public:
     ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin);
+    virtual ~ContentTabPage_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void        ActivatePage() SAL_OVERRIDE;
     virtual Control*    GetLastFocusControl() SAL_OVERRIDE;
@@ -119,8 +123,8 @@ public:
 class IndexTabPage_Impl : public HelpTabPage_Impl
 {
 private:
-    IndexBox_Impl*      m_pIndexCB;
-    PushButton*         m_pOpenBtn;
+    VclPtr<IndexBox_Impl>      m_pIndexCB;
+    VclPtr<PushButton>         m_pOpenBtn;
 
     Idle                aFactoryIdle;
     Timer               aKeywordTimer;
@@ -196,12 +200,12 @@ public:
 class SearchTabPage_Impl : public HelpTabPage_Impl
 {
 private:
-    SearchBox_Impl*         m_pSearchED;
-    PushButton*             m_pSearchBtn;
-    CheckBox*               m_pFullWordsCB;
-    CheckBox*               m_pScopeCB;
-    SearchResultsBox_Impl*  m_pResultsLB;
-    PushButton*             m_pOpenBtn;
+    VclPtr<SearchBox_Impl>         m_pSearchED;
+    VclPtr<PushButton>             m_pSearchBtn;
+    VclPtr<CheckBox>               m_pFullWordsCB;
+    VclPtr<CheckBox>               m_pScopeCB;
+    VclPtr<SearchResultsBox_Impl>  m_pResultsLB;
+    VclPtr<PushButton>             m_pOpenBtn;
 
     OUString                aFactory;
 
@@ -252,13 +256,15 @@ public:
 class BookmarksTabPage_Impl : public HelpTabPage_Impl
 {
 private:
-    BookmarksBox_Impl*  m_pBookmarksBox;
-    PushButton*         m_pBookmarksPB;
+    VclPtr<BookmarksBox_Impl>  m_pBookmarksBox;
+    VclPtr<PushButton>         m_pBookmarksPB;
 
     DECL_LINK(OpenHdl, void *);
 
 public:
     BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
+    virtual ~BookmarksTabPage_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void        ActivatePage() SAL_OVERRIDE;
     virtual Control*    GetLastFocusControl() SAL_OVERRIDE;
@@ -276,8 +282,8 @@ class SfxHelpWindow_Impl;
 class SfxHelpIndexWindow_Impl : public vcl::Window, public VclBuilderContainer
 {
 private:
-    ListBox*            m_pActiveLB;
-    TabControl*         m_pTabCtrl;
+    VclPtr<ListBox>            m_pActiveLB;
+    VclPtr<TabControl>         m_pTabCtrl;
 
     Idle                aIdle;
 
@@ -286,12 +292,12 @@ private:
     Link                aIndexKeywordLink;
     OUString            sKeyword;
 
-    SfxHelpWindow_Impl*     pParentWin;
+    VclPtr<SfxHelpWindow_Impl>     pParentWin;
 
-    ContentTabPage_Impl*    pCPage;
-    IndexTabPage_Impl*      pIPage;
-    SearchTabPage_Impl*     pSPage;
-    BookmarksTabPage_Impl*  pBPage;
+    VclPtr<ContentTabPage_Impl>    pCPage;
+    VclPtr<IndexTabPage_Impl>      pIPage;
+    VclPtr<SearchTabPage_Impl>     pSPage;
+    VclPtr<BookmarksTabPage_Impl>  pBPage;
 
     long                nMinWidth;
     bool                bWasCursorLeftOrRight;
@@ -419,9 +425,9 @@ private:
     OUString                aOnStartupText;
     OUString                sCurrentFactory;
 
-    SfxHelpWindow_Impl*     pHelpWin;
-    vcl::Window*                 pTextWin;
-    sfx2::SearchDialog*     pSrchDlg;
+    VclPtr<SfxHelpWindow_Impl>     pHelpWin;
+    VclPtr<vcl::Window>            pTextWin;
+    VclPtr<sfx2::SearchDialog>     pSrchDlg;
     ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
                             xFrame;
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
@@ -489,8 +495,8 @@ friend class SfxHelpIndexWindow_Impl;
     ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
                                 xFrame;
 
-    SfxHelpIndexWindow_Impl*    pIndexWin;
-    SfxHelpTextWindow_Impl*     pTextWin;
+    VclPtr<SfxHelpIndexWindow_Impl>    pIndexWin;
+    VclPtr<SfxHelpTextWindow_Impl>     pTextWin;
     HelpInterceptor_Impl*       pHelpInterceptor;
     HelpListener_Impl*          pHelpListener;
 
@@ -561,9 +567,11 @@ public:
 class SfxAddHelpBookmarkDialog_Impl : public ModalDialog
 {
 private:
-    Edit* m_pTitleED;
+    VclPtr<Edit> m_pTitleED;
 public:
     SfxAddHelpBookmarkDialog_Impl( vcl::Window* pParent, bool bRename = true );
+    virtual ~SfxAddHelpBookmarkDialog_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetTitle( const OUString& rTitle );
     OUString GetTitle() const { return m_pTitleED->GetText(); }
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 7f3920dcc088..1591113ab7ee 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -853,7 +853,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
             case SfxChildAlignment::LOWESTTOP:
                 aSize.Width() = aTmp.GetWidth();
                 if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW )
-                    aSize = static_cast<SplitWindow *>(pCli->pWin)->CalcLayoutSizePixel( aSize );
+                    aSize = static_cast<SplitWindow *>(pCli->pWin.get())->CalcLayoutSizePixel( aSize );
                 bAllowHiding = false;
                 aBorder.Top() += aSize.Height();
                 aPos = aTmp.TopLeft();
@@ -868,7 +868,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
             case SfxChildAlignment::HIGHESTBOTTOM:
                 aSize.Width() = aTmp.GetWidth();
                 if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW )
-                    aSize = static_cast<SplitWindow *>(pCli->pWin)->CalcLayoutSizePixel( aSize );
+                    aSize = static_cast<SplitWindow *>(pCli->pWin.get())->CalcLayoutSizePixel( aSize );
                 aBorder.Bottom() += aSize.Height();
                 aPos = aTmp.BottomLeft();
                 aPos.Y() -= (aSize.Height()-1);
@@ -883,7 +883,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
             case SfxChildAlignment::TOOLBOXLEFT:
                 aSize.Height() = aTmp.GetHeight();
                 if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW )
-                    aSize = static_cast<SplitWindow *>(pCli->pWin)->CalcLayoutSizePixel( aSize );
+                    aSize = static_cast<SplitWindow *>(pCli->pWin.get())->CalcLayoutSizePixel( aSize );
                 bAllowHiding = false;
                 aBorder.Left() += aSize.Width();
                 aPos = aTmp.TopLeft();
@@ -898,7 +898,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
             case SfxChildAlignment::TOOLBOXRIGHT:
                 aSize.Height() = aTmp.GetHeight();
                 if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW )
-                    aSize = static_cast<SplitWindow *>(pCli->pWin)->CalcLayoutSizePixel( aSize );
+                    aSize = static_cast<SplitWindow *>(pCli->pWin.get())->CalcLayoutSizePixel( aSize );
                 aBorder.Right() += aSize.Width();
                 aPos = aTmp.TopRight();
                 aPos.X() -= (aSize.Width()-1);
@@ -1071,10 +1071,10 @@ void SfxWorkWindow::ShowChildren_Impl()
                 switch ( pCli->pWin->GetType() )
                 {
                     case RSC_DOCKINGWINDOW :
-                        static_cast<DockingWindow*>(pCli->pWin)->Show( true, nFlags );
+                        static_cast<DockingWindow*>(pCli->pWin.get())->Show( true, nFlags );
                         break;
                     case RSC_SPLITWINDOW :
-                        static_cast<SplitWindow*>(pCli->pWin)->Show( true, nFlags );
+                        static_cast<SplitWindow*>(pCli->pWin.get())->Show( true, nFlags );
                         break;
                     default:
                         pCli->pWin->Show( true, nFlags );
@@ -1088,7 +1088,7 @@ void SfxWorkWindow::ShowChildren_Impl()
                 switch ( pCli->pWin->GetType() )
                 {
                     case RSC_DOCKINGWINDOW :
-                        static_cast<DockingWindow*>(pCli->pWin)->Hide();
+                        static_cast<DockingWindow*>(pCli->pWin.get())->Hide();
                         break;
                     default:
                         pCli->pWin->Hide();
@@ -1111,7 +1111,7 @@ void SfxWorkWindow::HideChildren_Impl()
             switch ( pChild->pWin->GetType() )
             {
                 case RSC_DOCKINGWINDOW :
-                    static_cast<DockingWindow*>(pChild->pWin)->Hide();
+                    static_cast<DockingWindow*>(pChild->pWin.get())->Hide();
                     break;
                 default:
                     pChild->pWin->Hide();
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index c62eedabb69f..8dd755cba732 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -78,7 +78,7 @@ void ThumbnailView::dispose()
     if (xComponent.is())
         xComponent->dispose ();
 
-    delete mpScrBar;
+    mpScrBar.clear();
     delete mpItemAttrs;
     delete mpProcessor;
 
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 4d0886e8de2f..3ba161b65c3a 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -593,7 +593,7 @@ void ThumbnailViewAcc::ThrowIfDisposed (void)
     }
     else
     {
-        DBG_ASSERT (mpParent!=NULL, "ValueSetAcc not disposed but mpParent == NULL");
+        DBG_ASSERT (mpParent!=nullptr, "ValueSetAcc not disposed but mpParent == NULL");
     }
 }
 
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 3eae0c037e66..4efb7f96e1c8 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 
+#include <vcl/vclptr.hxx>
 #include <vector>
 
 class ThumbnailView;
@@ -78,7 +79,7 @@ public:
 
     // XComponent
     virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-        { WeakComponentImplHelperBase::dispose(); }
+        { mpParent.clear(); WeakComponentImplHelperBase::dispose(); }
     virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         { WeakComponentImplHelperBase::addEventListener(xListener); }
     virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
@@ -129,7 +130,7 @@ public:
 private:
     ::std::vector< ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessibleEventListener > >   mxEventListeners;
-    ThumbnailView*                                                           mpParent;
+    VclPtr<ThumbnailView>                                               mpParent;
     bool                                                                mbIsTransientChildrenDisabled;
     /// The current FOCUSED state.
     bool mbIsFocused;
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index c866a8f9513c..4d265d75d311 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -117,7 +117,6 @@ ThumbnailViewItem::ThumbnailViewItem(ThumbnailView &rView, sal_uInt16 nId)
 
 ThumbnailViewItem::~ThumbnailViewItem()
 {
-    delete mpTitleED;
     if( mpxAcc )
     {
         static_cast< ThumbnailViewItemAcc* >( mpxAcc->get() )->ParentDestroyed();
@@ -178,9 +177,9 @@ void ThumbnailViewItem::setEditTitle (bool edit, bool bChangeFocus)
     {
         mpTitleED->SetText(maTitle);
         updateTitleEditSize();
-        static_cast<ResizableMultiLineEdit*>(mpTitleED)->SetInGrabFocus(true);
+        static_cast<ResizableMultiLineEdit*>(mpTitleED.get())->SetInGrabFocus(true);
         mpTitleED->GrabFocus();
-        static_cast<ResizableMultiLineEdit*>(mpTitleED)->SetInGrabFocus(false);
+        static_cast<ResizableMultiLineEdit*>(mpTitleED.get())->SetInGrabFocus(false);
     }
     else if (bChangeFocus)
     {
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index e157e6ebfd85..81032bdd11d0 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -61,6 +61,8 @@ void SfxAlienWarningDialog::dispose()
     bool bChecked = m_pWarningOnBox->IsChecked();
     if ( aSaveOpt.IsWarnAlienFormat() != bChecked )
         aSaveOpt.SetWarnAlienFormat( bChecked );
+    m_pKeepCurrentBtn.clear();
+    m_pWarningOnBox.clear();
     MessageDialog::dispose();
 }
 
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index fcb9074ecfc2..39bee6d64b43 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -203,8 +203,7 @@ void BackingWindow::dispose()
     // deregister drag&drop helper
     if (mxDropTargetListener.is())
     {
-        for (std::vector<vcl::Window*>::iterator aI = maDndWindows.begin(),
-            aEnd = maDndWindows.end(); aI != aEnd; ++aI)
+        for (auto aI = maDndWindows.begin(), aEnd = maDndWindows.end(); aI != aEnd; ++aI)
         {
             vcl::Window *pDndWin = *aI;
             css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget =
@@ -218,6 +217,27 @@ void BackingWindow::dispose()
         mxDropTargetListener = css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >();
     }
     disposeBuilder();
+    mpOpenButton.clear();
+    mpRecentButton.clear();
+    mpTemplateButton.clear();
+    mpCreateLabel.clear();
+    mpWriterAllButton.clear();
+    mpCalcAllButton.clear();
+    mpImpressAllButton.clear();
+    mpDrawAllButton.clear();
+    mpDBAllButton.clear();
+    mpMathAllButton.clear();
+    mpHelpButton.clear();
+    mpExtensionsButton.clear();
+    mpAllButtonsBox.clear();
+    mpButtonsBox.clear();
+    mpSmallButtonsBox.clear();
+    mpThinBox1.clear();
+    mpThinBox2.clear();
+    mpHelpBox.clear();
+    mpExtensionsBox.clear();
+    mpAllRecentThumbnails.clear();
+    mpLocalView.clear();
     vcl::Window::dispose();
 }
 
@@ -469,8 +489,7 @@ void BackingWindow::setOwningFrame( const com::sun::star::uno::Reference< com::s
     // establish drag&drop mode
     mxDropTargetListener.set(new OpenFileDropTargetListener(mxContext, mxFrame));
 
-    for (std::vector<vcl::Window*>::iterator aI = maDndWindows.begin(),
-        aEnd = maDndWindows.end(); aI != aEnd; ++aI)
+    for (auto aI = maDndWindows.begin(), aEnd = maDndWindows.end(); aI != aEnd; ++aI)
     {
         vcl::Window *pDndWin = *aI;
         css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget =
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 023e1cb7e88b..a9a07f662e45 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -61,35 +61,35 @@ class BackingWindow
     /** helper for drag&drop. */
     com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener;
 
-    PushButton*                     mpOpenButton;
-    PushButton*                     mpRecentButton;
-    MenuButton*                     mpTemplateButton;
-
-    FixedText*                      mpCreateLabel;
-
-    PushButton*                     mpWriterAllButton;
-    PushButton*                     mpCalcAllButton;
-    PushButton*                     mpImpressAllButton;
-    PushButton*                     mpDrawAllButton;
-    PushButton*                     mpDBAllButton;
-    PushButton*                     mpMathAllButton;
-
-    PushButton*                     mpHelpButton;
-    PushButton*                     mpExtensionsButton;
-
-    VclBox*                         mpAllButtonsBox;
-    VclBox*                         mpButtonsBox;
-    VclBox*                         mpSmallButtonsBox;
-    VclBox*                         mpThinBox1;
-    VclBox*                         mpThinBox2;
-    VclBox*                         mpHelpBox;
-    VclBox*                         mpExtensionsBox;
-
-    RecentDocsView*                 mpAllRecentThumbnails;
-    TemplateDefaultView*              mpLocalView;
-    bool                            mbLocalViewInitialized;
-
-    std::vector<vcl::Window*>            maDndWindows;
+    VclPtr<PushButton>                     mpOpenButton;
+    VclPtr<PushButton>                     mpRecentButton;
+    VclPtr<MenuButton>                     mpTemplateButton;
+
+    VclPtr<FixedText>                      mpCreateLabel;
+
+    VclPtr<PushButton>                     mpWriterAllButton;
+    VclPtr<PushButton>                     mpCalcAllButton;
+    VclPtr<PushButton>                     mpImpressAllButton;
+    VclPtr<PushButton>                     mpDrawAllButton;
+    VclPtr<PushButton>                     mpDBAllButton;
+    VclPtr<PushButton>                     mpMathAllButton;
+
+    VclPtr<PushButton>                     mpHelpButton;
+    VclPtr<PushButton>                     mpExtensionsButton;
+
+    VclPtr<VclBox>                         mpAllButtonsBox;
+    VclPtr<VclBox>                         mpButtonsBox;
+    VclPtr<VclBox>                         mpSmallButtonsBox;
+    VclPtr<VclBox>                         mpThinBox1;
+    VclPtr<VclBox>                         mpThinBox2;
+    VclPtr<VclBox>                         mpHelpBox;
+    VclPtr<VclBox>                         mpExtensionsBox;
+
+    VclPtr<RecentDocsView>                 mpAllRecentThumbnails;
+    VclPtr<TemplateDefaultView>            mpLocalView;
+    bool                                   mbLocalViewInitialized;
+
+    std::vector<VclPtr<vcl::Window> >      maDndWindows;
 
     Rectangle                       maStartCentButtons;
 
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index e624ad6d8b13..3e2f0b0f2e44 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -45,6 +45,12 @@ using namespace ::com::sun::star::uno;
 
 #define USERITEM_NAME OUString("UserItem")
 
+SingleTabDlgImpl::SingleTabDlgImpl()
+        : m_pSfxPage(NULL)
+        , m_pLine(NULL)
+    {
+    }
+
 class SfxModelessDialog_Impl : public SfxListener
 {
 public:
@@ -706,9 +712,10 @@ SfxSingleTabDialog::~SfxSingleTabDialog()
 
 void SfxSingleTabDialog::dispose()
 {
-    delete pImpl->m_pSfxPage;
-    delete pImpl->m_pLine;
     delete pImpl;
+    pOKBtn.clear();
+    pCancelBtn.clear();
+    pHelpBtn.clear();
     SfxModalDialog::dispose();
 }
 
@@ -723,7 +730,7 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage,
 
 {
     SetUniqId(nSettingsId);
-    delete pImpl->m_pSfxPage;
+    pImpl->m_pSfxPage.clear();
     pImpl->m_pSfxPage = pTabPage;
     fnGetRanges = pRangesFunc;
 
diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx
index 61d963ef8a5e..b365adab07da 100644
--- a/sfx2/source/dialog/checkin.cxx
+++ b/sfx2/source/dialog/checkin.cxx
@@ -20,6 +20,19 @@ SfxCheckinDialog::SfxCheckinDialog( vcl::Window* pParent ) :
     m_pOKBtn->SetClickHdl( LINK( this, SfxCheckinDialog, OKHdl ) );
 }
 
+SfxCheckinDialog::~SfxCheckinDialog()
+{
+    dispose();
+}
+
+void SfxCheckinDialog::dispose()
+{
+    m_pCommentED.clear();
+    m_pMajorCB.clear();
+    m_pOKBtn.clear();
+    ModalDialog::dispose();
+}
+
 OUString SfxCheckinDialog::GetComment( )
 {
     return m_pCommentED->GetText( );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 03b9028ea4ba..75581c9f63e7 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -626,6 +626,20 @@ SfxDocumentDescPage::SfxDocumentDescPage( vcl::Window * pParent, const SfxItemSe
     m_pCommentEd->set_height_request(m_pCommentEd->GetTextHeight() * 16);
 }
 
+SfxDocumentDescPage::~SfxDocumentDescPage()
+{
+    dispose();
+}
+
+void SfxDocumentDescPage::dispose()
+{
+    m_pTitleEd.clear();
+    m_pThemaEd.clear();
+    m_pKeywordsEd.clear();
+    m_pCommentEd.clear();
+    SfxTabPage::dispose();
+}
+
 SfxTabPage *SfxDocumentDescPage::Create(vcl::Window *pParent, const SfxItemSet *rItemSet)
 {
      return new SfxDocumentDescPage(pParent, *rItemSet);
@@ -789,6 +803,33 @@ SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSe
         m_pSignatureBtn->Disable();
 }
 
+SfxDocumentPage::~SfxDocumentPage()
+{
+    dispose();
+}
+
+void SfxDocumentPage::dispose()
+{
+    m_pBmp.clear();
+    m_pNameED.clear();
+    m_pChangePassBtn.clear();
+    m_pShowTypeFT.clear();
+    m_pReadOnlyCB.clear();
+    m_pFileValFt.clear();
+    m_pShowSizeFT.clear();
+    m_pCreateValFt.clear();
+    m_pChangeValFt.clear();
+    m_pSignedValFt.clear();
+    m_pSignatureBtn.clear();
+    m_pPrintValFt.clear();
+    m_pTimeLogValFt.clear();
+    m_pDocNoValFt.clear();
+    m_pUseUserDataCB.clear();
+    m_pDeleteBtn.clear();
+    m_pTemplFt.clear();
+    m_pTemplValFt.clear();
+    SfxTabPage::dispose();
+}
 
 
 IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl)
@@ -1209,19 +1250,20 @@ void CustomPropertiesYesNoButton::dispose()
 
 class DurationDialog_Impl : public ModalDialog
 {
-    CheckBox*       m_pNegativeCB;
-    NumericField*   m_pYearNF;
-    NumericField*   m_pMonthNF;
-    NumericField*   m_pDayNF;
-    NumericField*   m_pHourNF;
-    NumericField*   m_pMinuteNF;
-    NumericField*   m_pSecondNF;
-    NumericField*   m_pMSecondNF;
+    VclPtr<CheckBox>       m_pNegativeCB;
+    VclPtr<NumericField>   m_pYearNF;
+    VclPtr<NumericField>   m_pMonthNF;
+    VclPtr<NumericField>   m_pDayNF;
+    VclPtr<NumericField>   m_pHourNF;
+    VclPtr<NumericField>   m_pMinuteNF;
+    VclPtr<NumericField>   m_pSecondNF;
+    VclPtr<NumericField>   m_pMSecondNF;
 
 public:
 
     DurationDialog_Impl( vcl::Window* pParent, const util::Duration& rDuration );
-
+    virtual ~DurationDialog_Impl();
+    virtual void dispose() SAL_OVERRIDE;
     util::Duration  GetDuration() const;
 };
 
@@ -1249,6 +1291,24 @@ DurationDialog_Impl::DurationDialog_Impl(vcl::Window* pParent,
     m_pMSecondNF->SetValue(rDuration.NanoSeconds);
 }
 
+DurationDialog_Impl::~DurationDialog_Impl()
+{
+    dispose();
+}
+
+void DurationDialog_Impl::dispose()
+{
+    m_pNegativeCB.clear();
+    m_pYearNF.clear();
+    m_pMonthNF.clear();
+    m_pDayNF.clear();
+    m_pHourNF.clear();
+    m_pMinuteNF.clear();
+    m_pSecondNF.clear();
+    m_pMSecondNF.clear();
+    ModalDialog::dispose();
+}
+
 util::Duration  DurationDialog_Impl::GetDuration() const
 {
     util::Duration  aRet;
@@ -1448,6 +1508,9 @@ void CustomPropertiesWindow::dispose()
     m_aEditButton.disposeAndClear();
     m_aYesNoButton.disposeAndClear();
     m_aRemoveButton.disposeAndClear();
+    m_pHeaderAccName.clear();
+    m_pHeaderAccType.clear();
+    m_pHeaderAccValue.clear();
     vcl::Window::dispose();
 }
 
@@ -2080,11 +2143,11 @@ CustomPropertiesControl::~CustomPropertiesControl()
 
 void CustomPropertiesControl::dispose()
 {
-    delete m_pVertScroll;
-    delete m_pPropertiesWin;
-    delete m_pBody;
-    delete m_pHeaderBar;
-    delete m_pVBox;
+    m_pVertScroll.clear();
+    m_pPropertiesWin.clear();
+    m_pBody.clear();
+    m_pHeaderBar.clear();
+    m_pVBox.clear();
     vcl::Window::dispose();
 }
 
@@ -2124,6 +2187,17 @@ SfxCustomPropertiesPage::SfxCustomPropertiesPage( vcl::Window* pParent, const Sf
     get<PushButton>("add")->SetClickHdl(LINK(this, SfxCustomPropertiesPage, AddHdl));
 }
 
+SfxCustomPropertiesPage::~SfxCustomPropertiesPage()
+{
+    dispose();
+}
+
+void SfxCustomPropertiesPage::dispose()
+{
+    m_pPropertiesCtrl.clear();
+    SfxTabPage::dispose();
+}
+
 IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl)
 {
     Any aAny;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index e17c3b26782a..3daafd2a5cff 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -62,7 +62,7 @@ static const int NUM_OF_DOCKINGWINDOWS = 10;
 
 class SfxTitleDockingWindow : public SfxDockingWindow
 {
-    vcl::Window*             m_pWrappedWindow;
+    VclPtr<vcl::Window>   m_pWrappedWindow;
 
 public:
                         SfxTitleDockingWindow(
@@ -208,7 +208,7 @@ SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd ,
 
     pWindow->SetOutputSizePixel( Size( 270, 240 ) );
 
-    static_cast<SfxDockingWindow*>( pWindow )->Initialize( pInfo );
+    static_cast<SfxDockingWindow*>( pWindow.get() )->Initialize( pInfo );
     SetHideNotDelete( true );
 }
 
@@ -258,9 +258,7 @@ SfxTitleDockingWindow::~SfxTitleDockingWindow()
 
 void SfxTitleDockingWindow::dispose()
 {
-    delete m_pWrappedWindow;
-    m_pWrappedWindow = NULL;
-
+    m_pWrappedWindow.clear();
     SfxDockingWindow::dispose();
 }
 
@@ -411,7 +409,7 @@ friend class SfxDockingWindow;
     SfxChildAlignment   eDockAlignment;
     bool                bConstructed;
     Size                aMinSize;
-    SfxSplitWindow*     pSplitWin;
+    VclPtr<SfxSplitWindow>  pSplitWin;
     bool                bSplitable;
     Idle                aMoveIdle;
 
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index c942fd25c059..6f0fab8bade5 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -34,6 +34,17 @@ SfxDocumentFontsPage::SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSe
     get( embedFontsCheckbox, "embedFonts" );
 }
 
+SfxDocumentFontsPage::~SfxDocumentFontsPage()
+{
+    dispose();
+}
+
+void SfxDocumentFontsPage::dispose()
+{
+    embedFontsCheckbox.clear();
+    SfxTabPage::dispose();
+}
+
 void SfxDocumentFontsPage::Reset( const SfxItemSet* )
 {
     bool bVal = false;
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index b947ca9adecd..cac4cb268b56 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -54,7 +54,7 @@ namespace sfx2
         SfxFilterMatcher*           mpMatcher;
         GraphicFilter*              mpGraphicFilter;
         FileDialogHelper*           mpAntiImpl;
-        vcl::Window*                     mpPreferredParentWindow;
+        VclPtr<vcl::Window>         mpPreferredParentWindow;
 
         ::std::vector< OUString > mlLastURLs;
 
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 777b3fec6cc8..639bd4baca93 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -150,14 +150,8 @@ SfxInfoBarWindow::~SfxInfoBarWindow()
 
 void SfxInfoBarWindow::dispose()
 {
-    delete m_pMessage;
-    delete m_pCloseBtn;
-
-    for ( vector< PushButton* >::iterator it = m_aActionBtns.begin( );
-            it != m_aActionBtns.end( ); ++it )
-    {
-        delete *it;
-    }
+    m_pMessage.clear();
+    m_pCloseBtn.clear();
     m_aActionBtns.clear( );
     vcl::Window::dispose();
 }
@@ -219,8 +213,7 @@ void SfxInfoBarWindow::Resize()
     long nX = m_pCloseBtn->GetPosPixel().getX() - 15 * nScaleFactor;
     long nButtonGap = 5 * nScaleFactor;
 
-    boost::ptr_vector<PushButton>::iterator it;
-    for (it = m_aActionBtns.begin(); it != m_aActionBtns.end(); ++it)
+    for (auto it = m_aActionBtns.begin(); it != m_aActionBtns.end(); ++it)
     {
         long nButtonWidth = it->GetSizePixel().getWidth();
         nX -= nButtonWidth;
@@ -254,11 +247,6 @@ SfxInfoBarContainerWindow::~SfxInfoBarContainerWindow()
 
 void SfxInfoBarContainerWindow::dispose()
 {
-    for ( vector< SfxInfoBarWindow* >::iterator it = m_pInfoBars.begin( );
-            it != m_pInfoBars.end( ); ++it )
-    {
-        delete *it;
-    }
     m_pInfoBars.clear( );
     Window::dispose();
 }
@@ -267,7 +255,7 @@ SfxInfoBarWindow* SfxInfoBarContainerWindow::appendInfoBar(const OUString& sId,
 {
     Size aSize = GetSizePixel();
 
-    SfxInfoBarWindow* pInfoBar = new SfxInfoBarWindow(this, sId, sMessage);
+    VclPtrInstance<SfxInfoBarWindow> pInfoBar(this, sId, sMessage);
     pInfoBar->SetPosPixel(Point(0, aSize.getHeight()));
     pInfoBar->Show();
     m_pInfoBars.push_back(pInfoBar);
@@ -280,8 +268,7 @@ SfxInfoBarWindow* SfxInfoBarContainerWindow::appendInfoBar(const OUString& sId,
 
 SfxInfoBarWindow* SfxInfoBarContainerWindow::getInfoBar(const OUString& sId)
 {
-    boost::ptr_vector<SfxInfoBarWindow>::iterator it;
-    for (it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
+    for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
     {
         if (it->getId() == sId)
             return &(*it);
@@ -291,8 +278,7 @@ SfxInfoBarWindow* SfxInfoBarContainerWindow::getInfoBar(const OUString& sId)
 
 void SfxInfoBarContainerWindow::removeInfoBar(SfxInfoBarWindow* pInfoBar)
 {
-    boost::ptr_vector<SfxInfoBarWindow>::iterator it;
-    for (it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
+    for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
     {
         if (pInfoBar == &(*it))
         {
@@ -302,7 +288,7 @@ void SfxInfoBarContainerWindow::removeInfoBar(SfxInfoBarWindow* pInfoBar)
     }
 
     long nY = 0;
-    for (it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
+    for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
     {
         it->SetPosPixel(Point(0, nY));
         nY += it->GetSizePixel().getHeight();
@@ -320,8 +306,7 @@ void SfxInfoBarContainerWindow::Resize()
     // Only need to change the width of the infobars
     long nWidth = GetSizePixel().getWidth();
 
-    boost::ptr_vector<SfxInfoBarWindow>::iterator it;
-    for (it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
+    for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
     {
         Size aSize = it->GetSizePixel();
         aSize.setWidth(nWidth);
diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx
index 6f1ab9288205..a49a412be52a 100644
--- a/sfx2/source/dialog/inputdlg.cxx
+++ b/sfx2/source/dialog/inputdlg.cxx
@@ -26,6 +26,20 @@ InputDialog::InputDialog(const OUString &rLabelText, vcl::Window *pParent)
     m_pCancel->SetClickHdl(LINK(this,InputDialog,ClickHdl));
 }
 
+InputDialog::~InputDialog()
+{
+    dispose();
+}
+
+void InputDialog::dispose()
+{
+    m_pEntry.clear();
+    m_pLabel.clear();
+    m_pOK.clear();
+    m_pCancel.clear();
+    ModalDialog::dispose();
+}
+
 OUString InputDialog::getEntryText() const
 {
     return m_pEntry->GetText();
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index c1a713d4f651..0a8a5b26210e 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -260,6 +260,18 @@ void SfxManageStyleSheetPage::dispose()
     delete pFamilies;
     pItem = 0;
     pStyle = 0;
+    m_pNameRo.clear();
+    m_pNameRw.clear();
+    m_pAutoCB.clear();
+    m_pFollowFt.clear();
+    m_pFollowLb.clear();
+    m_pEditStyleBtn.clear();
+    m_pBaseFt.clear();
+    m_pBaseLb.clear();
+    m_pEditLinkStyleBtn.clear();
+    m_pFilterFt.clear();
+    m_pFilterLb.clear();
+    m_pDescFt.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 415c347d4970..48a30206b94c 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -41,7 +41,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd ,
     pWindow->SetHelpId ( HID_NAVIGATOR_WINDOW );
     pWindow->SetOutputSizePixel( Size( 270, 240 ) );
 
-    static_cast<SfxDockingWindow*>( pWindow )->Initialize( pInfo );
+    static_cast<SfxDockingWindow*>( pWindow.get() )->Initialize( pInfo );
     SetHideNotDelete( true );
 }
 
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index b8ec5b1a83e5..8fe73b084c61 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -88,6 +88,8 @@ SfxNewStyleDlg::~SfxNewStyleDlg()
 void SfxNewStyleDlg::dispose()
 {
     aQueryOverwriteBox.disposeAndClear();
+    m_pColBox.clear();
+    m_pOKBtn.clear();
     ModalDialog::dispose();
 }
 
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 40fabdb1f624..0292b83640f9 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -65,10 +65,10 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl
     assert(pInfo);
     pInfo->nFlags |= SfxChildWindowFlags::FORCEDOCK;
 
-    static_cast<SfxDockingWindow*>(pWindow)->SetFloatingSize( Size( 175, 175 ) );
+    static_cast<SfxDockingWindow*>(pWindow.get())->SetFloatingSize( Size( 175, 175 ) );
     pWindow->SetSizePixel( Size( 175, 175 ) );
 
-    static_cast<SfxDockingWindow*>(pWindow)->Initialize( pInfo );
+    static_cast<SfxDockingWindow*>(pWindow.get())->Initialize( pInfo );
     SetHideNotDelete( true );
 }
 
@@ -82,7 +82,7 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
     // But don't do it, if xFrame already exist. Then dispose() must come from inside ...
     // and we need a valid pMgr for further operations ...
 
-    SfxPartDockWnd_Impl* pWin = static_cast<SfxPartDockWnd_Impl*>(pWindow);
+    SfxPartDockWnd_Impl* pWin = static_cast<SfxPartDockWnd_Impl*>(pWindow.get());
 
     if ( pWin && xFrame == pWin->GetBindings().GetActiveFrame() )
         pWin->GetBindings().SetActiveFrame( NULL );
@@ -90,7 +90,7 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
 
 bool SfxPartChildWnd_Impl::QueryClose()
 {
-    return static_cast<SfxPartDockWnd_Impl*>(pWindow)->QueryClose();
+    return static_cast<SfxPartDockWnd_Impl*>(pWindow.get())->QueryClose();
 }
 
 
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 56ba1282f617..1db877fbc258 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -125,7 +125,29 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou
     SetPasswdText();
 }
 
+SfxPasswordDialog::~SfxPasswordDialog()
+{
+    dispose();
+}
 
+void SfxPasswordDialog::dispose()
+{
+    mpPassword1Box.clear();
+    mpUserFT.clear();
+    mpUserED.clear();
+    mpPassword1FT.clear();
+    mpPassword1ED.clear();
+    mpConfirm1FT.clear();
+    mpConfirm1ED.clear();
+    mpPassword2Box.clear();
+    mpPassword2FT.clear();
+    mpPassword2ED.clear();
+    mpConfirm2FT.clear();
+    mpConfirm2ED.clear();
+    mpMinLengthFT.clear();
+    mpOKBtn.clear();
+    ModalDialog::dispose();
+}
 
 void SfxPasswordDialog::SetPasswdText( )
 {
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 0daebad48a52..b5e5d49ee7c9 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -85,6 +85,36 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( vcl::Window* pParent
     m_pReduceBitmapsResolutionRB->SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl ) );
 }
 
+SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage()
+{
+    dispose();
+}
+
+void SfxCommonPrintOptionsTabPage::dispose()
+{
+    m_pPrinterOutputRB.clear();
+    m_pPrintFileOutputRB.clear();
+    m_pReduceTransparencyCB.clear();
+    m_pReduceTransparencyAutoRB.clear();
+    m_pReduceTransparencyNoneRB.clear();
+    m_pReduceGradientsCB.clear();
+    m_pReduceGradientsStripesRB.clear();
+    m_pReduceGradientsColorRB.clear();
+    m_pReduceGradientsStepCountNF.clear();
+    m_pReduceBitmapsCB.clear();
+    m_pReduceBitmapsOptimalRB.clear();
+    m_pReduceBitmapsNormalRB.clear();
+    m_pReduceBitmapsResolutionRB.clear();
+    m_pReduceBitmapsResolutionLB.clear();
+    m_pReduceBitmapsTransparencyCB.clear();
+    m_pConvertToGreyscalesCB.clear();
+    m_pPDFCB.clear();
+    m_pPaperSizeCB.clear();
+    m_pPaperOrientationCB.clear();
+    m_pTransparencyCB.clear();
+    SfxTabPage::dispose();
+}
+
 SfxTabPage* SfxCommonPrintOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return( new SfxCommonPrintOptionsTabPage( pParent, *rAttrSet ) );
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index d63d1df4eff4..c674d9823ac1 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -134,7 +134,7 @@ SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* pPare
     pWindow = new SfxRecordingFloat_Impl( pBindings, this, pParentWnd );
     SetWantsFocus( false );
     eChildAlignment = SfxChildAlignment::NOALIGNMENT;
-    static_cast<SfxFloatingWindow*>(pWindow)->Initialize( pInfo );
+    static_cast<SfxFloatingWindow*>(pWindow.get())->Initialize( pInfo );
 }
 
 SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl()
@@ -216,6 +216,7 @@ void SfxRecordingFloat_Impl::dispose()
     catch ( uno::Exception& )
     {
     }
+    m_pTbx.clear();
     SfxFloatingWindow::dispose();
 }
 
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index b70ca3c4fab2..81e54371aa19 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -136,10 +136,10 @@ struct SfxSecurityPage_Impl
 {
     SfxSecurityPage &   m_rMyTabPage;
 
-    CheckBox*           m_pOpenReadonlyCB;
-    CheckBox*           m_pRecordChangesCB;         // for record changes
-    PushButton*         m_pProtectPB;               // for record changes
-    PushButton*         m_pUnProtectPB;             // for record changes
+    VclPtr<CheckBox>    m_pOpenReadonlyCB;
+    VclPtr<CheckBox>    m_pRecordChangesCB;         // for record changes
+    VclPtr<PushButton>  m_pProtectPB;               // for record changes
+    VclPtr<PushButton>  m_pUnProtectPB;             // for record changes
     RedliningMode       m_eRedlingMode;             // for record changes
 
     bool                m_bOrigPasswordIsConfirmed;
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 036a578c166d..4a7d42377a39 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -87,15 +87,16 @@ class SfxEmptySplitWin_Impl : public SplitWindow
 */
 friend class SfxSplitWindow;
 
-    SfxSplitWindow*     pOwner;
-    bool                bFadeIn;
-    bool                bAutoHide;
-    bool                bSplit;
-    bool                bEndAutoHide;
-    Timer               aTimer;
-    Point               aLastPos;
+    VclPtr<SfxSplitWindow>  pOwner;
+    bool                    bFadeIn;
+    bool                    bAutoHide;
+    bool                    bSplit;
+    bool                    bEndAutoHide;
+    Timer                   aTimer;
+    Point                   aLastPos;
     sal_uInt16              nState;
 
+public:
                         SfxEmptySplitWin_Impl( SfxSplitWindow *pParent )
                             : SplitWindow( pParent->GetParent(), WinBits( WB_BORDER | WB_3DLOOK ) )
                             , pOwner( pParent )
@@ -119,6 +120,7 @@ friend class SfxSplitWindow;
    virtual void         dispose() SAL_OVERRIDE
                         {
                             aTimer.Stop();
+                            pOwner.clear();
                             SplitWindow::dispose();
                         }
 
@@ -315,10 +317,11 @@ void SfxSplitWindow::dispose()
         // Set pOwner to NULL, otherwise try to delete pEmptyWin once more. The
         // window that is just being docked is always deleted from the outside.
         pEmptyWin->pOwner = NULL;
-        delete pEmptyWin;
     }
+    pEmptyWin.clear();
 
     delete pDockArr;
+    pActive.clear();
     SplitWindow::dispose();
 }
 
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index d933c0224f26..7fd8ec70aff2 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -69,6 +69,12 @@ void SearchDialog::dispose()
 {
     SaveConfig();
     m_aCloseHdl.Call( NULL );
+    m_pSearchEdit.clear();
+    m_pWholeWordsBox.clear();
+    m_pMatchCaseBox.clear();
+    m_pWrapAroundBox.clear();
+    m_pBackwardsBox.clear();
+    m_pFindBtn.clear();
     ModelessDialog::dispose();
 }
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 1af64784fe14..b8f63d54c85e 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -60,7 +60,7 @@ struct Data_Impl
     sal_uInt16 nId;                   // The ID
     CreateTabPage fnCreatePage;   // Pointer to Factory
     GetTabPageRanges fnGetRanges; // Pointer to Ranges-Function
-    SfxTabPage* pTabPage;         // The TabPage itself
+    VclPtr<SfxTabPage> pTabPage;         // The TabPage itself
     bool bOnDemand;              // Flag: ItemSet onDemand
     bool bRefresh;                // Flag: Page must be re-initialized
 
@@ -398,7 +398,7 @@ void SfxTabDialog::dispose()
 
             if ( pDataObject->bOnDemand )
                 delete &pDataObject->pTabPage->GetItemSet();
-            delete pDataObject->pTabPage;
+            pDataObject->pTabPage.disposeAndClear();
         }
         delete pDataObject;
     }
@@ -409,16 +409,16 @@ void SfxTabDialog::dispose()
     delete pExampleSet;
     delete [] pRanges;
 
-    if (m_bOwnsBaseFmtBtn)
-        delete m_pBaseFmtBtn;
-    if (m_bOwnsResetBtn)
-        delete m_pResetBtn;
-    if (m_bOwnsHelpBtn)
-        delete m_pHelpBtn;
-    if (m_bOwnsCancelBtn)
-        delete m_pCancelBtn;
-    if (m_bOwnsOKBtn)
-        delete m_pOKBtn;
+    m_pBox.clear();
+    m_pTabCtrl.clear();
+    m_pOKBtn.clear();
+    m_pApplyBtn.clear();
+    m_pUserBtn.clear();
+    m_pCancelBtn.clear();
+    m_pHelpBtn.clear();
+    m_pResetBtn.clear();
+    m_pBaseFmtBtn.clear();
+    m_pActionArea.clear();
     TabDialog::dispose();
 }
 
@@ -438,33 +438,33 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag)
     assert(m_pActionArea);
 
     m_pOKBtn = m_pUIBuilder->get<PushButton>("ok");
-    m_bOwnsOKBtn = m_pOKBtn == NULL;
+    m_bOwnsOKBtn = m_pOKBtn == nullptr;
     if (m_bOwnsOKBtn)
         m_pOKBtn = new OKButton(m_pActionArea);
 
     m_pApplyBtn = m_pUIBuilder->get<PushButton>("apply");
     m_pUserBtn = m_pUIBuilder->get<PushButton>("user");
     m_pCancelBtn = m_pUIBuilder->get<CancelButton>("cancel");
-    m_bOwnsCancelBtn = m_pCancelBtn == NULL;
+    m_bOwnsCancelBtn = m_pCancelBtn == nullptr;
     if (m_bOwnsCancelBtn)
         m_pCancelBtn = new CancelButton(m_pActionArea);
 
     m_pHelpBtn = m_pUIBuilder->get<HelpButton>("help");
-    m_bOwnsHelpBtn = m_pHelpBtn == NULL;
+    m_bOwnsHelpBtn = m_pHelpBtn == nullptr;
     if (m_bOwnsHelpBtn)
         m_pHelpBtn = new HelpButton(m_pActionArea);
 
     m_pResetBtn = m_pUIBuilder->get<PushButton>("reset");
-    m_bOwnsResetBtn = m_pResetBtn == NULL;
+    m_bOwnsResetBtn = m_pResetBtn == nullptr;
     if (m_bOwnsResetBtn)
-        m_pResetBtn = new PushButton(m_pActionArea);
+        m_pResetBtn = new PushButton(m_pActionArea.get());
     else
         pImpl->bHideResetBtn = !m_pResetBtn->IsVisible();
 
     m_pBaseFmtBtn = m_pUIBuilder->get<PushButton>("standard");
-    m_bOwnsBaseFmtBtn = m_pBaseFmtBtn == NULL;
+    m_bOwnsBaseFmtBtn = m_pBaseFmtBtn == nullptr;
     if (m_bOwnsBaseFmtBtn)
-        m_pBaseFmtBtn = new PushButton(m_pActionArea);
+        m_pBaseFmtBtn = new PushButton(m_pActionArea.get());
 
     m_pOKBtn->SetClickHdl( LINK( this, SfxTabDialog, OkHdl ) );
     m_pCancelBtn->SetClickHdl( LINK( this, SfxTabDialog, CancelHdl ) );
@@ -698,7 +698,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
 
             if ( pDataObject->bOnDemand )
                 delete &pDataObject->pTabPage->GetItemSet();
-            delete pDataObject->pTabPage;
+            pDataObject->pTabPage.disposeAndClear();
         }
 
         delete pDataObject;
@@ -1135,7 +1135,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
         else
             pTabPage = (pDataObject->fnCreatePage)
                             ( pTabCtrl, CreateInputItemSet( nId ) );
-        DBG_ASSERT( NULL == pDataObject->pTabPage, "create TabPage more than once" );
+        DBG_ASSERT( nullptr == pDataObject->pTabPage, "create TabPage more than once" );
         pDataObject->pTabPage = pTabPage;
 
         OUString sConfigId = OStringToOUString(pTabPage->GetConfigId(), RTL_TEXTENCODING_UTF8);
@@ -1255,7 +1255,7 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
         {
             Data_Impl* pObj = *it;
 
-            if ( pObj->pTabPage != pPage ) // Do not refresh own Page anymore
+            if ( pObj->pTabPage.get() != pPage ) // Do not refresh own Page anymore
                 pObj->bRefresh = true;
             else
                 pObj->bRefresh = false;
diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx
index a1779d6fefc9..e16db6db0f95 100644
--- a/sfx2/source/dialog/templateinfodlg.cxx
+++ b/sfx2/source/dialog/templateinfodlg.cxx
@@ -38,7 +38,7 @@ SfxTemplateInfoDlg::SfxTemplateInfoDlg (vcl::Window *pParent)
     get(mpBtnClose, "close");
     get(mpBox, "box");
     get(mpInfoView, "infoDrawingArea");
-    mpPreviewView = new vcl::Window(mpBox);
+    mpPreviewView = new vcl::Window(mpBox.get());
 
     Size aSize(LogicToPixel(Size(250, 160), MAP_APPFONT));
     mpBox->set_width_request(aSize.Width());
@@ -60,6 +60,10 @@ SfxTemplateInfoDlg::~SfxTemplateInfoDlg()
 void SfxTemplateInfoDlg::dispose()
 {
     m_xFrame->dispose();
+    mpBtnClose.clear();
+    mpBox.clear();
+    mpPreviewView.clear();
+    mpInfoView.clear();
     ModalDialog::dispose();
 }
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 34097725d091..72fde222b23c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -765,7 +765,6 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
     if ( pStyleSheetPool )
         EndListening(*pStyleSheetPool);
     pStyleSheetPool = NULL;
-    delete pTreeBox;
     delete pIdle;
     if ( m_pDeletionWatcher )
         m_pDeletionWatcher->signal();
@@ -1532,7 +1531,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
     }
     else
     {
-        DELETEZ(pTreeBox);
+        pTreeBox.clear();
         aFmtLb->Show();
         // If bHierarchical, then the family can have changed
         // minus one since hierarchical is inserted at the start
@@ -2173,7 +2172,7 @@ void SfxTemplateDialog_Impl::LoadedFamilies()
 // The size of the Listboxen is adjusted
 void SfxTemplateDialog_Impl::Resize()
 {
-    SfxDockingWindow* pDockingWindow = dynamic_cast<SfxDockingWindow*>(m_pFloat);
+    SfxDockingWindow* pDockingWindow = dynamic_cast<SfxDockingWindow*>(m_pFloat.get());
     FloatingWindow *pF = pDockingWindow!=NULL ? pDockingWindow->GetFloatingWindow() : NULL;
     if ( pF )
     {
@@ -2182,7 +2181,7 @@ void SfxTemplateDialog_Impl::Resize()
             return;
     }
 
-    if (m_pFloat == NULL)
+    if (m_pFloat == nullptr)
         return;
     Size aDlgSize=m_pFloat->PixelToLogic(m_pFloat->GetOutputSizePixel());
     Size aSizeATL=m_pFloat->PixelToLogic(m_aActionTbL->CalcWindowSizePixel());
@@ -2242,7 +2241,7 @@ void SfxTemplateDialog_Impl::Resize()
 
 Size SfxTemplateDialog_Impl::GetMinOutputSizePixel()
 {
-    if (m_pFloat != NULL)
+    if (m_pFloat != nullptr)
     {
         Size aSizeATL=m_pFloat->PixelToLogic(m_aActionTbL->CalcWindowSizePixel());
         Size aSizeATR=m_pFloat->PixelToLogic(m_aActionTbR->CalcWindowSizePixel());
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 797c89342f28..f74654602fdc 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -335,7 +335,14 @@ SfxVersionDialog::~SfxVersionDialog()
 void SfxVersionDialog::dispose()
 {
     delete m_pTable;
-    delete m_pVersionBox;
+    m_pVersionBox.clear();
+    m_pSaveButton.clear();
+    m_pSaveCheckBox.clear();
+    m_pOpenButton.clear();
+    m_pViewButton.clear();
+    m_pDeleteButton.clear();
+    m_pCompareButton.clear();
+    m_pCmisButton.clear();
     SfxModalDialog::dispose();
 }
 
@@ -499,6 +506,22 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVe
     }
 }
 
+SfxViewVersionDialog_Impl::~SfxViewVersionDialog_Impl()
+{
+    dispose();
+}
+
+void SfxViewVersionDialog_Impl::dispose()
+{
+    m_pDateTimeText.clear();
+    m_pSavedByText.clear();
+    m_pEdit.clear();
+    m_pOKButton.clear();
+    m_pCancelButton.clear();
+    m_pCloseButton.clear();
+    SfxModalDialog::dispose();
+}
+
 IMPL_LINK(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton)
 {
     assert(pButton == m_pOKButton);
@@ -569,7 +592,11 @@ SfxCmisVersionsDialog::~SfxCmisVersionsDialog()
 void SfxCmisVersionsDialog::dispose()
 {
     delete m_pTable;
-    delete m_pVersionBox;
+    m_pVersionBox.clear();
+    m_pOpenButton.clear();
+    m_pViewButton.clear();
+    m_pDeleteButton.clear();
+    m_pCompareButton.clear();
     SfxModalDialog::dispose();
 }
 
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index e120cf23dc56..3ad16cf0901e 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -123,19 +123,19 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxPreviewWin(vcl::Win
 
 class SfxNewFileDialog_Impl
 {
-    ListBox*  m_pRegionLb;
-    ListBox*  m_pTemplateLb;
+    VclPtr<ListBox>  m_pRegionLb;
+    VclPtr<ListBox>  m_pTemplateLb;
 
-    SfxPreviewWin_Impl* m_pPreviewWin;
+    VclPtr<SfxPreviewWin_Impl> m_pPreviewWin;
 
-    CheckBox* m_pTextStyleCB;
-    CheckBox* m_pFrameStyleCB;
-    CheckBox* m_pPageStyleCB;
-    CheckBox* m_pNumStyleCB;
-    CheckBox* m_pMergeStyleCB;
-    PushButton* m_pLoadFilePB;
+    VclPtr<CheckBox> m_pTextStyleCB;
+    VclPtr<CheckBox> m_pFrameStyleCB;
+    VclPtr<CheckBox> m_pPageStyleCB;
+    VclPtr<CheckBox> m_pNumStyleCB;
+    VclPtr<CheckBox> m_pMergeStyleCB;
+    VclPtr<PushButton> m_pLoadFilePB;
 
-    VclExpander* m_pMoreBt;
+    VclPtr<VclExpander> m_pMoreBt;
     Idle aPrevIdle;
     OUString aNone;
     OUString sLoadTemplate;
@@ -143,7 +143,7 @@ class SfxNewFileDialog_Impl
     sal_uInt16 nFlags;
     SfxDocumentTemplates aTemplates;
     SfxObjectShellLock xDocShell;
-    SfxNewFileDialog* pAntiImpl;
+    VclPtr<SfxNewFileDialog> pAntiImpl;
 
     DECL_LINK( Update, void * );
 
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b1c416c2a507..3ace50cbec6e 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -321,6 +321,16 @@ void SfxTemplateManagerDlg::dispose()
 
     mpSearchView->setItemStateHdl(Link());
     mpSearchView->setOpenTemplateHdl(Link());
+
+    mpTabControl.clear();
+    mpSearchEdit.clear();
+    mpViewBar.clear();
+    mpActionBar.clear();
+    mpTemplateBar.clear();
+    mpSearchView.clear();
+    mpCurView.clear();
+    mpLocalView.clear();
+    mpRemoteView.clear();
     ModalDialog::dispose();
 }
 
@@ -1409,7 +1419,7 @@ void SfxTemplateManagerDlg::switchMainView(bool bDisplayLocal)
 {
     if (bDisplayLocal)
     {
-        mpCurView = mpLocalView;
+        mpCurView = mpLocalView.get();
 
         mpViewBar->HideItem(VIEWBAR_DELETE);
 
@@ -1422,7 +1432,7 @@ void SfxTemplateManagerDlg::switchMainView(bool bDisplayLocal)
     }
     else
     {
-        mpCurView = mpRemoteView;
+        mpCurView = mpRemoteView.get();
 
         mpViewBar->ShowItem(VIEWBAR_DELETE);
 
diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx
index a21473dc6a88..bd234104b53a 100644
--- a/sfx2/source/inc/alienwarn.hxx
+++ b/sfx2/source/inc/alienwarn.hxx
@@ -25,8 +25,8 @@
 class SfxAlienWarningDialog : public MessageDialog
 {
 private:
-    PushButton*             m_pKeepCurrentBtn;
-    CheckBox*               m_pWarningOnBox;
+    VclPtr<PushButton>             m_pKeepCurrentBtn;
+    VclPtr<CheckBox>               m_pWarningOnBox;
 
 public:
     SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName);
diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx
index 360f88713010..5b64db66b00b 100644
--- a/sfx2/source/inc/documentfontsdialog.hxx
+++ b/sfx2/source/inc/documentfontsdialog.hxx
@@ -31,12 +31,14 @@ class SfxDocumentFontsPage: public SfxTabPage
 {
 public:
     SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set );
+    virtual ~SfxDocumentFontsPage();
+    virtual void dispose() SAL_OVERRIDE;
     static SfxTabPage* Create( vcl::Window* parent, const SfxItemSet* set );
 protected:
     virtual bool FillItemSet( SfxItemSet* set ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet* set ) SAL_OVERRIDE;
 private:
-    CheckBox* embedFontsCheckbox;
+    VclPtr<CheckBox> embedFontsCheckbox;
 };
 
 #endif
diff --git a/sfx2/source/inc/inputdlg.hxx b/sfx2/source/inc/inputdlg.hxx
index 29b5c45b9453..41888d44d3c9 100644
--- a/sfx2/source/inc/inputdlg.hxx
+++ b/sfx2/source/inc/inputdlg.hxx
@@ -21,6 +21,8 @@ class InputDialog : public ModalDialog
 public:
     InputDialog (const OUString &labelText, vcl::Window *pParent = NULL);
     OUString getEntryText () const;
+    virtual ~InputDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
 private:
 
@@ -28,10 +30,10 @@ private:
 
 private:
 
-    Edit *m_pEntry;
-    FixedText *m_pLabel;
-    PushButton *m_pOK;
-    PushButton *m_pCancel;
+    VclPtr<Edit>       m_pEntry;
+    VclPtr<FixedText>  m_pLabel;
+    VclPtr<PushButton> m_pOK;
+    VclPtr<PushButton> m_pCancel;
 };
 
 #endif // INCLUDED_SFX2_SOURCE_INC_INPUTDLG_HXX
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index df32b12b25c7..50dd7f6dc9fd 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -39,7 +39,7 @@ public:
 
 class SfxRecordingFloat_Impl : public SfxFloatingWindow
 {
-    ToolBox*                m_pTbx;
+    VclPtr<ToolBox>                m_pTbx;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xStopRecTbxCtrl;
 public:
                         SfxRecordingFloat_Impl( SfxBindings* pBindings ,
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 9dfa27dd8f4c..177bd769c70c 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -31,9 +31,9 @@ class SfxEmptySplitWin_Impl;
 struct SfxDock_Impl
 {
     sal_uInt16        nType;
-    SfxDockingWindow* pWin;      // SplitWindow has this window
-    bool          bNewLine;
-    bool          bHide;     // SplitWindow had this window
+    VclPtr<SfxDockingWindow> pWin;      // SplitWindow has this window
+    bool              bNewLine;
+    bool              bHide;     // SplitWindow had this window
     long              nSize;
 };
 
@@ -49,8 +49,8 @@ private:
     SfxDockArr_Impl*    pDockArr;
     bool                bLocked;
     bool                bPinned;
-    SfxEmptySplitWin_Impl*  pEmptyWin;
-    SfxDockingWindow*   pActive;
+    VclPtr<SfxEmptySplitWin_Impl>  pEmptyWin;
+    VclPtr<SfxDockingWindow>       pActive;
 
     void                InsertWindow_Impl( SfxDock_Impl* pDockWin,
                             const Size& rSize,
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index f50de2e057e7..c72f3056aa88 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -169,7 +169,7 @@ protected:
     SfxBindings* pBindings;
     SfxTemplateControllerItem* pBoundItems[COUNT_BOUND_FUNC];
 
-    vcl::Window* pWindow;
+    VclPtr<vcl::Window> pWindow;
     SfxModule* pModule;
     Idle* pIdle;
 
@@ -177,7 +177,7 @@ protected:
     SfxStyleFamilies* pStyleFamilies;
     SfxTemplateItem* pFamilyState[MAX_FAMILIES];
     SfxStyleSheetBasePool* pStyleSheetPool;
-    StyleTreeListBox_Impl* pTreeBox;
+    VclPtr<StyleTreeListBox_Impl> pTreeBox;
     SfxObjectShell* pCurObjShell;
     css::uno::Reference<css::frame::XModuleManager2> xModuleManager;
     DeletionWatcher* m_pDeletionWatcher;
@@ -369,10 +369,10 @@ private:
     friend class DropToolBox_Impl;
     friend class SfxTemplatePanelControl;
 
-    vcl::Window*        m_pFloat;
-    bool                m_bZoomIn;
+    VclPtr<vcl::Window>         m_pFloat;
+    bool                        m_bZoomIn;
     VclPtr<DropToolBox_Impl>    m_aActionTbL;
-    VclPtr<ToolBox>     m_aActionTbR;
+    VclPtr<ToolBox>             m_aActionTbR;
 
     DECL_LINK( ToolBoxLSelect, ToolBox* );
     DECL_LINK( ToolBoxRSelect, ToolBox* );
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 0079e0f1f26f..67453efa3a51 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -45,14 +45,14 @@ public:
 class SfxVersionTableDtor;
 class SfxVersionDialog : public SfxModalDialog
 {
-    PushButton*                 m_pSaveButton;
-    CheckBox*                   m_pSaveCheckBox;
-    SfxVersionsTabListBox_Impl* m_pVersionBox;
-    PushButton*                 m_pOpenButton;
-    PushButton*                 m_pViewButton;
-    PushButton*                 m_pDeleteButton;
-    PushButton*                 m_pCompareButton;
-    PushButton*                 m_pCmisButton;
+    VclPtr<PushButton>                 m_pSaveButton;
+    VclPtr<CheckBox>                   m_pSaveCheckBox;
+    VclPtr<SfxVersionsTabListBox_Impl> m_pVersionBox;
+    VclPtr<PushButton>                 m_pOpenButton;
+    VclPtr<PushButton>                 m_pViewButton;
+    VclPtr<PushButton>                 m_pDeleteButton;
+    VclPtr<PushButton>                 m_pCompareButton;
+    VclPtr<PushButton>                 m_pCmisButton;
     SfxViewFrame*               pViewFrame;
     SfxVersionTableDtor*        m_pTable;
     bool                        m_bIsSaveVersionOnClose;
@@ -72,27 +72,29 @@ public:
 
 class SfxViewVersionDialog_Impl : public SfxModalDialog
 {
-    FixedText*        m_pDateTimeText;
-    FixedText*        m_pSavedByText;
-    VclMultiLineEdit* m_pEdit;
-    OKButton*         m_pOKButton;
-    CancelButton*     m_pCancelButton;
-    CloseButton*      m_pCloseButton;
+    VclPtr<FixedText>        m_pDateTimeText;
+    VclPtr<FixedText>        m_pSavedByText;
+    VclPtr<VclMultiLineEdit> m_pEdit;
+    VclPtr<OKButton>         m_pOKButton;
+    VclPtr<CancelButton>     m_pCancelButton;
+    VclPtr<CloseButton>      m_pCloseButton;
     SfxVersionInfo&   m_rInfo;
 
     DECL_LINK(ButtonHdl, Button*);
 
 public:
     SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit);
+    virtual ~SfxViewVersionDialog_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 };
 
 class SfxCmisVersionsDialog : public SfxModalDialog
 {
-    SfxVersionsTabListBox_Impl* m_pVersionBox;
-    PushButton*                 m_pOpenButton;
-    PushButton*                 m_pViewButton;
-    PushButton*                 m_pDeleteButton;
-    PushButton*                 m_pCompareButton;
+    VclPtr<SfxVersionsTabListBox_Impl> m_pVersionBox;
+    VclPtr<PushButton>                 m_pOpenButton;
+    VclPtr<PushButton>                 m_pViewButton;
+    VclPtr<PushButton>                 m_pDeleteButton;
+    VclPtr<PushButton>                 m_pCompareButton;
     SfxViewFrame*               pViewFrame;
     SfxVersionTableDtor*        m_pTable;
     bool                        m_bIsSaveVersionOnClose;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 1d5281746f2c..911fd8570a7e 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -96,7 +96,7 @@ namespace o3tl
 
 struct SfxChild_Impl
 {
-    vcl::Window*                     pWin;
+    VclPtr<vcl::Window>             pWin;
     Size                            aSize;
     SfxChildAlignment               eAlign;
     SfxChildVisibility              nVisible;
@@ -226,12 +226,12 @@ protected:
     SfxChildList_Impl       aChildren;
     SfxChildWindows_Impl    aChildWins;
     SfxBindings*            pBindings;
-    vcl::Window*                 pWorkWin;
+    VclPtr<vcl::Window>     pWorkWin;
     SfxShell*               pConfigShell;
-    vcl::Window*                 pActiveChild;
-    sal_uInt16                  nUpdateMode;
-    sal_uInt16                  nChildren;
-    sal_uInt16                  nOrigMode;
+    VclPtr<vcl::Window>     pActiveChild;
+    sal_uInt16              nUpdateMode;
+    sal_uInt16              nChildren;
+    sal_uInt16              nOrigMode;
     bool                    bSorted : 1;
     bool                    bDockingAllowed : 1;
     bool                    bInternalDockingAllowed : 1;
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index af116e67c605..3e41a3ab5418 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -65,9 +65,9 @@ void FocusManager::Clear (void)
 
 void FocusManager::ClearPanels (void)
 {
-    ::std::vector<Panel*> aPanels;
+    ::std::vector<VclPtr<Panel> > aPanels;
     aPanels.swap(maPanels);
-    for (::std::vector<Panel*>::iterator iPanel(aPanels.begin()),iEnd(aPanels.end());
+    for (auto iPanel(aPanels.begin()),iEnd(aPanels.end());
          iPanel!=iEnd;
         ++iPanel)
     {
@@ -84,9 +84,9 @@ void FocusManager::ClearPanels (void)
 
 void FocusManager::ClearButtons (void)
 {
-    ::std::vector<Button*> aButtons;
+    ::std::vector<VclPtr<Button> > aButtons;
     aButtons.swap(maButtons);
-    for (::std::vector<Button*>::iterator iButton(aButtons.begin()),iEnd(aButtons.end());
+    for (auto iButton(aButtons.begin()),iEnd(aButtons.end());
          iButton!=iEnd;
         ++iButton)
     {
@@ -96,14 +96,14 @@ void FocusManager::ClearButtons (void)
 
 void FocusManager::SetDeckTitle (DeckTitleBar* pDeckTitleBar)
 {
-    if (mpDeckTitleBar != NULL)
+    if (mpDeckTitleBar != nullptr)
     {
         UnregisterWindow(*mpDeckTitleBar);
         UnregisterWindow(mpDeckTitleBar->GetToolBox());
     }
     mpDeckTitleBar = pDeckTitleBar;
 
-    if (mpDeckTitleBar != NULL)
+    if (mpDeckTitleBar != nullptr)
     {
         RegisterWindow(*mpDeckTitleBar);
         RegisterWindow(mpDeckTitleBar->GetToolBox());
@@ -156,7 +156,7 @@ void FocusManager::UnregisterWindow (vcl::Window& rWindow)
 FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& rWindow) const
 {
     // Check the deck title.
-    if (mpDeckTitleBar != NULL)
+    if (mpDeckTitleBar != nullptr)
     {
         if (mpDeckTitleBar == &rWindow)
             return FocusLocation(PC_DeckTitle, -1);
@@ -186,7 +186,7 @@ FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& r
 
 void FocusManager::FocusDeckTitle (void)
 {
-    if (mpDeckTitleBar != NULL)
+    if (mpDeckTitleBar != nullptr)
     {
         if (IsDeckTitleVisible())
         {
@@ -207,7 +207,7 @@ void FocusManager::FocusDeckTitle (void)
 
 bool FocusManager::IsDeckTitleVisible (void) const
 {
-    return mpDeckTitleBar != NULL && mpDeckTitleBar->IsVisible();
+    return mpDeckTitleBar != nullptr && mpDeckTitleBar->IsVisible();
 }
 
 bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const
@@ -286,7 +286,7 @@ void FocusManager::ClickButton (const sal_Int32 nButtonIndex)
 
 void FocusManager::RemoveWindow (vcl::Window& rWindow)
 {
-    ::std::vector<Panel*>::iterator iPanel (::std::find(maPanels.begin(), maPanels.end(), &rWindow));
+    auto iPanel (::std::find(maPanels.begin(), maPanels.end(), &rWindow));
     if (iPanel != maPanels.end())
     {
         UnregisterWindow(rWindow);
@@ -299,7 +299,7 @@ void FocusManager::RemoveWindow (vcl::Window& rWindow)
         return;
     }
 
-    ::std::vector<Button*>::iterator iButton (::std::find(maButtons.begin(), maButtons.end(), &rWindow));
+    auto iButton (::std::find(maButtons.begin(), maButtons.end(), &rWindow));
     if (iButton != maButtons.end())
     {
         UnregisterWindow(rWindow);
@@ -596,7 +596,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent)
                         break;
 
                     case KEY_TAB:
-                        if (mpFirstFocusedContentControl!=NULL
+                        if (mpFirstFocusedContentControl!=nullptr
                             && mpLastFocusedWindow == mpFirstFocusedContentControl)
                         {
                             // Move focus back to panel (or deck)
diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx
index 0577c8cd88e7..4662517c12ed 100644
--- a/sfx2/source/sidebar/FocusManager.hxx
+++ b/sfx2/source/sidebar/FocusManager.hxx
@@ -68,13 +68,13 @@ public:
     void SetButtons (const ::std::vector<Button*>& rButtons);
 
 private:
-    DeckTitleBar* mpDeckTitleBar;
-    ::std::vector<Panel*> maPanels;
-    ::std::vector<Button*> maButtons;
+    VclPtr<DeckTitleBar> mpDeckTitleBar;
+    ::std::vector<VclPtr<Panel> > maPanels;
+    ::std::vector<VclPtr<Button> > maButtons;
     const ::boost::function<void(const Panel&)> maShowPanelFunctor;
     bool mbObservingContentControlFocus;
-    vcl::Window* mpFirstFocusedContentControl;
-    vcl::Window* mpLastFocusedWindow;
+    VclPtr<vcl::Window> mpFirstFocusedContentControl;
+    VclPtr<vcl::Window> mpLastFocusedWindow;
 
     enum PanelComponent
     {
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 0f840e3a77d3..30ad8476bba8 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -51,13 +51,24 @@ PanelTitleBar::PanelTitleBar (
       msMoreOptionsCommand(),
       msAccessibleNamePrefix(SFX2_RESSTR(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX))
 {
-    OSL_ASSERT(mpPanel != NULL);
+    OSL_ASSERT(mpPanel != nullptr);
 
 #ifdef DEBUG
     SetText(OUString("PanelTitleBar"));
 #endif
 }
 
+PanelTitleBar::~PanelTitleBar()
+{
+    dispose();
+}
+
+void PanelTitleBar::dispose()
+{
+    mpPanel.clear();
+    TitleBar::dispose();
+}
+
 void PanelTitleBar::SetMoreOptionsCommand (
     const ::rtl::OUString& rsCommandName,
     const css::uno::Reference<css::frame::XFrame>& rxFrame)
@@ -94,7 +105,7 @@ void PanelTitleBar::SetMoreOptionsCommand (
 
 Rectangle PanelTitleBar::GetTitleArea (const Rectangle& rTitleBarBox)
 {
-    if (mpPanel != NULL)
+    if (mpPanel != nullptr)
     {
         Image aImage (mpPanel->IsExpanded()
             ? Theme::GetImage(Theme::Image_Expand)
@@ -113,7 +124,7 @@ void PanelTitleBar::PaintDecoration (const Rectangle& rTitleBarBox)
 {
     (void)rTitleBarBox;
 
-    if (mpPanel != NULL)
+    if (mpPanel != nullptr)
     {
         Image aImage (mpPanel->IsExpanded()
             ? Theme::GetImage(Theme::Image_Collapse)
@@ -181,7 +192,7 @@ void PanelTitleBar::MouseButtonUp (const MouseEvent& rMouseEvent)
     {
         if (mbIsLeftButtonDown)
         {
-            if (mpPanel != NULL)
+            if (mpPanel != nullptr)
             {
                 mpPanel->SetExpanded( ! mpPanel->IsExpanded());
                 Invalidate();
diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx
index 1fc3eb3ec82e..f1a23f83d1ca 100644
--- a/sfx2/source/sidebar/PanelTitleBar.hxx
+++ b/sfx2/source/sidebar/PanelTitleBar.hxx
@@ -36,6 +36,8 @@ public:
         const ::rtl::OUString& rsTitle,
         vcl::Window* pParentWindow,
         Panel* pPanel );
+    virtual ~PanelTitleBar();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetMoreOptionsCommand (
         const ::rtl::OUString& rsCommandName,
@@ -55,7 +57,7 @@ protected:
 
 private:
     bool mbIsLeftButtonDown;
-    Panel* mpPanel;
+    VclPtr<Panel> mpPanel;
     const sal_uInt16 mnMenuItemIndex;
     css::uno::Reference<css::frame::XFrame> mxFrame;
     ::rtl::OUString msMoreOptionsCommand;
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 22d71d3ca95a..05fad1caacf8 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -47,7 +47,7 @@ SidebarChildWindow::SidebarChildWindow (
     pWindow->SetHelpId(HID_SIDEBAR_WINDOW);
     pWindow->SetOutputSizePixel(Size(GetDefaultWidth(pWindow), 450));
 
-    SfxDockingWindow* pDockingParent = dynamic_cast<SfxDockingWindow*>(pWindow);
+    SfxDockingWindow* pDockingParent = dynamic_cast<SfxDockingWindow*>(pWindow.get());
     if (pDockingParent != NULL)
     {
         if (pInfo && pInfo->aExtraString.isEmpty() && pInfo->aModule != "simpress")
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index eb2554df744d..807403248053 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -188,13 +188,13 @@ void SAL_CALL SidebarController::disposing (void)
 
     if (mxReadOnlyModeDispatch.is())
         mxReadOnlyModeDispatch->removeStatusListener(this, Tools::GetURL(gsReadOnlyCommandName));
-    if (mpSplitWindow != NULL)
+    if (mpSplitWindow != nullptr)
     {
         mpSplitWindow->RemoveEventListener(LINK(this, SidebarController, WindowEventHandler));
         mpSplitWindow = NULL;
     }
 
-    if (mpParentWindow != NULL)
+    if (mpParentWindow != nullptr)
     {
         mpParentWindow->RemoveEventListener(LINK(this, SidebarController, WindowEventHandler));
         mpParentWindow = NULL;
@@ -737,7 +737,7 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement (
         ::comphelper::NamedValueCollection aCreationArguments;
         aCreationArguments.put("Frame", makeAny(mxFrame));
         aCreationArguments.put("ParentWindow", makeAny(rxWindow));
-        SfxDockingWindow* pSfxDockingWindow = dynamic_cast<SfxDockingWindow*>(mpParentWindow);
+        SfxDockingWindow* pSfxDockingWindow = dynamic_cast<SfxDockingWindow*>(mpParentWindow.get());
         if (pSfxDockingWindow != NULL)
             aCreationArguments.put("SfxBindings", makeAny(sal_uInt64(&pSfxDockingWindow->GetBindings())));
         aCreationArguments.put("Theme", Theme::GetPropertySet());
@@ -802,7 +802,7 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent*, pEvent)
                 break;
         }
     }
-    else if (pEvent->GetWindow()==mpSplitWindow && mpSplitWindow!=NULL)
+    else if (pEvent->GetWindow()==mpSplitWindow && mpSplitWindow!=nullptr)
     {
         switch (pEvent->GetId())
         {
@@ -1060,7 +1060,7 @@ void SidebarController::RestrictWidth (sal_Int32 nWidth)
     SfxSplitWindow* pSplitWindow = GetSplitWindow();
     if (pSplitWindow != NULL)
     {
-        const sal_uInt16 nId (pSplitWindow->GetItemId(mpParentWindow));
+        const sal_uInt16 nId (pSplitWindow->GetItemId(mpParentWindow.get()));
         const sal_uInt16 nSetId (pSplitWindow->GetSet(nId));
         pSplitWindow->SetItemSizeRange(
             nSetId,
@@ -1071,17 +1071,17 @@ void SidebarController::RestrictWidth (sal_Int32 nWidth)
 
 SfxSplitWindow* SidebarController::GetSplitWindow (void)
 {
-    if (mpParentWindow != NULL)
+    if (mpParentWindow != nullptr)
     {
         SfxSplitWindow* pSplitWindow = dynamic_cast<SfxSplitWindow*>(mpParentWindow->GetParent());
         if (pSplitWindow != mpSplitWindow)
         {
-            if (mpSplitWindow != NULL)
+            if (mpSplitWindow != nullptr)
                 mpSplitWindow->RemoveEventListener(LINK(this, SidebarController, WindowEventHandler));
 
             mpSplitWindow = pSplitWindow;
 
-            if (mpSplitWindow != NULL)
+            if (mpSplitWindow != nullptr)
                 mpSplitWindow->AddEventListener(LINK(this, SidebarController, WindowEventHandler));
         }
         return mpSplitWindow;
@@ -1092,7 +1092,7 @@ SfxSplitWindow* SidebarController::GetSplitWindow (void)
 
 void SidebarController::UpdateCloseIndicator (const bool bCloseAfterDrag)
 {
-    if (mpParentWindow == NULL)
+    if (mpParentWindow == nullptr)
         return;
 
     if (bCloseAfterDrag)
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 15c694d85fea..340aba5c32eb 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -145,7 +145,7 @@ private:
     static SidebarControllerContainer maSidebarControllerContainer;
 
     ::boost::scoped_ptr<Deck> mpCurrentDeck;
-    SidebarDockingWindow* mpParentWindow;
+    VclPtr<SidebarDockingWindow> mpParentWindow;
     ::boost::scoped_ptr<TabBar> mpTabBar;
     css::uno::Reference<css::frame::XFrame> mxFrame;
     Context maCurrentContext;
@@ -177,7 +177,7 @@ private:
     FocusManager maFocusManager;
     css::uno::Reference<css::frame::XDispatch> mxReadOnlyModeDispatch;
     bool mbIsDocumentReadOnly;
-    SfxSplitWindow* mpSplitWindow;
+    VclPtr<SfxSplitWindow> mpSplitWindow;
     /** When the user moves the splitter then we remember the
         width at that time.
     */
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index a1b54dba617e..fdaaeb4aae67 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -67,7 +67,7 @@ SidebarPanelBase::SidebarPanelBase (
         if (xMultiplexer.is())
             xMultiplexer->addContextChangeEventListener(this, mxFrame->getController());
     }
-    if (mpControl != NULL)
+    if (mpControl != nullptr)
     {
         mpControl->SetBackground(Theme::GetWallpaper(Theme::Paint_PanelBackground));
         mpControl->Show();
@@ -81,11 +81,7 @@ SidebarPanelBase::~SidebarPanelBase (void)
 void SAL_CALL SidebarPanelBase::disposing (void)
     throw (css::uno::RuntimeException)
 {
-    if (mpControl != NULL)
-    {
-        delete mpControl;
-        mpControl = NULL;
-    }
+    mpControl.clear();
 
     if (mxFrame.is())
     {
@@ -104,7 +100,7 @@ void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
     throw (css::uno::RuntimeException, std::exception)
 {
     IContextChangeReceiver* pContextChangeReceiver
-        = dynamic_cast<IContextChangeReceiver*>(mpControl);
+        = dynamic_cast<IContextChangeReceiver*>(mpControl.get());
     if (pContextChangeReceiver != NULL)
     {
         const EnumContext aContext(
@@ -161,7 +157,7 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl
 Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void)
     throw(css::uno::RuntimeException, std::exception)
 {
-    if (mpControl != NULL)
+    if (mpControl != nullptr)
         return Reference<awt::XWindow>(
             mpControl->GetComponentInterface(),
             UNO_QUERY);
@@ -176,7 +172,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
         return maLayoutSize;
     else
     {
-        ILayoutableWindow* pLayoutableWindow = dynamic_cast<ILayoutableWindow*>(mpControl);
+        ILayoutableWindow* pLayoutableWindow = dynamic_cast<ILayoutableWindow*>(mpControl.get());
 
         if (isLayoutEnabled(mpControl))
         {
@@ -186,7 +182,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
         }
         else if (pLayoutableWindow != NULL)
             return pLayoutableWindow->GetHeightForWidth(nWidth);
-        else if (mpControl != NULL)
+        else if (mpControl != nullptr)
         {
             const sal_Int32 nHeight (mpControl->GetSizePixel().Height());
             return ui::LayoutSize(nHeight,nHeight,nHeight);
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index da1f7e269818..3ebd81948203 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -442,7 +442,7 @@ void SfxStatusBarControl::StateChanged
 */
 
 {
-    DBG_ASSERT( pBar != 0, "setting state to dangling StatusBar" );
+    DBG_ASSERT( pBar != nullptr, "setting state to dangling StatusBar" );
 
     const SfxStringItem* pStr = PTR_CAST( SfxStringItem, pState );
     if ( eState == SfxItemState::DEFAULT && pStr )
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index befb3c36d9aa..7b355d64b03c 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -45,7 +45,7 @@ const sal_uInt32 IMAGELIST_COUNT = 4; // small, small-hi, large, large-hi
 
 struct ToolBoxInf_Impl
 {
-    ToolBox* pToolBox;
+    VclPtr<ToolBox> pToolBox;
     sal_uInt16   nFlags;
 };
 
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index ca0694d51d2c..6afaec6536eb 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -186,13 +186,13 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
 
 struct SfxToolBoxControl_Impl
 {
-    ToolBox*                pBox;
+    VclPtr<ToolBox>         pBox;
     bool                    bShowString;
     SfxTbxCtrlFactory*      pFact;
     sal_uInt16              nTbxId;
     sal_uInt16              nSlotId;
-    SfxPopupWindow*         mpFloatingWindow;
-    SfxPopupWindow*         mpPopupWindow;
+    VclPtr<SfxPopupWindow>  mpFloatingWindow;
+    VclPtr<SfxPopupWindow>  mpPopupWindow;
     Reference< XUIElement > mxUIElement;
 
     DECL_LINK( WindowEventListener, VclSimpleEvent* );
@@ -207,10 +207,9 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent
     {
         vcl::Window* pWindow( static_cast<VclWindowEvent*>(pEvent)->GetWindow() );
         if (( pWindow == mpFloatingWindow ) &&
-            ( mpPopupWindow != 0 ))
+            ( mpPopupWindow != nullptr ))
         {
-            delete mpPopupWindow;
-            mpPopupWindow = 0;
+            mpPopupWindow.clear();
         }
     }
 
@@ -292,11 +291,8 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime
     pImpl->mxUIElement = 0;
 
     // Delete my popup windows
-    delete pImpl->mpFloatingWindow;
-    delete pImpl->mpPopupWindow;
-
-    pImpl->mpFloatingWindow = 0;
-    pImpl->mpPopupWindow = 0;
+    pImpl->mpFloatingWindow.clear();
+    pImpl->mpPopupWindow.clear();
 }
 
 
@@ -866,9 +862,9 @@ IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl)
     {
         // Replace floating window with popup window and destroy
         // floating window instance.
-        delete pImpl->mpFloatingWindow;
+        pImpl->mpFloatingWindow.clear();
         pImpl->mpFloatingWindow = pImpl->mpPopupWindow;
-        pImpl->mpPopupWindow    = 0;
+        pImpl->mpPopupWindow.clear();
         // We also need to know when the user tries to use the
         // floating window.
         pImpl->mpFloatingWindow->AddEventListener( LINK( pImpl, SfxToolBoxControl_Impl, WindowEventListener ));
@@ -877,7 +873,7 @@ IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl)
     {
         // Popup window has been closed by the user. No replacement, instance
         // will destroy itself.
-        pImpl->mpPopupWindow = 0;
+        pImpl->mpPopupWindow.clear();
     }
 
     return 1;
@@ -903,7 +899,7 @@ void SfxToolBoxControl::StateChanged
     const SfxPoolItem*  pState
 )
 {
-    DBG_ASSERT( pImpl->pBox != 0, "setting state to dangling ToolBox" );
+    DBG_ASSERT( pImpl->pBox != nullptr, "setting state to dangling ToolBox" );
 
     if ( GetId() >= SID_OBJECTMENU0 && GetId() <= SID_OBJECTMENU_LAST )
         return;
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 4b3696887b3e..c65bc7bc532b 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -93,7 +93,7 @@ void SfxFrame::Construct_Impl()
 SfxFrame::~SfxFrame()
 {
     RemoveTopFrame_Impl( this );
-    DELETEZ( pWindow );
+    pWindow.clear();
 
     SfxFrameArr_Impl::iterator it = std::find( pFramesArr_Impl->begin(), pFramesArr_Impl->end(), this );
     if ( it != pFramesArr_Impl->end() )
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 0c21681aeaf9..f03d12ed07a9 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -345,7 +345,7 @@ SystemWindow* SfxFrame::GetSystemWindow() const
 SystemWindow* SfxFrame::GetTopWindow_Impl() const
 {
     if ( pImp->pExternalContainerWindow->IsSystemWindow() )
-        return static_cast<SystemWindow*>( pImp->pExternalContainerWindow );
+        return static_cast<SystemWindow*>( pImp->pExternalContainerWindow.get() );
     else
         return NULL;
 }
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 5f1aaae8e4fc..271ef70c1d45 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -41,17 +41,17 @@ public:
     SfxViewFrame*             pCurrentViewFrame;
     SfxFrameDescriptor*       pDescr;
     sal_uInt16                nLocks;
-    bool                  bClosing : 1;
-    bool                  bPrepClosing : 1;
-    bool                  bInCancelTransfers : 1;
-    bool                  bOwnsBindings : 1;
-    bool                  bReleasingComponent : 1;
-    bool                  bInPlace : 1;
+    bool                      bClosing : 1;
+    bool                      bPrepClosing : 1;
+    bool                      bInCancelTransfers : 1;
+    bool                      bOwnsBindings : 1;
+    bool                      bReleasingComponent : 1;
+    bool                      bInPlace : 1;
     SfxFrame*                 pFrame;
     SfxWorkWindow*            pWorkWin;
     SvBorder                  aBorder;
     // formerly SfxTopFrame
-    vcl::Window*                   pExternalContainerWindow;
+    VclPtr<vcl::Window>       pExternalContainerWindow;
     bool                      bHidden;
     bool                      bLockResize;
     bool                      bMenuBarOn;
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index 129d03c5e8ce..0f8bfdc47f85 100644
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -35,9 +35,9 @@ struct SfxViewFrame_Impl
     OUString            aActualURL;
     SfxFrame&           rFrame;
     svtools::AsynchronLink* pReloader;
-    vcl::Window*             pWindow;
+    VclPtr<vcl::Window> pWindow;
     SfxViewFrame*       pActiveChild;
-    vcl::Window*             pFocusWin;
+    VclPtr<vcl::Window> pFocusWin;
     sal_uInt16          nDocViewNo;
     sal_uInt16          nCurViewId;
     bool            bResizeInToOut:1;
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 2f6867387afb..635ccf0bf89f 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -235,7 +235,7 @@ SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
 void SfxPrintOptionsDialog::dispose()
 {
     delete pDlgImpl;
-    delete pPage;
+    pPage.clear();
     delete pOptions;
     ModalDialog::dispose();
 }
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 9f160d7615e9..bf696c4b1949 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1451,7 +1451,7 @@ void SfxBaseController::ShowInfoBars( )
                     SfxInfoBarWindow* pInfoBar = pViewFrame->AppendInfoBar( "checkout", SfxResId( STR_NONCHECKEDOUT_DOCUMENT ) );
                     if (pInfoBar)
                     {
-                        PushButton* pBtn = new PushButton( &pViewFrame->GetWindow(), SfxResId( BT_CHECKOUT ) );
+                        VclPtrInstance<PushButton> pBtn( &pViewFrame->GetWindow(), SfxResId( BT_CHECKOUT ) );
                         pBtn->SetClickHdl( LINK( this, SfxBaseController, CheckOutHandler ) );
                         pInfoBar->addButton(pBtn);
                     }
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5d7685af9fbb..f61969f753da 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1369,7 +1369,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
                     SfxInfoBarWindow* pInfoBar = AppendInfoBar("readonly", SfxResId(STR_READONLY_DOCUMENT));
                     if (pInfoBar)
                     {
-                        PushButton* pBtn = new PushButton( &GetWindow(), SfxResId(BT_READONLY_EDIT));
+                        VclPtrInstance<PushButton> pBtn( &GetWindow(), SfxResId(BT_READONLY_EDIT));
                         pBtn->SetClickHdl(LINK(this, SfxViewFrame, SwitchReadOnlyHandler));
                         pInfoBar->addButton(pBtn);
                     }
@@ -1489,7 +1489,7 @@ SfxViewFrame::~SfxViewFrame()
         // The Bindings delete the Frame!
         KillDispatcher_Impl();
 
-    delete pImp->pWindow;
+    pImp->pWindow.clear();
 
     if ( GetFrame().GetCurrentViewFrame() == this )
         GetFrame().SetCurrentViewFrame_Impl( NULL );
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 34716d67aabe..71ff494c5ab0 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -411,9 +411,9 @@ class SfxDialogExecutor_Impl
 {
 private:
     SfxViewShell*           _pViewSh;
-    PrinterSetupDialog*     _pSetupParent;
+    VclPtr<PrinterSetupDialog>  _pSetupParent;
     SfxItemSet*             _pOptions;
-    bool                _bHelpDisabled;
+    bool                    _bHelpDisabled;
 
     DECL_LINK( Execute, void * );