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

90 files changed, 1213 insertions, 601 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 4a36503c83b2..200e62b432a1 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -347,12 +347,13 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDes
 class SdDesignNameDlg : public ModalDialog
 {
 private:
-    Edit*           m_pEdit;
-    OKButton*       m_pBtnOK;
+    VclPtr<Edit>           m_pEdit;
+    VclPtr<OKButton>       m_pBtnOK;
 
 public:
     SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName );
-
+    virtual ~SdDesignNameDlg();
+    virtual void dispose() SAL_OVERRIDE;
     OUString GetDesignName();
     DECL_LINK(ModifyHdl, void *);
 };
@@ -483,8 +484,97 @@ SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType)
 
 SdPublishingDlg::~SdPublishingDlg()
 {
+    dispose();
+}
+
+void SdPublishingDlg::dispose()
+{
+    pPage1.clear();
+    pPage1_Titel.clear();
+    pPage1_NewDesign.clear();
+    pPage1_OldDesign.clear();
+    pPage1_Designs.clear();
+    pPage1_DelDesign.clear();
+    pPage1_Desc.clear();
+    pPage2.clear();
+    pPage2Frame2.clear();
+    pPage2Frame3.clear();
+    pPage2Frame4.clear();
+    pPage2_Titel.clear();
+    pPage2_Standard.clear();
+    pPage2_Frames.clear();
+    pPage2_SingleDocument.clear();
+    pPage2_Kiosk.clear();
+    pPage2_WebCast.clear();
+    pPage2_Standard_FB.clear();
+    pPage2_Frames_FB.clear();
+    pPage2_Kiosk_FB.clear();
+    pPage2_WebCast_FB.clear();
+    pPage2_Titel_Html.clear();
+    pPage2_Content.clear();
+    pPage2_Notes.clear();
+    pPage2_Titel_WebCast.clear();
+    pPage2_ASP.clear();
+    pPage2_PERL.clear();
+    pPage2_URL_txt.clear();
+    pPage2_URL.clear();
+    pPage2_CGI_txt.clear();
+    pPage2_CGI.clear();
+    pPage2_Index_txt.clear();
+    pPage2_Index.clear();
+    pPage2_Titel_Kiosk.clear();
+    pPage2_ChgDefault.clear();
+    pPage2_ChgAuto.clear();
+    pPage2_Duration_txt.clear();
+    pPage2_Duration.clear();
+    pPage2_Endless.clear();
+    pPage3.clear();
+    pPage3_Titel1.clear();
+    pPage3_Png.clear();
+    pPage3_Gif.clear();
+    pPage3_Jpg.clear();
+    pPage3_Quality_txt.clear();
+    pPage3_Quality.clear();
+    pPage3_Titel2.clear();
+    pPage3_Resolution_1.clear();
+    pPage3_Resolution_2.clear();
+    pPage3_Resolution_3.clear();
+    pPage3_Titel3.clear();
+    pPage3_SldSound.clear();
+    pPage3_HiddenSlides.clear();
+    pPage4.clear();
+    pPage4_Titel1.clear();
+    pPage4_Author_txt.clear();
+    pPage4_Author.clear();
+    pPage4_Email_txt.clear();
+    pPage4_Email.clear();
+    pPage4_WWW_txt.clear();
+    pPage4_WWW.clear();
+    pPage4_Titel2.clear();
+    pPage4_Misc.clear();
+    pPage4_Download.clear();
+    pPage5.clear();
+    pPage5_Titel.clear();
+    pPage5_TextOnly.clear();
+    pPage5_Buttons.clear();
+    pPage6.clear();
+    pPage6_Titel.clear();
+    pPage6_Default.clear();
+    pPage6_User.clear();
+    pPage6_Back.clear();
+    pPage6_Text.clear();
+    pPage6_Link.clear();
+    pPage6_VLink.clear();
+    pPage6_ALink.clear();
+    pPage6_DocColors.clear();
+    pPage6_Preview.clear();
+    pLastPageButton.clear();
+    pNextPageButton.clear();
+    pFinishButton.clear();
+    ModalDialog::dispose();
 }
 
+
 // Generate dialog controls and embed them in the pages
 void SdPublishingDlg::CreatePages()
 {
@@ -1542,6 +1632,18 @@ SdDesignNameDlg::SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName)
     m_pBtnOK->Enable(!aName.isEmpty());
 }
 
+SdDesignNameDlg::~SdDesignNameDlg()
+{
+    dispose();
+}
+
+void SdDesignNameDlg::dispose()
+{
+    m_pEdit.clear();
+    m_pBtnOK.clear();
+    ModalDialog::dispose();
+}
+
 OUString SdDesignNameDlg::GetDesignName()
 {
     return m_pEdit->GetText();
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 8d04f48fe315..dc6aa03db0a4 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -96,7 +96,7 @@ private:
     sal_Int32 mnFirstVisibleChild;
     sal_Int32 mnLastVisibleChild;
     bool mbListeningToDocument;
-    vcl::Window* mpWindow;
+    VclPtr<vcl::Window> mpWindow;
     sal_Int32 mnFocusedIndex;
     bool mbModelChangeLocked;
     ImplSVEvent * mnUpdateChildrenUserEventId;
@@ -221,7 +221,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent
     const SolarMutexGuard aSolarGuard;
     Reference<XAccessible> xParent;
 
-    if (mpContentWindow != NULL)
+    if (mpContentWindow != nullptr)
     {
         vcl::Window* pParent = mpContentWindow->GetAccessibleParentWindow();
         if (pParent != NULL)
@@ -302,7 +302,7 @@ Reference<XAccessibleStateSet > SAL_CALL
     pStateSet->AddState(AccessibleStateType::ACTIVE);
     pStateSet->AddState(AccessibleStateType::MULTI_SELECTABLE);
     pStateSet->AddState(AccessibleStateType::OPAQUE);
-    if (mpContentWindow!=NULL)
+    if (mpContentWindow!=nullptr)
     {
         if (mpContentWindow->IsVisible())
             pStateSet->AddState(AccessibleStateType::VISIBLE);
@@ -416,7 +416,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void)
     const SolarMutexGuard aSolarGuard;
     awt::Rectangle aBBox;
 
-    if (mpContentWindow != NULL)
+    if (mpContentWindow != nullptr)
     {
         const Point aPosition (mpContentWindow->GetPosPixel());
         const Size aSize (mpContentWindow->GetOutputSizePixel());
@@ -436,7 +436,7 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void)
     ThrowIfDisposed();
     awt::Point aLocation;
 
-    if (mpContentWindow != NULL)
+    if (mpContentWindow != nullptr)
     {
         const Point aPosition (mpContentWindow->GetPosPixel());
         aLocation.X = aPosition.X();
@@ -478,7 +478,7 @@ awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void)
     ThrowIfDisposed();
     awt::Size aSize;
 
-    if (mpContentWindow != NULL)
+    if (mpContentWindow != nullptr)
     {
         const Size aOutputSize (mpContentWindow->GetOutputSizePixel());
         aSize.Width = aOutputSize.Width();
@@ -813,7 +813,7 @@ void AccessibleSlideSorterView::Implementation::ConnectListeners (void)
         StartListening (*mrSlideSorter.GetViewShell());
     mbListeningToDocument = true;
 
-    if (mpWindow != NULL)
+    if (mpWindow != nullptr)
         mpWindow->AddEventListener(
             LINK(this,AccessibleSlideSorterView::Implementation,WindowEventListener));
 
@@ -834,7 +834,7 @@ void AccessibleSlideSorterView::Implementation::ReleaseListeners (void)
     mrSlideSorter.GetView().RemoveVisibilityChangeListener(
         LINK(this,AccessibleSlideSorterView::Implementation,VisibilityChangeListener));
 
-    if (mpWindow != NULL)
+    if (mpWindow != nullptr)
         mpWindow->RemoveEventListener(
             LINK(this,AccessibleSlideSorterView::Implementation,WindowEventListener));
 
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 5e7c988e148e..358ce0705cc9 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -165,6 +165,7 @@ class CustomAnimationCreateTabPage : public TabPage
 public:
     CustomAnimationCreateTabPage( vcl::Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath = false );
     virtual ~CustomAnimationCreateTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     PathKind getCreatePathKind() const;
     CustomAnimationPresetPtr getSelectedPreset() const;
@@ -187,12 +188,12 @@ private:
     void clearEffects();
 
 private:
-    CategoryListBox*    mpLBEffects;
-    FixedText*  mpFTSpeed;
-    ListBox*    mpCBSpeed;
-    CheckBox*   mpCBXPReview;
+    VclPtr<CategoryListBox>    mpLBEffects;
+    VclPtr<FixedText>  mpFTSpeed;
+    VclPtr<ListBox>    mpCBSpeed;
+    VclPtr<CheckBox>   mpCBXPReview;
 
-    CustomAnimationCreateDialog*        mpParent;
+    VclPtr<CustomAnimationCreateDialog>        mpParent;
 
     sal_uInt16 mnId;
 
@@ -296,7 +297,18 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( vcl::Window* pParent
 
 CustomAnimationCreateTabPage::~CustomAnimationCreateTabPage()
 {
+    dispose();
+}
+
+void CustomAnimationCreateTabPage::dispose()
+{
     clearEffects();
+    mpLBEffects.clear();
+    mpFTSpeed.clear();
+    mpCBSpeed.clear();
+    mpCBXPReview.clear();
+    mpParent.clear();
+    TabPage::dispose();
 }
 
 IMPL_LINK( CustomAnimationCreateTabPage, implSelectHdl, Control*, pControl )
@@ -548,6 +560,8 @@ void CustomAnimationCreateDialog::dispose()
     delete mpTabPages[MOTIONPATH];
     delete mpTabPages[MISCEFFECTS];
 
+    mpTabControl.clear();
+    mpPane.clear();
     TabDialog::dispose();
 }
 
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
index 7ae2ec75a9fd..974b3f34de17 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
@@ -57,13 +57,13 @@ private:
     DECL_LINK(implDeactivatePagekHdl, void *);
 
 private:
-    CustomAnimationPane* mpPane;
+    VclPtr<CustomAnimationPane> mpPane;
     const std::vector< ::com::sun::star::uno::Any >& mrTargets;
 
     double mfDuration;
     bool mbIsPreview;
 
-    TabControl* mpTabControl;
+    VclPtr<TabControl> mpTabControl;
 
     CustomAnimationCreateTabPage* mpTabPages[5];
     sal_uInt16 mnEntranceId, mnEmphasisId, mnExitId, mnMPathId, mnMiscId;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index c5e3a2e6b2c4..ce65a000ebcd 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -107,7 +107,7 @@ public:
 
 private:
     std::map< sal_uInt16, OUString > maPropertyValues;
-    ListBox* mpControl;
+    VclPtr<ListBox> mpControl;
 };
 
 PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl )
@@ -159,7 +159,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
 
 PresetPropertyBox::~PresetPropertyBox()
 {
-    delete mpControl;
+    mpControl.clear();
 }
 
 Any PresetPropertyBox::getValue()
@@ -183,7 +183,7 @@ public:
     virtual Control* getControl() SAL_OVERRIDE;
 
 private:
-    ColorListBox* mpControl;
+    VclPtr<ColorListBox> mpControl;
 };
 
 ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
@@ -219,7 +219,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent
 
 ColorPropertyBox::~ColorPropertyBox()
 {
-    delete mpControl;
+    mpControl.clear();
 }
 
 void ColorPropertyBox::setValue( const Any& rValue, const OUString& )
@@ -256,7 +256,7 @@ public:
     virtual Control* getControl() SAL_OVERRIDE;
 
 private:
-    FontNameBox* mpControl;
+    VclPtr<FontNameBox> mpControl;
 };
 
 FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
@@ -303,7 +303,7 @@ void FontPropertyBox::setValue( const Any& rValue, const OUString& )
 
 FontPropertyBox::~FontPropertyBox()
 {
-    delete mpControl;
+    mpControl.clear();
 }
 
 Any FontPropertyBox::getValue()
@@ -331,7 +331,7 @@ public:
 
 private:
     VclPtr<Edit> mpSubControl;
-    MenuButton*  mpDropdownButton;
+    VclPtr<MenuButton>  mpDropdownButton;
     PopupMenu*   mpMenu;
 };
 
@@ -356,8 +356,8 @@ DropdownMenuBox::~DropdownMenuBox()
 
 void DropdownMenuBox::dispose()
 {
-    SetSubEdit(VclPtr<Edit>());
-    delete mpDropdownButton;
+    SetSubEdit(nullptr);
+    mpDropdownButton.clear();
     delete mpMenu;
     mpSubControl.disposeAndClear();
     Edit::dispose();
@@ -412,7 +412,7 @@ public:
     DECL_LINK( implMenuSelectHdl, MenuButton* );
 
 private:
-    DropdownMenuBox* mpControl;
+    VclPtr<DropdownMenuBox> mpControl;
     PopupMenu* mpMenu;
     VclPtr<MetricField> mpMetric;
 };
@@ -437,7 +437,7 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Windo
 
 CharHeightPropertyBox::~CharHeightPropertyBox()
 {
-    delete mpControl;
+    mpControl.clear();
 }
 
 IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb )
@@ -492,7 +492,7 @@ public:
     void updateMenu();
 
 private:
-    DropdownMenuBox* mpControl;
+    VclPtr<DropdownMenuBox> mpControl;
     PopupMenu* mpMenu;
     VclPtr<MetricField> mpMetric;
     Link maModifyHdl;
@@ -528,7 +528,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::W
 
 TransparencyPropertyBox::~TransparencyPropertyBox()
 {
-    delete mpControl;
+    mpControl.clear();
 }
 
 void TransparencyPropertyBox::updateMenu()
@@ -596,7 +596,7 @@ public:
     void updateMenu();
 
 private:
-    DropdownMenuBox* mpControl;
+    VclPtr<DropdownMenuBox> mpControl;
     PopupMenu* mpMenu;
     VclPtr<MetricField> mpMetric;
     Link maModifyHdl;
@@ -626,7 +626,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* p
 
 RotationPropertyBox::~RotationPropertyBox()
 {
-    delete mpControl;
+    mpControl.clear();
 }
 
 void RotationPropertyBox::updateMenu()
@@ -721,7 +721,7 @@ public:
     void updateMenu();
 
 private:
-    DropdownMenuBox* mpControl;
+    VclPtr<DropdownMenuBox> mpControl;
     PopupMenu* mpMenu;
     VclPtr<MetricField> mpMetric;
     Link maModifyHdl;
@@ -751,7 +751,7 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent
 
 ScalePropertyBox::~ScalePropertyBox()
 {
-    delete mpControl;
+    mpControl.clear();
 }
 
 void ScalePropertyBox::updateMenu()
@@ -883,7 +883,7 @@ public:
     void update();
 
 private:
-    DropdownMenuBox* mpControl;
+    VclPtr<DropdownMenuBox> mpControl;
     PopupMenu* mpMenu;
     VclPtr<Edit> mpEdit;
     Link maModifyHdl;
@@ -911,7 +911,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window*
 
 FontStylePropertyBox::~FontStylePropertyBox()
 {
-    delete mpControl;
+    mpControl.clear();
 }
 
 void FontStylePropertyBox::update()
@@ -993,6 +993,7 @@ class CustomAnimationEffectTabPage : public TabPage
 public:
     CustomAnimationEffectTabPage( vcl::Window* pParent, const STLPropertySet* pSet );
     virtual ~CustomAnimationEffectTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     void update( STLPropertySet* pSet );
     DECL_LINK( implSelectHdl, Control* );
@@ -1010,24 +1011,24 @@ private:
     bool mbHasText;
     const STLPropertySet* mpSet;
 
