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

54 files changed, 955 insertions, 370 deletions

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 8e4776361897..55b85df456fa 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -156,8 +156,10 @@ void CertPathDialog::dispose()
         delete pCertPath;
         pEntry = m_pCertPathList->Next( pEntry );
     }
-    delete m_pCertPathList;
-    m_pCertPathList = NULL;
+    m_pCertPathListContainer.clear();
+    m_pCertPathList.clear();
+    m_pAddBtn.clear();
+    m_pOKBtn.clear();
     ModalDialog::dispose();
 }
 
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index 1add8ea14c1f..29a3e1aa45fb 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -19,10 +19,10 @@
 class CertPathDialog : public ModalDialog
 {
 private:
-    SvSimpleTableContainer* m_pCertPathListContainer;
-    svx::SvxRadioButtonListBox* m_pCertPathList;
-    PushButton* m_pAddBtn;
-    OKButton*   m_pOKBtn;
+    VclPtr<SvSimpleTableContainer> m_pCertPathListContainer;
+    VclPtr<svx::SvxRadioButtonListBox> m_pCertPathList;
+    VclPtr<PushButton> m_pAddBtn;
+    VclPtr<OKButton>   m_pOKBtn;
     OUString    m_sAddDialogText;
     OUString    m_sManual;
 
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 3d432698e0fc..ecb996322bee 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -325,6 +325,23 @@ namespace offapp
         m_pDriverList->SetRowChangeHandler( LINK(this, ConnectionPoolOptionsPage, OnDriverRowChanged) );
     }
 
+    ConnectionPoolOptionsPage::~ConnectionPoolOptionsPage()
+    {
+        dispose();
+    }
+
+    void ConnectionPoolOptionsPage::dispose()
+    {
+        m_pEnablePooling.clear();
+        m_pDriversLabel.clear();
+        m_pDriverList.clear();
+        m_pDriverLabel.clear();
+        m_pDriver.clear();
+        m_pDriverPoolingEnabled.clear();
+        m_pTimeoutLabel.clear();
+        m_pTimeout.clear();
+        SfxTabPage::dispose();
+    }
 
     SfxTabPage* ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet)
     {
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 868c42702a16..8650d121ce16 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -38,19 +38,21 @@ namespace offapp
         using TabPage::ActivatePage;
 
     protected:
-        CheckBox*               m_pEnablePooling;
-        FixedText*              m_pDriversLabel;
-        DriverListControl*      m_pDriverList;
-        FixedText*              m_pDriverLabel;
-        FixedText*              m_pDriver;
-        CheckBox*               m_pDriverPoolingEnabled;
-        FixedText*              m_pTimeoutLabel;
-        NumericField*           m_pTimeout;
+        VclPtr<CheckBox>               m_pEnablePooling;
+        VclPtr<FixedText>              m_pDriversLabel;
+        VclPtr<DriverListControl>      m_pDriverList;
+        VclPtr<FixedText>              m_pDriverLabel;
+        VclPtr<FixedText>              m_pDriver;
+        VclPtr<CheckBox>               m_pDriverPoolingEnabled;
+        VclPtr<FixedText>              m_pTimeoutLabel;
+        VclPtr<NumericField>           m_pTimeout;
 
     protected:
         ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet);
 
     public:
+        virtual ~ConnectionPoolOptionsPage();
+        virtual void dispose() SAL_OVERRIDE;
         static SfxTabPage*  Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet);
 
     protected:
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index a7041604683b..a911a1eaceee 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -60,6 +60,17 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent,
     pPage->EnableSaveOptions(false);
 }
 
+SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog()
+{
+    dispose();
+}
+
+void SvxJSearchOptionsDialog::dispose()
+{
+    pPage.clear();
+    SfxSingleTabDialog::dispose();
+}
+
 void SvxJSearchOptionsDialog::Activate()
 {
     pPage->SetTransliterationFlags( nInitialTlFlags );
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index de08fa07c5e0..f149629776b8 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -170,8 +170,11 @@ void DbRegistrationOptionsPage::dispose()
 {
     for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
         delete static_cast< DatabaseRegistration* >( pPathBox->GetEntry(i)->GetUserData() );
-    delete pPathBox;
-    pPathBox = NULL;
+    pPathBox.clear();
+    m_pPathCtrl.clear();
+    m_pNew.clear();
+    m_pEdit.clear();
+    m_pDelete.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 01482292caf4..74e87425b1e5 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -70,6 +70,20 @@ namespace svx
         m_pURL->SetDropDownLineCount( 5 );
     }
 
+    ODocumentLinkDialog::~ODocumentLinkDialog()
+    {
+        dispose();
+    }
+
+    void ODocumentLinkDialog::dispose()
+    {
+        m_pURL.clear();
+        m_pBrowseFile.clear();
+        m_pName.clear();
+        m_pOK.clear();
+        ModalDialog::dispose();
+    }
+
 
     void ODocumentLinkDialog::setLink( const OUString& _rName, const OUString& _rURL )
     {
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 0584734b761d..55493e9e9974 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -40,10 +40,10 @@ namespace svx
     class ODocumentLinkDialog : public ModalDialog
     {
     protected:
-        ::svt::OFileURLControl* m_pURL;
-        PushButton*             m_pBrowseFile;
-        Edit*                   m_pName;
-        OKButton*               m_pOK;
+        VclPtr<::svt::OFileURLControl> m_pURL;
+        VclPtr<PushButton>             m_pBrowseFile;
+        VclPtr<Edit>                   m_pName;
+        VclPtr<OKButton>               m_pOK;
 
         bool                m_bCreatingNew;
 
@@ -51,6 +51,8 @@ namespace svx
 
     public:
         ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew );
+        virtual ~ODocumentLinkDialog();
+        virtual void dispose() SAL_OVERRIDE;
 
         // name validation has to be done by an external instance
         // the validator link gets a pointer to a String, and should return 0 if the string is not
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 098855ae032e..6dfd19f52a2a 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -147,8 +147,16 @@ void SvxFontSubstTabPage::dispose()
     pCheckButtonData = NULL;
     delete pConfig;
     pConfig = NULL;
-    delete m_pCheckLB;
-    m_pCheckLB = NULL;
+    m_pCheckLB.clear();
+    m_pUseTableCB.clear();
+    m_pReplacements.clear();
+    m_pFont1CB.clear();
+    m_pFont2CB.clear();
+    m_pApply.clear();
+    m_pDelete.clear();
+    m_pFontNameLB.clear();
+    m_pNonPropFontsOnlyCB.clear();
+    m_pFontHeightLB.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index b051cdd3c752..3a5b967a3908 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -63,18 +63,18 @@ class SvxFontSubstCheckListBox : public SvSimpleTable
 class SvtFontSubstConfig;
 class SvxFontSubstTabPage : public SfxTabPage
 {
-    CheckBox*                   m_pUseTableCB;
-    VclContainer*               m_pReplacements;
-    FontNameBox*                m_pFont1CB;
-    FontNameBox*                m_pFont2CB;
-    PushButton*                 m_pApply;
-    PushButton*                 m_pDelete;
-
-    SvxFontSubstCheckListBox*   m_pCheckLB;
-
-    ListBox*                    m_pFontNameLB;
-    CheckBox*                   m_pNonPropFontsOnlyCB;
-    ListBox*                    m_pFontHeightLB;
+    VclPtr<CheckBox>                   m_pUseTableCB;
+    VclPtr<VclContainer>               m_pReplacements;
+    VclPtr<FontNameBox>                m_pFont1CB;
+    VclPtr<FontNameBox>                m_pFont2CB;
+    VclPtr<PushButton>                 m_pApply;
+    VclPtr<PushButton>                 m_pDelete;
+
+    VclPtr<SvxFontSubstCheckListBox>   m_pCheckLB;
+
+    VclPtr<ListBox>                    m_pFontNameLB;
+    VclPtr<CheckBox>                   m_pNonPropFontsOnlyCB;
+    VclPtr<ListBox>                    m_pFontHeightLB;
 
     OUString                    m_sAutomatic;
 
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index c5ef749ec20f..02d818438286 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -164,6 +164,21 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
     m_pPrefBox->SetAlternatingRowColors( true );
 }
 
+CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
+{
+    dispose();
+}
+
+void CuiAboutConfigTabPage::dispose()
+{
+    m_pPrefCtrl.clear();
+    m_pResetBtn.clear();
+    m_pEditBtn.clear();
+    m_pSearchBtn.clear();
+    m_pSearchEdit.clear();
+    ModelessDialog::dispose();
+}
+
 void CuiAboutConfigTabPage::InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue)
 {
     SvTreeListEntry* pEntry = new SvTreeListEntry;
@@ -477,6 +492,17 @@ CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow,
 
 }
 
+CuiAboutConfigValueDialog::~CuiAboutConfigValueDialog()
+{
+    dispose();
+}
+
+void CuiAboutConfigValueDialog::dispose()
+{
+    m_pEDValue.clear();
+    ModalDialog::dispose();
+}
+
 IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl )
 {
     Reset();
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index dc19e4ae6539..85a10deb5ff1 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -43,11 +43,11 @@ public:
 class CuiAboutConfigTabPage : public ModelessDialog
 {
 private:
-    SvSimpleTableContainer* m_pPrefCtrl;
-    PushButton* m_pResetBtn;
-    PushButton* m_pEditBtn;
-    PushButton* m_pSearchBtn;
-    Edit* m_pSearchEdit;
+    VclPtr<SvSimpleTableContainer> m_pPrefCtrl;
+    VclPtr<PushButton> m_pResetBtn;
+    VclPtr<PushButton> m_pEditBtn;
+    VclPtr<PushButton> m_pSearchBtn;
+    VclPtr<Edit> m_pSearchEdit;
 
     std::vector< boost::shared_ptr< Prop_Impl > > m_vectorOfModified;
     boost::scoped_ptr< SvSimpleTable > m_pPrefBox;
@@ -65,6 +65,8 @@ private:
 
 public:
    CuiAboutConfigTabPage(vcl::Window* pParent);
+   virtual ~CuiAboutConfigTabPage();
+   virtual void dispose() SAL_OVERRIDE;
    void     InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue);
    void     Reset();
    void     FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess);
@@ -75,10 +77,12 @@ public:
 class CuiAboutConfigValueDialog : public ModalDialog
 {
 private:
-    CuiCustomMultilineEdit* m_pEDValue;
+    VclPtr<CuiCustomMultilineEdit> m_pEDValue;
 
 public:
     CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue , int limit = 0);