-    VclFrame*       mpSettings;
-    FixedText*      mpFTProperty1;
-    PropertyControl* mpLBProperty1;
-    VclHBox*        mpPlaceholderBox;
-    CheckBox*       mpCBSmoothStart;
-    CheckBox*       mpCBSmoothEnd;
-
-    FixedText*      mpFTSound;
-    ListBox*        mpLBSound;
-    PushButton*     mpPBSoundPreview;
-    FixedText*      mpFTAfterEffect;
-    ListBox*        mpLBAfterEffect;
-    FixedText*      mpFTDimColor;
-    ColorListBox*   mpCLBDimColor;
-    FixedText*      mpFTTextAnim;
-    ListBox*        mpLBTextAnim;
-    MetricField*    mpMFTextDelay;
-    FixedText*      mpFTTextDelay;
+    VclPtr<VclFrame>       mpSettings;
+    VclPtr<FixedText>      mpFTProperty1;
+    VclPtr<PropertyControl> mpLBProperty1;
+    VclPtr<VclHBox>        mpPlaceholderBox;
+    VclPtr<CheckBox>       mpCBSmoothStart;
+    VclPtr<CheckBox>       mpCBSmoothEnd;
+
+    VclPtr<FixedText>      mpFTSound;
+    VclPtr<ListBox>        mpLBSound;
+    VclPtr<PushButton>     mpPBSoundPreview;
+    VclPtr<FixedText>      mpFTAfterEffect;
+    VclPtr<ListBox>        mpLBAfterEffect;
+    VclPtr<FixedText>      mpFTDimColor;
+    VclPtr<ColorListBox>   mpCLBDimColor;
+    VclPtr<FixedText>      mpFTTextAnim;
+    VclPtr<ListBox>        mpLBTextAnim;
+    VclPtr<MetricField>    mpMFTextDelay;
+    VclPtr<FixedText>      mpFTTextDelay;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
 };
@@ -1262,7 +1263,30 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent
 
 CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage()
 {
+    dispose();
+}
+
+void CustomAnimationEffectTabPage::dispose()
+{
     clearSoundListBox();
+    mpSettings.clear();
+    mpFTProperty1.clear();
+    mpLBProperty1.clear();
+    mpPlaceholderBox.clear();
+    mpCBSmoothStart.clear();
+    mpCBSmoothEnd.clear();
+    mpFTSound.clear();
+    mpLBSound.clear();
+    mpPBSoundPreview.clear();
+    mpFTAfterEffect.clear();
+    mpLBAfterEffect.clear();
+    mpFTDimColor.clear();
+    mpCLBDimColor.clear();
+    mpFTTextAnim.clear();
+    mpLBTextAnim.clear();
+    mpMFTextDelay.clear();
+    mpFTTextDelay.clear();
+    TabPage::dispose();
 }
 
 void CustomAnimationEffectTabPage::updateControlStates()
@@ -1565,6 +1589,7 @@ class CustomAnimationDurationTabPage : public TabPage
 public:
     CustomAnimationDurationTabPage( vcl::Window* pParent, const STLPropertySet* pSet );
     virtual ~CustomAnimationDurationTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     void update( STLPropertySet* pSet );
 
@@ -1573,18 +1598,18 @@ public:
 private:
     const STLPropertySet* mpSet;
 
-    FixedText* mpFTStart;
-    ListBox* mpLBStart;
-    FixedText* mpFTStartDelay;
-    MetricField* mpMFStartDelay;
-    FixedText* mpFTDuration;
-    ListBox* mpCBDuration;
-    FixedText* mpFTRepeat;
-    ListBox* mpCBRepeat;
-    CheckBox* mpCBXRewind;
-    RadioButton* mpRBClickSequence;
-    RadioButton* mpRBInteractive;
-    ListBox* mpLBTrigger;
+    VclPtr<FixedText> mpFTStart;
+    VclPtr<ListBox> mpLBStart;
+    VclPtr<FixedText> mpFTStartDelay;
+    VclPtr<MetricField> mpMFStartDelay;
+    VclPtr<FixedText> mpFTDuration;
+    VclPtr<ListBox> mpCBDuration;
+    VclPtr<FixedText> mpFTRepeat;
+    VclPtr<ListBox> mpCBRepeat;
+    VclPtr<CheckBox> mpCBXRewind;
+    VclPtr<RadioButton> mpRBClickSequence;
+    VclPtr<RadioButton> mpRBInteractive;
+    VclPtr<ListBox> mpLBTrigger;
 };
 
 CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pParent, const STLPropertySet* pSet)
@@ -1762,6 +1787,24 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar
 
 CustomAnimationDurationTabPage::~CustomAnimationDurationTabPage()
 {
+    dispose();
+}
+
+void CustomAnimationDurationTabPage::dispose()
+{
+    mpFTStart.clear();
+    mpLBStart.clear();
+    mpFTStartDelay.clear();
+    mpMFStartDelay.clear();
+    mpFTDuration.clear();
+    mpCBDuration.clear();
+    mpFTRepeat.clear();
+    mpCBRepeat.clear();
+    mpCBXRewind.clear();
+    mpRBClickSequence.clear();
+    mpRBInteractive.clear();
+    mpLBTrigger.clear();
+    TabPage::dispose();
 }
 
 IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl )
@@ -1931,6 +1974,8 @@ class CustomAnimationTextAnimTabPage : public TabPage
 {
 public:
     CustomAnimationTextAnimTabPage( vcl::Window* pParent, const STLPropertySet* pSet );
+    virtual ~CustomAnimationTextAnimTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     void update( STLPropertySet* pSet );
 
@@ -1938,12 +1983,12 @@ public:
     DECL_LINK(implSelectHdl, void *);
 
 private:
-    FixedText*   maFTGroupText;
-    ListBox*     maLBGroupText;
-    CheckBox*    maCBXGroupAuto;
-    MetricField* maMFGroupAuto;
-    CheckBox*    maCBXAnimateForm;
-    CheckBox*    maCBXReverse;
+    VclPtr<FixedText>   maFTGroupText;
+    VclPtr<ListBox>     maLBGroupText;
+    VclPtr<CheckBox>    maCBXGroupAuto;
+    VclPtr<MetricField> maMFGroupAuto;
+    VclPtr<CheckBox>    maCBXAnimateForm;
+    VclPtr<CheckBox>    maCBXReverse;
 
     const STLPropertySet* mpSet;
 
@@ -2030,6 +2075,22 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(vcl::Window* pPar
     updateControlStates();
 }
 
+CustomAnimationTextAnimTabPage::~CustomAnimationTextAnimTabPage()
+{
+    dispose();
+}
+
+void CustomAnimationTextAnimTabPage::dispose()
+{
+    maFTGroupText.clear();
+    maLBGroupText.clear();
+    maCBXGroupAuto.clear();
+    maMFGroupAuto.clear();
+    maCBXAnimateForm.clear();
+    maCBXReverse.clear();
+    TabPage::dispose();
+}
+
 void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
 {
     sal_Int32 nPos = maLBGroupText->GetSelectEntryPos();
@@ -2151,13 +2212,14 @@ CustomAnimationDialog::~CustomAnimationDialog()
 
 void CustomAnimationDialog::dispose()
 {
-    delete mpEffectTabPage;
-    delete mpDurationTabPage;
-    delete mpTextAnimTabPage;
+    mpEffectTabPage.clear();
+    mpDurationTabPage.clear();
+    mpTextAnimTabPage.clear();
 
     delete mpSet;
     delete mpResultSet;
 
+    mpTabControl.clear();
     TabDialog::dispose();
 }
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 897a22946c9d..3754d93ffdbf 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -156,11 +156,11 @@ private:
     STLPropertySet* mpResultSet;
 
     CustomAnimationEffectPtr mpEffect;
-    TabControl* mpTabControl;
+    VclPtr<TabControl> mpTabControl;
 
-    CustomAnimationDurationTabPage* mpDurationTabPage;
-    CustomAnimationEffectTabPage* mpEffectTabPage;
-    CustomAnimationTextAnimTabPage* mpTextAnimTabPage;
+    VclPtr<CustomAnimationDurationTabPage> mpDurationTabPage;
+    VclPtr<CustomAnimationEffectTabPage> mpEffectTabPage;
+    VclPtr<CustomAnimationTextAnimTabPage> mpTextAnimTabPage;
 };
 
 }
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 43f3c3451bb8..24bf4e892471 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -210,7 +210,7 @@ public:
     virtual void Paint(
         const Point&, SvTreeListBox& rDev, const SvViewDataEntry* pView,const SvTreeListEntry* pEntry) SAL_OVERRIDE;
 private:
-    CustomAnimationList* mpParent;
+    VclPtr<CustomAnimationList> mpParent;
     OUString        maDescription;
     CustomAnimationEffectPtr mpEffect;
 };
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index c64a1f28bcf2..c83dc7155be2 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -240,6 +240,23 @@ void CustomAnimationPane::dispose()
     for( aIter = aTags.begin(); aIter != aTags.end(); ++aIter )
         (*aIter)->Dispose();
 
+    mpPBAddEffect.clear();
+    mpPBChangeEffect.clear();
+    mpPBRemoveEffect.clear();
+    mpFTEffect.clear();
+    mpFTStart.clear();
+    mpLBStart.clear();
+    mpFTProperty.clear();
+    mpPlaceholderBox.clear();
+    mpLBProperty.clear();
+    mpPBPropertyMore.clear();
+    mpFTSpeed.clear();
+    mpCBSpeed.clear();
+    mpCustomAnimationList.clear();
+    mpPBMoveUp.clear();
+    mpPBMoveDown.clear();
+    mpPBPlay.clear();
+    mpCBAutoPreview.clear();
     PanelLayout::dispose();
 }
 
@@ -815,11 +832,11 @@ void CustomAnimationPane::UpdateLook (void)
         ::sfx2::sidebar::Theme::GetWallpaper(
             ::sfx2::sidebar::Theme::Paint_PanelBackground));
     SetBackground(aBackground);
-    if (mpFTStart != NULL)
+    if (mpFTStart != nullptr)
         mpFTStart->SetBackground(aBackground);
-    if (mpFTProperty != NULL)
+    if (mpFTProperty != nullptr)
         mpFTProperty->SetBackground(aBackground);
-    if (mpFTSpeed != NULL)
+    if (mpFTSpeed != nullptr)
         mpFTSpeed->SetBackground(aBackground);
 }
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index bdf29dd1cf9e..f1e75d387af6 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -126,23 +126,23 @@ private:
 
     const CustomAnimationPresets* mpCustomAnimationPresets;
 
-    PushButton* mpPBAddEffect;
-    PushButton* mpPBChangeEffect;
-    PushButton* mpPBRemoveEffect;
-    FixedText*  mpFTEffect;
-    FixedText*  mpFTStart;
-    ListBox*    mpLBStart;
-    FixedText*  mpFTProperty;
-    VclHBox*    mpPlaceholderBox;
-    PropertyControl*    mpLBProperty;
-    PushButton* mpPBPropertyMore;
-    FixedText*  mpFTSpeed;
-    ListBox*   mpCBSpeed;
-    CustomAnimationList*    mpCustomAnimationList;
-    PushButton* mpPBMoveUp;
-    PushButton* mpPBMoveDown;
-    PushButton* mpPBPlay;
-    CheckBox*   mpCBAutoPreview;
+    VclPtr<PushButton> mpPBAddEffect;
+    VclPtr<PushButton> mpPBChangeEffect;
+    VclPtr<PushButton> mpPBRemoveEffect;
+    VclPtr<FixedText>  mpFTEffect;
+    VclPtr<FixedText>  mpFTStart;
+    VclPtr<ListBox>    mpLBStart;
+    VclPtr<FixedText>  mpFTProperty;
+    VclPtr<VclHBox>    mpPlaceholderBox;
+    VclPtr<PropertyControl>    mpLBProperty;
+    VclPtr<PushButton> mpPBPropertyMore;
+    VclPtr<FixedText>  mpFTSpeed;
+    VclPtr<ListBox>   mpCBSpeed;
+    VclPtr<CustomAnimationList>    mpCustomAnimationList;
+    VclPtr<PushButton> mpPBMoveUp;
+    VclPtr<PushButton> mpPBMoveDown;
+    VclPtr<PushButton> mpPBPlay;
+    VclPtr<CheckBox>   mpCBAutoPreview;
 
     OUString    maStrModify;
     OUString    maStrProperty;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 5d5682bb3363..ce7e18773e43 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -386,7 +386,7 @@ struct lcl_AppendSoundToListBox : public ::std::unary_function< OUString, void >
     }
 
 private:
-    ListBox*  mrListBox;
+    VclPtr<ListBox>  mrListBox;
 };
 
 void lcl_FillSoundListBox(
@@ -490,6 +490,19 @@ void SlideTransitionPane::dispose()
 {
     maLateInitTimer.Stop();
     removeListener();
+    mpLB_SLIDE_TRANSITIONS.clear();
+    mpFT_SPEED.clear();
+    mpLB_SPEED.clear();
+    mpFT_SOUND.clear();
+    mpLB_SOUND.clear();
+    mpCB_LOOP_SOUND.clear();
+    mpRB_ADVANCE_ON_MOUSE.clear();
+    mpRB_ADVANCE_AUTO.clear();
+    mpMF_ADVANCE_AUTO_AFTER.clear();
+    mpPB_APPLY_TO_ALL.clear();
+    mpPB_PLAY.clear();
+    mpPB_SLIDE_SHOW.clear();
+    mpCB_AUTO_PREVIEW.clear();
     PanelLayout::dispose();
 }
 
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index 1cf22541dc68..00642e6c4d9c 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -105,19 +105,19 @@ private:
     SdDrawDocument *  mpDrawDoc;
     Size              maMinSize;
 
-    ListBox*      mpLB_SLIDE_TRANSITIONS;
-    FixedText*    mpFT_SPEED;
-    ListBox*      mpLB_SPEED;
-    FixedText*    mpFT_SOUND;
-    ListBox*      mpLB_SOUND;
-    CheckBox*     mpCB_LOOP_SOUND;
-    RadioButton*  mpRB_ADVANCE_ON_MOUSE;
-    RadioButton*  mpRB_ADVANCE_AUTO;
-    MetricField*  mpMF_ADVANCE_AUTO_AFTER;
-    PushButton*   mpPB_APPLY_TO_ALL;
-    PushButton*   mpPB_PLAY;
-    PushButton*   mpPB_SLIDE_SHOW;
-    CheckBox*     mpCB_AUTO_PREVIEW;
+    VclPtr<ListBox>      mpLB_SLIDE_TRANSITIONS;
+    VclPtr<FixedText>    mpFT_SPEED;
+    VclPtr<ListBox>      mpLB_SPEED;
+    VclPtr<FixedText>    mpFT_SOUND;
+    VclPtr<ListBox>      mpLB_SOUND;
+    VclPtr<CheckBox>     mpCB_LOOP_SOUND;
+    VclPtr<RadioButton>  mpRB_ADVANCE_ON_MOUSE;
+    VclPtr<RadioButton>  mpRB_ADVANCE_AUTO;
+    VclPtr<MetricField>  mpMF_ADVANCE_AUTO_AFTER;
+    VclPtr<PushButton>   mpPB_APPLY_TO_ALL;
+    VclPtr<PushButton>   mpPB_PLAY;
+    VclPtr<PushButton>   mpPB_SLIDE_SHOW;
+    VclPtr<CheckBox>     mpCB_AUTO_PREVIEW;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView >             mxView;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >                  mxModel;
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 96085f253fcb..34645274499e 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -85,7 +85,7 @@ private:
     const ::vcl::Font&                              mrFont;
     Size                                            maSize;
     ImplSVEvent *                                   mnClosePopupEvent;
-    vcl::Window*                                       mpListenWindow;
+    VclPtr<vcl::Window>                             mpListenWindow;
     Point                                           maMouseDownPos;
 };
 
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 491142fb8895..f17151d0e6df 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -118,6 +118,13 @@ AnnotationTextWindow::AnnotationTextWindow( AnnotationWindow* pParent, WinBits n
 
 AnnotationTextWindow::~AnnotationTextWindow()
 {
+    dispose();
+}
+
+void AnnotationTextWindow::dispose()
+{
+    mpAnnotationWindow.clear();
+    Control::dispose();
 }
 
 void AnnotationTextWindow::Paint( const Rectangle& rRect)
@@ -289,11 +296,11 @@ AnnotationWindow::~AnnotationWindow()
 
 void AnnotationWindow::dispose()
 {
-    delete mpMeta;
+    mpMeta.clear();
     delete mpOutlinerView;
     delete mpOutliner;
-    delete mpVScrollbar;
-    delete mpTextWindow;
+    mpVScrollbar.clear();
+    mpTextWindow.clear();
     FloatingWindow::dispose();
 }
 
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index a29ca421e522..54334b1f4ea3 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -50,7 +50,7 @@ class AnnotationTextWindow : public Control
 {
 private:
     OutlinerView*       mpOutlinerView;
-    AnnotationWindow*   mpAnnotationWindow;
+    VclPtr<AnnotationWindow>   mpAnnotationWindow;
 
 protected:
     virtual void    Paint( const Rectangle& rRect) SAL_OVERRIDE;
@@ -64,6 +64,7 @@ protected:
 public:
     AnnotationTextWindow( AnnotationWindow* pParent, WinBits nBits );
     virtual ~AnnotationTextWindow();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; }
 
@@ -83,13 +84,13 @@ class AnnotationWindow : public FloatingWindow
 
         OutlinerView*           mpOutlinerView;
         Outliner*               mpOutliner;
-        ScrollBar*              mpVScrollbar;
+        VclPtr<ScrollBar>              mpVScrollbar;
         ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > mxAnnotation;
         bool                    mbReadonly;
         bool                    mbProtected;
         bool                    mbMouseOverButton;
-        AnnotationTextWindow*   mpTextWindow;
-        MultiLineEdit*          mpMeta;
+        VclPtr<AnnotationTextWindow>   mpTextWindow;
+        VclPtr<MultiLineEdit>          mpMeta;
         Rectangle               maRectMetaButton;
         basegfx::B2DPolygon     maPopupTriangle;
 
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 7c8d02a46819..53a7d6d87714 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -67,6 +67,7 @@ class LayoutToolbarMenu : public svtools::ToolbarMenu
 public:
     LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, vcl::Window* pParent, const bool bInsertPage );
     virtual ~LayoutToolbarMenu();