+    virtual ~CuiAboutConfigValueDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     OUString getValue()
     {
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index f09b19c5eafa..61354e138c6b 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -65,6 +65,15 @@ void SvxAccessibilityOptionsTabPage::dispose()
 {
     delete m_pImpl;
     m_pImpl = NULL;
+    m_pAccessibilityTool.clear();
+    m_pTextSelectionInReadonly.clear();
+    m_pAnimatedGraphics.clear();
+    m_pAnimatedTexts.clear();
+    m_pTipHelpCB.clear();
+    m_pTipHelpNF.clear();
+    m_pAutoDetectHC.clear();
+    m_pAutomaticFontColor.clear();
+    m_pPagePreviews.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index ccf2ac00712b..0a33851b6f56 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -25,15 +25,15 @@
 struct SvxAccessibilityOptionsTabPage_Impl;
 class SvxAccessibilityOptionsTabPage : public SfxTabPage
 {
-    CheckBox*       m_pAccessibilityTool;
-    CheckBox*       m_pTextSelectionInReadonly;
-    CheckBox*       m_pAnimatedGraphics;
-    CheckBox*       m_pAnimatedTexts;
-    CheckBox*       m_pTipHelpCB;
-    NumericField*   m_pTipHelpNF;
-    CheckBox*       m_pAutoDetectHC;
-    CheckBox*       m_pAutomaticFontColor;
-    CheckBox*       m_pPagePreviews;
+    VclPtr<CheckBox>       m_pAccessibilityTool;
+    VclPtr<CheckBox>       m_pTextSelectionInReadonly;
+    VclPtr<CheckBox>       m_pAnimatedGraphics;
+    VclPtr<CheckBox>       m_pAnimatedTexts;
+    VclPtr<CheckBox>       m_pTipHelpCB;
+    VclPtr<NumericField>   m_pTipHelpNF;
+    VclPtr<CheckBox>       m_pAutoDetectHC;
+    VclPtr<CheckBox>       m_pAutomaticFontColor;
+    VclPtr<CheckBox>       m_pPagePreviews;
 
     DECL_LINK(TipHelpHdl, CheckBox*);
     void EnableTipHelp(bool bCheck);
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 0f9bab237d61..49b501572ce9 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -158,6 +158,19 @@ void SvxAsianLayoutPage::dispose()
 {
     delete pImpl;
     pImpl = NULL;
+    m_pCharKerningRB.clear();
+    m_pCharPunctKerningRB.clear();
+    m_pNoCompressionRB.clear();
+    m_pPunctCompressionRB.clear();
+    m_pPunctKanaCompressionRB.clear();
+    m_pLanguageFT.clear();
+    m_pLanguageLB.clear();
+    m_pStandardCB.clear();
+    m_pStartFT.clear();
+    m_pStartED.clear();
+    m_pEndFT.clear();
+    m_pEndED.clear();
+    m_pHintFT.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 74028ff45621..1be35826d5d5 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -45,6 +45,22 @@ SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxI
 
 }
 
+SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage()
+{
+    dispose();
+}
+
+void SvxBasicIDEOptionsPage::dispose()
+{
+    pCodeCompleteChk.clear();
+    pAutocloseProcChk.clear();
+    pAutocloseParenChk.clear();
+    pAutocloseQuotesChk.clear();
+    pAutoCorrectChk.clear();
+    pUseExtendedTypesChk.clear();
+    SfxTabPage::dispose();
+}
+
 void SvxBasicIDEOptionsPage::LoadConfig()
 {
     bool bProcClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get();
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 45f93120bcf4..9aaced3eb2a9 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -27,17 +27,19 @@
 class SvxBasicIDEOptionsPage: public SfxTabPage
 {
 private:
-    CheckBox* pCodeCompleteChk;
-    CheckBox* pAutocloseProcChk;
-    CheckBox* pAutocloseParenChk;
-    CheckBox* pAutocloseQuotesChk;
-    CheckBox* pAutoCorrectChk;
-    CheckBox* pUseExtendedTypesChk;
+    VclPtr<CheckBox> pCodeCompleteChk;
+    VclPtr<CheckBox> pAutocloseProcChk;
+    VclPtr<CheckBox> pAutocloseParenChk;
+    VclPtr<CheckBox> pAutocloseQuotesChk;
+    VclPtr<CheckBox> pAutoCorrectChk;
+    VclPtr<CheckBox> pUseExtendedTypesChk;
 
     void LoadConfig();
 
 public:
     SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    virtual ~SvxBasicIDEOptionsPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
     virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 8005483464f1..7cb85b4fe9f1 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -99,6 +99,11 @@ void SvxDefaultColorOptPage::dispose()
         delete pChartOptions;
         pChartOptions = NULL;
     }
+    m_pLbChartColors.clear();
+    m_pValSetColorBox.clear();
+    m_pPBDefault.clear();
+    m_pPBAdd.clear();
+    m_pPBRemove.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 99d5377ccd00..ff6970627113 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -33,11 +33,11 @@ class SvxDefaultColorOptPage : public SfxTabPage
 {
 
 private:
-    ColorLB*                m_pLbChartColors;
-    ValueSet*               m_pValSetColorBox;
-    PushButton*             m_pPBDefault;
-    PushButton*             m_pPBAdd;
-    PushButton*             m_pPBRemove;
+    VclPtr<ColorLB>                m_pLbChartColors;
+    VclPtr<ValueSet>               m_pValSetColorBox;
+    VclPtr<PushButton>             m_pPBDefault;
+    VclPtr<PushButton>             m_pPBAdd;
+    VclPtr<PushButton>             m_pPBRemove;
 
     SvxChartOptions*        pChartOptions;
     SvxChartColorTableItem* pColorConfig;
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index b18abccdec0f..6bdf8a1340e7 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -174,7 +174,7 @@ class ColorConfigWindow_Impl
 {
 public:
     ColorConfigWindow_Impl(vcl::Window* pParent);
-    ~ColorConfigWindow_Impl() { dispose(); }
+    virtual ~ColorConfigWindow_Impl() { dispose(); }
     virtual void dispose() SAL_OVERRIDE;
 
 public:
@@ -193,8 +193,7 @@ private:
     class Chapter
     {
         // text
-        bool m_bOwnsWidget;
-        FixedText *m_pText;
+        VclPtr<FixedText> m_pText;
     public:
         Chapter(FixedText *pText, bool bShow);
         Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& sDisplayName);
@@ -235,11 +234,11 @@ private:
     private:
         bool m_bOwnsWidgets;
         // checkbox (CheckBox) or simple text (FixedText)
-        Control* m_pText;
+        VclPtr<Control> m_pText;
         // color list box
-        ColorListBox* m_pColorList;
+        VclPtr<ColorListBox> m_pColorList;
         // color preview box
-        vcl::Window* m_pPreview;
+        VclPtr<vcl::Window> m_pPreview;
         // default color
         Color m_aDefaultColor;
     private:
@@ -256,9 +255,9 @@ private:
 
 
 private:
-    VclGrid *m_pGrid;
-    ScrollBar *m_pVScroll;
-    HeaderBar *m_pHeaderHB;
+    VclPtr<VclGrid>   m_pGrid;
+    VclPtr<ScrollBar> m_pVScroll;
+    VclPtr<HeaderBar> m_pHeaderHB;
 
     // initialization
     void CreateEntries();
@@ -283,8 +282,7 @@ private:
 // eGroup: which group is this?
 // rResMgr: resource manager
 ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow)
-    : m_bOwnsWidget(false)
-    , m_pText(pText)
+    : m_pText(pText)
 {
     if (!bShow)
         Hide();
@@ -293,7 +291,6 @@ ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow)
 // ctor for extended groups
 ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid,
     unsigned nYPos, const OUString& rDisplayName)
-    : m_bOwnsWidget(true)
 {
     m_pText = new FixedText(pGrid, WB_LEFT|WB_VCENTER|WB_3DLOOK);
     m_pText->set_font_attribute("weight", "bold");
@@ -305,8 +302,6 @@ ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid,
 
 ColorConfigWindow_Impl::Chapter::~Chapter()
 {
-    if (m_bOwnsWidget)
-        delete m_pText;
 }
 
 void ColorConfigWindow_Impl::Chapter::Show(Wallpaper const& rBackWall)
@@ -373,9 +368,9 @@ ColorConfigWindow_Impl::Entry::~Entry()
 {
     if (m_bOwnsWidgets)
     {
-        delete m_pText;
-        delete m_pColorList;
-        delete m_pPreview;
+        m_pText.clear();
+        m_pColorList.clear();
+        m_pPreview.clear();
     }
 }
 
@@ -417,7 +412,7 @@ void ColorConfigWindow_Impl::Entry::SetLinks(
 {
     m_pColorList->SetSelectHdl(aColorLink);
     m_pColorList->SetGetFocusHdl(aGetFocusLink);
-    if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText))
+    if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText.get()))
     {
         pCheckBox->SetClickHdl(aCheckLink);
         pCheckBox->SetGetFocusHdl(aGetFocusLink);
@@ -440,7 +435,7 @@ void ColorConfigWindow_Impl::Entry::Update (
         m_pColorList->SelectEntry(aColor);
     }
     m_pPreview->SetBackground(Wallpaper(aColor));
-    if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText))
+    if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText.get()))
         pCheckBox->Check(rValue.bIsVisible);
 }
 
@@ -513,6 +508,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
 void ColorConfigWindow_Impl::dispose()
 {
     disposeBuilder();
+        m_pGrid.clear();
+        m_pVScroll.clear();
+        m_pHeaderHB.clear();
     VclContainer::dispose();
 }
 
@@ -827,10 +825,10 @@ void ColorConfigWindow_Impl::Command( const CommandEvent& rCEvt )
 
 class ColorConfigCtrl_Impl : public VclVBox
 {
-    HeaderBar*              m_pHeaderHB;
-    VclHBox*                m_pBody;
-    ColorConfigWindow_Impl* m_pScrollWindow;
-    ScrollBar*              m_pVScroll;
+    VclPtr<HeaderBar>              m_pHeaderHB;
+    VclPtr<VclHBox>                m_pBody;
+    VclPtr<ColorConfigWindow_Impl> m_pScrollWindow;
+    VclPtr<ScrollBar>              m_pVScroll;
 
     EditableColorConfig*            pColorConfig;
     EditableExtendedColorConfig*    pExtColorConfig;
@@ -920,15 +918,10 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
 
 void ColorConfigCtrl_Impl::dispose()
 {
-    delete m_pVScroll;
-    m_pVScroll = NULL;
-    delete m_pScrollWindow;
-    m_pScrollWindow = NULL;
-    delete m_pBody;
-    m_pBody = NULL;
-    delete m_pHeaderHB;
-    m_pHeaderHB = NULL;
-
+    m_pVScroll.clear();
+    m_pScrollWindow.clear();
+    m_pBody.clear();
+    m_pHeaderHB.clear();
     VclVBox::dispose();
 }
 
@@ -1100,6 +1093,10 @@ void SvxColorOptionsTabPage::dispose()
         delete pExtColorConfig;
         pExtColorConfig = NULL;
     }