+    virtual void dispose() SAL_OVERRIDE;
 
 protected:
     DECL_LINK( SelectHdl, void * );
@@ -75,8 +76,8 @@ private:
     SlideLayoutController& mrController;
     Reference< XFrame > mxFrame;
     bool mbInsertPage;
-    ValueSet* mpLayoutSet1;
-    ValueSet* mpLayoutSet2;
+    VclPtr<ValueSet> mpLayoutSet1;
+    VclPtr<ValueSet> mpLayoutSet2;
 };
 
 struct snewfoil_value_info
@@ -256,6 +257,14 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
 
 LayoutToolbarMenu::~LayoutToolbarMenu()
 {
+    dispose();
+}
+
+void LayoutToolbarMenu::dispose()
+{
+    mpLayoutSet1.clear();
+    mpLayoutSet2.clear();
+    svtools::ToolbarMenu::dispose();
 }
 
 IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index 15908461a011..26606bc20e2b 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -62,7 +62,7 @@ PaneChildWindow::PaneChildWindow (
         pParentWindow,
         SD_RESSTR(nTitleBarResId));
     eChildAlignment = eAlignment;
-    static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo);
+    static_cast<SfxDockingWindow*>(pWindow.get())->Initialize(pInfo);
     SetHideNotDelete(true);
 
     ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame());
@@ -75,7 +75,7 @@ PaneChildWindow::PaneChildWindow (
 PaneChildWindow::~PaneChildWindow (void)
 {
     ViewShellBase* pBase = NULL;
-    PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(pWindow);
+    PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(pWindow.get());
     if (pDockingWindow != NULL)
         pBase = ViewShellBase::GetViewShellBase(
             pDockingWindow->GetBindings().GetDispatcher()->GetFrame());
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 4d75e6c8142c..5a81ddcf72db 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -76,6 +76,23 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pAc
 
 SdPhotoAlbumDialog::~SdPhotoAlbumDialog()
 {
+    dispose();
+}
+
+void SdPhotoAlbumDialog::dispose()
+{
+    pCancelBtn.clear();
+    pCreateBtn.clear();
+    pAddBtn.clear();
+    pUpBtn.clear();
+    pDownBtn.clear();
+    pRemoveBtn.clear();
+    pImagesLst.clear();
+    pImg.clear();
+    pInsTypeCombo.clear();
+    pASRCheck.clear();
+    pCapCheck.clear();
+    ModalDialog::dispose();
 }
 
 IMPL_LINK_NOARG(SdPhotoAlbumDialog, CancelHdl)
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index c7d12e47bcc8..44b1f5c97a1e 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -46,25 +46,27 @@ class SdPhotoAlbumDialog : public ModalDialog
 public:
     SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pActDoc);
     virtual ~SdPhotoAlbumDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual short Execute() SAL_OVERRIDE;
 
 private:
     static OUString sDirUrl;
-    CancelButton*   pCancelBtn;
-    PushButton*     pCreateBtn;
+    VclPtr<CancelButton>   pCancelBtn;
+    VclPtr<PushButton>     pCreateBtn;
 
-    PushButton*     pAddBtn;
-    PushButton*     pUpBtn;
-    PushButton*     pDownBtn;
-    PushButton*     pRemoveBtn;
+    VclPtr<PushButton>     pAddBtn;
+    VclPtr<PushButton>     pUpBtn;
+    VclPtr<PushButton>     pDownBtn;
+    VclPtr<PushButton>     pRemoveBtn;
 
-    ListBox*        pImagesLst;
-    FixedImage*     pImg;
+    VclPtr<ListBox>        pImagesLst;
+    VclPtr<FixedImage>     pImg;
+
+    VclPtr<ListBox>    pInsTypeCombo;
+    VclPtr<CheckBox>   pASRCheck;
+    VclPtr<CheckBox>   pCapCheck;
 
-    ListBox*    pInsTypeCombo;
-    CheckBox*   pASRCheck;
-    CheckBox*   pCapCheck;
     SdDrawDocument* pDoc;
     GraphicFilter* mpGraphicFilter;
 
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index f9cd67cb8dad..625cc04cd7f4 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -30,6 +30,19 @@ RemoteDialog::RemoteDialog( vcl::Window *pWindow )
     m_pButtonClose->SetClickHdl( LINK( this, RemoteDialog, CloseHdl ) );
 }
 
+RemoteDialog::~RemoteDialog()
+{
+    dispose();
+}
+
+void RemoteDialog::dispose()
+{
+    m_pButtonConnect.clear();
+    m_pButtonClose.clear();
+    m_pClientBox.clear();
+    ModalDialog::dispose();
+}
+
 IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton)
 {
 //     setBusy( true );
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx
index 7334c4bea548..3c936eb10a1a 100644
--- a/sd/source/ui/dlg/RemoteDialog.hxx
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -24,14 +24,16 @@ namespace sd
 class RemoteDialog : public ModalDialog
 {
 private:
-    PushButton*     m_pButtonConnect;
-    CloseButton*    m_pButtonClose;
-    ClientBox*      m_pClientBox;
+    VclPtr<PushButton>     m_pButtonConnect;
+    VclPtr<CloseButton>    m_pButtonClose;
+    VclPtr<ClientBox>      m_pClientBox;
 
     DECL_DLLPRIVATE_LINK( HandleConnectButton, void * );
     DECL_LINK( CloseHdl, void * );
 public:
     RemoteDialog( vcl::Window* pWindow );
+    virtual ~RemoteDialog();
+    virtual void dispose() SAL_OVERRIDE;
 };
 
 }
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index c40ac96212c1..63bf2db5a577 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -69,7 +69,7 @@ class ClientBox;
 
 class ClientRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
 {
-    ClientBox   *m_pParent;
+    VclPtr<ClientBox>   m_pParent;
 
 public:
 
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index a84cfd9d0ddd..c7bba27e3eab 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -224,8 +224,26 @@ void AnimationWindow::dispose()
     // delete the clones
     delete pMyDoc;
 
-    delete m_pCtlDisplay;
-
+    m_pCtlDisplay.clear();
+    m_pBtnFirst.clear();
+    m_pBtnReverse.clear();
+    m_pBtnStop.clear();
+    m_pBtnPlay.clear();
+    m_pBtnLast.clear();
+    m_pNumFldBitmap.clear();
+    m_pTimeField.clear();
+    m_pLbLoopCount.clear();
+    m_pBtnGetOneObject.clear();
+    m_pBtnGetAllObjects.clear();
+    m_pBtnRemoveBitmap.clear();
+    m_pBtnRemoveAll.clear();
+    m_pFiCount.clear();
+    m_pRbtGroup.clear();
+    m_pRbtBitmap.clear();
+    m_pFtAdjustment.clear();
+    m_pLbAdjustment.clear();
+    m_pBtnCreateGroup.clear();
+    pWin.clear();
     SfxDockingWindow::dispose();
 }
 
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 92c83eac13c7..bd6cad52decf 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -72,8 +72,10 @@ BreakDlg::~BreakDlg()
 
 void BreakDlg::dispose()
 {
-    delete mpProgress;
-    delete pProgrInfo;
+    m_pFiObjInfo.clear();
+    m_pFiActInfo.clear();
+    m_pFiInsInfo.clear();
+    m_pBtnCancel.clear();
     SfxModalDialog::dispose();
 }
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index a66d6a041807..7fcd27804f12 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -89,31 +89,17 @@ CopyDlg::~CopyDlg()
 
 void CopyDlg::dispose()
 {
-    OUString& rStr = GetExtraData();
-
-    rStr = OUString::number(m_pNumFldCopies->GetValue());
-    rStr += OUString(TOKEN);
-
-    rStr += OUString::number(m_pMtrFldMoveX->GetValue());
-    rStr += OUString( TOKEN );
-
-    rStr += OUString::number(m_pMtrFldMoveY->GetValue());
-    rStr += OUString( TOKEN );
-
-    rStr += OUString::number(m_pMtrFldAngle->GetValue());
-    rStr += OUString( TOKEN );
-
-    rStr += OUString::number(m_pMtrFldWidth->GetValue());
-    rStr += OUString( TOKEN );
-
-    rStr += OUString::number(m_pMtrFldHeight->GetValue());
-    rStr += OUString( TOKEN );
-
-    rStr += OUString::number( m_pLbStartColor->GetSelectEntryColor().GetColor() );
-    rStr += OUString( TOKEN );
-
-    rStr += OUString::number( m_pLbEndColor->GetSelectEntryColor().GetColor() );
-
+    m_pNumFldCopies.clear();
+    m_pBtnSetViewData.clear();
+    m_pMtrFldMoveX.clear();
+    m_pMtrFldMoveY.clear();
+    m_pMtrFldAngle.clear();
+    m_pMtrFldWidth.clear();
+    m_pMtrFldHeight.clear();
+    m_pLbStartColor.clear();
+    m_pFtEndColor.clear();
+    m_pLbEndColor.clear();
+    m_pBtnSetDefault.clear();
     SfxModalDialog::dispose();
 }
 
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 8cfd56d0a583..95132d4c5e4f 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -85,6 +85,21 @@ SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow,
 
 SdCustomShowDlg::~SdCustomShowDlg()
 {
+    dispose();
+}
+
+void SdCustomShowDlg::dispose()
+{
+    m_pLbCustomShows.clear();
+    m_pCbxUseCustomShow.clear();
+    m_pBtnNew.clear();
+    m_pBtnEdit.clear();
+    m_pBtnRemove.clear();
+    m_pBtnCopy.clear();
+    m_pBtnHelp.clear();
+    m_pBtnStartShow.clear();
+    m_pBtnOK.clear();
+    ModalDialog::dispose();
 }
 
 void SdCustomShowDlg::CheckState()
@@ -336,6 +351,20 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow,
 
 SdDefineCustomShowDlg::~SdDefineCustomShowDlg()
 {
+    dispose();
+}
+
+void SdDefineCustomShowDlg::dispose()
+{
+    m_pEdtName.clear();
+    m_pLbPages.clear();
+    m_pBtnAdd.clear();
+    m_pBtnRemove.clear();
+    m_pLbCustomPages.clear();
+    m_pBtnOK.clear();
+    m_pBtnCancel.clear();
+    m_pBtnHelp.clear();
+    ModalDialog::dispose();
 }
 
 // CheckState
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 757028a0f4fc..bec74ca9a16f 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -101,8 +101,8 @@ public:
     void Enable (bool bEnable);
 
 private:
-    PushButton* mpNextButton1;
-    PushButton* mpNextButton2;
+    VclPtr<PushButton> mpNextButton1;
+    VclPtr<PushButton> mpNextButton2;
     bool mbIsFirstButtonActive;
 };
 
@@ -160,7 +160,7 @@ public:
     */
     bool mbPreviewUpdating;
 
-    vcl::Window* mpWindow;
+    VclPtr<vcl::Window> mpWindow;
 
     void SavePassword( SfxObjectShellLock xDoc, const OUString& rPath );
     void RestorePassword( SfxItemSet* pSet, const OUString& rPath );
@@ -247,74 +247,74 @@ public:
 
     // Common
     Assistent           maAssistentFunc;
-    CheckBox*           mpPreviewFlag;
-    CheckBox*           mpStartWithFlag;
-    PushButton*         mpLastPageButton;
-    NextButton*         mpNextPageButton;
-    PushButton*         mpFinishButton;
-    SdDocPreviewWin*    mpPreview;
-    VclContainer*       mpPage1235;
+    VclPtr<CheckBox>           mpPreviewFlag;
+    VclPtr<CheckBox>           mpStartWithFlag;
+    VclPtr<PushButton>         mpLastPageButton;
+    NextButton*                mpNextPageButton;
+    VclPtr<PushButton>         mpFinishButton;
+    VclPtr<SdDocPreviewWin>    mpPreview;
+    VclPtr<VclContainer>       mpPage1235;
 
     // page 1
-    VclContainer*       mpPage1;
-    FixedImage*         mpPage1FB;
-    FixedText*          mpPage1ArtFL;
-    RadioButton*        mpPage1EmptyRB;
-    RadioButton*        mpPage1TemplateRB;
-    ListBox*            mpPage1RegionLB;
-    ListBox*            mpPage1TemplateLB;
-    RadioButton*        mpPage1OpenRB;
-    ListBox*            mpPage1OpenLB;
-    PushButton*         mpPage1OpenPB;
+    VclPtr<VclContainer>       mpPage1;
+    VclPtr<FixedImage>         mpPage1FB;
+    VclPtr<FixedText>          mpPage1ArtFL;
+    VclPtr<RadioButton>        mpPage1EmptyRB;
+    VclPtr<RadioButton>        mpPage1TemplateRB;
+    VclPtr<ListBox>            mpPage1RegionLB;
+    VclPtr<ListBox>            mpPage1TemplateLB;
+    VclPtr<RadioButton>        mpPage1OpenRB;
+    VclPtr<ListBox>            mpPage1OpenLB;
+    VclPtr<PushButton>         mpPage1OpenPB;
 
     // page 2
-    VclContainer*       mpPage2;
-    FixedImage*         mpPage2FB;
-    FixedText*          mpPage2LayoutFL;
-    ListBox*            mpPage2RegionLB;
-    ListBox*            mpPage2LayoutLB;
-    FixedText*          mpPage2OutTypesFL;
-    RadioButton*        mpPage2Medium1RB;
-    RadioButton*        mpPage2Medium2RB;
-    RadioButton*        mpPage2Medium3RB;
-    RadioButton*        mpPage2Medium4RB;
-    RadioButton*        mpPage2Medium5RB;
-    RadioButton*        mpPage2Medium6RB;
+    VclPtr<VclContainer>       mpPage2;
+    VclPtr<FixedImage>         mpPage2FB;
+    VclPtr<FixedText>          mpPage2LayoutFL;
+    VclPtr<ListBox>            mpPage2RegionLB;
+    VclPtr<ListBox>            mpPage2LayoutLB;
+    VclPtr<FixedText>          mpPage2OutTypesFL;
+    VclPtr<RadioButton>        mpPage2Medium1RB;
+    VclPtr<RadioButton>        mpPage2Medium2RB;
+    VclPtr<RadioButton>        mpPage2Medium3RB;
+    VclPtr<RadioButton>        mpPage2Medium4RB;
+    VclPtr<RadioButton>        mpPage2Medium5RB;
+    VclPtr<RadioButton>        mpPage2Medium6RB;
 
     // page 3