+    m_pColorSchemeLB.clear();
+    m_pSaveSchemePB.clear();
+    m_pDeleteSchemePB.clear();
+    m_pColorConfigCT.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index cc886b5e2d79..f5c31bdb1ac1 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -31,10 +31,10 @@ class SvxColorOptionsTabPage : public SfxTabPage
 {
     using SfxTabPage::DeactivatePage;
 
-    ListBox* m_pColorSchemeLB;
-    PushButton* m_pSaveSchemePB;
-    PushButton* m_pDeleteSchemePB;
-    ColorConfigCtrl_Impl* m_pColorConfigCT;
+    VclPtr<ListBox> m_pColorSchemeLB;
+    VclPtr<PushButton> m_pSaveSchemePB;
+    VclPtr<PushButton> m_pDeleteSchemePB;
+    VclPtr<ColorConfigCtrl_Impl> m_pColorConfigCT;
 
     bool bFillItemSetCalled;
 
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index caaa0471294d..40203d831f41 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -57,6 +57,22 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rS
     m_pNumeralsLB->SetDropDownLineCount( m_pNumeralsLB->GetEntryCount() );
 }
 
+SvxCTLOptionsPage::~SvxCTLOptionsPage()
+{
+    dispose();
+}
+
+void SvxCTLOptionsPage::dispose()
+{
+    m_pSequenceCheckingCB.clear();
+    m_pRestrictedCB.clear();
+    m_pTypeReplaceCB.clear();
+    m_pMovementLogicalRB.clear();
+    m_pMovementVisualRB.clear();
+    m_pNumeralsLB.clear();
+    SfxTabPage::dispose();
+}
+
 SfxTabPage* SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxCTLOptionsPage( pParent, *rAttrSet );
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 034e04b6d70f..4c086eb90726 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -30,20 +30,22 @@ class SvxCTLOptionsPage : public SfxTabPage
 {
 private:
 
-    CheckBox*            m_pSequenceCheckingCB;
-    CheckBox*            m_pRestrictedCB;
-    CheckBox*            m_pTypeReplaceCB;
+    VclPtr<CheckBox>            m_pSequenceCheckingCB;
+    VclPtr<CheckBox>            m_pRestrictedCB;
+    VclPtr<CheckBox>            m_pTypeReplaceCB;
 
-    RadioButton*         m_pMovementLogicalRB;
-    RadioButton*         m_pMovementVisualRB;
+    VclPtr<RadioButton>         m_pMovementLogicalRB;
+    VclPtr<RadioButton>         m_pMovementVisualRB;
 
-    ListBox*             m_pNumeralsLB;
+    VclPtr<ListBox>             m_pNumeralsLB;
 
     DECL_LINK( SequenceCheckingCB_Hdl, void* );
 
     SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
 
 public:
+    virtual ~SvxCTLOptionsPage();
+    virtual void dispose() SAL_OVERRIDE;
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index fefbbd25ef39..d48e9a5fa348 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -117,6 +117,19 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent,
     pLanguageLB->SelectEntryPos(0);
 }
 
+SvxNewDictionaryDialog::~SvxNewDictionaryDialog()
+{
+    dispose();
+}
+
+void SvxNewDictionaryDialog::dispose()
+{
+    pNameEdit.clear();
+    pLanguageLB.clear();
+    pExceptBtn.clear();
+    pOKBtn.clear();
+    ModalDialog::dispose();
+}
 
 
 IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
@@ -331,6 +344,24 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
     }
 }
 