-    VclContainer*       mpPage3;
-    FixedImage*         mpPage3FB;
-    FixedText*          mpPage3EffectFL;
-    FixedText*          mpPage3EffectFT;
-    FadeEffectLB*       mpPage3EffectLB;
-    FixedText*          mpPage3SpeedFT;
-    ListBox*            mpPage3SpeedLB;
-    FixedText*          mpPage3PresTypeFL;
-    RadioButton*        mpPage3PresTypeLiveRB;
-    RadioButton*        mpPage3PresTypeKioskRB;
-    FixedText*          mpPage3PresTimeFT;
-    TimeField*          mpPage3PresTimeTMF;
-    FixedText*          mpPage3BreakFT;
-    TimeField*          mpPage3BreakTMF;
-    CheckBox*           mpPage3LogoCB;
+    VclPtr<VclContainer>       mpPage3;
+    VclPtr<FixedImage>         mpPage3FB;
+    VclPtr<FixedText>          mpPage3EffectFL;
+    VclPtr<FixedText>          mpPage3EffectFT;
+    VclPtr<FadeEffectLB>       mpPage3EffectLB;
+    VclPtr<FixedText>          mpPage3SpeedFT;
+    VclPtr<ListBox>            mpPage3SpeedLB;
+    VclPtr<FixedText>          mpPage3PresTypeFL;
+    VclPtr<RadioButton>        mpPage3PresTypeLiveRB;
+    VclPtr<RadioButton>        mpPage3PresTypeKioskRB;
+    VclPtr<FixedText>          mpPage3PresTimeFT;
+    VclPtr<TimeField>          mpPage3PresTimeTMF;
+    VclPtr<FixedText>          mpPage3BreakFT;
+    VclPtr<TimeField>          mpPage3BreakTMF;
+    VclPtr<CheckBox>           mpPage3LogoCB;
 
     // page 4
-    VclContainer*       mpPage4;
-    FixedImage*         mpPage4FB;
-    FixedText*          mpPage4PersonalFL;
-    FixedText*          mpPage4AskNameFT;
-    Edit*               mpPage4AskNameEDT;
-    FixedText*          mpPage4AskTopicFT;
-    Edit*               mpPage4AskTopicEDT;
-    FixedText*          mpPage4AskInfoFT;
-    VclMultiLineEdit*      mpPage4AskInfoEDT;
+    VclPtr<VclContainer>       mpPage4;
+    VclPtr<FixedImage>         mpPage4FB;
+    VclPtr<FixedText>          mpPage4PersonalFL;
+    VclPtr<FixedText>          mpPage4AskNameFT;
+    VclPtr<Edit>               mpPage4AskNameEDT;
+    VclPtr<FixedText>          mpPage4AskTopicFT;
+    VclPtr<Edit>               mpPage4AskTopicEDT;
+    VclPtr<FixedText>          mpPage4AskInfoFT;
+    VclPtr<VclMultiLineEdit>   mpPage4AskInfoEDT;
 
     // page 5
-    VclContainer*       mpPage5;
-    FixedImage*         mpPage5FB;
-    FixedText*          mpPage5PageListFT;
-    SdPageListControl*  mpPage5PageListCT;
-    CheckBox*           mpPage5SummaryCB;
+    VclPtr<VclContainer>       mpPage5;
+    VclPtr<FixedImage>         mpPage5FB;
+    VclPtr<FixedText>          mpPage5PageListFT;
+    VclPtr<SdPageListControl>  mpPage5PageListCT;
+    VclPtr<CheckBox>           mpPage5SummaryCB;
 
 };
 
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 64e4d476baa7..e236cd133048 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -53,6 +53,21 @@ SdModifyFieldDlg::SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pI
     FillControls();
 }
 
+SdModifyFieldDlg::~SdModifyFieldDlg()
+{
+    dispose();
+}
+
+void SdModifyFieldDlg::dispose()
+{
+    m_pRbtFix.clear();
+    m_pRbtVar.clear();
+    m_pLbLanguage.clear();
+    m_pLbFormat.clear();
+    ModalDialog::dispose();
+}
+
+
 /**
  * Returns the new field, owned by caller.
  * Returns NULL if nothing has changed.
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 07d6e2c2886d..2e590fa9a8cf 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -111,6 +111,25 @@ SdSnapLineDlg::SdSnapLineDlg(
     m_pRbPoint->Check();
 }
 
+SdSnapLineDlg::~SdSnapLineDlg()
+{
+    dispose();
+}
+
+void SdSnapLineDlg::dispose()
+{
+    m_pFtX.clear();
+    m_pMtrFldX.clear();
+    m_pFtY.clear();
+    m_pMtrFldY.clear();
+    m_pRadioGroup.clear();
+    m_pRbPoint.clear();
+    m_pRbVert.clear();
+    m_pRbHorz.clear();
+    m_pBtnDelete.clear();
+    ModalDialog::dispose();
+}
+
 /**
  * fills provided item sets with dialog box attributes
  */
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index b7c95485fff2..f2ea08902841 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -115,29 +115,29 @@ class HeaderFooterTabPage : public TabPage
 {
 private:
 
-    FixedText*   mpFTIncludeOn;
+    VclPtr<FixedText>   mpFTIncludeOn;
 
-    CheckBox*    mpCBHeader;
-    VclContainer* mpHeaderBox;
-    Edit*        mpTBHeader;
+    VclPtr<CheckBox>    mpCBHeader;
+    VclPtr<VclContainer> mpHeaderBox;
+    VclPtr<Edit>        mpTBHeader;
 
-    CheckBox*    mpCBDateTime;
-    RadioButton* mpRBDateTimeFixed;
-    RadioButton* mpRBDateTimeAutomatic;
-    Edit*        mpTBDateTimeFixed;
-    ListBox*     mpCBDateTimeFormat;
-    FixedText*   mpFTDateTimeLanguage;
-    SvxLanguageBox*  mpCBDateTimeLanguage;
+    VclPtr<CheckBox>    mpCBDateTime;
+    VclPtr<RadioButton> mpRBDateTimeFixed;
+    VclPtr<RadioButton> mpRBDateTimeAutomatic;
+    VclPtr<Edit>        mpTBDateTimeFixed;
+    VclPtr<ListBox>     mpCBDateTimeFormat;
+    VclPtr<FixedText>   mpFTDateTimeLanguage;
+    VclPtr<SvxLanguageBox>  mpCBDateTimeLanguage;
 
-    CheckBox*    mpCBFooter;
-    VclContainer* mpFooterBox;
-    Edit*        mpTBFooter;
+    VclPtr<CheckBox>    mpCBFooter;
+    VclPtr<VclContainer> mpFooterBox;
+    VclPtr<Edit>        mpTBFooter;
 
-    CheckBox*   mpCBSlideNumber;
+    VclPtr<CheckBox>   mpCBSlideNumber;
 
-    CheckBox*    mpCBNotOnTitle;
+    VclPtr<CheckBox>    mpCBNotOnTitle;
 
-    PresLayoutPreview*   mpCTPreview;
+    VclPtr<PresLayoutPreview>   mpCTPreview;
 
     SdDrawDocument*    mpDoc;
     LanguageType        meOldLanguage;
@@ -155,6 +155,7 @@ private:
 public:
     HeaderFooterTabPage( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode );
     virtual ~HeaderFooterTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     void    init( const HeaderFooterSettings& rSettings, bool bNotOnTitle );
     void    getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle );
@@ -245,8 +246,12 @@ HeaderFooterDialog::~HeaderFooterDialog()
 
 void HeaderFooterDialog::dispose()
 {
-    delete mpSlideTabPage;
-    delete mpNotesHandoutsTabPage;
+    mpSlideTabPage.clear();
+    mpNotesHandoutsTabPage.clear();
+    mpTabCtrl.clear();
+    maPBApplyToAll.clear();
+    maPBApply.clear();
+    maPBCancel.clear();
     TabDialog::dispose();
 }
 
@@ -457,6 +462,29 @@ HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument*
 
 HeaderFooterTabPage::~HeaderFooterTabPage()
 {
+    dispose();
+}
+
+void HeaderFooterTabPage::dispose()
+{
+    mpFTIncludeOn.clear();
+    mpCBHeader.clear();
+    mpHeaderBox.clear();
+    mpTBHeader.clear();
+    mpCBDateTime.clear();
+    mpRBDateTimeFixed.clear();
+    mpRBDateTimeAutomatic.clear();
+    mpTBDateTimeFixed.clear();
+    mpCBDateTimeFormat.clear();
+    mpFTDateTimeLanguage.clear();
+    mpCBDateTimeLanguage.clear();
+    mpCBFooter.clear();
+    mpFooterBox.clear();
+    mpTBFooter.clear();
+    mpCBSlideNumber.clear();
+    mpCBNotOnTitle.clear();
+    mpCTPreview.clear();
+    TabPage::dispose();
 }
 
 IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl)
diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx
index a256990697e0..833b471d140a 100644
--- a/sd/source/ui/dlg/ins_paste.cxx
+++ b/sd/source/ui/dlg/ins_paste.cxx
@@ -28,6 +28,18 @@ SdInsertPasteDlg::SdInsertPasteDlg(vcl::Window* pWindow)
     m_pRbAfter->Check( true );
 }
 
+SdInsertPasteDlg::~SdInsertPasteDlg()
+{
+    dispose();
+}
+
+void SdInsertPasteDlg::dispose()
+{
+    m_pRbBefore.clear();
+    m_pRbAfter.clear();
+    ModalDialog::dispose();
+}
+
 bool SdInsertPasteDlg::IsInsertBefore() const
 {
     return( m_pRbBefore->IsChecked() );
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 5593562947c1..0d5e29c1c6ce 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -55,6 +55,15 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
 
 SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg()
 {
+    dispose();
+}
+
+void SdInsertPagesObjsDlg::dispose()
+{
+    m_pLbTree.clear();
+    m_pCbxLink.clear();
+    m_pCbxMasters.clear();
+    ModalDialog::dispose();
 }
 
 /**
diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx
index 86df27c22cb1..12b3e4d1aa9c 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.cxx
+++ b/sd/source/ui/dlg/layeroptionsdlg.cxx
@@ -50,6 +50,22 @@ SdInsertLayerDlg::SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInA
     get<VclContainer>("nameframe")->Enable(bDeletable);
 }
 
+SdInsertLayerDlg::~SdInsertLayerDlg()
+{
+    dispose();
+}
+
+void SdInsertLayerDlg::dispose()
+{
+    m_pEdtName.clear();
+    m_pEdtTitle.clear();
+    m_pEdtDesc.clear();
+    m_pCbxVisible.clear();
+    m_pCbxPrintable.clear();
+    m_pCbxLocked.clear();
+    ModalDialog::dispose();
+}
+
 void SdInsertLayerDlg::GetAttr( SfxItemSet& rAttrs )
 {
     rAttrs.Put( SdAttrLayerName( m_pEdtName->GetText() ) );
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index d10f8224ad8b..898ca5b2e4eb 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -75,6 +75,21 @@ MasterLayoutDialog::MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pD
     mpCBPageNumber->Check( mbOldPageNumber );
 }
 
+MasterLayoutDialog::~MasterLayoutDialog()
+{
+    dispose();
+}
+
+void MasterLayoutDialog::dispose()
+{
+    mpCBDate.clear();
+    mpCBPageNumber.clear();
+    mpCBSlideNumber.clear();
+    mpCBHeader.clear();
+    mpCBFooter.clear();
+    ModalDialog::dispose();
+}
+
 short MasterLayoutDialog::Execute()
 {
     if ( ModalDialog::Execute() )
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index d21de6f97c27..8ea2b1856965 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -66,6 +66,15 @@ MorphDlg::MorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObjec
 
 MorphDlg::~MorphDlg()
 {
+    dispose();
+}
+
+void MorphDlg::dispose()
+{
+    m_pMtfSteps.clear();
+    m_pCbxAttributes.clear();
+    m_pCbxOrientation.clear();
+    ModalDialog::dispose();
 }
 
 void MorphDlg::LoadSettings()
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 53fb0adb873e..6714cb0ba55e 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -39,6 +39,7 @@ class SdParagraphNumTabPage : public SfxTabPage
 public:
     SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SdParagraphNumTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
     static const sal_uInt16*  GetRanges();
@@ -47,9 +48,9 @@ public:
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
 private:
-    TriStateBox*     m_pNewStartCB;
-    TriStateBox*     m_pNewStartNumberCB;
-    NumericField*    m_pNewStartNF;
+    VclPtr<TriStateBox>     m_pNewStartCB;
+    VclPtr<TriStateBox>     m_pNewStartNumberCB;
+    VclPtr<NumericField>    m_pNewStartNF;
     bool             mbModified;
 
     DECL_LINK( ImplNewStartHdl, void* );
@@ -72,6 +73,15 @@ SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItem
 
 SdParagraphNumTabPage::~SdParagraphNumTabPage()
 {
+    dispose();
+}
+
+void SdParagraphNumTabPage::dispose()
+{
+    m_pNewStartCB.clear();
+    m_pNewStartNumberCB.clear();
+    m_pNewStartNF.clear();
+    SfxTabPage::dispose();
 }
 
 SfxTabPage* SdParagraphNumTabPage::Create(vcl::Window *pParent, const SfxItemSet * rAttrSet)
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index c4b95a9d2458..72d30c31b6c1 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -150,6 +150,39 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow,
     ChangePauseHdl( NULL );
 }
 
+SdStartPresentationDlg::~SdStartPresentationDlg()
+{
+    dispose();
+}
+
+void SdStartPresentationDlg::dispose()
+{
+    aRbtAll.clear();
+    aRbtAtDia.clear();
+    aRbtCustomshow.clear();
+    aLbDias.clear();
+    aLbCustomshow.clear();
+    aRbtStandard.clear();
+    aRbtWindow.clear();
+    aRbtAuto.clear();
+    aTmfPause.clear();
+    aCbxAutoLogo.clear();
+    aCbxManuel.clear();
+    aCbxMousepointer.clear();
+    aCbxPen.clear();
+    aCbxNavigator.clear();
+    aCbxAnimationAllowed.clear();
+    aCbxChangePage.clear();
+    aCbxAlwaysOnTop.clear();
+    maFtMonitor.clear();
+    maLBMonitor.clear();
+    msMonitor.clear();
+    msAllMonitors.clear();
+    msMonitorExternal.clear();
+    msExternal.clear();
+    ModalDialog::dispose();
+}
+
 OUString SdStartPresentationDlg::GetDisplayName( sal_Int32   nDisplay,
                                                  DisplayType eType )
 {
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 943144be7a53..b9cdc6e06ce7 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -30,7 +30,7 @@
  */
 SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs ) :
     SfxTabPage          ( pParent, "prntopts" , "modules/simpress/ui/prntopts.ui" , &rInAttrs ),
-        rOutAttrs               ( rInAttrs )
+    rOutAttrs           ( rInAttrs )
 {
     get( m_pFrmContent , "contentframe" );
     get( m_pCbxDraw , "drawingcb" );
@@ -74,6 +74,31 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs
 
 SdPrintOptions::~SdPrintOptions()
 {
+    dispose();
+}
+
+void SdPrintOptions::dispose()
+{
+    m_pFrmContent.clear();
+    m_pCbxDraw.clear();
+    m_pCbxNotes.clear();
+    m_pCbxHandout.clear();
+    m_pCbxOutline.clear();
+    m_pRbtColor.clear();
+    m_pRbtGrayscale.clear();
+    m_pRbtBlackWhite.clear();
+    m_pCbxPagename.clear();
+    m_pCbxDate.clear();
+    m_pCbxTime.clear();
+    m_pCbxHiddenPages.clear();
+    m_pRbtDefault.clear();
+    m_pRbtPagesize.clear();
+    m_pRbtPagetile.clear();
+    m_pRbtBooklet.clear();
+    m_pCbxFront.clear();
+    m_pCbxBack.clear();
+    m_pCbxPaperbin.clear();
+    SfxTabPage::dispose();
 }
 
 bool SdPrintOptions::FillItemSet( SfxItemSet* rAttrs )
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 8e5c87a381d3..3e4c4a9a4155 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -121,37 +121,37 @@ OUString SdAbstractTabDialog_Impl::GetText() const
 
 void AbstractBulletDialog_Impl::SetCurPageId( sal_uInt16 nId )
 {
-    static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( nId );
+    static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->SetCurPageId( nId );
 }
 
 void AbstractBulletDialog_Impl::SetCurPageId( const OString& rName )
 {
-    static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( rName );
+    static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->SetCurPageId( rName );
 }
 
 const SfxItemSet* AbstractBulletDialog_Impl::GetOutputItemSet() const
 {
-    return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetOutputItemSet();
+    return static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->GetOutputItemSet();
 }
 
 const sal_uInt16* AbstractBulletDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
-    return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetInputRanges( pItem );
+    return static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->GetInputRanges( pItem );
 }
 
 void AbstractBulletDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
 {
-     static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetInputSet( pInSet );
+     static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->SetInputSet( pInSet );
 }
 
 void AbstractBulletDialog_Impl::SetText( const OUString& rStr )
 {
-    static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetText( rStr );
+    static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->SetText( rStr );
 }
 
 OUString AbstractBulletDialog_Impl::GetText() const
 {
-    return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetText();
+    return static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->GetText();
 }
 
 void SdPresLayoutTemplateDlg_Impl::SetCurPageId( sal_uInt16 nId )
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 38d6d1e4c1e7..b7fe5347e91a 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/basedlgs.hxx>
 
 #define DECL_ABSTDLG_BASE(Class,DialogClass)        \
-    DialogClass*        pDlg;                       \
+    VclPtr<DialogClass> pDlg;                       \
 public:                                             \
                     Class( DialogClass* p)          \
                      : pDlg(p)                      \
@@ -34,7 +34,6 @@ public:                                             \
 #define IMPL_ABSTDLG_BASE(Class)                    \
 Class::~Class()                                     \
 {                                                   \
-    delete pDlg;                                    \
 }                                                   \
 short Class::Execute()                             \
 {                                                   \
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 21d8a89afb6f..6c9691affc69 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -55,6 +55,16 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,
 
 SdPresLayoutDlg::~SdPresLayoutDlg()
 {
+    dispose();
+}
+
+void SdPresLayoutDlg::dispose()
+{
+    m_pVS.clear();
+    m_pCbxMasterPage.clear();
+    m_pCbxCheckMasters.clear();
+    m_pBtnLoad.clear();
+    ModalDialog::dispose();
 }
 
 /**
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 184cc15081d8..e7473b16e39a 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -265,6 +265,8 @@ void SdPageObjsTLB::dispose()
     else
         // no document was created from mpMedium, so this object is still the owner of it
         delete mpMedium;
+    mpParent.clear();
+    mpDropNavWin.clear();
     SvTreeListBox::dispose();
 }
 
@@ -1349,7 +1351,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
                 OUString                aFile;
 
                 if( aDataHelper.GetString( SotClipboardFormatId::SIMPLE_FILE, aFile ) &&
-                    static_cast<SdNavigatorWin*>(mpParent)->InsertFile( aFile ) )
+                    static_cast<SdNavigatorWin*>(mpParent.get())->InsertFile( aFile ) )
                 {
                     nRet = rEvt.mnAction;
                 }
diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx
index 3c526380a538..84127950fcd2 100644
--- a/sd/source/ui/dlg/sduiexp.cxx
+++ b/sd/source/ui/dlg/sduiexp.cxx
@@ -18,6 +18,21 @@
  */
 
 #include "sddlgfact.hxx"
+#include "morphdlg.hxx"
+#include "present.hxx"
+#include "inspagob.hxx"
+#include "vectdlg.hxx"
+#include "sdpreslt.hxx"
+#include "headerfooterdlg.hxx"
+#include "pubdlg.hxx"
+#include "ins_paste.hxx"
+#include "layeroptionsdlg.hxx"
+#include "dlgsnap.hxx"
+#include "dlgfield.hxx"
+#include "dlgass.hxx"
+#include "prltempl.hxx"
+#include "custsdlg.hxx"
+#include "copydlg.hxx"
 #include "sal/types.h"
 
 extern "C"
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 521a9c64bcb7..f4ae36271b57 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -142,6 +142,25 @@ SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs)
 
 SdTPAction::~SdTPAction()
 {
+    dispose();
+}
+
+void SdTPAction::dispose()
+{
+    m_pLbAction.clear();
+    m_pFtTree.clear();
+    m_pLbTree.clear();
+    m_pLbTreeDocument.clear();
+    m_pLbOLEAction.clear();
+    m_pFrame.clear();
+    m_pEdtSound.clear();
+    m_pEdtBookmark.clear();
+    m_pEdtDocument.clear();
+    m_pEdtProgram.clear();
+    m_pEdtMacro.clear();
+    m_pBtnSearch.clear();
+    m_pBtnSeek.clear();
+    SfxTabPage::dispose();
 }
 
 void SdTPAction::SetView( const ::sd::View* pSdView )
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 6383700d0bb7..eefac3577a77 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -122,6 +122,16 @@ SdTpOptionsContents::SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet
 
 SdTpOptionsContents::~SdTpOptionsContents()
 {
+    dispose();
+}
+
+void SdTpOptionsContents::dispose()
+{
+    m_pCbxRuler.clear();
+    m_pCbxDragStripes.clear();
+    m_pCbxHandlesBezier.clear();
+    m_pCbxMoveOutline.clear();
+    SfxTabPage::dispose();
 }
 
 bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs )
@@ -276,6 +286,38 @@ SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttr
 
 SdTpOptionsMisc::~SdTpOptionsMisc()
 {
+    dispose();
+}
+
+void SdTpOptionsMisc::dispose()
+{
+    m_pCbxQuickEdit.clear();
+    m_pCbxPickThrough.clear();
+    m_pNewDocumentFrame.clear();
+    m_pCbxStartWithTemplate.clear();
+    m_pCbxMasterPageCache.clear();
+    m_pCbxCopy.clear();
+    m_pCbxMarkedHitMovesAlways.clear();
+    m_pPresentationFrame.clear();
+    m_pLbMetric.clear();
+    m_pMtrFldTabstop.clear();
+    m_pCbxEnableSdremote.clear();
+    m_pCbxEnablePresenterScreen.clear();
+    m_pCbxUsePrinterMetrics.clear();
+    m_pCbxCompatibility.clear();
+    m_pScaleFrame.clear();
+    m_pCbScale.clear();
+    m_pNewDocLb.clear();
+    m_pFiInfo1.clear();
+    m_pMtrFldOriginalWidth.clear();
+    m_pWidthLb.clear();
+    m_pHeightLb.clear();
+    m_pFiInfo2.clear();
+    m_pMtrFldOriginalHeight.clear();
+    m_pCbxDistrot.clear();
+    m_pMtrFldInfo1.clear();
+    m_pMtrFldInfo2.clear();
+    SfxTabPage::dispose();
 }
 
 void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 71d6ed9dd558..99f86cb9d239 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -72,6 +72,22 @@ SdVectorizeDlg::SdVectorizeDlg(vcl::Window* pParent, const Bitmap& rBmp, ::sd::D
 
 SdVectorizeDlg::~SdVectorizeDlg()
 {
+    dispose();
+}
+
+void SdVectorizeDlg::dispose()
+{
+    m_pNmLayers.clear();
+    m_pMtReduce.clear();
+    m_pFtFillHoles.clear();
+    m_pMtFillHoles.clear();
+    m_pCbFillHoles.clear();
+    m_pBmpWin.clear();
+    m_pMtfWin.clear();
+    m_pPrgs.clear();
+    m_pBtnOK.clear();
+    m_pBtnPreview.clear();
+    ModalDialog::dispose();
 }
 
 Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) const
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 7e6da77b9cbf..d0c0766588ea 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -188,7 +188,7 @@ void SAL_CALL ChildWindowPane::disposing (void)
 Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void)
     throw (RuntimeException, std::exception)
 {
-    if (mpWindow == NULL || ! mxWindow.is())
+    if (mpWindow == nullptr || ! mxWindow.is())
         GetWindow();
     return Pane::getWindow();
 }
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index ae8698c4f503..ba1a0131734c 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -103,11 +103,7 @@ FullScreenPane::~FullScreenPane (void) throw()
 
 void SAL_CALL FullScreenPane::disposing (void)
 {
-    // We have created the window pointed to by mpWindow, we delete it.
-    if (mpWindow != NULL)
-    {
-        delete mpWindow;
-    }
+    mpWindow.clear();
 
     if (mpWorkWindow.get() != NULL)
     {
@@ -126,7 +122,7 @@ sal_Bool SAL_CALL FullScreenPane::isVisible (void)
 {
     ThrowIfDisposed();
 
-    if (mpWindow != NULL)
+    if (mpWindow != nullptr)
         return mpWindow->IsReallyVisible();
     else
         return false;
@@ -137,7 +133,7 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible)
 {
     ThrowIfDisposed();
 
-    if (mpWindow != NULL)
+    if (mpWindow != nullptr)
         mpWindow->Show(bIsVisible);
     if (mpWorkWindow != 0)
         mpWorkWindow->Show(bIsVisible);
@@ -160,7 +156,7 @@ void SAL_CALL FullScreenPane::setAccessible (
 {
     ThrowIfDisposed();
 
-    if (mpWindow != NULL)
+    if (mpWindow != nullptr)
     {
         Reference<lang::XInitialization> xInitializable (rxAccessible, UNO_QUERY);
         if (xInitializable.is())
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 978cb870f8ec..9a9f04dfaf41 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -175,7 +175,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void)
 {
     Reference<rendering::XCanvas> xCanvas;
 
-    if (mpWindow != NULL)
+    if (mpWindow != nullptr)
     {
         ::cppcanvas::SpriteCanvasSharedPtr pCanvas (
             ::cppcanvas::VCLFactory::getInstance().createSpriteCanvas(*mpWindow));
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index f1db1952db29..f3d94ef85579 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -101,9 +101,6 @@ FuPoor::~FuPoor()
     aDragTimer.Stop();
     aScrollTimer.Stop();
     aDelayToScrollTimer.Stop ();
-
-    if (pDialog)
-        delete pDialog;
 }
 
 void FuPoor::Activate()
@@ -130,6 +127,11 @@ void FuPoor::Deactivate()
     if (mpWindow) mpWindow->ReleaseMouse ();
 }
 
+void FuPoor::SetWindow(::sd::Window* pWin)
+{
+    mpWindow = pWin;
+}
+
 /**
  * scroll when approached the border of the window; is called by MouseMove
  */
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 16241381f83f..af4c95012e63 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -278,7 +278,7 @@ private:
 
 protected:
     /// The core window that is made accessible.
-    ::sd::Window* mpWindow;
+    VclPtr<::sd::Window> mpWindow;
 
     /// The API window that is made accessible.
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index 99affbe53d99..070bd303bd2d 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
+#include <vcl/vclptr.hxx>
 
 #include <memory>
 
@@ -297,7 +298,7 @@ private:
 
     sal_uInt32 mnClientId;
 
-    vcl::Window* mpContentWindow;
+    VclPtr<vcl::Window> mpContentWindow;
 
     /** Check whether or not the object has been disposed (or is in the
         state of being disposed).  If that is the case then
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 13aab79c025b..40c650c5ee7f 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -58,10 +58,10 @@ public:
     short Execute() SAL_OVERRIDE;
 
 private:
-    FixedText*      m_pFiObjInfo;
-    FixedText*      m_pFiActInfo;
-    FixedText*      m_pFiInsInfo;
-    CancelButton*   m_pBtnCancel;
+    VclPtr<FixedText>      m_pFiObjInfo;
+    VclPtr<FixedText>      m_pFiActInfo;
+    VclPtr<FixedText>      m_pFiInsInfo;
+    VclPtr<CancelButton>   m_pBtnCancel;
 
     DrawView*   pDrView;
 
diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx
index 0168800353ca..1e1e104a758f 100644
--- a/sd/source/ui/inc/FormShellManager.hxx
+++ b/sd/source/ui/inc/FormShellManager.hxx
@@ -24,6 +24,7 @@
 
 #include <tools/link.hxx>
 #include <svl/lstner.hxx>
+#include <vcl/vclptr.hxx>
 
 class VclWindowEvent;
 class FmFormShell;
@@ -89,7 +90,7 @@ private:
 
     bool mbIsMainViewChangePending;
 
-    vcl::Window* mpMainViewShellWindow;
+    VclPtr<vcl::Window> mpMainViewShellWindow;
 
     /** Register at window of center pane and at the form shell that
         represents the form tool bar.  The former informs this manager about
diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx
index 5ca70571aa6b..efaa152061b4 100644
--- a/sd/source/ui/inc/Ruler.hxx
+++ b/sd/source/ui/inc/Ruler.hxx
@@ -50,7 +50,7 @@ public:
     using ::Ruler::SetNullOffset;
 protected:
     ::sd::View* pSdView;
-    ::sd::Window* pSdWin;
+    VclPtr<::sd::Window> pSdWin;
     DrawViewShell* pDrViewShell;
     RulerCtrlItem* pCtrlItem;
     bool bHorz;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 93bb0f9485e2..f0f643e40946 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -484,7 +484,7 @@ protected:
     bool mbHasRulers;
 
     /// The active window.
-    ::sd::Window* mpActiveWindow;
+    VclPtr<::sd::Window> mpActiveWindow;
     ::sd::View* mpView;
     FrameView*  mpFrameView;
 
@@ -568,7 +568,7 @@ protected:
     void doShow();
 
 private:
-    ::vcl::Window* mpParentWindow;
+    VclPtr<::vcl::Window> mpParentWindow;
     /** This window updater is used to keep all relevant windows up to date
         with reference to the digit language used to display digits in text
         shapes.
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 9e81c7645184..9586e61298d7 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -150,7 +150,7 @@ public:
     void DropScroll (const Point& rMousePos);
     virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
 protected:
-    ::sd::Window* mpShareWin;
+    VclPtr<::sd::Window> mpShareWin;
     Point maWinPos;
     Point maViewOrigin;
     Size maViewSize;
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index b35c73c82a0c..5f7c5c978cc7 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -22,6 +22,7 @@
 
 #include <svl/lstner.hxx>
 #include <svl/ctloptions.hxx>
+#include <vcl/vclptr.hxx>
 #include "sddllapi.h"
 
 #include <vector>
@@ -120,7 +121,7 @@ private:
     /** Type and data member for a list of devices that have to be kept
         up-to-date.
     */
-    typedef ::std::vector< vcl::Window*> tWindowList;
+    typedef ::std::vector< VclPtr<vcl::Window> > tWindowList;
     tWindowList maWindowList;
 
     /** The central method of this class.  Update the given output device.
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 24ec9e859dd4..20f3ffeccddd 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -98,28 +98,28 @@ protected:
     virtual void    FillInfo( SfxChildWinInfo& ) const SAL_OVERRIDE;
 
 private:
-    SdDisplay*      m_pCtlDisplay;
-    PushButton*     m_pBtnFirst;
-    PushButton*     m_pBtnReverse;
-    PushButton*     m_pBtnStop;
-    PushButton*     m_pBtnPlay;
-    PushButton*     m_pBtnLast;
-    NumericField*   m_pNumFldBitmap;
-    TimeField*      m_pTimeField;
-    ListBox*        m_pLbLoopCount;
-    PushButton*     m_pBtnGetOneObject;
-    PushButton*     m_pBtnGetAllObjects;
-    PushButton*     m_pBtnRemoveBitmap;
-    PushButton*     m_pBtnRemoveAll;
-    FixedText*      m_pFiCount;
-
-    RadioButton*    m_pRbtGroup;
-    RadioButton*    m_pRbtBitmap;
-    FixedText*      m_pFtAdjustment;
-    ListBox*        m_pLbAdjustment;
-    PushButton*     m_pBtnCreateGroup;
-
-    vcl::Window*       pWin;
+    VclPtr<SdDisplay>      m_pCtlDisplay;
+    VclPtr<PushButton>     m_pBtnFirst;
+    VclPtr<PushButton>     m_pBtnReverse;
+    VclPtr<PushButton>     m_pBtnStop;
+    VclPtr<PushButton>     m_pBtnPlay;
+    VclPtr<PushButton>     m_pBtnLast;
+    VclPtr<NumericField>   m_pNumFldBitmap;
+    VclPtr<TimeField>      m_pTimeField;
+    VclPtr<ListBox>        m_pLbLoopCount;
+    VclPtr<PushButton>     m_pBtnGetOneObject;
+    VclPtr<PushButton>     m_pBtnGetAllObjects;
+    VclPtr<PushButton>     m_pBtnRemoveBitmap;
+    VclPtr<PushButton>     m_pBtnRemoveAll;
+    VclPtr<FixedText>      m_pFiCount;
+
+    VclPtr<RadioButton>    m_pRbtGroup;
+    VclPtr<RadioButton>    m_pRbtBitmap;
+    VclPtr<FixedText>      m_pFtAdjustment;
+    VclPtr<ListBox>        m_pLbAdjustment;
+    VclPtr<PushButton>     m_pBtnCreateGroup;
+
+    VclPtr<vcl::Window>    pWin;
     ::std::vector< ::std::pair<BitmapEx*, ::tools::Time*> > m_FrameList;
     static const size_t EMPTY_FRAMELIST;
     size_t          m_nCurrentFrame;
@@ -164,7 +164,7 @@ protected:
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
         const SfxPoolItem* pState ) SAL_OVERRIDE;
 private:
-    AnimationWindow* pAnimationWin;
+    VclPtr<AnimationWindow> pAnimationWin;
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index e0d1237218c4..1da44c927a6c 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -48,21 +48,21 @@ public:
     void Reset();
 
 private:
-    NumericField*       m_pNumFldCopies;
-    Button*             m_pBtnSetViewData;
+    VclPtr<NumericField>       m_pNumFldCopies;
+    VclPtr<Button>             m_pBtnSetViewData;
 
-    MetricField*        m_pMtrFldMoveX;
-    MetricField*        m_pMtrFldMoveY;
-    MetricField*        m_pMtrFldAngle;
+    VclPtr<MetricField>        m_pMtrFldMoveX;
+    VclPtr<MetricField>        m_pMtrFldMoveY;
+    VclPtr<MetricField>        m_pMtrFldAngle;
 
-    MetricField*        m_pMtrFldWidth;
-    MetricField*        m_pMtrFldHeight;
+    VclPtr<MetricField>        m_pMtrFldWidth;
+    VclPtr<MetricField>        m_pMtrFldHeight;
 
-    ColorLB*            m_pLbStartColor;
-    FixedText*          m_pFtEndColor;
-    ColorLB*            m_pLbEndColor;
+    VclPtr<ColorLB>            m_pLbStartColor;
+    VclPtr<FixedText>          m_pFtEndColor;
+    VclPtr<ColorLB>            m_pLbEndColor;
 
-    PushButton*         m_pBtnSetDefault;
+    VclPtr<PushButton>         m_pBtnSetDefault;
 
     const SfxItemSet&   mrOutAttrs;
     XColorListRef       mpColorList;
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index 54f1cfe6b73b..4fcbc7d54c75 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -34,15 +34,15 @@ class SdCustomShowList;
 class SdCustomShowDlg : public ModalDialog
 {
 private:
-    ListBox*         m_pLbCustomShows;
-    CheckBox*        m_pCbxUseCustomShow;
-    PushButton*      m_pBtnNew;
-    PushButton*      m_pBtnEdit;
-    PushButton*      m_pBtnRemove;
-    PushButton*      m_pBtnCopy;
-    HelpButton*      m_pBtnHelp;
-    PushButton*      m_pBtnStartShow;
-    OKButton*        m_pBtnOK;
+    VclPtr<ListBox>         m_pLbCustomShows;
+    VclPtr<CheckBox>        m_pCbxUseCustomShow;
+    VclPtr<PushButton>      m_pBtnNew;
+    VclPtr<PushButton>      m_pBtnEdit;
+    VclPtr<PushButton>      m_pBtnRemove;
+    VclPtr<PushButton>      m_pBtnCopy;
+    VclPtr<HelpButton>      m_pBtnHelp;
+    VclPtr<PushButton>      m_pBtnStartShow;
+    VclPtr<OKButton>        m_pBtnOK;
 
     SdDrawDocument& rDoc;
     SdCustomShowList* pCustomShowList;
@@ -57,22 +57,22 @@ private:
 public:
                 SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc );
                 virtual ~SdCustomShowDlg();
-
-    bool        IsModified() const { return bModified; }
-    bool        IsCustomShow() const;
+    virtual void dispose() SAL_OVERRIDE;
+    bool         IsModified() const { return bModified; }
+    bool         IsCustomShow() const;
 };
 
 class SdDefineCustomShowDlg : public ModalDialog
 {
 private:
-    Edit*            m_pEdtName;
-    ListBox*         m_pLbPages;
-    PushButton*      m_pBtnAdd;
-    PushButton*      m_pBtnRemove;
-    SvTreeListBox*   m_pLbCustomPages;
-    OKButton*        m_pBtnOK;
-    CancelButton*    m_pBtnCancel;
-    HelpButton*      m_pBtnHelp;
+    VclPtr<Edit>            m_pEdtName;
+    VclPtr<ListBox>         m_pLbPages;
+    VclPtr<PushButton>      m_pBtnAdd;
+    VclPtr<PushButton>      m_pBtnRemove;
+    VclPtr<SvTreeListBox>   m_pLbCustomPages;
+    VclPtr<OKButton>        m_pBtnOK;
+    VclPtr<CancelButton>    m_pBtnCancel;
+    VclPtr<HelpButton>      m_pBtnHelp;
 
     SdDrawDocument& rDoc;
     SdCustomShow*&  rpCustomShow;
@@ -90,6 +90,7 @@ public:
                     SdDefineCustomShowDlg( vcl::Window* pWindow,
                             SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS );
                     virtual ~SdDefineCustomShowDlg();
+    virtual void    dispose() SAL_OVERRIDE;
 
     bool            IsModified() const { return bModified; }
 };
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index b458b8df84b9..fe11b0768b45 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -34,10 +34,10 @@ class SvxFieldData;
 class SdModifyFieldDlg : public ModalDialog
 {
 private:
-    RadioButton* m_pRbtFix;
-    RadioButton* m_pRbtVar;
-    SvxLanguageBox* m_pLbLanguage;
-    ListBox* m_pLbFormat;
+    VclPtr<RadioButton> m_pRbtFix;
+    VclPtr<RadioButton> m_pRbtVar;
+    VclPtr<SvxLanguageBox> m_pLbLanguage;
+    VclPtr<ListBox> m_pLbFormat;
     SfxItemSet          maInputSet;
 
     const SvxFieldData* pField;
@@ -49,7 +49,8 @@ private:
 
 public:
     SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet );
-    virtual ~SdModifyFieldDlg() {}
+    virtual ~SdModifyFieldDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     SvxFieldData*       GetField();
     SfxItemSet          GetItemSet();
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index ab431c856be3..f17a7c5c3413 100644
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -41,15 +41,15 @@ namespace sd {
 class SdSnapLineDlg : public ModalDialog
 {
 private:
-    FixedText*          m_pFtX;
-    MetricField*        m_pMtrFldX;
-    FixedText*          m_pFtY;
-    MetricField*        m_pMtrFldY;
-    VclContainer*       m_pRadioGroup;
-    RadioButton*        m_pRbPoint;
-    RadioButton*        m_pRbVert;
-    RadioButton*        m_pRbHorz;
-    PushButton*         m_pBtnDelete;
+    VclPtr<FixedText>          m_pFtX;
+    VclPtr<MetricField>        m_pMtrFldX;
+    VclPtr<FixedText>          m_pFtY;
+    VclPtr<MetricField>        m_pMtrFldY;
+    VclPtr<VclContainer>       m_pRadioGroup;
+    VclPtr<RadioButton>        m_pRbPoint;
+    VclPtr<RadioButton>        m_pRbVert;
+    VclPtr<RadioButton>        m_pRbHorz;
+    VclPtr<PushButton>         m_pBtnDelete;
     long                nXValue;
     long                nYValue;
     FieldUnit           eUIUnit;
@@ -59,6 +59,8 @@ private:
 
 public:
     SdSnapLineDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView);
+    virtual ~SdSnapLineDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     void GetAttr(SfxItemSet& rOutAttrs);
 
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index b4ee242f32bf..7945aa29bc5b 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -29,6 +29,7 @@
 #include <cppuhelper/compbase3.hxx>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <vcl/vclptr.hxx>
 
 namespace vcl { class Window; }
 
@@ -135,7 +136,7 @@ public:
 
 protected:
     ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId;
-    vcl::Window* mpWindow;
+    VclPtr<vcl::Window> mpWindow;
     ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxWindow;
     ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> mxCanvas;
 
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index 00817a769d5a..67a7a91d598d 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -82,7 +82,7 @@ public:
     virtual void Activate();        ///< activates the function
     virtual void Deactivate();      ///< deactivates the function
 
-    void SetWindow(::sd::Window* pWin) { mpWindow = pWin; }
+    void SetWindow(::sd::Window* pWin);
 
     virtual void SelectionHasChanged();
 
@@ -150,14 +150,14 @@ protected:
 
     ::sd::View* mpView;
     ViewShell* mpViewShell;
-    ::sd::Window* mpWindow;
+    VclPtr<::sd::Window> mpWindow;
     DrawDocShell* mpDocSh;
     SdDrawDocument* mpDoc;
 
     sal_uInt16          nSlotId;
     sal_uInt16          nSlotValue;
 
-    Dialog*             pDialog;
+    VclPtr<Dialog>             pDialog;
 
     Timer               aScrollTimer;           ///< for auto-scrolling
     DECL_LINK( ScrollHdl, void * );
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 558e6487878b..4206cd4dc62b 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -44,17 +44,17 @@ private:
     DECL_LINK( ClickApplyHdl, void * );
     DECL_LINK( ClickCancelHdl, void * );
 
-    TabControl*      mpTabCtrl;
+    VclPtr<TabControl>      mpTabCtrl;
 
-    HeaderFooterTabPage*    mpSlideTabPage;
-    HeaderFooterTabPage*    mpNotesHandoutsTabPage;
+    VclPtr<HeaderFooterTabPage>    mpSlideTabPage;
+    VclPtr<HeaderFooterTabPage>    mpNotesHandoutsTabPage;
 
     sal_uInt16 mnSlidesId;
     sal_uInt16 mnNotesId;
 
-    PushButton*      maPBApplyToAll;
-    PushButton*      maPBApply;
-    CancelButton*    maPBCancel;
+    VclPtr<PushButton>      maPBApplyToAll;
+    VclPtr<PushButton>      maPBApply;
+    VclPtr<CancelButton>    maPBCancel;
 
     HeaderFooterSettings    maSlideSettings;
     HeaderFooterSettings    maNotesHandoutSettings;
diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx
index 0cd396f4c31a..78362535242b 100644
--- a/sd/source/ui/inc/ins_paste.hxx
+++ b/sd/source/ui/inc/ins_paste.hxx
@@ -31,11 +31,13 @@
 class SD_DLLPUBLIC SdInsertPasteDlg : public ModalDialog
 {
 private:
-    RadioButton* m_pRbBefore;
-    RadioButton* m_pRbAfter;
+    VclPtr<RadioButton> m_pRbBefore;
+    VclPtr<RadioButton> m_pRbAfter;
 
 public:
     SdInsertPasteDlg( vcl::Window* pWindow );
+    virtual ~SdInsertPasteDlg();
+    virtual void dispose() SAL_OVERRIDE;
     bool IsInsertBefore() const;
 };
 
diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx
index f7a0e12ae859..7dd1c7541b94 100644
--- a/sd/source/ui/inc/inspagob.hxx
+++ b/sd/source/ui/inc/inspagob.hxx
@@ -29,9 +29,9 @@ class SdDrawDocument;
 class SdInsertPagesObjsDlg : public ModalDialog
 {
 private:
-    SdPageObjsTLB*          m_pLbTree;
-    CheckBox*               m_pCbxLink;
-    CheckBox*               m_pCbxMasters;
+    VclPtr<SdPageObjsTLB>          m_pLbTree;
+    VclPtr<CheckBox>               m_pCbxLink;
+    VclPtr<CheckBox>               m_pCbxMasters;
 
     SfxMedium*              pMedium;
     const SdDrawDocument*   mpDoc;
@@ -46,6 +46,7 @@ public:
                                 SfxMedium* pSfxMedium,
                                 const OUString& rFileName );
                 virtual ~SdInsertPagesObjsDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     /** returns the list
           nType == 0 -> pages
diff --git a/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx
index e3ad80873223..ec0b1d24ad30 100644
--- a/sd/source/ui/inc/layeroptionsdlg.hxx
+++ b/sd/source/ui/inc/layeroptionsdlg.hxx
@@ -35,12 +35,12 @@ class SfxItemSet;
 class SD_DLLPUBLIC SdInsertLayerDlg : public ModalDialog
 {
 private:
-    Edit*               m_pEdtName;
-    Edit*               m_pEdtTitle;
-    VclMultiLineEdit*   m_pEdtDesc;
-    CheckBox*           m_pCbxVisible;
-    CheckBox*           m_pCbxPrintable;
-    CheckBox*           m_pCbxLocked;
+    VclPtr<Edit>               m_pEdtName;
+    VclPtr<Edit>               m_pEdtTitle;
+    VclPtr<VclMultiLineEdit>   m_pEdtDesc;
+    VclPtr<CheckBox>           m_pCbxVisible;
+    VclPtr<CheckBox>           m_pCbxPrintable;
+    VclPtr<CheckBox>           m_pCbxLocked;
 
     const SfxItemSet&   mrOutAttrs;
 
@@ -48,6 +48,9 @@ public:
 
     SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs,
         bool bDeletable, const OUString& rStr );
+    virtual ~SdInsertLayerDlg();
+    virtual void dispose() SAL_OVERRIDE;
+
     void                GetAttr( SfxItemSet& rOutAttrs );
 };
 
diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx
index b6c216944d8b..f6be32bc6ab1 100644
--- a/sd/source/ui/inc/masterlayoutdlg.hxx
+++ b/sd/source/ui/inc/masterlayoutdlg.hxx
@@ -37,11 +37,11 @@ private:
     SdDrawDocument* mpDoc;
     SdPage*         mpCurrentPage;
 
-    CheckBox*       mpCBDate;
-    CheckBox*       mpCBPageNumber;
-    CheckBox*       mpCBSlideNumber;
-    CheckBox*       mpCBHeader;
-    CheckBox*       mpCBFooter;
+    VclPtr<CheckBox>       mpCBDate;
+    VclPtr<CheckBox>       mpCBPageNumber;
+    VclPtr<CheckBox>       mpCBSlideNumber;
+    VclPtr<CheckBox>       mpCBHeader;
+    VclPtr<CheckBox>       mpCBFooter;
 
     bool            mbOldHeader;
     bool            mbOldFooter;
@@ -54,6 +54,8 @@ private:
 
 public:
     MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage );
+    virtual ~MasterLayoutDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual short Execute() SAL_OVERRIDE;
 };
diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx
index f23d69207d98..f675535a1ba1 100644
--- a/sd/source/ui/inc/morphdlg.hxx
+++ b/sd/source/ui/inc/morphdlg.hxx
@@ -38,7 +38,8 @@ public:
         vcl::Window* pParent,
         const SdrObject* pObj1,
         const SdrObject* pObj2);
-    virtual ~MorphDlg (void);
+    virtual ~MorphDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     void            SaveSettings() const;
     sal_uInt16      GetFadeSteps() const { return (sal_uInt16) m_pMtfSteps->GetValue(); }
@@ -46,9 +47,9 @@ public:
     bool            IsOrientationFade() const { return m_pCbxOrientation->IsChecked(); }
 
 private:
-    NumericField*   m_pMtfSteps;
-    CheckBox*       m_pCbxAttributes;
-    CheckBox*       m_pCbxOrientation;
+    VclPtr<NumericField>   m_pMtfSteps;
+    VclPtr<CheckBox>       m_pCbxAttributes;
+    VclPtr<CheckBox>       m_pCbxOrientation;
 
     void            LoadSettings();
 };
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 96654145ac78..9eb82d864b55 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -178,7 +178,7 @@ protected:
                                 const SfxPoolItem* pState ) SAL_OVERRIDE;
 
 private:
-    SdNavigatorWin* pNavigatorWin;
+    VclPtr<SdNavigatorWin> pNavigatorWin;
     const SdNavigatorWin::UpdateRequestFunctor maUpdateRequest;
 };
 
@@ -196,7 +196,7 @@ protected:
                                 const SfxPoolItem* pState ) SAL_OVERRIDE;
 
 private:
-    SdNavigatorWin* pNavigatorWin;
+    VclPtr<SdNavigatorWin> pNavigatorWin;
     const SdNavigatorWin::UpdateRequestFunctor maUpdateRequest;
 };
 
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index ea2fcde3e25d..0398823c783d 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -37,37 +37,37 @@ class SdStartPresentationDlg : public ModalDialog
 {
 private:
 
-    RadioButton*        aRbtAll;
-    RadioButton*        aRbtAtDia;
-    RadioButton*        aRbtCustomshow;
-    ListBox*            aLbDias;
-    ListBox*            aLbCustomshow;
+    VclPtr<RadioButton>        aRbtAll;
+    VclPtr<RadioButton>        aRbtAtDia;
+    VclPtr<RadioButton>        aRbtCustomshow;
+    VclPtr<ListBox>            aLbDias;
+    VclPtr<ListBox>            aLbCustomshow;
 
-    RadioButton*        aRbtStandard;
-    RadioButton*        aRbtWindow;
-    RadioButton*        aRbtAuto;
-    TimeField*          aTmfPause;
-    CheckBox*           aCbxAutoLogo;
+    VclPtr<RadioButton>        aRbtStandard;
+    VclPtr<RadioButton>        aRbtWindow;
+    VclPtr<RadioButton>        aRbtAuto;
+    VclPtr<TimeField>          aTmfPause;
+    VclPtr<CheckBox>           aCbxAutoLogo;
 
-    CheckBox*           aCbxManuel;
-    CheckBox*           aCbxMousepointer;
-    CheckBox*           aCbxPen;
-    CheckBox*           aCbxNavigator;
-    CheckBox*           aCbxAnimationAllowed;
-    CheckBox*           aCbxChangePage;
-    CheckBox*           aCbxAlwaysOnTop;
+    VclPtr<CheckBox>           aCbxManuel;
+    VclPtr<CheckBox>           aCbxMousepointer;
+    VclPtr<CheckBox>           aCbxPen;
+    VclPtr<CheckBox>           aCbxNavigator;
+    VclPtr<CheckBox>           aCbxAnimationAllowed;
+    VclPtr<CheckBox>           aCbxChangePage;
+    VclPtr<CheckBox>           aCbxAlwaysOnTop;
 
-    FixedText*          maFtMonitor;
-    ListBox*            maLBMonitor;
+    VclPtr<FixedText>          maFtMonitor;
+    VclPtr<ListBox>            maLBMonitor;
 
     SdCustomShowList*   pCustomShowList;
     const SfxItemSet&   rOutAttrs;
     sal_Int32           mnMonitors;
 
-    FixedText*          msMonitor;
-    FixedText*          msAllMonitors;
-    FixedText*          msMonitorExternal;
-    FixedText*          msExternal;
+    VclPtr<FixedText>          msMonitor;
+    VclPtr<FixedText>          msAllMonitors;
+    VclPtr<FixedText>          msMonitorExternal;
+    VclPtr<FixedText>          msExternal;
 
                         DECL_LINK( ChangeRangeHdl, void * );
                         DECL_LINK( ClickWindowPresentationHdl, void * );
@@ -88,6 +88,8 @@ public:
                                 const SfxItemSet& rInAttrs,
                                 const std::vector<OUString> &rPageNames,
                                 SdCustomShowList* pCSList );
+    virtual             ~SdStartPresentationDlg();
+    virtual void        dispose() SAL_OVERRIDE;
 
     void                GetAttr( SfxItemSet& rOutAttrs );
 };
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 9ae6631f435e..c64b4d76cb6b 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -32,25 +32,25 @@ class SdPrintOptions : public SfxTabPage
  friend class SdModule;
 
 private:
-    VclFrame            *m_pFrmContent;
-    CheckBox            *m_pCbxDraw;
-    CheckBox            *m_pCbxNotes;
-    CheckBox            *m_pCbxHandout;
-    CheckBox            *m_pCbxOutline;
-    RadioButton         *m_pRbtColor;
-    RadioButton         *m_pRbtGrayscale;
-    RadioButton         *m_pRbtBlackWhite;
-    CheckBox            *m_pCbxPagename;
-    CheckBox            *m_pCbxDate;
-    CheckBox            *m_pCbxTime;
-    CheckBox            *m_pCbxHiddenPages;
-    RadioButton         *m_pRbtDefault;
-    RadioButton         *m_pRbtPagesize;
-    RadioButton         *m_pRbtPagetile;
-    RadioButton         *m_pRbtBooklet;
-    CheckBox            *m_pCbxFront;
-    CheckBox            *m_pCbxBack;
-    CheckBox            *m_pCbxPaperbin;
+    VclPtr<VclFrame>            m_pFrmContent;
+    VclPtr<CheckBox>            m_pCbxDraw;
+    VclPtr<CheckBox>            m_pCbxNotes;
+    VclPtr<CheckBox>            m_pCbxHandout;
+    VclPtr<CheckBox>            m_pCbxOutline;
+    VclPtr<RadioButton>         m_pRbtColor;
+    VclPtr<RadioButton>         m_pRbtGrayscale;
+    VclPtr<RadioButton>         m_pRbtBlackWhite;
+    VclPtr<CheckBox>            m_pCbxPagename;
+    VclPtr<CheckBox>            m_pCbxDate;
+    VclPtr<CheckBox>            m_pCbxTime;
+    VclPtr<CheckBox>            m_pCbxHiddenPages;
+    VclPtr<RadioButton>         m_pRbtDefault;
+    VclPtr<RadioButton>         m_pRbtPagesize;
+    VclPtr<RadioButton>         m_pRbtPagetile;
+    VclPtr<RadioButton>         m_pRbtBooklet;
+    VclPtr<CheckBox>            m_pCbxFront;
+    VclPtr<CheckBox>            m_pCbxBack;
+    VclPtr<CheckBox>            m_pCbxPaperbin;
 
     const SfxItemSet&   rOutAttrs;
 
@@ -63,6 +63,7 @@ private:
 public:
             SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs);
             virtual ~SdPrintOptions();
+    virtual void dispose() SAL_OVERRIDE;
 
     static  SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
 
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index bbb4f264d8ee..f9670c7b038f 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -53,104 +53,104 @@ class SdPublishingDlg : public ModalDialog
 {
 private:
     // page 1 controls
-    VclContainer*   pPage1;
-    FixedText*      pPage1_Titel;
-    RadioButton*    pPage1_NewDesign;
-    RadioButton*    pPage1_OldDesign;
-    ListBox*        pPage1_Designs;
-    PushButton*     pPage1_DelDesign;
-    FixedText*      pPage1_Desc;
+    VclPtr<VclContainer>   pPage1;
+    VclPtr<FixedText>      pPage1_Titel;
+    VclPtr<RadioButton>    pPage1_NewDesign;
+    VclPtr<RadioButton>    pPage1_OldDesign;
+    VclPtr<ListBox>        pPage1_Designs;
+    VclPtr<PushButton>     pPage1_DelDesign;
+    VclPtr<FixedText>      pPage1_Desc;
 
     // page 2 controls
-    VclContainer*   pPage2;
-    VclContainer*   pPage2Frame2;
-    VclContainer*   pPage2Frame3;
-    VclContainer*   pPage2Frame4;
-    FixedText*      pPage2_Titel;
-    RadioButton*    pPage2_Standard;
-    RadioButton*    pPage2_Frames;
-    RadioButton*    pPage2_SingleDocument;
-    RadioButton*    pPage2_Kiosk;
-    RadioButton*    pPage2_WebCast;
-    FixedImage*    pPage2_Standard_FB;
-    FixedImage*    pPage2_Frames_FB;
-    FixedImage*    pPage2_Kiosk_FB;
-    FixedImage*    pPage2_WebCast_FB;
-
-    FixedText*      pPage2_Titel_Html;
-    CheckBox*       pPage2_Content;
-    CheckBox*       pPage2_Notes;
-
-    FixedText*      pPage2_Titel_WebCast;
-    RadioButton*    pPage2_ASP;
-    RadioButton*    pPage2_PERL;
-    FixedText*      pPage2_URL_txt;
-    Edit*           pPage2_URL;
-    FixedText*      pPage2_CGI_txt;
-    Edit*           pPage2_CGI;
-    FixedText*      pPage2_Index_txt;
-    Edit*           pPage2_Index;
-    FixedText*      pPage2_Titel_Kiosk;
-    RadioButton*    pPage2_ChgDefault;
-    RadioButton*    pPage2_ChgAuto;
-    FixedText*      pPage2_Duration_txt;
-    TimeField*      pPage2_Duration;
-    CheckBox*       pPage2_Endless;
+    VclPtr<VclContainer>   pPage2;
+    VclPtr<VclContainer>   pPage2Frame2;
+    VclPtr<VclContainer>   pPage2Frame3;
+    VclPtr<VclContainer>   pPage2Frame4;
+    VclPtr<FixedText>      pPage2_Titel;
+    VclPtr<RadioButton>    pPage2_Standard;
+    VclPtr<RadioButton>    pPage2_Frames;
+    VclPtr<RadioButton>    pPage2_SingleDocument;
+    VclPtr<RadioButton>    pPage2_Kiosk;
+    VclPtr<RadioButton>    pPage2_WebCast;
+    VclPtr<FixedImage>    pPage2_Standard_FB;
+    VclPtr<FixedImage>    pPage2_Frames_FB;
+    VclPtr<FixedImage>    pPage2_Kiosk_FB;
+    VclPtr<FixedImage>    pPage2_WebCast_FB;
+
+    VclPtr<FixedText>      pPage2_Titel_Html;
+    VclPtr<CheckBox>       pPage2_Content;
+    VclPtr<CheckBox>       pPage2_Notes;
+
+    VclPtr<FixedText>      pPage2_Titel_WebCast;
+    VclPtr<RadioButton>    pPage2_ASP;
+    VclPtr<RadioButton>    pPage2_PERL;
+    VclPtr<FixedText>      pPage2_URL_txt;
+    VclPtr<Edit>           pPage2_URL;
+    VclPtr<FixedText>      pPage2_CGI_txt;
+    VclPtr<Edit>           pPage2_CGI;
+    VclPtr<FixedText>      pPage2_Index_txt;
+    VclPtr<Edit>           pPage2_Index;
+    VclPtr<FixedText>      pPage2_Titel_Kiosk;
+    VclPtr<RadioButton>    pPage2_ChgDefault;
+    VclPtr<RadioButton>    pPage2_ChgAuto;
+    VclPtr<FixedText>      pPage2_Duration_txt;
+    VclPtr<TimeField>      pPage2_Duration;
+    VclPtr<CheckBox>       pPage2_Endless;
 
     // page 3 controls
-    VclContainer*   pPage3;
-    FixedText*      pPage3_Titel1;
-    RadioButton*    pPage3_Png;
-    RadioButton*    pPage3_Gif;
-    RadioButton*    pPage3_Jpg;
-    FixedText*      pPage3_Quality_txt;
-    ComboBox*       pPage3_Quality;
-    FixedText*      pPage3_Titel2;
-    RadioButton*    pPage3_Resolution_1;
-    RadioButton*    pPage3_Resolution_2;
-    RadioButton*    pPage3_Resolution_3;
-    FixedText*      pPage3_Titel3;
-    CheckBox*       pPage3_SldSound;
-    CheckBox*       pPage3_HiddenSlides;
+    VclPtr<VclContainer>   pPage3;
+    VclPtr<FixedText>      pPage3_Titel1;
+    VclPtr<RadioButton>    pPage3_Png;
+    VclPtr<RadioButton>    pPage3_Gif;
+    VclPtr<RadioButton>    pPage3_Jpg;
+    VclPtr<FixedText>      pPage3_Quality_txt;
+    VclPtr<ComboBox>       pPage3_Quality;
+    VclPtr<FixedText>      pPage3_Titel2;
+    VclPtr<RadioButton>    pPage3_Resolution_1;
+    VclPtr<RadioButton>    pPage3_Resolution_2;
+    VclPtr<RadioButton>    pPage3_Resolution_3;
+    VclPtr<FixedText>      pPage3_Titel3;
+    VclPtr<CheckBox>       pPage3_SldSound;
+    VclPtr<CheckBox>       pPage3_HiddenSlides;
 
     // page 4 controls
-    VclContainer*   pPage4;
-    FixedText*      pPage4_Titel1;
-    FixedText*      pPage4_Author_txt;
-    Edit*           pPage4_Author;
-    FixedText*      pPage4_Email_txt;
-    Edit*           pPage4_Email;
-    FixedText*      pPage4_WWW_txt;
-    Edit*           pPage4_WWW;
-    FixedText*      pPage4_Titel2;
-    VclMultiLineEdit*  pPage4_Misc;
-    CheckBox*       pPage4_Download;
+    VclPtr<VclContainer>   pPage4;
+    VclPtr<FixedText>      pPage4_Titel1;
+    VclPtr<FixedText>      pPage4_Author_txt;
+    VclPtr<Edit>           pPage4_Author;
+    VclPtr<FixedText>      pPage4_Email_txt;
+    VclPtr<Edit>           pPage4_Email;
+    VclPtr<FixedText>      pPage4_WWW_txt;
+    VclPtr<Edit>           pPage4_WWW;
+    VclPtr<FixedText>      pPage4_Titel2;
+    VclPtr<VclMultiLineEdit>  pPage4_Misc;
+    VclPtr<CheckBox>       pPage4_Download;
 
     // page 5 controls
-    VclContainer*   pPage5;
-    FixedText*      pPage5_Titel;
-    CheckBox*       pPage5_TextOnly;
-    ValueSet*       pPage5_Buttons;
+    VclPtr<VclContainer>   pPage5;
+    VclPtr<FixedText>      pPage5_Titel;
+    VclPtr<CheckBox>       pPage5_TextOnly;
+    VclPtr<ValueSet>       pPage5_Buttons;
 
     // page 6 controls
-    VclContainer*   pPage6;
-    FixedText*      pPage6_Titel;
-    RadioButton*    pPage6_Default;
-    RadioButton*    pPage6_User;
-    PushButton*     pPage6_Back;
-    PushButton*     pPage6_Text;
-    PushButton*     pPage6_Link;
-    PushButton*     pPage6_VLink;
-    PushButton*     pPage6_ALink;
-    RadioButton*    pPage6_DocColors;
-    SdHtmlAttrPreview*  pPage6_Preview;
+    VclPtr<VclContainer>   pPage6;
+    VclPtr<FixedText>      pPage6_Titel;
+    VclPtr<RadioButton>    pPage6_Default;
+    VclPtr<RadioButton>    pPage6_User;
+    VclPtr<PushButton>     pPage6_Back;
+    VclPtr<PushButton>     pPage6_Text;
+    VclPtr<PushButton>     pPage6_Link;
+    VclPtr<PushButton>     pPage6_VLink;
+    VclPtr<PushButton>     pPage6_ALink;
+    VclPtr<RadioButton>    pPage6_DocColors;
+    VclPtr<SdHtmlAttrPreview>  pPage6_Preview;
 
     boost::scoped_ptr< ButtonSet > mpButtonSet;
 
     // standard controls
-    PushButton*     pLastPageButton;
-    PushButton*     pNextPageButton;
-    PushButton*     pFinishButton;
+    VclPtr<PushButton>     pLastPageButton;
+    VclPtr<PushButton>     pNextPageButton;
+    VclPtr<PushButton>     pFinishButton;
 
     Assistent       aAssistentFunc;
 
@@ -197,6 +197,7 @@ public:
 
     SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType);
     virtual ~SdPublishingDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams );
 };
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index ea68e8de3214..7afb5a8b5ac7 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -42,7 +42,8 @@ public:
         vcl::Window* pWindow,
         const SfxItemSet& rInAttrs);
 
-    virtual ~SdPresLayoutDlg (void);
+    virtual ~SdPresLayoutDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     void                GetAttr(SfxItemSet& rOutAttrs);
 
@@ -51,10 +52,10 @@ public:
 
 private:
     ::sd::DrawDocShell* mpDocSh;
-    ValueSet*           m_pVS;
-    CheckBox*           m_pCbxMasterPage;
-    CheckBox*           m_pCbxCheckMasters;
-    PushButton*         m_pBtnLoad;
+    VclPtr<ValueSet>           m_pVS;
+    VclPtr<CheckBox>           m_pCbxMasterPage;
+    VclPtr<CheckBox>           m_pCbxCheckMasters;
+    VclPtr<PushButton>         m_pBtnLoad;
 
     const SfxItemSet&   mrOutAttrs;
 
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 6e683855cfc4..86731a6ce474 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -121,7 +121,7 @@ public:
 
 protected:
 
-    vcl::Window*                 mpParent;
+    VclPtr<vcl::Window>     mpParent;
     const SdDrawDocument*   mpDoc;
     SdDrawDocument*         mpBookmarkDoc;
     SfxMedium*              mpMedium;
@@ -131,7 +131,7 @@ protected:
     bool                mbLinkableSelected;
     OUString                maDocName;
     ::sd::DrawDocShellRef   mxBookmarkDocShRef; ///< for the loading of bookmarks
-    SdNavigatorWin*         mpDropNavWin;
+    VclPtr<SdNavigatorWin>  mpDropNavWin;
     SfxViewFrame*           mpFrame;
     std::vector<OUString>   maTreeItem;
     bool                mbSaveTreeItemState;
diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
index e6ae9d24572b..5cb6f07cb872 100644
--- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
+++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
@@ -86,7 +86,7 @@ private:
     static void AddInstance (const SdDrawDocument* pDocument, SlideSorterCacheDisplay* pControl);
     static void RemoveInstance (SlideSorterCacheDisplay* pControl);
 
-    vcl::Window* mpWindow;
+    VclPtr<vcl::Window> mpWindow;
     sal_Int32 mnPageCount;
     sal_Int32 mnColumnCount;
     sal_Int32 mnRowCount;
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index bd1ac112877b..576f64733181 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -53,21 +53,21 @@ public:
 class SdTPAction : public SfxTabPage
 {
 private:
-    ListBox*                m_pLbAction;
-
-    FixedText*              m_pFtTree;                // jump destination controls
-    SdPageObjsTLB*          m_pLbTree;
-    SdPageObjsTLB*          m_pLbTreeDocument;
-    ListBox*                m_pLbOLEAction;
-
-    VclFrame*               m_pFrame;
-    Edit*                   m_pEdtSound;
-    Edit*                   m_pEdtBookmark;
-    Edit*                   m_pEdtDocument;
-    Edit*                   m_pEdtProgram;
-    Edit*                   m_pEdtMacro;
-    PushButton*             m_pBtnSearch;
-    PushButton*             m_pBtnSeek;
+    VclPtr<ListBox>                m_pLbAction;
+
+    VclPtr<FixedText>              m_pFtTree;                // jump destination controls
+    VclPtr<SdPageObjsTLB>          m_pLbTree;
+    VclPtr<SdPageObjsTLB>          m_pLbTreeDocument;
+    VclPtr<ListBox>                m_pLbOLEAction;
+
+    VclPtr<VclFrame>               m_pFrame;
+    VclPtr<Edit>                   m_pEdtSound;
+    VclPtr<Edit>                   m_pEdtBookmark;
+    VclPtr<Edit>                   m_pEdtDocument;
+    VclPtr<Edit>                   m_pEdtProgram;
+    VclPtr<Edit>                   m_pEdtMacro;
+    VclPtr<PushButton>             m_pBtnSearch;
+    VclPtr<PushButton>             m_pBtnSeek;
 
     const SfxItemSet&       rOutAttrs;
     const ::sd::View*       mpView;
@@ -97,6 +97,7 @@ private:
 public:
             SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs );
             virtual ~SdTPAction();
+    virtual void dispose() SAL_OVERRIDE;
 
     static  SfxTabPage* Create( vcl::Window*, const SfxItemSet& );
 
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 353b06eee46f..55f671d408c6 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -50,14 +50,15 @@ public:
 class SdTpOptionsContents : public SfxTabPage
 {
 private:
-    CheckBox*    m_pCbxRuler;
-    CheckBox*    m_pCbxDragStripes;
-    CheckBox*    m_pCbxHandlesBezier;
-    CheckBox*    m_pCbxMoveOutline;
+    VclPtr<CheckBox>    m_pCbxRuler;
+    VclPtr<CheckBox>    m_pCbxDragStripes;
+    VclPtr<CheckBox>    m_pCbxHandlesBezier;
+    VclPtr<CheckBox>    m_pCbxMoveOutline;
 
 public:
             SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet& rInAttrs  );
             virtual ~SdTpOptionsContents();
+    virtual void dispose() SAL_OVERRIDE;
 
     static  SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -73,38 +74,38 @@ class SdTpOptionsMisc : public SfxTabPage
  friend class SdModule;
 
 private:
-    CheckBox    *m_pCbxQuickEdit;
-    CheckBox    *m_pCbxPickThrough;
+    VclPtr<CheckBox>    m_pCbxQuickEdit;
+    VclPtr<CheckBox>    m_pCbxPickThrough;
 
-    VclFrame    *m_pNewDocumentFrame;
-    CheckBox    *m_pCbxStartWithTemplate;
+    VclPtr<VclFrame>    m_pNewDocumentFrame;
+    VclPtr<CheckBox>    m_pCbxStartWithTemplate;
 
-    CheckBox    *m_pCbxMasterPageCache;
-    CheckBox    *m_pCbxCopy;
-    CheckBox    *m_pCbxMarkedHitMovesAlways;
-    VclFrame    *m_pPresentationFrame;
+    VclPtr<CheckBox>    m_pCbxMasterPageCache;
+    VclPtr<CheckBox>    m_pCbxCopy;
+    VclPtr<CheckBox>    m_pCbxMarkedHitMovesAlways;
+    VclPtr<VclFrame>    m_pPresentationFrame;
 
-    ListBox     *m_pLbMetric;
-    MetricField *m_pMtrFldTabstop;
+    VclPtr<ListBox>     m_pLbMetric;
+    VclPtr<MetricField> m_pMtrFldTabstop;
 
-    CheckBox    *m_pCbxEnableSdremote;
-    CheckBox    *m_pCbxEnablePresenterScreen;
-    CheckBox    *m_pCbxUsePrinterMetrics;
-    CheckBox    *m_pCbxCompatibility;
+    VclPtr<CheckBox>    m_pCbxEnableSdremote;
+    VclPtr<CheckBox>    m_pCbxEnablePresenterScreen;
+    VclPtr<CheckBox>    m_pCbxUsePrinterMetrics;
+    VclPtr<CheckBox>    m_pCbxCompatibility;
 
     //Scale
-    VclFrame    *m_pScaleFrame;
-    ComboBox    *m_pCbScale;
-    FixedText   *m_pNewDocLb;
-    FixedText   *m_pFiInfo1;
-    MetricField *m_pMtrFldOriginalWidth;
-    FixedText   *m_pWidthLb;
-    FixedText   *m_pHeightLb;
-    FixedText   *m_pFiInfo2;
-    MetricField *m_pMtrFldOriginalHeight;
-    CheckBox    *m_pCbxDistrot;
-    MetricField *m_pMtrFldInfo1;
-    MetricField *m_pMtrFldInfo2;
+    VclPtr<VclFrame>    m_pScaleFrame;
+    VclPtr<ComboBox>    m_pCbScale;
+    VclPtr<FixedText>   m_pNewDocLb;
+    VclPtr<FixedText>   m_pFiInfo1;
+    VclPtr<MetricField> m_pMtrFldOriginalWidth;
+    VclPtr<FixedText>   m_pWidthLb;
+    VclPtr<FixedText>   m_pHeightLb;
+    VclPtr<FixedText>   m_pFiInfo2;
+    VclPtr<MetricField> m_pMtrFldOriginalHeight;
+    VclPtr<CheckBox>    m_pCbxDistrot;
+    VclPtr<MetricField> m_pMtrFldInfo1;
+    VclPtr<MetricField> m_pMtrFldInfo2;
 
     sal_uInt32          nWidth;
     sal_uInt32          nHeight;
@@ -131,6 +132,7 @@ protected:
 public:
             SdTpOptionsMisc( vcl::Window* pParent, const SfxItemSet& rInAttrs  );
             virtual ~SdTpOptionsMisc();
+    virtual void dispose() SAL_OVERRIDE;
 
     static  SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index 153343dae933..fefa8efe82ef 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -42,20 +42,20 @@ class DrawDocShell;
 class SdVectorizeDlg : public ModalDialog
 {
     ::sd::DrawDocShell *    mpDocSh;
-    NumericField*       m_pNmLayers;
-    MetricField*        m_pMtReduce;
-    FixedText*          m_pFtFillHoles;
-    MetricField*        m_pMtFillHoles;
-    CheckBox*           m_pCbFillHoles;
+    VclPtr<NumericField>       m_pNmLayers;
+    VclPtr<MetricField>        m_pMtReduce;
+    VclPtr<FixedText>          m_pFtFillHoles;
+    VclPtr<MetricField>        m_pMtFillHoles;
+    VclPtr<CheckBox>           m_pCbFillHoles;
 
-    GraphCtrl*          m_pBmpWin;
+    VclPtr<GraphCtrl>          m_pBmpWin;
 
-    GraphCtrl*          m_pMtfWin;
+    VclPtr<GraphCtrl>          m_pMtfWin;
 
-    ProgressBar*        m_pPrgs;
+    VclPtr<ProgressBar>        m_pPrgs;
 
-    OKButton*           m_pBtnOK;
-    PushButton*         m_pBtnPreview;
+    VclPtr<OKButton>           m_pBtnOK;
+    VclPtr<PushButton>         m_pBtnPreview;
 
     Bitmap              aBmp;
     Bitmap              aPreviewBmp;
@@ -82,6 +82,7 @@ public:
 
                         SdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell );
                         virtual ~SdVectorizeDlg();
+    virtual void        dispose() SAL_OVERRIDE;
 
     const GDIMetaFile&  GetGDIMetaFile() const { return aMtf; }
 };
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 32f8db4ed6b0..7e8144380528 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -927,7 +927,7 @@ bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Ref
 
 OutputDevice* SlideShow::getShowWindow()
 {
-    return mxController.is() ? mxController->mpShowWindow : 0;
+    return mxController.is() ? mxController->mpShowWindow.get() : 0;
 }
 
 int SlideShow::getAnimationMode()
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index f64376e69571..15b2bb3eecbb 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -707,8 +707,7 @@ void SAL_CALL SlideshowImpl::disposing()
     if( mpTimeButton )
     {
         mpTimeButton->Hide();
-        delete mpTimeButton;
-        mpTimeButton = 0;
+        mpTimeButton.clear();
     }
 
     if( mpShowWindow )
@@ -743,8 +742,7 @@ void SAL_CALL SlideshowImpl::disposing()
 
     if( mpShowWindow )
     {
-        delete mpShowWindow;
-        mpShowWindow = 0;
+        mpShowWindow.clear();
     }
 
     setActiveXToolbarsVisible( true );
@@ -805,7 +803,7 @@ bool SlideshowImpl::startPreview(
         mpSlideController->insertSlideNumber( nSlideNumber-1 );
         mpSlideController->setPreviewNode( xAnimationNode );
 
-        mpShowWindow = new ShowWindow( this, ((pParent == 0) && mpViewShell) ?  mpParentWindow : pParent );
+        mpShowWindow = new ShowWindow( this, ((pParent == 0) && mpViewShell) ?  mpParentWindow.get() : pParent );
         if( mpViewShell )
         {
             mpViewShell->SetActiveWindow( mpShowWindow );
@@ -857,7 +855,7 @@ bool SlideshowImpl::startPreview(
 
         bRet = startShowImpl( aProperties );
 
-        if( mpShowWindow != 0 && meAnimationMode == ANIMATIONMODE_PREVIEW )
+        if( mpShowWindow != nullptr && meAnimationMode == ANIMATIONMODE_PREVIEW )
             mpShowWindow->SetPreviewMode();
 
     }
@@ -882,8 +880,8 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
     DBG_ASSERT( !mxShow.is(), "sd::SlideshowImpl::startShow(), called twice!" );
     if( mxShow.is() )
         return true;
-    DBG_ASSERT( mpParentWindow!=NULL, "sd::SlideshowImpl::startShow() called without parent window" );
-    if (mpParentWindow == NULL)
+    DBG_ASSERT( mpParentWindow!=nullptr, "sd::SlideshowImpl::startShow() called without parent window" );
+    if (mpParentWindow == nullptr)
         return false;
 
     // Autoplay (pps/ppsx)
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index b39c4ede6c9a..2d96b97ec269 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -92,7 +92,7 @@ struct PresentationSettingsEx : public PresentationSettings
 {
     bool mbRehearseTimings;
     bool mbPreview;
-    vcl::Window* mpParentWindow;
+    VclPtr<vcl::Window> mpParentWindow;
     css::uno::Reference< css::drawing::XDrawPage > mxStartPage;
     css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode;
 
@@ -332,9 +332,9 @@ private:
     SdDrawDocument* mpDoc;
 
     SfxItemSet*     mpNewAttr;
-    vcl::Window*       mpParentWindow;
-    ShowWindow*     mpShowWindow;
-    PushButton*     mpTimeButton;
+    VclPtr<vcl::Window>    mpParentWindow;
+    VclPtr<ShowWindow>     mpShowWindow;
+    VclPtr<PushButton>     mpTimeButton;
 
     boost::shared_ptr< AnimationSlideController > mpSlideController;
 
@@ -347,8 +347,8 @@ private:
     OUString        maCharBuffer;
     Pointer         maOldPointer;
     Pointer         maPencil;
-    std::vector< ::sd::Window* > maDrawModeWindows;
-    ::sd::Window*   mpOldActiveWindow;
+    std::vector< VclPtr<::sd::Window> > maDrawModeWindows;
+    VclPtr<::sd::Window>   mpOldActiveWindow;
     Link            maStarBASICGlobalErrorHdl;
     unsigned long   mnChildMask;
     bool            mbGridVisible;
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 0fb256cc103c..ecf324078546 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -92,8 +92,8 @@ private:
 private:
     ViewShellBase& mrBase;
 
-    TableValueSet* m_pValueSet;
-    CheckBox* m_aCheckBoxes[CB_COUNT];
+    VclPtr<TableValueSet> m_pValueSet;
+    VclPtr<CheckBox> m_aCheckBoxes[CB_COUNT];
 
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxSelectedTable;
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView;
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index 5a72e6691027..67df29c52f44 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -138,7 +138,7 @@ void FormShellManager::RegisterAtCenterPane (void)
         return;
 
     mpMainViewShellWindow = pShell->GetActiveWindow();
-    if (mpMainViewShellWindow == NULL)
+    if (mpMainViewShellWindow == nullptr)
         return;
 
     // Register at the window to get informed when to move the form
@@ -158,7 +158,7 @@ void FormShellManager::RegisterAtCenterPane (void)
 
 void FormShellManager::UnregisterAtCenterPane (void)
 {
-    if (mpMainViewShellWindow != NULL)
+    if (mpMainViewShellWindow != nullptr)
     {
         // Unregister from the window.
         mpMainViewShellWindow->RemoveEventListener(
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index e4592649694c..f4c1d2282a19 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -101,6 +101,7 @@ void Ruler::dispose()
     rBindings.EnterRegistrations();
     delete pCtrlItem;
     rBindings.LeaveRegistrations();
+    pSdWin.clear();
     SvxRuler::dispose();
 }
 
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 0cb06ef6b2b3..e0f3cdf5d854 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
 struct SdNavigatorDropEvent : public ExecuteDropEvent
 {
     DropTargetHelper&       mrTargetHelper;
-    ::sd::Window* mpTargetWindow;
+    VclPtr<::sd::Window>    mpTargetWindow;
     sal_uInt16                  mnPage;
     sal_uInt16                  mnLayer;
 
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index a8e0fa33a188..5b6523ed3324 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -105,6 +105,7 @@ void Window::dispose()
         if (pWindowUpdater != NULL)
             pWindowUpdater->UnregisterWindow (this);
     }
+    mpShareWin.clear();
     vcl::Window::dispose();
 }
 
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index f6d25df97e1e..2f37f852d1a9 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -648,7 +648,7 @@ void ViewShell::SetActiveWindow (::sd::Window* pWin)
         }
     }
 
-    if (mpActiveWindow != pWin)
+    if (mpActiveWindow.get() != pWin)
         mpActiveWindow = pWin;
 
     // The rest of this function is not guarded anymore against calling this
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 4016503e16d4..4076a096f9f4 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -891,7 +891,7 @@ void ViewShell::Resize (void)
 {
     SetupRulers ();
 
-    if (mpParentWindow == NULL)
+    if (mpParentWindow == nullptr)
         return;
 
     // Make sure that the new size is not degenerate.