+SvxEditDictionaryDialog::~SvxEditDictionaryDialog()
+{
+    dispose();
+}
+
+void SvxEditDictionaryDialog::dispose()
+{
+    pAllDictsLB.clear();
+    pLangFT.clear();
+    pLangLB.clear();
+    pWordED.clear();
+    pReplaceFT.clear();
+    pReplaceED.clear();
+    pWordsLB.clear();
+    pNewReplacePB.clear();
+    pDeletePB.clear();
+    ModalDialog::dispose();
+}
 
 
 /*
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 6a6d7116d70b..65953a886a0a 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -54,6 +54,25 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& r
     aEBasicCodeCB->SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) );
 }
 
+OfaMSFilterTabPage::~OfaMSFilterTabPage()
+{
+    dispose();
+}
+
+void OfaMSFilterTabPage::dispose()
+{
+    aWBasicCodeCB.clear();
+    aWBasicWbctblCB.clear();
+    aWBasicStgCB.clear();
+    aEBasicCodeCB.clear();
+    aEBasicExectblCB.clear();
+    aEBasicStgCB.clear();
+    aPBasicCodeCB.clear();
+    aPBasicStgCB.clear();
+    SfxTabPage::dispose();
+}
+
+
 IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl)
 {
     aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() );
@@ -166,8 +185,8 @@ void OfaMSFilterTabPage2::dispose()
 {
     delete pCheckButtonData;
     pCheckButtonData = NULL;
-    delete m_pCheckLB;
-    m_pCheckLB = NULL;
+    m_pCheckLB.clear();
+    m_pCheckLBContainer.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 763794fd36b9..20b01c1916f8 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -27,20 +27,22 @@
 
 class OfaMSFilterTabPage : public SfxTabPage
 {
-    CheckBox*       aWBasicCodeCB;
-    CheckBox*       aWBasicWbctblCB;
-    CheckBox*       aWBasicStgCB;
-    CheckBox*       aEBasicCodeCB;
-    CheckBox*       aEBasicExectblCB;
-    CheckBox*       aEBasicStgCB;
-    CheckBox*       aPBasicCodeCB;
-    CheckBox*       aPBasicStgCB;
+    VclPtr<CheckBox>       aWBasicCodeCB;
+    VclPtr<CheckBox>       aWBasicWbctblCB;
+    VclPtr<CheckBox>       aWBasicStgCB;
+    VclPtr<CheckBox>       aEBasicCodeCB;
+    VclPtr<CheckBox>       aEBasicExectblCB;
+    VclPtr<CheckBox>       aEBasicStgCB;
+    VclPtr<CheckBox>       aPBasicCodeCB;
+    VclPtr<CheckBox>       aPBasicStgCB;
 
     OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
 
     DECL_LINK(LoadWordBasicCheckHdl_Impl, void *);
     DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *);
 public:
+    virtual ~OfaMSFilterTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage*  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet );
@@ -72,8 +74,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage
         }
     };
 
-    SvSimpleTableContainer* m_pCheckLBContainer;
-    MSFltrSimpleTable* m_pCheckLB;
+    VclPtr<SvSimpleTableContainer> m_pCheckLBContainer;
+    VclPtr<MSFltrSimpleTable> m_pCheckLB;
     OUString sHeader1, sHeader2;
     OUString sChgToFromMath,
            sChgToFromWriter,
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 3ab3ae842707..dabfc6b8fdb1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -307,6 +307,27 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_pToolTipsCB->SetClickHdl( aLink );
 }
 
+OfaMiscTabPage::~OfaMiscTabPage()
+{
+    dispose();
+}
+
+void OfaMiscTabPage::dispose()
+{
+    m_pToolTipsCB.clear();
+    m_pExtHelpCB.clear();
+    m_pFileDlgROImage.clear();
+    m_pFileDlgCB.clear();
+    m_pPrintDlgCB.clear();
+    m_pDocStatusCB.clear();
+    m_pSaveAlwaysCB.clear();
+    m_pYearFrame.clear();
+    m_pYearValueField.clear();
+    m_pToYearFT.clear();
+    m_pCollectUsageInfo.clear();
+    SfxTabPage::dispose();
+}
+
 SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new OfaMiscTabPage( pParent, *rAttrSet );
@@ -693,6 +714,23 @@ void OfaViewTabPage::dispose()
     pCanvasSettings = NULL;
     delete pAppearanceCfg;
     pAppearanceCfg = NULL;
+    m_pWindowSizeMF.clear();
+    m_pIconSizeLB.clear();
+    m_pIconStyleLB.clear();
+    m_pFontAntiAliasing.clear();
+    m_pAAPointLimitLabel.clear();
+    m_pAAPointLimit.clear();
+    m_pMenuIconsLB.clear();
+    m_pFontShowCB.clear();
+    m_pFontHistoryCB.clear();
+    m_pUseHardwareAccell.clear();
+    m_pUseAntiAliase.clear();
+    m_pUseOpenGL.clear();
+    m_pForceOpenGL.clear();
+    m_pMousePosLB.clear();
+    m_pMouseMiddleLB.clear();
+    m_pSelectionCB.clear();
+    m_pSelectionMF.clear();
     SfxTabPage::dispose();
 }
 
@@ -1217,6 +1255,22 @@ void OfaLanguagesTabPage::dispose()
 {
     delete pLangConfig;
     pLangConfig = NULL;
+    m_pUserInterfaceLB.clear();
+    m_pLocaleSettingFT.clear();
+    m_pLocaleSettingLB.clear();
+    m_pDecimalSeparatorCB.clear();
+    m_pCurrencyFT.clear();
+    m_pCurrencyLB.clear();
+    m_pDatePatternsFT.clear();
+    m_pDatePatternsED.clear();
+    m_pWesternLanguageLB.clear();
+    m_pWesternLanguageFT.clear();
+    m_pAsianLanguageLB.clear();
+    m_pComplexLanguageLB.clear();
+    m_pCurrentDocCB.clear();
+    m_pAsianSupportCB.clear();
+    m_pCTLSupportCB.clear();
+    m_pIgnoreLanguageChangeCB.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 4f01834727ed..19ec2a06ef56 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -44,24 +44,24 @@ class OfaMiscTabPage : public SfxTabPage
 {
     using TabPage::DeactivatePage;
 private:
-    CheckBox*     m_pToolTipsCB;
-    CheckBox*     m_pExtHelpCB;
+    VclPtr<CheckBox>     m_pToolTipsCB;
+    VclPtr<CheckBox>     m_pExtHelpCB;
 
-    FixedImage*   m_pFileDlgROImage;
-    CheckBox*     m_pFileDlgCB;
+    VclPtr<FixedImage>   m_pFileDlgROImage;
+    VclPtr<CheckBox>     m_pFileDlgCB;
 
-    CheckBox*     m_pPrintDlgCB;
+    VclPtr<CheckBox>     m_pPrintDlgCB;
 
-    CheckBox*     m_pDocStatusCB;
-    CheckBox*     m_pSaveAlwaysCB;
+    VclPtr<CheckBox>     m_pDocStatusCB;
+    VclPtr<CheckBox>     m_pSaveAlwaysCB;
 
-    VclContainer* m_pYearFrame;
-    NumericField* m_pYearValueField;
-    FixedText*    m_pToYearFT;
+    VclPtr<VclContainer> m_pYearFrame;
+    VclPtr<NumericField> m_pYearValueField;
+    VclPtr<FixedText>    m_pToYearFT;
 
     OUString      m_aStrDateInfo;
 
-    CheckBox*     m_pCollectUsageInfo;
+    VclPtr<CheckBox>     m_pCollectUsageInfo;
 
     DECL_LINK( TwoFigureHdl, NumericField* );
     DECL_LINK( TwoFigureConfigHdl, NumericField* );
@@ -74,6 +74,8 @@ protected:
 
 public:
     OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    virtual ~OfaMiscTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
 
@@ -87,30 +89,30 @@ class SvtTabAppearanceCfg;
 class OfaViewTabPage : public SfxTabPage
 {
 private:
-    MetricField*    m_pWindowSizeMF;
-    ListBox*        m_pIconSizeLB;
-    ListBox*        m_pIconStyleLB;
+    VclPtr<MetricField>    m_pWindowSizeMF;
+    VclPtr<ListBox>        m_pIconSizeLB;
+    VclPtr<ListBox>        m_pIconStyleLB;
 
-    CheckBox*       m_pFontAntiAliasing;
-    FixedText*      m_pAAPointLimitLabel;
-    MetricField*    m_pAAPointLimit;
+    VclPtr<CheckBox>       m_pFontAntiAliasing;
+    VclPtr<FixedText>      m_pAAPointLimitLabel;
+    VclPtr<MetricField>    m_pAAPointLimit;
 
-    ListBox*        m_pMenuIconsLB;
+    VclPtr<ListBox>        m_pMenuIconsLB;
 
-    CheckBox*       m_pFontShowCB;
-    CheckBox*       m_pFontHistoryCB;
+    VclPtr<CheckBox>       m_pFontShowCB;
+    VclPtr<CheckBox>       m_pFontHistoryCB;
 
-    CheckBox*       m_pUseHardwareAccell;
-    CheckBox*       m_pUseAntiAliase;
-    CheckBox*       m_pUseOpenGL;
-    CheckBox*       m_pForceOpenGL;
+    VclPtr<CheckBox>       m_pUseHardwareAccell;
+    VclPtr<CheckBox>       m_pUseAntiAliase;
+    VclPtr<CheckBox>       m_pUseOpenGL;
+    VclPtr<CheckBox>       m_pForceOpenGL;
 
-    ListBox*        m_pMousePosLB;
-    ListBox*        m_pMouseMiddleLB;
+    VclPtr<ListBox>        m_pMousePosLB;
+    VclPtr<ListBox>        m_pMouseMiddleLB;
 
     // #i97672#
-    CheckBox*       m_pSelectionCB;
-    MetricField*    m_pSelectionMF;
+    VclPtr<CheckBox>       m_pSelectionCB;
+    VclPtr<MetricField>    m_pSelectionMF;
 
     sal_uInt16      nSizeLB_InitialSelection;
     sal_uInt16      nStyleLB_InitialSelection;
@@ -142,23 +144,23 @@ public:
 struct LanguageConfig_Impl;
 class OfaLanguagesTabPage : public SfxTabPage
 {
-    ListBox*        m_pUserInterfaceLB;
-    FixedText*      m_pLocaleSettingFT;
-    SvxLanguageBox* m_pLocaleSettingLB;
-    CheckBox*       m_pDecimalSeparatorCB;
-    FixedText*      m_pCurrencyFT;
-    ListBox*        m_pCurrencyLB;
-    FixedText*      m_pDatePatternsFT;
-    Edit*           m_pDatePatternsED;
-
-    SvxLanguageBox* m_pWesternLanguageLB;
-    FixedText*      m_pWesternLanguageFT;
-    SvxLanguageBox* m_pAsianLanguageLB;
-    SvxLanguageBox* m_pComplexLanguageLB;
-    CheckBox*       m_pCurrentDocCB;
-    CheckBox*       m_pAsianSupportCB;
-    CheckBox*       m_pCTLSupportCB;
-    CheckBox*       m_pIgnoreLanguageChangeCB;
+    VclPtr<ListBox>        m_pUserInterfaceLB;
+    VclPtr<FixedText>      m_pLocaleSettingFT;
+    VclPtr<SvxLanguageBox> m_pLocaleSettingLB;
+    VclPtr<CheckBox>       m_pDecimalSeparatorCB;
+    VclPtr<FixedText>      m_pCurrencyFT;
+    VclPtr<ListBox>        m_pCurrencyLB;
+    VclPtr<FixedText>      m_pDatePatternsFT;
+    VclPtr<Edit>           m_pDatePatternsED;
+
+    VclPtr<SvxLanguageBox> m_pWesternLanguageLB;
+    VclPtr<FixedText>      m_pWesternLanguageFT;
+    VclPtr<SvxLanguageBox> m_pAsianLanguageLB;
+    VclPtr<SvxLanguageBox> m_pComplexLanguageLB;
+    VclPtr<CheckBox>       m_pCurrentDocCB;
+    VclPtr<CheckBox>       m_pAsianSupportCB;
+    VclPtr<CheckBox>       m_pCTLSupportCB;
+    VclPtr<CheckBox>       m_pIgnoreLanguageChangeCB;
 
     bool        m_bOldAsian;
     bool        m_bOldCtl;
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 28fde5a5fd7e..9d6afd387479 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -166,7 +166,7 @@ struct SvxGeneralTabPage::Row
     // which row is it?
     RowType eRow;
     // row label
-    FixedText* pLabel;
+    VclPtr<FixedText> pLabel;
     // first and last field in the row (last is exclusive)
     unsigned nFirstField, nLastField;
 
@@ -191,7 +191,7 @@ struct SvxGeneralTabPage::Field
     // which field is this? (in vFieldInfo[] above)
     unsigned iField;
     // edit box
-    Edit *pEdit;
+    VclPtr<Edit> pEdit;
 
 public:
     Field (Edit *pEdit_, unsigned iField_)
@@ -219,6 +219,16 @@ SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCo
     SetLinks();
 }
 
+SvxGeneralTabPage::~SvxGeneralTabPage()
+{
+    dispose();
+}
+
+void SvxGeneralTabPage::dispose()
+{
+    m_pUseDataCB.clear();
+    SfxTabPage::dispose();
+}
 
 
 // Initializes the titles and the edit boxes,
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index eeae4d7d14ce..34d7fff2d462 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -84,6 +84,32 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )
     aCharSetLB->FillWithMimeAndSelectBest();
 }
 
+OfaHtmlTabPage::~OfaHtmlTabPage()
+{
+    dispose();
+}
+
+void OfaHtmlTabPage::dispose()
+{
+    aSize1NF.clear();
+    aSize2NF.clear();
+    aSize3NF.clear();
+    aSize4NF.clear();
+    aSize5NF.clear();
+    aSize6NF.clear();
+    aSize7NF.clear();
+    aNumbersEnglishUSCB.clear();
+    aUnknownTagCB.clear();
+    aIgnoreFontNamesCB.clear();
+    aExportLB.clear();
+    aStarBasicCB.clear();
+    aStarBasicWarningCB.clear();
+    aPrintExtensionCB.clear();
+    aSaveGrfLocalCB.clear();
+    aCharSetLB.clear();
+    SfxTabPage::dispose();
+}
+
 SfxTabPage* OfaHtmlTabPage::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet )
 {
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 2697fb50a830..0e17f48330e6 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -30,30 +30,32 @@
 class OfaHtmlTabPage : public SfxTabPage
 {
 
-    NumericField*    aSize1NF;
-    NumericField*    aSize2NF;
-    NumericField*    aSize3NF;
-    NumericField*    aSize4NF;
-    NumericField*    aSize5NF;
-    NumericField*    aSize6NF;
-    NumericField*    aSize7NF;
+    VclPtr<NumericField>    aSize1NF;
+    VclPtr<NumericField>    aSize2NF;
+    VclPtr<NumericField>    aSize3NF;
+    VclPtr<NumericField>    aSize4NF;
+    VclPtr<NumericField>    aSize5NF;
+    VclPtr<NumericField>    aSize6NF;
+    VclPtr<NumericField>    aSize7NF;
 
-    CheckBox*        aNumbersEnglishUSCB;
-    CheckBox*        aUnknownTagCB;
-    CheckBox*        aIgnoreFontNamesCB;
+    VclPtr<CheckBox>        aNumbersEnglishUSCB;
+    VclPtr<CheckBox>        aUnknownTagCB;
+    VclPtr<CheckBox>        aIgnoreFontNamesCB;
 
-    ListBox*         aExportLB;
-    CheckBox*        aStarBasicCB;
-    CheckBox*        aStarBasicWarningCB;
-    CheckBox*        aPrintExtensionCB;
-    CheckBox*        aSaveGrfLocalCB;
-    SvxTextEncodingBox* aCharSetLB;
+    VclPtr<ListBox>         aExportLB;
+    VclPtr<CheckBox>        aStarBasicCB;
+    VclPtr<CheckBox>        aStarBasicWarningCB;
+    VclPtr<CheckBox>        aPrintExtensionCB;
+    VclPtr<CheckBox>        aSaveGrfLocalCB;
+    VclPtr<SvxTextEncodingBox> aCharSetLB;
 
     DECL_LINK(ExportHdl_Impl, ListBox*);
     DECL_LINK(CheckBoxHdl_Impl, CheckBox*);
 
     OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
 public:
+    virtual ~OfaHtmlTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage*  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet );
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index a9063ece06d4..5dc7a284e51f 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -215,6 +215,32 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
         aArgumentList );
 }
 
+SvxProxyTabPage::~SvxProxyTabPage()
+{
+    dispose();
+}
+
+void SvxProxyTabPage::dispose()
+{
+    m_pProxyModeLB.clear();
+    m_pHttpProxyFT.clear();
+    m_pHttpProxyED.clear();
+    m_pHttpPortFT.clear();
+    m_pHttpPortED.clear();
+    m_pHttpsProxyFT.clear();
+    m_pHttpsProxyED.clear();
+    m_pHttpsPortFT.clear();
+    m_pHttpsPortED.clear();
+    m_pFtpProxyFT.clear();
+    m_pFtpProxyED.clear();
+    m_pFtpPortFT.clear();
+    m_pFtpPortED.clear();
+    m_pNoProxyForFT.clear();
+    m_pNoProxyForED.clear();
+    m_pNoProxyDescFT.clear();
+    SfxTabPage::dispose();
+}
+
 SfxTabPage* SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxProxyTabPage(pParent, *rAttrSet);
@@ -627,12 +653,20 @@ SvxSecurityTabPage::~SvxSecurityTabPage()
 
 void SvxSecurityTabPage::dispose()
 {
-    delete mpCertPathDlg;
-    mpCertPathDlg = NULL;
     delete mpSecOptions;
     mpSecOptions = NULL;
-    delete mpSecOptDlg;
-    mpSecOptDlg = NULL;
+    mpCertPathDlg.clear();
+    mpSecOptDlg.clear();
+    m_pSecurityOptionsPB.clear();
+    m_pSavePasswordsCB.clear();
+    m_pShowConnectionsPB.clear();
+    m_pMasterPasswordCB.clear();
+    m_pMasterPasswordFT.clear();
+    m_pMasterPasswordPB.clear();
+    m_pMacroSecFrame.clear();
+    m_pMacroSecPB.clear();
+    m_pCertFrame.clear();
+    m_pCertPathPB.clear();
     SfxTabPage::dispose();
 }
 
@@ -983,6 +1017,13 @@ void SvxEMailTabPage::dispose()
 {
     delete pImpl;
     pImpl = NULL;
+    m_pMailContainer.clear();
+    m_pMailerURLFI.clear();
+    m_pMailerURLED.clear();
+    m_pMailerURLPB.clear();
+    m_pSuppressHiddenContainer.clear();
+    m_pSuppressHiddenFI.clear();
+    m_pSuppressHidden.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 6eddd54219b3..e1cccd41a09f 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -58,26 +58,26 @@ class SvxProxyTabPage : public SfxTabPage
 {
 private:
 
-    ListBox*        m_pProxyModeLB;
+    VclPtr<ListBox>        m_pProxyModeLB;
 
-    FixedText*      m_pHttpProxyFT;
-    SvxNoSpaceEdit* m_pHttpProxyED;
-    FixedText*      m_pHttpPortFT;
-    SvxNoSpaceEdit* m_pHttpPortED;
+    VclPtr<FixedText>      m_pHttpProxyFT;
+    VclPtr<SvxNoSpaceEdit> m_pHttpProxyED;
+    VclPtr<FixedText>      m_pHttpPortFT;
+    VclPtr<SvxNoSpaceEdit> m_pHttpPortED;
 
-    FixedText*      m_pHttpsProxyFT;
-    SvxNoSpaceEdit* m_pHttpsProxyED;
-    FixedText*      m_pHttpsPortFT;
-    SvxNoSpaceEdit* m_pHttpsPortED;
+    VclPtr<FixedText>      m_pHttpsProxyFT;
+    VclPtr<SvxNoSpaceEdit> m_pHttpsProxyED;
+    VclPtr<FixedText>      m_pHttpsPortFT;
+    VclPtr<SvxNoSpaceEdit> m_pHttpsPortED;
 
-    FixedText*      m_pFtpProxyFT;
-    SvxNoSpaceEdit* m_pFtpProxyED;
-    FixedText*      m_pFtpPortFT;
-    SvxNoSpaceEdit* m_pFtpPortED;
+    VclPtr<FixedText>      m_pFtpProxyFT;
+    VclPtr<SvxNoSpaceEdit> m_pFtpProxyED;
+    VclPtr<FixedText>      m_pFtpPortFT;
+    VclPtr<SvxNoSpaceEdit> m_pFtpPortED;
 
-    FixedText*      m_pNoProxyForFT;
-    Edit*           m_pNoProxyForED;
-    FixedText*      m_pNoProxyDescFT;
+    VclPtr<FixedText>      m_pNoProxyForFT;
+    VclPtr<Edit>           m_pNoProxyForED;
+    VclPtr<FixedText>      m_pNoProxyDescFT;
 
     const OUString aProxyModePN;
     const OUString aHttpProxyPN;
@@ -101,6 +101,8 @@ private:
     SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
 
 public:
+    virtual ~SvxProxyTabPage();
+    virtual void dispose() SAL_OVERRIDE;
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -129,28 +131,28 @@ class SvxSecurityTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
 private:
-    PushButton*         m_pSecurityOptionsPB;
+    VclPtr<PushButton>         m_pSecurityOptionsPB;
 
-    CheckBox*           m_pSavePasswordsCB;
-    PushButton*         m_pShowConnectionsPB;
+    VclPtr<CheckBox>           m_pSavePasswordsCB;
+    VclPtr<PushButton>         m_pShowConnectionsPB;
 
-    CheckBox*           m_pMasterPasswordCB;
-    FixedText*          m_pMasterPasswordFT;
-    PushButton*         m_pMasterPasswordPB;
+    VclPtr<CheckBox>           m_pMasterPasswordCB;
+    VclPtr<FixedText>          m_pMasterPasswordFT;
+    VclPtr<PushButton>         m_pMasterPasswordPB;
 
-    VclContainer*       m_pMacroSecFrame;
-    PushButton*         m_pMacroSecPB;
+    VclPtr<VclContainer>       m_pMacroSecFrame;
+    VclPtr<PushButton>         m_pMacroSecPB;
 
-    VclContainer*       m_pCertFrame;
-    PushButton*         m_pCertPathPB;
+    VclPtr<VclContainer>       m_pCertFrame;
+    VclPtr<PushButton>         m_pCertPathPB;
 
     VclContainer*       m_pTSAURLsFrame;
     PushButton*         m_pTSAURLsPB;
 
     SvtSecurityOptions*         mpSecOptions;
-    svx::SecurityOptionsDialog* mpSecOptDlg;
+    VclPtr<svx::SecurityOptionsDialog> mpSecOptDlg;
 
-    CertPathDialog* mpCertPathDlg;
+    VclPtr<CertPathDialog> mpCertPathDlg;
 
     OUString            m_sPasswordStoringDeactivateStr;
 
@@ -182,13 +184,13 @@ public:
 struct SvxEMailTabPage_Impl;
 class SvxEMailTabPage : public SfxTabPage
 {
-    VclContainer* m_pMailContainer;
-    FixedImage*   m_pMailerURLFI;
-    Edit*         m_pMailerURLED;
-    PushButton*   m_pMailerURLPB;
-    VclContainer* m_pSuppressHiddenContainer;
-    FixedImage*   m_pSuppressHiddenFI;
-    CheckBox*     m_pSuppressHidden;
+    VclPtr<VclContainer> m_pMailContainer;
+    VclPtr<FixedImage>   m_pMailerURLFI;
+    VclPtr<Edit>         m_pMailerURLED;
+    VclPtr<PushButton>   m_pMailerURLPB;
+    VclPtr<VclContainer> m_pSuppressHiddenContainer;
+    VclPtr<FixedImage>   m_pSuppressHiddenFI;
+    VclPtr<CheckBox>     m_pSuppressHidden;
 
     OUString      m_sDefaultFilterName;
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 5be1b1fa39fe..98853d58b743 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -207,12 +207,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
 
 void SvxJavaOptionsPage::dispose()
 {
-    delete m_pJavaList;
-    m_pJavaList = NULL;
-    delete m_pParamDlg;
-    m_pParamDlg = NULL;
-    delete m_pPathDlg;
-    m_pPathDlg = NULL;
+    m_pJavaList.clear();
     ClearJavaInfo();
 #if HAVE_FEATURE_JAVA
     std::vector< JavaInfo* >::iterator pIter;
@@ -225,6 +220,17 @@ void SvxJavaOptionsPage::dispose()
 
     jfw_unlock();
 #endif
+    m_pJavaEnableCB.clear();
+    m_pJavaBox.clear();
+    m_pJavaPathText.clear();
+    m_pAddBtn.clear();
+    m_pParameterBtn.clear();
+    m_pClassPathBtn.clear();
+    m_pExpertConfigBtn.clear();
+    m_pExperimentalCB.clear();
+    m_pMacroCB.clear();
+    m_pParamDlg.clear();
+    m_pPathDlg.clear();
     SfxTabPage::dispose();
 }
 
@@ -815,6 +821,19 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) :
     EnableRemoveButton();
 }
 
+SvxJavaParameterDlg::~SvxJavaParameterDlg()
+{
+    dispose();
+}
+
+void SvxJavaParameterDlg::dispose()
+{
+    m_pParameterEdit.clear();
+    m_pAssignBtn.clear();
+    m_pAssignedList.clear();
+    m_pRemoveBtn.clear();
+    ModalDialog::dispose();
+}
 
 
 IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
@@ -955,6 +974,10 @@ void SvxJavaClassPathDlg::dispose()
             delete static_cast< OUString* >( m_pPathList->GetEntryData(i) );
         m_pPathList = NULL;
     }
+    m_pPathList.clear();
+    m_pAddArchiveBtn.clear();
+    m_pAddPathBtn.clear();
+    m_pRemoveBtn.clear();
     ModalDialog::dispose();
 }
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 4c422011a02f..68ed24427d85 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -51,17 +51,17 @@ class   SvxJavaListBox;
 class SvxJavaOptionsPage : public SfxTabPage
 {
 private:
-    CheckBox*                   m_pJavaEnableCB;
-    VclContainer*               m_pJavaBox;
-    SvxJavaListBox*             m_pJavaList;
-    FixedText*                  m_pJavaPathText;
-    PushButton*                 m_pAddBtn;
-    PushButton*                 m_pParameterBtn;
-    PushButton*                 m_pClassPathBtn;
-    PushButton*                 m_pExpertConfigBtn;
-
-    SvxJavaParameterDlg*    m_pParamDlg;
-    SvxJavaClassPathDlg*    m_pPathDlg;
+    VclPtr<CheckBox>                   m_pJavaEnableCB;
+    VclPtr<VclContainer>               m_pJavaBox;
+    VclPtr<SvxJavaListBox>             m_pJavaList;
+    VclPtr<FixedText>                  m_pJavaPathText;
+    VclPtr<PushButton>                 m_pAddBtn;
+    VclPtr<PushButton>                 m_pParameterBtn;
+    VclPtr<PushButton>                 m_pClassPathBtn;
+    VclPtr<PushButton>                 m_pExpertConfigBtn;
+
+    VclPtr<SvxJavaParameterDlg>        m_pParamDlg;
+    VclPtr<SvxJavaClassPathDlg>        m_pPathDlg;
 
 #if HAVE_FEATURE_JAVA
     JavaInfo**              m_parJavaInfo;
@@ -75,8 +75,8 @@ private:
     OUString                m_sAddDialogText;
     Idle                    m_aResetIdle;
 
-    CheckBox*               m_pExperimentalCB;
-    CheckBox*               m_pMacroCB;
+    VclPtr<CheckBox>               m_pExperimentalCB;
+    VclPtr<CheckBox>               m_pMacroCB;
 
     ::std::vector< JavaInfo* >
                             m_aAddedInfos;
@@ -121,11 +121,11 @@ public:
 class SvxJavaParameterDlg : public ModalDialog
 {
 private:
-    Edit*                   m_pParameterEdit;
-    PushButton*             m_pAssignBtn;
+    VclPtr<Edit>                   m_pParameterEdit;
+    VclPtr<PushButton>             m_pAssignBtn;
 
-    ListBox*                m_pAssignedList;
-    PushButton*             m_pRemoveBtn;
+    VclPtr<ListBox>                m_pAssignedList;
+    VclPtr<PushButton>             m_pRemoveBtn;
 
     DECL_LINK(ModifyHdl_Impl, void *);
     DECL_LINK(AssignHdl_Impl, void *);
@@ -141,6 +141,8 @@ private:
 
 public:
     SvxJavaParameterDlg( vcl::Window* pParent );
+    virtual ~SvxJavaParameterDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual short           Execute() SAL_OVERRIDE;
 
@@ -153,10 +155,10 @@ public:
 class SvxJavaClassPathDlg : public ModalDialog
 {
 private:
-    ListBox*                 m_pPathList;
-    PushButton*              m_pAddArchiveBtn;
-    PushButton*              m_pAddPathBtn;
-    PushButton*              m_pRemoveBtn;
+    VclPtr<ListBox>                 m_pPathList;
+    VclPtr<PushButton>              m_pAddArchiveBtn;
+    VclPtr<PushButton>              m_pAddPathBtn;
+    VclPtr<PushButton>              m_pRemoveBtn;
 
     OUString                m_sOldPath;
 
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 707717f34218..263405d1322e 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -55,6 +55,34 @@ SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxIte
     nTransliterationFlags = 0x00000000;
 }
 
+SvxJSearchOptionsPage::~SvxJSearchOptionsPage()
+{
+    dispose();
+}
+
+void SvxJSearchOptionsPage::dispose()
+{
+    m_pMatchCase.clear();
+    m_pMatchFullHalfWidth.clear();
+    m_pMatchHiraganaKatakana.clear();
+    m_pMatchContractions.clear();
+    m_pMatchMinusDashChoon.clear();
+    m_pMatchRepeatCharMarks.clear();
+    m_pMatchVariantFormKanji.clear();
+    m_pMatchOldKanaForms.clear();
+    m_pMatchDiziDuzu.clear();
+    m_pMatchBavaHafa.clear();
+    m_pMatchTsithichiDhizi.clear();
+    m_pMatchHyuiyuByuvyu.clear();
+    m_pMatchSesheZeje.clear();
+    m_pMatchIaiya.clear();
+    m_pMatchKiku.clear();
+    m_pMatchProlongedSoundMark.clear();
+    m_pIgnorePunctuation.clear();
+    m_pIgnoreWhitespace.clear();
+    m_pIgnoreMiddleDot.clear();
+    SfxTabPage::dispose();
+}
 
 SfxTabPage*  SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
 {
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 35639dfbff58..70d03acb2b2f 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -32,26 +32,26 @@ class SfxItemSet;
 class SvxJSearchOptionsPage : public SfxTabPage
 {
 private:
-    CheckBox*   m_pMatchCase;
-    CheckBox*   m_pMatchFullHalfWidth;
-    CheckBox*   m_pMatchHiraganaKatakana;
-    CheckBox*   m_pMatchContractions;
-    CheckBox*   m_pMatchMinusDashChoon;
-    CheckBox*   m_pMatchRepeatCharMarks;
-    CheckBox*   m_pMatchVariantFormKanji;
-    CheckBox*   m_pMatchOldKanaForms;
-    CheckBox*   m_pMatchDiziDuzu;
-    CheckBox*   m_pMatchBavaHafa;
-    CheckBox*   m_pMatchTsithichiDhizi;
-    CheckBox*   m_pMatchHyuiyuByuvyu;
-    CheckBox*   m_pMatchSesheZeje;
-    CheckBox*   m_pMatchIaiya;
-    CheckBox*   m_pMatchKiku;
-    CheckBox*   m_pMatchProlongedSoundMark;
-
-    CheckBox*   m_pIgnorePunctuation;
-    CheckBox*   m_pIgnoreWhitespace;
-    CheckBox*   m_pIgnoreMiddleDot;
+    VclPtr<CheckBox>   m_pMatchCase;
+    VclPtr<CheckBox>   m_pMatchFullHalfWidth;
+    VclPtr<CheckBox>   m_pMatchHiraganaKatakana;
+    VclPtr<CheckBox>   m_pMatchContractions;
+    VclPtr<CheckBox>   m_pMatchMinusDashChoon;
+    VclPtr<CheckBox>   m_pMatchRepeatCharMarks;
+    VclPtr<CheckBox>   m_pMatchVariantFormKanji;
+    VclPtr<CheckBox>   m_pMatchOldKanaForms;
+    VclPtr<CheckBox>   m_pMatchDiziDuzu;
+    VclPtr<CheckBox>   m_pMatchBavaHafa;
+    VclPtr<CheckBox>   m_pMatchTsithichiDhizi;
+    VclPtr<CheckBox>   m_pMatchHyuiyuByuvyu;
+    VclPtr<CheckBox>   m_pMatchSesheZeje;
+    VclPtr<CheckBox>   m_pMatchIaiya;
+    VclPtr<CheckBox>   m_pMatchKiku;
+    VclPtr<CheckBox>   m_pMatchProlongedSoundMark;
+
+    VclPtr<CheckBox>   m_pIgnorePunctuation;
+    VclPtr<CheckBox>   m_pIgnoreWhitespace;
+    VclPtr<CheckBox>   m_pIgnoreMiddleDot;
 
     sal_Int32       nTransliterationFlags;
     bool        bSaveOptions;
@@ -62,6 +62,8 @@ protected:
                         SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
 
 public:
+    virtual ~SvxJSearchOptionsPage();
+    virtual void dispose() SAL_OVERRIDE;
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 8e7929e0334f..9c357e682d8d 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -329,10 +329,10 @@ static inline OUString lcl_GetPropertyName( EID_OPTIONS eEntryId )
 
 class OptionsBreakSet : public ModalDialog
 {
-    VclFrame*       m_pBeforeFrame;
-    VclFrame*       m_pAfterFrame;
-    VclFrame*       m_pMinimalFrame;
-    NumericField*   m_pBreakNF;
+    VclPtr<VclFrame>       m_pBeforeFrame;
+    VclPtr<VclFrame>       m_pAfterFrame;
+    VclPtr<VclFrame>       m_pMinimalFrame;
+    VclPtr<NumericField>   m_pBreakNF;
 
 public:
     OptionsBreakSet(vcl::Window* pParent, sal_uInt16 nRID)
@@ -364,6 +364,15 @@ public:
             get(m_pBreakNF, "wordlength");
         }
     }
+    virtual ~OptionsBreakSet() { dispose(); }
+    virtual void dispose() SAL_OVERRIDE
+    {
+        m_pBeforeFrame.clear();
+        m_pAfterFrame.clear();
+        m_pMinimalFrame.clear();
+        m_pBreakNF.clear();
+        ModalDialog::dispose();
+    }
 
     NumericField&   GetNumericFld()
     {
@@ -1129,6 +1138,17 @@ void SvxLinguTabPage::dispose()
 {
     delete pLinguData;
     pLinguData = NULL;
+    m_pLinguModulesFT.clear();
+    m_pLinguModulesCLB.clear();
+    m_pLinguModulesEditPB.clear();
+    m_pLinguDicsFT.clear();
+    m_pLinguDicsCLB.clear();
+    m_pLinguDicsNewPB.clear();
+    m_pLinguDicsEditPB.clear();
+    m_pLinguDicsDelPB.clear();
+    m_pLinguOptionsCLB.clear();
+    m_pLinguOptionsEditPB.clear();
+    m_pMoreDictsLink.clear();
     SfxTabPage::dispose();
 }
 
@@ -1905,6 +1925,13 @@ void SvxEditModulesDlg::dispose()
 {
     delete pDefaultLinguData;
     pDefaultLinguData = NULL;
+    m_pLanguageLB.clear();
+    m_pModulesCLB.clear();
+    m_pPrioUpPB.clear();
+    m_pPrioDownPB.clear();
+    m_pBackPB.clear();
+    m_pMoreDictsLink.clear();
+    m_pClosePB.clear();
     ModalDialog::dispose();
 }
 
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 3f509a431084..79a86d9d6f69 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -141,6 +141,23 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSe
     m_pNfGraphicCache->SetModifyHdl( LINK( this, OfaMemoryOptionsPage, GraphicCacheConfigHdl ) );
 }
 
+OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
+{
+    dispose();
+}
+
+void OfaMemoryOptionsPage::dispose()
+{
+    m_pUndoEdit.clear();
+    m_pNfGraphicCache.clear();
+    m_pNfGraphicObjectCache.clear();
+    m_pTfGraphicObjectTime.clear();
+    m_pNfOLECache.clear();
+    m_pQuickStarterFrame.clear();
+    m_pQuickLaunchCB.clear();
+    SfxTabPage::dispose();
+}
+
 SfxTabPage* OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new OfaMemoryOptionsPage( pParent, *rAttrSet );
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index c3d189f37bdc..91559d99da1e 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -32,16 +32,16 @@ class OfaMemoryOptionsPage : public SfxTabPage
 {
     using SfxTabPage::DeactivatePage;
 private:
-    NumericField*       m_pUndoEdit;
+    VclPtr<NumericField>       m_pUndoEdit;
 
-    NumericField*       m_pNfGraphicCache;
-    NumericField*       m_pNfGraphicObjectCache;
-    TimeField*          m_pTfGraphicObjectTime;
+    VclPtr<NumericField>       m_pNfGraphicCache;
+    VclPtr<NumericField>       m_pNfGraphicObjectCache;
+    VclPtr<TimeField>          m_pTfGraphicObjectTime;
 
-    NumericField*       m_pNfOLECache;
+    VclPtr<NumericField>       m_pNfOLECache;
 
-    VclContainer*       m_pQuickStarterFrame;
-    CheckBox*           m_pQuickLaunchCB;
+    VclPtr<VclContainer>       m_pQuickStarterFrame;
+    VclPtr<CheckBox>           m_pQuickLaunchCB;
 
     DECL_LINK(GraphicCacheConfigHdl, void *);
 
@@ -57,6 +57,8 @@ protected:
 
 public:
     OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    virtual ~OfaMemoryOptionsPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
 
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index b6faede94b5e..bd8c7846002b 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -117,6 +117,34 @@ void SvxOpenCLTabPage::dispose()
     mpWhiteList.disposeAndClear()
 }
 
+SvxOpenCLTabPage::~SvxOpenCLTabPage()
+{
+    dispose();
+}
+
+void SvxOpenCLTabPage::dispose()
+{
+    mpUseOpenCL.clear();
+    mpBlackListFrame.clear();
+    mpBlackList.clear();
+    mpBlackListTable.clear();
+    mpBlackListEdit.clear();
+    mpBlackListAdd.clear();
+    mpBlackListDelete.clear();
+    mpOS.clear();
+    mpOSVersion.clear();
+    mpDevice.clear();
+    mpVendor.clear();
+    mpDrvVersion.clear();
+    mpWhiteListFrame.clear();
+    mpWhiteList.clear();
+    mpWhiteListTable.clear();
+    mpWhiteListEdit.clear();
+    mpWhiteListAdd.clear();
+    mpWhiteListDelete.clear();
+    SfxTabPage::dispose();
+}
+
 SfxTabPage* SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxOpenCLTabPage(pParent, *rAttrSet);
@@ -194,16 +222,27 @@ class ListEntryDialog : public ModalDialog
 public:
     OpenCLConfig::ImplMatcher maEntry;
 
-    ListBox* mpOS;
-    Edit* mpOSVersion;
-    Edit* mpPlatformVendor;
-    Edit* mpDevice;
-    Edit* mpDriverVersion;
+    VclPtr<ListBox> mpOS;
+    VclPtr<Edit> mpOSVersion;
+    VclPtr<Edit> mpPlatformVendor;
+    VclPtr<Edit> mpDevice;
+    VclPtr<Edit> mpDriverVersion;
 
     DECL_LINK(OSSelectHdl, ListBox*);
     DECL_LINK(EditModifiedHdl, Edit*);
 
     ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag);
+    virtual ~ListEntryDialog() { dispose(); }
+    virtual void dispose() SAL_OVERRIDE
+    {
+        mpOS.clear();
+        mpOSVersion.clear();
+        mpPlatformVendor.clear();
+        mpDevice.clear();
+        mpDriverVersion.clear();
+        ModalDialog::dispose();
+    }
+
 };
 
 ListEntryDialog::ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag)
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index 378dd5ab6c7b..067b038e22d7 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -31,26 +31,26 @@ class SvxOpenCLTabPage : public SfxTabPage
 private:
     OpenCLConfig maConfig;
 
-    CheckBox* mpUseOpenCL;
-
-    VclFrame* mpBlackListFrame;
-    SvSimpleTable* mpBlackList;
-    SvSimpleTableContainer* mpBlackListTable;
-    PushButton* mpBlackListEdit;
-    PushButton* mpBlackListAdd;
-    PushButton* mpBlackListDelete;
-    FixedText*  mpOS;
-    FixedText*  mpOSVersion;
-    FixedText*  mpDevice;
-    FixedText*  mpVendor;
-    FixedText*  mpDrvVersion;
-
-    VclFrame* mpWhiteListFrame;
-    SvSimpleTable* mpWhiteList;
-    SvSimpleTableContainer* mpWhiteListTable;
-    PushButton* mpWhiteListEdit;
-    PushButton* mpWhiteListAdd;
-    PushButton* mpWhiteListDelete;
+    VclPtr<CheckBox> mpUseOpenCL;
+
+    VclPtr<VclFrame> mpBlackListFrame;
+    VclPtr<SvSimpleTable> mpBlackList;
+    VclPtr<SvSimpleTableContainer> mpBlackListTable;
+    VclPtr<PushButton> mpBlackListEdit;
+    VclPtr<PushButton> mpBlackListAdd;
+    VclPtr<PushButton> mpBlackListDelete;
+    VclPtr<FixedText> mpOS;
+    VclPtr<FixedText> mpOSVersion;
+    VclPtr<FixedText> mpDevice;
+    VclPtr<FixedText> mpVendor;
+    VclPtr<FixedText> mpDrvVersion;
+
+    VclPtr<VclFrame> mpWhiteListFrame;
+    VclPtr<SvSimpleTable> mpWhiteList;
+    VclPtr<SvSimpleTableContainer> mpWhiteListTable;
+    VclPtr<PushButton> mpWhiteListEdit;
+    VclPtr<PushButton> mpWhiteListAdd;
+    VclPtr<PushButton> mpWhiteListDelete;
 
     DECL_LINK(BlackListEditHdl, void*);
     DECL_LINK(BlackListAddHdl, void*);
@@ -70,6 +70,7 @@ private:
 
 public:
     SvxOpenCLTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    virtual ~SvxOpenCLTabPage();
     virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage*      Create( vcl::Window* pParent, const SfxItemSet* rSet );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 94de402f231c..7d2d48c9baca 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -256,11 +256,13 @@ void SvxPathTabPage::dispose()
     {
         for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
             delete static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData());
-        delete pPathBox;
-        pPathBox = NULL;
+        pPathBox.clear();
     }
     delete pImpl;
     pImpl = NULL;
+    m_pPathCtrl.clear();
+    m_pStandardBtn.clear();
+    m_pPathBtn.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 00d3aff38e77..8da1a6cbf11f 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -206,6 +206,23 @@ void SvxSaveTabPage::dispose()
 {
     delete pImpl;
     pImpl = NULL;
+    aLoadUserSettingsCB.clear();
+    aLoadDocPrinterCB.clear();
+    aDocInfoCB.clear();
+    aBackupCB.clear();
+    aAutoSaveCB.clear();
+    aAutoSaveEdit.clear();
+    aMinuteFT.clear();
+    aUserAutoSaveCB.clear();
+    aRelativeFsysCB.clear();
+    aRelativeInetCB.clear();
+    aODFVersionLB.clear();
+    aWarnAlienFormatCB.clear();
+    aDocTypeLB.clear();
+    aSaveAsFT.clear();
+    aSaveAsLB.clear();
+    aODFWarningFI.clear();
+    aODFWarningFT.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 87bd682dddcf..0cb7526de828 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -42,25 +42,25 @@ struct SvxSaveTabPage_Impl;
 class SvxSaveTabPage : public SfxTabPage
 {
 private:
-    CheckBox*               aLoadUserSettingsCB;
-    CheckBox*               aLoadDocPrinterCB;
-
-    CheckBox*               aDocInfoCB;
-    CheckBox*               aBackupCB;
-    CheckBox*               aAutoSaveCB;
-    NumericField*           aAutoSaveEdit;
-    FixedText*              aMinuteFT;
-    CheckBox*               aUserAutoSaveCB;
-    CheckBox*               aRelativeFsysCB;
-    CheckBox*               aRelativeInetCB;
-
-    ListBox*                aODFVersionLB;
-    CheckBox*               aWarnAlienFormatCB;
-    ListBox*                aDocTypeLB;
-    FixedText*              aSaveAsFT;
-    ListBox*                aSaveAsLB;
-    FixedImage*             aODFWarningFI;
-    FixedText*              aODFWarningFT;
+    VclPtr<CheckBox>               aLoadUserSettingsCB;
+    VclPtr<CheckBox>               aLoadDocPrinterCB;
+
+    VclPtr<CheckBox>               aDocInfoCB;
+    VclPtr<CheckBox>               aBackupCB;
+    VclPtr<CheckBox>               aAutoSaveCB;
+    VclPtr<NumericField>           aAutoSaveEdit;
+    VclPtr<FixedText>              aMinuteFT;
+    VclPtr<CheckBox>               aUserAutoSaveCB;
+    VclPtr<CheckBox>               aRelativeFsysCB;
+    VclPtr<CheckBox>               aRelativeInetCB;
+
+    VclPtr<ListBox>                aODFVersionLB;
+    VclPtr<CheckBox>               aWarnAlienFormatCB;
+    VclPtr<ListBox>                aDocTypeLB;
+    VclPtr<FixedText>              aSaveAsFT;
+    VclPtr<ListBox>                aSaveAsLB;
+    VclPtr<FixedImage>             aODFWarningFI;
+    VclPtr<FixedText>              aODFWarningFT;
 
     SvxSaveTabPage_Impl*    pImpl;
 
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 0c7894c63164..30eb7188e71f 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -82,6 +82,25 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxIt
     UpdateLastCheckedText();
 }
 
+SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage()
+{
+    dispose();
+}
+
+void SvxOnlineUpdateTabPage::dispose()
+{
+    m_pAutoCheckCheckBox.clear();
+    m_pEveryDayButton.clear();
+    m_pEveryWeekButton.clear();
+    m_pEveryMonthButton.clear();
+    m_pCheckNowButton.clear();
+    m_pAutoDownloadCheckBox.clear();
+    m_pDestPathLabel.clear();
+    m_pDestPath.clear();
+    m_pChangePathButton.clear();
+    m_pLastChecked.clear();
+    SfxTabPage::dispose();
+}
 
 
 void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index ce5362bd94aa..4324cafe34fe 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -29,16 +29,16 @@
 class SvxOnlineUpdateTabPage : public SfxTabPage
 {
 private:
-    CheckBox*           m_pAutoCheckCheckBox;
-    RadioButton*        m_pEveryDayButton;
-    RadioButton*        m_pEveryWeekButton;
-    RadioButton*        m_pEveryMonthButton;
-    PushButton*         m_pCheckNowButton;
-    CheckBox*           m_pAutoDownloadCheckBox;
-    FixedText*          m_pDestPathLabel;
-    FixedText*          m_pDestPath;
-    PushButton*         m_pChangePathButton;
-    FixedText*          m_pLastChecked;
+    VclPtr<CheckBox>           m_pAutoCheckCheckBox;
+    VclPtr<RadioButton>        m_pEveryDayButton;
+    VclPtr<RadioButton>        m_pEveryWeekButton;
+    VclPtr<RadioButton>        m_pEveryMonthButton;
+    VclPtr<PushButton>         m_pCheckNowButton;
+    VclPtr<CheckBox>           m_pAutoDownloadCheckBox;
+    VclPtr<FixedText>          m_pDestPathLabel;
+    VclPtr<FixedText>          m_pDestPath;
+    VclPtr<PushButton>         m_pChangePathButton;
+    VclPtr<FixedText>          m_pLastChecked;
     OUString       m_aNeverChecked;
     OUString       m_aLastCheckedTemplate;
 
@@ -52,6 +52,8 @@ private:
 
 public:
     SvxOnlineUpdateTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    virtual ~SvxOnlineUpdateTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage*      Create( vcl::Window* pParent, const SfxItemSet* rSet );
 
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 1bae7f526f79..e6d73e4dd044 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -92,6 +92,25 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent )
     }
 }
 
+SelectPersonaDialog::~SelectPersonaDialog()
+{
+    dispose();
+}
+
+void SelectPersonaDialog::dispose()
+{
+    m_pEdit.clear();
+    m_pSearchButton.clear();
+    m_pProgressLabel.clear();
+    for (VclPtr<PushButton> vp : m_vResultList)
+        vp.clear();
+    for (VclPtr<PushButton> vp : m_vSearchSuggestions)
+        vp.clear();
+    m_pOkButton.clear();
+    m_pCancelButton.clear();
+    ModalDialog::dispose();
+}
+
 OUString SelectPersonaDialog::GetSelectedPersona() const
 {
     if( !m_aSelectedPersona.isEmpty( ) )
@@ -291,6 +310,26 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons
     LoadExtensionThemes();
 }
 
+SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
+{
+    dispose();
+}
+
+void SvxPersonalizationTabPage::dispose()
+{
+    m_pNoPersona.clear();
+    m_pDefaultPersona.clear();
+    m_pOwnPersona.clear();
+    m_pSelectPersona.clear();
+    for (int i=0; i<3; ++i)
+        m_vDefaultPersonaImages[i].clear();
+    m_pExtensionPersonaPreview.clear();
+    m_pPersonaList.clear();
+    m_pExtensionLabel.clear();
+    SfxTabPage::dispose();
+}
+
+
 SfxTabPage* SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
 {
     return new SvxPersonalizationTabPage( pParent, *rSet );
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 4c147ab926cf..e491d8b1853e 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -25,15 +25,15 @@ class SvxPersonalizationTabPage : public SfxTabPage
     using SfxTabPage::DeactivatePage;
 
 private:
-    RadioButton *m_pNoPersona;                  ///< Just the default look, without any bitmap
-    RadioButton *m_pDefaultPersona;             ///< Use the built-in bitmap
-    RadioButton *m_pOwnPersona;                 ///< Use the user-defined bitmap
-    PushButton *m_pSelectPersona;               ///< Let the user select in the 'own' case
-    PushButton *m_vDefaultPersonaImages[3];     ///< Buttons to show the default persona images
-    PushButton *m_pExtensionPersonaPreview;     ///< Buttons to show the last 3 personas installed via extensions
-    ListBox* m_pPersonaList;                    ///< The ListBox to show the list of installed personas
+    VclPtr<RadioButton> m_pNoPersona;                  ///< Just the default look, without any bitmap
+    VclPtr<RadioButton> m_pDefaultPersona;             ///< Use the built-in bitmap
+    VclPtr<RadioButton> m_pOwnPersona;                 ///< Use the user-defined bitmap
+    VclPtr<PushButton> m_pSelectPersona;               ///< Let the user select in the 'own' case
+    VclPtr<PushButton> m_vDefaultPersonaImages[3];     ///< Buttons to show the default persona images
+    VclPtr<PushButton> m_pExtensionPersonaPreview;     ///< Buttons to show the last 3 personas installed via extensions
+    VclPtr<ListBox> m_pPersonaList;                    ///< The ListBox to show the list of installed personas
     OUString m_aPersonaSettings;                ///< Header and footer images + color to be set in the settings.
-    FixedText *m_pExtensionLabel;               ///< The "select persona installed via extensions" label
+    VclPtr<FixedText> m_pExtensionLabel;               ///< The "select persona installed via extensions" label
 
     std::vector<OUString> m_vDefaultPersonaSettings;
     std::vector<OUString> m_vExtensionPersonaSettings;
@@ -41,6 +41,8 @@ private:
 public:
     ::rtl::Reference< SearchAndParseThread > m_rApplyThread;
     SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet );
+    virtual ~SvxPersonalizationTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage* Create( vcl::Window *pParent, const SfxItemSet *rSet );
 
@@ -77,13 +79,13 @@ https://addons.mozilla.org/firefox/themes ...
 class SelectPersonaDialog : public ModalDialog
 {
 private:
-    Edit *m_pEdit;                          ///< The input line for the search term
-    PushButton *m_pSearchButton;            ///< The search button
-    FixedText *m_pProgressLabel;            ///< The label for showing progress of search
-    PushButton *m_vResultList[9];           ///< List of buttons to show search results
-    PushButton *m_vSearchSuggestions[5];    ///< List of buttons for the search suggestions
-    PushButton *m_pOkButton;                ///< The OK button
-    PushButton *m_pCancelButton;            ///< The Cancel button
+    VclPtr<Edit> m_pEdit;                          ///< The input line for the search term
+    VclPtr<PushButton> m_pSearchButton;            ///< The search button
+    VclPtr<FixedText> m_pProgressLabel;            ///< The label for showing progress of search
+    VclPtr<PushButton> m_vResultList[9];           ///< List of buttons to show search results
+    VclPtr<PushButton> m_vSearchSuggestions[5];    ///< List of buttons for the search suggestions
+    VclPtr<PushButton> m_pOkButton;                ///< The OK button
+    VclPtr<PushButton> m_pCancelButton;            ///< The Cancel button
 
     std::vector<OUString> m_vPersonaSettings;
     OUString m_aSelectedPersona;
@@ -91,6 +93,8 @@ private:
 
 public:
     SelectPersonaDialog( vcl::Window *pParent );
+    virtual ~SelectPersonaDialog();
+    virtual void dispose() SAL_OVERRIDE;
     ::rtl::Reference< SearchAndParseThread > m_rSearchThread;
 
     OUString GetSelectedPersona() const;
@@ -113,7 +117,7 @@ class SearchAndParseThread: public salhelper::Thread
 {
 private:
 
-    SelectPersonaDialog *m_pPersonaDialog;
+    VclPtr<SelectPersonaDialog> m_pPersonaDialog;
     OUString m_aURL;
     bool m_bExecute;
 
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index 64d81bc589a4..5071769e2c40 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -72,6 +72,24 @@ SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOp
         *get<FixedImage>("lockblockuntrusted"));
 }
 
+SecurityOptionsDialog::~SecurityOptionsDialog()
+{
+    dispose();
+}
+
+void SecurityOptionsDialog::dispose()
+{
+    m_pSaveOrSendDocsCB.clear();
+    m_pSignDocsCB.clear();
+    m_pPrintDocsCB.clear();
+    m_pCreatePdfCB.clear();
+    m_pRemovePersInfoCB.clear();
+    m_pRecommPasswdCB.clear();
+    m_pCtrlHyperlinkCB.clear();
+    m_pBlockUntrustedRefererLinksCB.clear();
+    ModalDialog::dispose();
+}
+
 }   // namespace svx
 
 
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 4581ed7ff072..216e372e945f 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
@@ -37,18 +37,20 @@ namespace svx
     class SecurityOptionsDialog : public ModalDialog
     {
     private:
-        CheckBox* m_pSaveOrSendDocsCB;
-        CheckBox* m_pSignDocsCB;
-        CheckBox* m_pPrintDocsCB;
-        CheckBox* m_pCreatePdfCB;
+        VclPtr<CheckBox> m_pSaveOrSendDocsCB;
+        VclPtr<CheckBox> m_pSignDocsCB;
+        VclPtr<CheckBox> m_pPrintDocsCB;
+        VclPtr<CheckBox> m_pCreatePdfCB;
 
-        CheckBox* m_pRemovePersInfoCB;
-        CheckBox* m_pRecommPasswdCB;
-        CheckBox* m_pCtrlHyperlinkCB;
-        CheckBox* m_pBlockUntrustedRefererLinksCB;
+        VclPtr<CheckBox> m_pRemovePersInfoCB;
+        VclPtr<CheckBox> m_pRecommPasswdCB;
+        VclPtr<CheckBox> m_pCtrlHyperlinkCB;
+        VclPtr<CheckBox> m_pBlockUntrustedRefererLinksCB;
 
     public:
         SecurityOptionsDialog( vcl::Window* pParent, SvtSecurityOptions* pOptions );
+        virtual ~SecurityOptionsDialog();
+        virtual void dispose() SAL_OVERRIDE;
 
         bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); }
         bool IsSignDocsChecked() const { return m_pSignDocsCB->IsChecked(); }
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 095b6fc3b6c8..f37c797d3f66 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -465,11 +465,11 @@ static bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogOptio
 
 struct OptionsPageInfo
 {
-    SfxTabPage*         m_pPage;
+    VclPtr<SfxTabPage>  m_pPage;
     sal_uInt16          m_nPageId;
     OUString       m_sPageURL;
     OUString       m_sEventHdl;
-    ExtensionsTabPage*  m_pExtPage;
+    VclPtr<ExtensionsTabPage>  m_pExtPage;
 
     OptionsPageInfo( sal_uInt16 nId ) : m_pPage( NULL ), m_nPageId( nId ), m_pExtPage( NULL ) {}
 };
@@ -483,7 +483,7 @@ struct OptionsGroupInfo
     sal_uInt16          m_nDialogId;    // Id of the former dialog
     bool            m_bLoadError;   // load fails?
     OUString       m_sPageURL;
-    ExtensionsTabPage*  m_pExtPage;
+    VclPtr<ExtensionsTabPage>  m_pExtPage;
 
     OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) :
         m_pInItemSet( NULL ), m_pOutItemSet( NULL ), m_pShell( pSh ),
@@ -575,7 +575,6 @@ void OfaTreeOptionsDialog::dispose()
                     SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number( pPageInfo->m_nPageId) );
                     SetViewOptUserItem( aTabPageOpt, aPageData );
                 }
-                delete pPageInfo->m_pPage;
             }
 
             if (pPageInfo->m_nPageId == RID_SFXPAGE_LINGU)
@@ -588,8 +587,6 @@ void OfaTreeOptionsDialog::dispose()
                 }
             }
 
-            delete pPageInfo->m_pExtPage;
-
             delete pPageInfo;
         }
         pEntry = pTreeLB->Next(pEntry);
@@ -602,8 +599,8 @@ void OfaTreeOptionsDialog::dispose()
         if(!pTreeLB->GetParent(pEntry))
         {
             OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData());
-            if ( pGroupInfo && pGroupInfo->m_pExtPage )
-                delete pGroupInfo->m_pExtPage;
+            if ( pGroupInfo )
+                pGroupInfo->m_pExtPage.clear();
             delete pGroupInfo;
         }
         pEntry = pTreeLB->Next(pEntry);
@@ -611,7 +608,11 @@ void OfaTreeOptionsDialog::dispose()
     delete pColorPageItemSet;
     pColorPageItemSet = NULL;
     deleteGroupNames();
-    pTreeLB = NULL;
+    pOkPB.clear();
+    pBackPB.clear();
+    pTreeLB.clear();
+    pTabBox.clear();
+    mpColorPage.clear();
     SfxModalDialog::dispose();
 }
 
@@ -1048,7 +1049,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
         {
             pPageInfo->m_pPage = ::CreateGeneralTabPage(
                 pPageInfo->m_nPageId, pTabBox, *pColorPageItemSet );
-            mpColorPage = static_cast<SvxColorTabPage*>(pPageInfo->m_pPage);
+            mpColorPage = static_cast<SvxColorTabPage*>(pPageInfo->m_pPage.get());
             mpColorPage->SetupForViewFrame( SfxViewFrame::Current() );
         }
         else
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 6628b18d4fb5..16fcd75a6de6 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -147,8 +147,10 @@ WebConnectionInfoDialog::~WebConnectionInfoDialog()
 
 void WebConnectionInfoDialog::dispose()
 {
-    delete m_pPasswordsLB;
-    m_pPasswordsLB = NULL;
+    m_pPasswordsLB.clear();
+    m_pRemoveBtn.clear();
+    m_pRemoveAllBtn.clear();
+    m_pChangeBtn.clear();
     ModalDialog::dispose();
 }
 
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 2cd37eb03f5e..a9d1b566d592 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -47,10 +47,10 @@ namespace svx
     class WebConnectionInfoDialog : public ModalDialog
     {
     private:
-        PasswordTable* m_pPasswordsLB;
-        PushButton*    m_pRemoveBtn;
-        PushButton*    m_pRemoveAllBtn;
-        PushButton*    m_pChangeBtn;
+        VclPtr<PasswordTable> m_pPasswordsLB;
+        VclPtr<PushButton>    m_pRemoveBtn;
+        VclPtr<PushButton>    m_pRemoveAllBtn;
+        VclPtr<PushButton>    m_pChangeBtn;
         sal_Int32      m_nPos;
 
     DECL_LINK( HeaderBarClickedHdl, SvSimpleTable* );