diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-09 14:29:30 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:20:39 +0100 |
| commit | 1c4025babd7037a3292aa530c7d45ab8d6ef6dcb (patch) | |
| tree | 44a2be8a53915e1600efa1f31a8c5b143527255d /vcl/source | |
| parent | 954e5e4b7820c5db3a6720dc9dc27e49cee449ac (diff) | |
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
Diffstat (limited to 'vcl/source')
47 files changed, 370 insertions, 316 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index a0447312a778..e05b73480148 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -28,6 +28,9 @@ #include <salobj.hxx> #include <salmenu.hxx> + +SalFrame::SalFrame() : m_pWindow( NULL ), m_pProc( NULL ) {} + // this file contains the virtual destructors of the sal interface // compilers usually put their vtables where the destructor is @@ -35,6 +38,12 @@ SalFrame::~SalFrame() { } +void SalFrame::SetCallback( vcl::Window* pWindow, SALFRAMEPROC pProc ) +{ + m_pWindow = pWindow; + m_pProc = pProc; +} + // default to full-frame flushes // on ports where partial-flushes are much cheaper this method should be overridden void SalFrame::Flush( const Rectangle& ) diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 4c3ba1cf994b..8344b71b5dca 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -156,21 +156,21 @@ struct ImplEventHook struct ImplPostEventData { sal_uLong mnEvent; - const vcl::Window* mpWin; + VclPtr<vcl::Window> mpWin; ImplSVEvent * mnEventId; KeyEvent maKeyEvent; MouseEvent maMouseEvent; ZoomEvent maZoomEvent; ScrollEvent maScrollEvent; - ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const KeyEvent& rKeyEvent ) : + ImplPostEventData( sal_uLong nEvent, vcl::Window* pWin, const KeyEvent& rKeyEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maKeyEvent( rKeyEvent ) {} - ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const MouseEvent& rMouseEvent ) : + ImplPostEventData( sal_uLong nEvent, vcl::Window* pWin, const MouseEvent& rMouseEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maMouseEvent( rMouseEvent ) {} #if !HAVE_FEATURE_DESKTOP - ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const ZoomEvent& rZoomEvent ) : + ImplPostEventData( sal_uLong nEvent, vcl::Window* pWin, const ZoomEvent& rZoomEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maZoomEvent( rZoomEvent ) {} - ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const ScrollEvent& rScrollEvent ) : + ImplPostEventData( sal_uLong nEvent, vcl::Window* pWin, const ScrollEvent& rScrollEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maScrollEvent( rScrollEvent ) {} #endif @@ -855,8 +855,8 @@ IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData ) break; }; - if( pData->mpWin && pData->mpWin->mpWindowImpl->mpFrameWindow && pEventData ) - ImplWindowFrameProc( pData->mpWin->mpWindowImpl->mpFrameWindow, NULL, (sal_uInt16) nEvent, pEventData ); + if( pData->mpWin && pData->mpWin.get()->mpWindowImpl->mpFrameWindow.get() && pEventData ) + ImplWindowFrameProc( pData->mpWin.get()->mpWindowImpl->mpFrameWindow.get(), NULL, (sal_uInt16) nEvent, pEventData ); // remove this event from list of posted events, watch for destruction of internal data ::std::list< ImplPostEventPair >::iterator aIter( aPostedEventList.begin() ); @@ -1010,7 +1010,7 @@ long Application::GetTopWindowCount() { long nRet = 0; ImplSVData* pSVData = ImplGetSVData(); - vcl::Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL; + vcl::Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame.get() : NULL; while( pWin ) { if( pWin->ImplGetWindow()->IsTopWindow() ) @@ -1024,7 +1024,7 @@ vcl::Window* Application::GetTopWindow( long nIndex ) { long nIdx = 0; ImplSVData* pSVData = ImplGetSVData(); - vcl::Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL; + vcl::Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame.get() : NULL; while( pWin ) { if( pWin->ImplGetWindow()->IsTopWindow() ) @@ -1268,7 +1268,7 @@ vcl::Window* Application::GetDefDialogParent() // #103442# find some useful dialog parent if there // was no default set // NOTE: currently even the default is not used - if( false && pSVData->maWinData.mpDefDialogParent != NULL ) + if( false && pSVData->maWinData.mpDefDialogParent.get() != NULL ) return pSVData->maWinData.mpDefDialogParent; else { @@ -1629,6 +1629,14 @@ void Application::setDeInitHook(Link const & hook) { pSVData->maAppData.mbInAppMain = true; } +ImplDelData::ImplDelData( vcl::Window* pWindow ) : + mpNext( NULL ), + mpWindow( NULL ), + mbDel( false ) +{ + if( pWindow ) AttachToWindow( pWindow ); +} + // helper method to allow inline constructor even for pWindow!=NULL case void ImplDelData::AttachToWindow( const vcl::Window* pWindow ) { @@ -1649,7 +1657,7 @@ ImplDelData::~ImplDelData() if( !mbDel && mpWindow ) { // the window still exists but we were not removed - const_cast<vcl::Window*>(mpWindow)->ImplRemoveDel( this ); + const_cast<vcl::Window*>(mpWindow.get())->ImplRemoveDel( this ); mpWindow = NULL; } } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index b30848cc20a8..aafc326065ba 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -45,6 +45,8 @@ #include "salimestatus.hxx" #include "salsys.hxx" #include "svids.hrc" +#include "helpwin.hxx" +#include "../window/scrwnd.hxx" #include "com/sun/star/accessibility/MSAAService.hpp" diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 11d03e3f8b03..325c9b659b18 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -18,6 +18,7 @@ */ #include "vcl/vclevent.hxx" +#include "vcl/window.hxx" #include "svdata.hxx" @@ -158,4 +159,12 @@ void VclEventListeners2::callListeners( VclSimpleEvent* i_pEvent ) m_aIterators.pop_back(); } + +VclWindowEvent::VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat ) : VclSimpleEvent(n) +{ + pWindow = pWin; pData = pDat; +} + +VclWindowEvent::~VclWindowEvent() {} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 7861656edf90..fb1a4a88bcdf 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -96,11 +96,12 @@ Button::Button( WindowType nType ) : Button::~Button() { dispose(); - delete mpButtonData; } void Button::dispose() { + delete mpButtonData; + mpButtonData = NULL; Control::dispose(); } @@ -2147,20 +2148,20 @@ void RadioButton::group(RadioButton &rOther) if (!m_xGroup) { - m_xGroup.reset(new std::vector<RadioButton*>); + m_xGroup.reset(new std::vector<VclPtr<RadioButton> >); m_xGroup->push_back(this); } - std::vector<RadioButton*>::iterator aFind = std::find(m_xGroup->begin(), m_xGroup->end(), &rOther); + auto aFind = std::find(m_xGroup->begin(), m_xGroup->end(), VclPtr<RadioButton>(&rOther)); if (aFind == m_xGroup->end()) { m_xGroup->push_back(&rOther); if (rOther.m_xGroup) { - std::vector< RadioButton* > aOthers(rOther.GetRadioButtonGroup(false)); + std::vector< VclPtr<RadioButton> > aOthers(rOther.GetRadioButtonGroup(false)); //make all members of the group share the same button group - for (std::vector<RadioButton*>::iterator aI = aOthers.begin(), aEnd = aOthers.end(); aI != aEnd; ++aI) + for (auto aI = aOthers.begin(), aEnd = aOthers.end(); aI != aEnd; ++aI) { aFind = std::find(m_xGroup->begin(), m_xGroup->end(), *aI); if (aFind == m_xGroup->end()) @@ -2169,8 +2170,7 @@ void RadioButton::group(RadioButton &rOther) } //make all members of the group share the same button group - for (std::vector<RadioButton*>::iterator aI = m_xGroup->begin(), aEnd = m_xGroup->end(); - aI != aEnd; ++aI) + for (auto aI = m_xGroup->begin(), aEnd = m_xGroup->end(); aI != aEnd; ++aI) { RadioButton* pButton = *aI; pButton->m_xGroup = m_xGroup; @@ -2182,14 +2182,14 @@ void RadioButton::group(RadioButton &rOther) ImplUncheckAllOther(); } -std::vector< RadioButton* > RadioButton::GetRadioButtonGroup(bool bIncludeThis) const +std::vector< VclPtr<RadioButton> > RadioButton::GetRadioButtonGroup(bool bIncludeThis) const { if (m_xGroup) { if (bIncludeThis) return *m_xGroup; - std::vector< RadioButton* > aGroup; - for (std::vector<RadioButton*>::iterator aI = m_xGroup->begin(), aEnd = m_xGroup->end(); aI != aEnd; ++aI) + std::vector< VclPtr<RadioButton> > aGroup; + for (auto aI = m_xGroup->begin(), aEnd = m_xGroup->end(); aI != aEnd; ++aI) { RadioButton *pRadioButton = *aI; if (pRadioButton == this) @@ -2211,7 +2211,7 @@ std::vector< RadioButton* > RadioButton::GetRadioButtonGroup(bool bIncludeThis) else break; } - std::vector< RadioButton* > aGroup; + std::vector< VclPtr<RadioButton> > aGroup; // insert radiobuttons up to next group do { @@ -2230,9 +2230,9 @@ void RadioButton::ImplUncheckAllOther() { mpWindowImpl->mnStyle |= WB_TABSTOP; - std::vector<RadioButton*> aGroup(GetRadioButtonGroup(false)); + std::vector<VclPtr<RadioButton> > aGroup(GetRadioButtonGroup(false)); // iterate over radio button group and checked buttons - for (std::vector<RadioButton*>::iterator aI = aGroup.begin(), aEnd = aGroup.end(); aI != aEnd; ++aI) + for (auto aI = aGroup.begin(), aEnd = aGroup.end(); aI != aEnd; ++aI) { RadioButton *pWindow = *aI; if ( pWindow->IsChecked() ) @@ -2316,7 +2316,7 @@ void RadioButton::dispose() { if (m_xGroup) { - m_xGroup->erase(std::remove(m_xGroup->begin(), m_xGroup->end(), this), + m_xGroup->erase(std::remove(m_xGroup->begin(), m_xGroup->end(), VclPtr<RadioButton>(this)), m_xGroup->end()); m_xGroup.reset(); } diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index c0e5d9bb8310..89a2fe1ac156 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -79,11 +79,9 @@ void ComboBox::dispose() mpImplLB = NULL; delete pImplLB; - delete mpFloatWin; - mpFloatWin = NULL; - delete mpBtn; - mpBtn = NULL; - + mpFloatWin.clear(); + mpBtn.clear(); + mpImplLB.clear(); Edit::dispose(); } diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 4cec1d0004d6..264a54668843 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -127,6 +127,10 @@ void Control::SetText( const OUString& rStr ) Window::SetText( rStr ); } +ControlLayoutData::ControlLayoutData() : m_pParent( NULL ) +{ +} + Rectangle ControlLayoutData::GetCharacterBounds( long nIndex ) const { return (nIndex >= 0 && nIndex < (long) m_aUnicodeBoundRects.size()) ? m_aUnicodeBoundRects[ nIndex ] : Rectangle(); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 4f111bffaedf..52b8bdac4ea9 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -466,6 +466,7 @@ FixedText::~FixedText() void FixedText::dispose() { set_mnemonic_widget(NULL); + m_pMnemonicWindow.clear(); Control::dispose(); } diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index b6a63c66ea6e..fce7d3fc6e17 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2174,9 +2174,9 @@ ImplListBox::~ImplListBox() void ImplListBox::dispose() { - delete mpHScrollBar; - delete mpVScrollBar; - delete mpScrollBarBox; + mpHScrollBar.clear(); + mpVScrollBar.clear(); + mpScrollBarBox.clear(); maLBWindow.clear(); Control::dispose(); } @@ -2931,6 +2931,18 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( vcl::Window* pParent ) : } +ImplListBoxFloatingWindow::~ImplListBoxFloatingWindow() +{ + dispose(); +} + +void ImplListBoxFloatingWindow::dispose() +{ + mpImplLB.clear(); + FloatingWindow::dispose(); +} + + bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS ) diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 31fcb3aecac5..78e0146a7938 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -77,18 +77,10 @@ void ListBox::dispose() { CallEventListeners( VCLEVENT_OBJECT_DYING ); - // When destroying the FloatWin TH does a GrabFocus to the Parent: - // that means this "ListBox => PreNotify() ..." - ImplListBox *pImplLB = mpImplLB; - mpImplLB = NULL; - delete pImplLB; - - delete mpFloatWin; - mpFloatWin = NULL; - delete mpImplWin; - mpImplWin = NULL; - delete mpBtn; - mpBtn = NULL; + mpFloatWin.clear(); + mpImplWin.clear(); + mpBtn.clear(); + mpImplLB.clear(); Control::dispose(); } diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 4a89c0f33ca5..ecb2c6022496 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -42,7 +42,7 @@ struct ImplTabItem { sal_uInt16 mnId; - TabPage* mpTabPage; + VclPtr<TabPage> mpTabPage; OUString maText; OUString maFormatText; OUString maHelpText; @@ -67,7 +67,7 @@ struct ImplTabCtrlData std::vector< Rectangle > maTabRectangles; Point maItemsOffset; // offset of the tabitems std::vector< ImplTabItem > maItemList; - ListBox* mpListBox; + VclPtr<ListBox> mpListBox; }; #define TAB_OFFSET 3 @@ -204,12 +204,8 @@ void TabControl::dispose() ImplFreeLayoutData(); // delete TabCtrl data - if ( mpTabCtrlData ) - { - delete mpTabCtrlData->mpListBox; - delete mpTabCtrlData; - mpTabCtrlData = NULL; - } + delete mpTabCtrlData; + mpTabCtrlData = NULL; Control::dispose(); } @@ -580,9 +576,9 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) ImplTabItem* pOldItem = ImplGetItem( nOldId ); ImplTabItem* pItem = ImplGetItem( nId ); - TabPage* pOldPage = (pOldItem) ? pOldItem->mpTabPage : NULL; - TabPage* pPage = (pItem) ? pItem->mpTabPage : NULL; - vcl::Window* pCtrlParent = GetParent(); + TabPage* pOldPage = (pOldItem) ? pOldItem->mpTabPage.get() : NULL; + TabPage* pPage = (pItem) ? pItem->mpTabPage.get() : NULL; + vcl::Window* pCtrlParent = GetParent(); if ( IsReallyVisible() && IsUpdateMode() ) { @@ -1019,7 +1015,7 @@ IMPL_LINK( TabControl, ImplWindowEventListener, VclSimpleEvent*, pEvent ) void TabControl::MouseButtonDown( const MouseEvent& rMEvt ) { - if( mpTabCtrlData->mpListBox == NULL ) + if( mpTabCtrlData->mpListBox.get() == NULL ) { if( rMEvt.IsLeft() ) { @@ -1089,7 +1085,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) // in this case we're only interested in the top border of the tabpage because the tabitems are used // standalone (eg impress) bool bNoTabPage = false; - TabPage* pCurPage = pCurItem ? pCurItem->mpTabPage : NULL; + TabPage* pCurPage = pCurItem ? pCurItem->mpTabPage.get() : NULL; if( !pCurPage || !pCurPage->IsVisible() ) { bNoTabPage = true; @@ -1175,7 +1171,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) } } - if ( !mpTabCtrlData->maItemList.empty() && mpTabCtrlData->mpListBox == NULL ) + if ( !mpTabCtrlData->maItemList.empty() && mpTabCtrlData->mpListBox == nullptr ) { // Some native toolkits (GTK+) draw tabs right-to-left, with an // overlap between adjacent tabs @@ -1433,7 +1429,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt ) void TabControl::Command( const CommandEvent& rCEvt ) { - if( (mpTabCtrlData->mpListBox == NULL) && (rCEvt.GetCommand() == COMMAND_CONTEXTMENU) && (GetPageCount() > 1) ) + if( (mpTabCtrlData->mpListBox == nullptr) && (rCEvt.GetCommand() == COMMAND_CONTEXTMENU) && (GetPageCount() > 1) ) { Point aMenuPos; bool bMenu; @@ -1885,7 +1881,7 @@ void TabControl::SetTabPage( sal_uInt16 nPageId, TabPage* pTabPage ) { ImplTabItem* pItem = ImplGetItem( nPageId ); - if ( pItem && (pItem->mpTabPage != pTabPage) ) + if ( pItem && (pItem->mpTabPage.get() != pTabPage) ) { if ( pTabPage ) { diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index cafbbf52f9c4..cc1a37e3fd32 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -147,7 +147,7 @@ struct ImpTextView { TextEngine* mpTextEngine; - vcl::Window* mpWindow; + VclPtr<vcl::Window> mpWindow; TextSelection maSelection; Point maStartDocPos; // TextPaM maMBDownPaM; diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index c0406c6329a6..30213f56cf80 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -76,12 +76,12 @@ public: class ImpVclMEdit : public SfxListener { private: - VclMultiLineEdit* pVclMultiLineEdit; + VclPtr<VclMultiLineEdit> pVclMultiLineEdit; - TextWindow* mpTextWindow; - ScrollBar* mpHScrollBar; - ScrollBar* mpVScrollBar; - ScrollBarBox* mpScrollBox; + VclPtr<TextWindow> mpTextWindow; + VclPtr<ScrollBar> mpHScrollBar; + VclPtr<ScrollBar> mpVScrollBar; + VclPtr<ScrollBarBox> mpScrollBox; Point maTextWindowOffset; sal_Int32 mnTextWidth; @@ -161,9 +161,9 @@ ImpVclMEdit::ImpVclMEdit( VclMultiLineEdit* pEdt, WinBits nWinStyle ) void ImpVclMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle ) { - const bool bHaveVScroll = (NULL != mpVScrollBar); - const bool bHaveHScroll = (NULL != mpHScrollBar); - const bool bHaveScrollBox = (NULL != mpScrollBox); + const bool bHaveVScroll = (nullptr != mpVScrollBar); + const bool bHaveHScroll = (nullptr != mpHScrollBar); + const bool bHaveScrollBox = (nullptr != mpScrollBox); bool bNeedVScroll = ( nWinStyle & WB_VSCROLL ) == WB_VSCROLL; const bool bNeedHScroll = ( nWinStyle & WB_HSCROLL ) == WB_HSCROLL; @@ -184,7 +184,6 @@ void ImpVclMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle ) bool bScrollbarsChanged = false; if ( bHaveVScroll != bNeedVScroll ) { - delete mpVScrollBar; mpVScrollBar = bNeedVScroll ? new ScrollBar( pVclMultiLineEdit, WB_VSCROLL|WB_DRAG ) : NULL; if ( bNeedVScroll ) @@ -198,7 +197,6 @@ void ImpVclMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle ) if ( bHaveHScroll != bNeedHScroll ) { - delete mpHScrollBar; mpHScrollBar = bNeedHScroll ? new ScrollBar( pVclMultiLineEdit, WB_HSCROLL|WB_DRAG ) : NULL; if ( bNeedHScroll ) @@ -212,7 +210,6 @@ void ImpVclMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle ) if ( bHaveScrollBox != bNeedScrollBox ) { - delete mpScrollBox; mpScrollBox = bNeedScrollBox ? new ScrollBarBox( pVclMultiLineEdit, WB_SIZEABLE ) : NULL; if ( bNeedScrollBox ) @@ -258,10 +255,6 @@ void ImpVclMEdit::InitFromStyle( WinBits nWinStyle ) ImpVclMEdit::~ImpVclMEdit() { EndListening( *mpTextWindow->GetTextEngine() ); - delete mpTextWindow; - delete mpHScrollBar; - delete mpVScrollBar; - delete mpScrollBox; } void ImpVclMEdit::ImpSetScrollBarRanges() diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 52c097c293d0..60ade3ac9845 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -156,7 +156,7 @@ public: vcl::PrinterController::MultiPageSetup maMultiPage; - vcl::PrintProgressDialog* mpProgress; + VclPtr<vcl::PrintProgressDialog> mpProgress; ImplPageCache maPageCache; @@ -191,7 +191,6 @@ public: mnDefaultPaperBin( -1 ), mnFixedPaperBin( -1 ) {} - ~ImplPrinterControllerData() { delete mpProgress; } Size getRealPaperSize( const Size& i_rPageSize, bool bNoNUP ) const { @@ -1332,8 +1331,7 @@ void PrinterController::abortJob() // applications (well, sw) depend on a page request with "IsLastPage" = true // to free resources, else they (well, sw) will crash eventually setLastPage( true ); - delete mpImplData->mpProgress; - mpImplData->mpProgress = NULL; + mpImplData->mpProgress.clear(); GDIMetaFile aMtf; getPageFile( 0, aMtf, false ); } diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index a3b7c0f8d061..99fea0983520 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -20,6 +20,7 @@ #include <tools/debug.hxx> #include <tools/rc.h> +#include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <accel.h> #include <vcl/accel.hxx> diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index ca8865618834..07abf759c92d 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -649,12 +649,11 @@ vcl::Window* Window::GetAccessibleRelationLabeledBy() const if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabeledByWindow) return mpWindowImpl->mpAccessibleInfos->pLabeledByWindow; - std::vector<FixedText*> aMnemonicLabels(list_mnemonic_labels()); + std::vector<VclPtr<FixedText> > aMnemonicLabels(list_mnemonic_labels()); if (!aMnemonicLabels.empty()) { //if we have multiple labels, then prefer the first that is visible - for (std::vector<FixedText*>::iterator - aI = aMnemonicLabels.begin(), aEnd = aMnemonicLabels.end(); aI != aEnd; ++aI) + for (auto aI = aMnemonicLabels.begin(), aEnd = aMnemonicLabels.end(); aI != aEnd; ++aI) { vcl::Window *pCandidate = *aI; if (pCandidate->IsVisible()) diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 7f32e648d423..a023af642fa6 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1853,7 +1853,7 @@ void ImplBorderWindow::dispose() { delete mpBorderView; mpBorderView = NULL; - + mpMenuBarWindow.clear(); vcl::Window::dispose(); } diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 4c0e73cd0a09..cc3c69e32a07 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -30,10 +30,10 @@ typedef boost::ptr_vector<ImplBtnDlgItem>::const_iterator btn_const_iterator; struct ImplBtnDlgItem { sal_uInt16 mnId; - bool mbOwnButton; - bool mbDummyAlign; - long mnSepSize; - PushButton* mpPushButton; + bool mbOwnButton; + bool mbDummyAlign; + long mnSepSize; + VclPtr<PushButton> mpPushButton; }; void ButtonDialog::ImplInitButtonDialogData() @@ -64,13 +64,7 @@ ButtonDialog::~ButtonDialog() void ButtonDialog::dispose() { - for ( btn_iterator it = maItemList.begin(); it != maItemList.end(); ++it) - { - if ( it->mpPushButton && it->mbOwnButton ) - delete it->mpPushButton; - } maItemList.clear(); - Dialog::dispose(); } @@ -335,10 +329,7 @@ void ButtonDialog::RemoveButton( sal_uInt16 nId ) if (it->mnId == nId) { it->mpPushButton->Hide(); - - if (it->mbOwnButton ) - delete it->mpPushButton; - + it->mpPushButton.clear(); maItemList.erase(it); return; } @@ -352,9 +343,6 @@ void ButtonDialog::Clear() for (btn_iterator it = maItemList.begin(); it != maItemList.end(); ++it) { it->mpPushButton->Hide(); - - if (it->mbOwnButton ) - delete it->mpPushButton; } maItemList.clear(); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 278a3e5edbd6..275e075a8bd6 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -471,14 +471,14 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr //Remove ScrollWindow parent widgets whose children in vcl implement scrolling //internally. - for (std::map<vcl::Window*, vcl::Window*>::iterator aI = m_pParserState->m_aRedundantParentWidgets.begin(), + for (auto aI = m_pParserState->m_aRedundantParentWidgets.begin(), aEnd = m_pParserState->m_aRedundantParentWidgets.end(); aI != aEnd; ++aI) { delete_by_window(aI->first); } //fdo#67378 merge the label into the disclosure button - for (std::vector<VclExpander*>::iterator aI = m_pParserState->m_aExpanderWidgets.begin(), + for (auto aI = m_pParserState->m_aExpanderWidgets.begin(), aEnd = m_pParserState->m_aExpanderWidgets.end(); aI != aEnd; ++aI) { VclExpander *pOne = *aI; @@ -1773,8 +1773,8 @@ vcl::Window *VclBuilder::makeObject(vcl::Window *pParent, const OString &name, c pWindow->SetHelpId(m_sHelpRoot + id); SAL_INFO("vcl.layout", "for " << name.getStr() << ", created " << pWindow << " child of " << - pParent << "(" << pWindow->mpWindowImpl->mpParent << "/" << - pWindow->mpWindowImpl->mpRealParent << "/" << + pParent << "(" << pWindow->mpWindowImpl->mpParent.get() << "/" << + pWindow->mpWindowImpl->mpRealParent.get() << "/" << pWindow->mpWindowImpl->mpBorderWindow.get() << ") with helpid " << pWindow->GetHelpId().getStr()); m_aChildren.push_back(WinAndId(id, pWindow, bVertical)); @@ -1853,14 +1853,14 @@ vcl::Window *VclBuilder::insertObject(vcl::Window *pParent, const OString &rClas //if we're being inserting under a toplevel dialog whose init is //deferred due to waiting to encounter it in this .ui, and it hasn't //been seen yet, then make unattached widgets parent-less toplevels - if (pParent == m_pParent && m_bToplevelHasDeferredInit) + if (pParent == m_pParent.get() && m_bToplevelHasDeferredInit) pParent = NULL; pCurrentChild = makeObject(pParent, rClass, rID, rProps); } if (pCurrentChild) { - if (pCurrentChild == m_pParent && m_bToplevelHasDeferredProperties) + if (pCurrentChild == m_pParent.get() && m_bToplevelHasDeferredProperties) m_aDeferredProperties = rProps; else set_properties(pCurrentChild, rProps); @@ -1872,7 +1872,7 @@ vcl::Window *VclBuilder::insertObject(vcl::Window *pParent, const OString &rClas pCurrentChild->set_font_attribute(rKey, rValue); } - m_pParserState->m_aAtkInfo[pCurrentChild] = rAtk; + m_pParserState->m_aAtkInfo[VclPtr<vcl::Window>(pCurrentChild)] = rAtk; } rProps.clear(); @@ -1880,7 +1880,7 @@ vcl::Window *VclBuilder::insertObject(vcl::Window *pParent, const OString &rClas rAtk.clear(); if (!pCurrentChild) - pCurrentChild = m_aChildren.empty() ? pParent : m_aChildren.back().m_pWindow; + pCurrentChild = m_aChildren.empty() ? pParent : m_aChildren.back().m_pWindow.get(); return pCurrentChild; } @@ -2100,14 +2100,14 @@ void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader) if (sInternalChild.startsWith("vbox") || sInternalChild.startsWith("messagedialog-vbox")) { if (Dialog *pBoxParent = dynamic_cast<Dialog*>(pParent)) - pBoxParent->set_content_area(VclPtr<VclBox>(static_cast<VclBox*>(pCurrentChild))); // FIXME-VCLPTR + pBoxParent->set_content_area(static_cast<VclBox*>(pCurrentChild)); // FIXME-VCLPTR } else if (sInternalChild.startsWith("action_area") || sInternalChild.startsWith("messagedialog-action_area")) { vcl::Window *pContentArea = pCurrentChild->GetParent(); if (Dialog *pBoxParent = dynamic_cast<Dialog*>(pContentArea ? pContentArea->GetParent() : NULL)) { - pBoxParent->set_action_area(VclPtr<VclButtonBox>(static_cast<VclButtonBox*>(pCurrentChild))); // FIXME-VCLPTR + pBoxParent->set_action_area(static_cast<VclButtonBox*>(pCurrentChild)); // FIXME-VCLPTR } } @@ -3022,7 +3022,7 @@ void VclBuilder::applyPackingProperty(vcl::Window *pCurrent, if (pCurrent->GetType() == WINDOW_SCROLLWINDOW) { - std::map<vcl::Window*, vcl::Window*>::iterator aFind = m_pParserState->m_aRedundantParentWidgets.find(pCurrent); + auto aFind = m_pParserState->m_aRedundantParentWidgets.find(VclPtr<vcl::Window>(pCurrent)); if (aFind != m_pParserState->m_aRedundantParentWidgets.end()) { pCurrent = aFind->second; @@ -3286,7 +3286,6 @@ void VclBuilder::delete_by_name(const OString& sID) { if (aI->m_sID.equals(sID)) { - delete aI->m_pWindow; m_aChildren.erase(aI); break; } @@ -3558,4 +3557,8 @@ void VclBuilder::mungeTextBuffer(VclMultiLineEdit &rTarget, const TextBuffer &rT } } +VclBuilder::ParserState::ParserState() + : m_nLastToolbarId(0) +{} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index 0c24e3051832..5fc94df0436a 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -929,7 +929,7 @@ void Window::ImplDeleteOverlapBackground() else { vcl::Window* pTemp = mpWindowImpl->mpFrameData->mpFirstBackWin; - while ( pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin != this ) + while ( pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin.get() != this ) pTemp = pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin; pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin = mpWindowImpl->mpOverlapData->mpNextBackWin; } diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index d0c9a7327e5d..e61d82b1b5d6 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -38,7 +38,7 @@ struct ImplCursorData unsigned char mnDirection; // indicates writing direction sal_uInt16 mnStyle; // Cursor-Style bool mbCurVisible; // Ist Cursor aktuell sichtbar - vcl::Window* mpWindow; // Zugeordnetes Windows + VclPtr<vcl::Window> mpWindow; // Zugeordnetes Windows }; static void ImplCursorInvert( ImplCursorData* pData ) @@ -319,7 +319,7 @@ void vcl::Cursor::Hide() void vcl::Cursor::SetWindow( vcl::Window* pWindow ) { - if ( mpWindow != pWindow ) + if ( mpWindow.get() != pWindow ) { mpWindow = pWindow; ImplNew(); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index b34a451cc450..6c8641948e5d 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -551,6 +551,7 @@ void Dialog::dispose() { delete mpDialogImpl; mpDialogImpl = NULL; + mpPrevExecuteDlg.clear(); mpActionArea.clear(); mpContentArea.clear(); SystemWindow::dispose(); @@ -1005,7 +1006,7 @@ void Dialog::SetModalInputMode( bool bModal ) pPrevModalDlg = pPrevModalDlg->mpPrevExecuteDlg; if( pPrevModalDlg && - ( pPrevModalDlg == mpPrevExecuteDlg + ( pPrevModalDlg == mpPrevExecuteDlg.get() || !pPrevModalDlg->IsWindowOrChild( this, true ) ) ) { mpPrevExecuteDlg->SetModalInputMode( false ); diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 2b63b3f3920d..eb899fdb2831 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -530,9 +530,9 @@ namespace ); } - bool focusNextInGroup(std::vector<RadioButton*>::iterator aStart, std::vector<RadioButton*> &rGroup) + bool focusNextInGroup(const std::vector<VclPtr<RadioButton> >::iterator& aStart, std::vector<VclPtr<RadioButton> > &rGroup) { - std::vector<RadioButton*>::iterator aI(aStart); + std::vector<VclPtr<RadioButton> >::iterator aI(aStart); if (aStart != rGroup.end()) ++aI; @@ -564,7 +564,7 @@ namespace bool nextInGroup(RadioButton *pSourceWindow, bool bBackward) { - std::vector<RadioButton*> aGroup(pSourceWindow->GetRadioButtonGroup(true)); + std::vector<VclPtr<RadioButton> > aGroup(pSourceWindow->GetRadioButtonGroup(true)); if (aGroup.size() == 1) //only one button in group return false; @@ -572,7 +572,7 @@ namespace if (bBackward) std::reverse(aGroup.begin(), aGroup.end()); - std::vector<RadioButton*>::iterator aStart(std::find(aGroup.begin(), aGroup.end(), pSourceWindow)); + auto aStart(std::find(aGroup.begin(), aGroup.end(), VclPtr<RadioButton>(pSourceWindow))); assert(aStart != aGroup.end()); @@ -716,9 +716,9 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) if ( bKeyInput && mpWindowImpl->mpDlgCtrlDownWindow ) { - if ( mpWindowImpl->mpDlgCtrlDownWindow != pButtonWindow ) + if ( mpWindowImpl->mpDlgCtrlDownWindow.get() != pButtonWindow ) { - static_cast<PushButton*>(mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( false ); + static_cast<PushButton*>(mpWindowImpl->mpDlgCtrlDownWindow.get())->SetPressed( false ); mpWindowImpl->mpDlgCtrlDownWindow = NULL; return true; } @@ -928,16 +928,16 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) { if ( bKeyInput ) { - if ( mpWindowImpl->mpDlgCtrlDownWindow && (mpWindowImpl->mpDlgCtrlDownWindow != pButtonWindow) ) + if ( mpWindowImpl->mpDlgCtrlDownWindow && (mpWindowImpl->mpDlgCtrlDownWindow.get() != pButtonWindow) ) { - static_cast<PushButton*>(mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( false ); + static_cast<PushButton*>(mpWindowImpl->mpDlgCtrlDownWindow.get())->SetPressed( false ); mpWindowImpl->mpDlgCtrlDownWindow = NULL; } static_cast<PushButton*>(pButtonWindow)->SetPressed( true ); mpWindowImpl->mpDlgCtrlDownWindow = pButtonWindow; } - else if ( mpWindowImpl->mpDlgCtrlDownWindow == pButtonWindow ) + else if ( mpWindowImpl->mpDlgCtrlDownWindow.get() == pButtonWindow ) { mpWindowImpl->mpDlgCtrlDownWindow = NULL; static_cast<PushButton*>(pButtonWindow)->SetPressed( false ); @@ -1060,7 +1060,7 @@ void Window::ImplDlgCtrlFocusChanged( vcl::Window* pWindow, bool bGetFocus ) { if ( mpWindowImpl->mpDlgCtrlDownWindow && !bGetFocus ) { - static_cast<PushButton*>(mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( false ); + static_cast<PushButton*>(mpWindowImpl->mpDlgCtrlDownWindow.get())->SetPressed( false ); mpWindowImpl->mpDlgCtrlDownWindow = NULL; } diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index dabfef79569e..94d6ae75b1dd 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -99,7 +99,7 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) vcl::Window* pChildWindow = findTopLevelWindow(location); // handle the case that drop is in an other vcl window than the last dragOver - if( pChildWindow != m_pCurrentWindow ) + if( pChildWindow != m_pCurrentWindow.get() ) { // fire dragExit on listeners of previous window fireDragExitEvent( m_pCurrentWindow ); @@ -177,7 +177,7 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) vcl::Window * pChildWindow = findTopLevelWindow(location); - if( pChildWindow != m_pCurrentWindow ) + if( pChildWindow != m_pCurrentWindow.get() ) { // fire dragExit on listeners of previous window fireDragExitEvent( m_pCurrentWindow ); @@ -215,7 +215,7 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& vcl::Window* pChildWindow = findTopLevelWindow(location); - if( pChildWindow != m_pCurrentWindow ) + if( pChildWindow != m_pCurrentWindow.get() ) { // fire dragExit on listeners of previous window fireDragExitEvent( m_pCurrentWindow ); diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 7b0f1c3ae2c5..90b436eddd33 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -827,7 +827,7 @@ ImplDockingWindowWrapper::ImplDockingWindowWrapper( const vcl::Window *pWindow ) , mbStartDockingEnabled(false) , mbLocked(false) { - DockingWindow *pDockWin = dynamic_cast< DockingWindow* > ( mpDockingWindow ); + DockingWindow *pDockWin = dynamic_cast< DockingWindow* > ( mpDockingWindow.get() ); if( pDockWin ) mnFloatBits = pDockWin->GetFloatStyle(); } @@ -1112,7 +1112,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLon // prepare reparenting vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); mpOldBorderWin = GetWindow()->GetWindow( WINDOW_BORDER ); - if( mpOldBorderWin == GetWindow() ) + if( mpOldBorderWin.get() == GetWindow() ) mpOldBorderWin = NULL; // no border window found // the new parent for popup mode @@ -1167,7 +1167,7 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) GetWindow()->Show( false, SHOW_NOFOCUSCHANGE ); // set parameter for handler before destroying floating window - ImplPopupFloatWin *pPopupFloatWin = static_cast<ImplPopupFloatWin*>(mpFloatWin); + ImplPopupFloatWin *pPopupFloatWin = static_cast<ImplPopupFloatWin*>(mpFloatWin.get()); EndPopupModeData aData( pPopupFloatWin->GetTearOffPosition(), mpFloatWin->IsPopupModeTearOff() ); // before deleting change parent back, so we can delete the floating window alone @@ -1176,7 +1176,7 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) if ( mpOldBorderWin ) { GetWindow()->SetParent( mpOldBorderWin ); - static_cast<ImplBorderWindow*>(mpOldBorderWin)->GetBorder( + static_cast<ImplBorderWindow*>(mpOldBorderWin.get())->GetBorder( GetWindow()->mpWindowImpl->mnLeftBorder, GetWindow()->mpWindowImpl->mnTopBorder, GetWindow()->mpWindowImpl->mnRightBorder, GetWindow()->mpWindowImpl->mnBottomBorder ); mpOldBorderWin->Resize(); @@ -1185,8 +1185,7 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) GetWindow()->SetParent( pRealParent ); GetWindow()->mpWindowImpl->mpRealParent = pRealParent; - delete mpFloatWin; - mpFloatWin = NULL; + mpFloatWin.clear(); // call handler - which will destroy the window and thus the wrapper as well ! GetWindow()->CallEventListeners( VCLEVENT_WINDOW_ENDPOPUPMODE, &aData ); @@ -1291,7 +1290,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) if ( mpOldBorderWin ) { GetWindow()->SetParent( mpOldBorderWin ); - static_cast<ImplBorderWindow*>(mpOldBorderWin)->GetBorder( + static_cast<ImplBorderWindow*>(mpOldBorderWin.get())->GetBorder( GetWindow()->mpWindowImpl->mnLeftBorder, GetWindow()->mpWindowImpl->mnTopBorder, GetWindow()->mpWindowImpl->mnRightBorder, GetWindow()->mpWindowImpl->mnBottomBorder ); mpOldBorderWin->Resize(); @@ -1300,7 +1299,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) GetWindow()->SetParent( pRealParent ); GetWindow()->mpWindowImpl->mpRealParent = pRealParent; - delete static_cast<ImplDockFloatWin2*>(mpFloatWin); + delete static_cast<ImplDockFloatWin2*>(mpFloatWin.get()); mpFloatWin = NULL; GetWindow()->SetPosPixel( maDockPos ); @@ -1364,7 +1363,7 @@ void ImplDockingWindowWrapper::SetMaxOutputSizePixel( const Size& rSize ) bool ImplDockingWindowWrapper::IsFloatingMode() const { - return (mpFloatWin != NULL); + return (mpFloatWin != nullptr); } void ImplDockingWindowWrapper::SetDragArea( const Rectangle& rRect ) diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index bc1740ef6771..743983c87952 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -42,8 +42,8 @@ public: ImplData(); ~ImplData(); - vcl::Window* mpParent; - Size maMaxOutSize; + VclPtr<vcl::Window> mpParent; + Size maMaxOutSize; }; DockingWindow::ImplData::ImplData() @@ -59,7 +59,7 @@ DockingWindow::ImplData::~ImplData() class ImplDockFloatWin : public FloatingWindow { private: - DockingWindow* mpDockWin; + VclPtr<DockingWindow> mpDockWin; sal_uLong mnLastTicks; Idle maDockIdle; Point maDockPos; @@ -122,6 +122,7 @@ void ImplDockFloatWin::dispose() disposeBuilder(); + mpDockWin.clear(); FloatingWindow::dispose(); } @@ -482,6 +483,9 @@ void DockingWindow::dispose() } delete mpImplData; mpImplData = NULL; + mpFloatWin.clear(); + mpOldBorderWin.clear(); + mpDialogParent.clear(); Window::dispose(); } @@ -867,13 +871,13 @@ void DockingWindow::SetFloatingMode( bool bFloatMode ) if ( mpOldBorderWin ) { SetParent( mpOldBorderWin ); - static_cast<ImplBorderWindow*>(mpOldBorderWin)->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder ); + static_cast<ImplBorderWindow*>(mpOldBorderWin.get())->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder ); mpOldBorderWin->Resize(); } mpWindowImpl->mpBorderWindow = mpOldBorderWin; SetParent( pRealParent ); mpWindowImpl->mpRealParent = pRealParent; - delete static_cast<ImplDockFloatWin*>(mpFloatWin); + mpFloatWin.clear(); mpFloatWin = NULL; SetPosPixel( maDockPos ); @@ -1049,7 +1053,7 @@ bool DockingWindow::IsFloatingMode() const if( pWrapper ) return pWrapper->IsFloatingMode(); else - return (mpFloatWin != NULL); + return (mpFloatWin != nullptr); } void DockingWindow::SetMaxOutputSizePixel( const Size& rSize ) diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 9b1e59df63e0..9a4f1c069b9d 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -283,7 +283,7 @@ ImplSVEvent * Window::PostUserEvent( const Link& rLink, void* pCaller ) void Window::RemoveUserEvent( ImplSVEvent * nUserEvent ) { - DBG_ASSERT( nUserEvent->mpWindow == this, + DBG_ASSERT( nUserEvent->mpWindow.get() == this, "Window::RemoveUserEvent(): Event doesn't send to this window or is already removed" ); DBG_ASSERT( nUserEvent->mbCall, "Window::RemoveUserEvent(): Event is already removed" ); @@ -521,14 +521,14 @@ void Window::ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, { if ( pSVData->maWinData.mpLastDeacWin ) { - if ( pSVData->maWinData.mpLastDeacWin == pNewOverlapWindow ) + if ( pSVData->maWinData.mpLastDeacWin.get() == pNewOverlapWindow ) bCallActivate = false; else { vcl::Window* pLastRealWindow = pSVData->maWinData.mpLastDeacWin->ImplGetWindow(); pSVData->maWinData.mpLastDeacWin->mpWindowImpl->mbActive = false; pSVData->maWinData.mpLastDeacWin->Deactivate(); - if ( pLastRealWindow != pSVData->maWinData.mpLastDeacWin ) + if ( pLastRealWindow != pSVData->maWinData.mpLastDeacWin.get() ) { pLastRealWindow->mpWindowImpl->mbActive = true; pLastRealWindow->Activate(); @@ -574,5 +574,22 @@ void Window::ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, } /* namespace vcl */ +NotifyEvent::NotifyEvent() +{ + mpWindow = NULL; + mpData = NULL; + mnEventType = MouseNotifyEvent::NONE; + mnRetValue = 0; +} + +NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow, + const void* pEvent, long nRet ) +{ + mpWindow = pWindow; + mpData = (void*)pEvent; + mnEventType = nEventType; + mnRetValue = nRet; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index ffafa4703622..7102b602633c 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -39,7 +39,7 @@ public: ImplData(); ~ImplData(); - ToolBox* mpBox; + VclPtr<ToolBox> mpBox; Rectangle maItemEdgeClipRect; // used to clip the common edge between a toolbar item and the border of this window }; @@ -208,6 +208,8 @@ void FloatingWindow::dispose() delete mpImplData; mpImplData = NULL; + mpNextFloat.clear(); + mpFirstPopupModeWin.clear(); SystemWindow::dispose(); } @@ -746,7 +748,7 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) mbInCleanUp = true; // prevent killing this window due to focus change while working with it // stop the PopupMode also for all following PopupMode windows - while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this ) + while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat.get() != this ) pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); // delete window from the list diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 4268f498e74b..709f97696992 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -47,8 +47,10 @@ void IntroWindow::dispose() { // FIXME: really we should have a dispose & a ref-ptr there [!] ... ImplSVData* pSVData = ImplGetSVData(); - if ( pSVData->mpIntroWindow == this ) - pSVData->mpIntroWindow = NULL; + if ( pSVData->mpIntroWindow.get() == this ) + pSVData->mpIntroWindow = nullptr; + + WorkWindow::dispose(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 5fee1f0f1bd8..1d691c0d9067 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1286,6 +1286,17 @@ void VclBin::setAllocation(const Size &rAllocation) setLayoutAllocation(*pChild, Point(0, 0), rAllocation); } +VclFrame::~VclFrame() +{ + dispose(); +} + +void VclFrame::dispose() +{ + m_pLabel.clear(); + VclBin::dispose(); +} + //To-Do, hook a DecorationView into VclFrame ? Size VclFrame::calculateRequisition() const @@ -1488,7 +1499,7 @@ Size VclExpander::calculateRequisition() const WindowImpl* pWindowImpl = ImplGetWindowImpl(); const vcl::Window *pChild = get_child(); - const vcl::Window *pLabel = pChild != pWindowImpl->mpLastChild ? pWindowImpl->mpLastChild : NULL; + const vcl::Window *pLabel = pChild != pWindowImpl->mpLastChild ? pWindowImpl->mpLastChild.get() : NULL; if (pChild && pChild->IsVisible() && m_pDisclosureButton->IsChecked()) aRet = getLayoutRequisition(*pChild); @@ -1525,7 +1536,7 @@ void VclExpander::setAllocation(const Size &rAllocation) //The label widget is the last (of two) children vcl::Window *pChild = get_child(); - vcl::Window *pLabel = pChild != pWindowImpl->mpLastChild ? pWindowImpl->mpLastChild : NULL; + vcl::Window *pLabel = pChild != pWindowImpl->mpLastChild.get() ? pWindowImpl->mpLastChild.get() : NULL; Size aButtonSize = getLayoutRequisition(*m_pDisclosureButton); Size aLabelSize; @@ -1835,7 +1846,7 @@ const vcl::Window *VclEventBox::get_child() const { const WindowImpl* pWindowImpl = ImplGetWindowImpl(); - assert(pWindowImpl->mpFirstChild == m_aEventBoxHelper.get()); + assert(pWindowImpl->mpFirstChild.get() == m_aEventBoxHelper.get()); return pWindowImpl->mpFirstChild->GetWindow(WINDOW_NEXT); } @@ -2004,19 +2015,13 @@ void MessageDialog::dispose() m_aOwnedButtons[i].disposeAndClear(); m_aOwnedButtons.clear(); - delete m_pSecondaryMessage; - m_pSecondaryMessage = NULL; - - delete m_pPrimaryMessage; - m_pSecondaryMessage = NULL; - - delete m_pImage; - m_pImage = NULL; - + m_pSecondaryMessage.clear(); + m_pSecondaryMessage.clear(); + m_pImage.clear(); m_pGrid.disposeAndClear(); m_pOwnedActionArea.disposeAndClear(); m_pOwnedContentArea.disposeAndClear(); - + m_pPrimaryMessage.clear(); Dialog::dispose(); } @@ -2038,7 +2043,7 @@ IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton) short MessageDialog::get_response(const vcl::Window *pWindow) const { - std::map<const vcl::Window*, short>::const_iterator aFind = m_aResponses.find(pWindow); + auto aFind = m_aResponses.find(pWindow); if (aFind != m_aResponses.end()) return aFind->second; if (!m_pUIBuilder) @@ -2160,7 +2165,7 @@ short MessageDialog::Execute() m_pSecondaryMessage->SetText(m_sSecondaryString); m_pSecondaryMessage->Show(bHasSecondaryText); - MessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, bHasSecondaryText ? m_pSecondaryMessage : NULL); + MessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, bHasSecondaryText ? m_pSecondaryMessage.get() : NULL); VclButtonBox *pButtonBox = get_action_area(); assert(pButtonBox); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index d32c86f3f07c..af18be1f4757 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -142,7 +142,7 @@ Menu::~Menu() // and make sure the MenuFloatingWindow knows about our destruction if ( pWindow ) { - MenuFloatingWindow* pFloat = static_cast<MenuFloatingWindow*>(pWindow); + MenuFloatingWindow* pFloat = static_cast<MenuFloatingWindow*>(pWindow.get()); if( pFloat->pMenu == this ) pFloat->pMenu = NULL; pWindow->SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() ); @@ -1704,7 +1704,7 @@ Size Menu::ImplCalcSize( const vcl::Window* pWin ) // account for the size of the close button, which actually is a toolbox // due to NWF this is variable - long nCloseButtonHeight = static_cast<MenuBarWindow*>(pWindow)->MinCloseButtonSize().Height(); + long nCloseButtonHeight = static_cast<MenuBarWindow*>(pWindow.get())->MinCloseButtonSize().Height(); if (aSz.Height() < nCloseButtonHeight) aSz.Height() = nCloseButtonHeight; } @@ -2269,7 +2269,7 @@ void Menu::ImplFillLayoutData() const } else { - MenuFloatingWindow* pFloat = static_cast<MenuFloatingWindow*>(pWindow); + MenuFloatingWindow* pFloat = static_cast<MenuFloatingWindow*>(pWindow.get()); ImplPaint( pWindow, pFloat->nScrollerHeight, pFloat->ImplGetStartY(), 0, false, true ); } } @@ -2381,9 +2381,9 @@ bool Menu::IsHighlighted( sal_uInt16 nItemPos ) const if( pWindow ) { if (IsMenuBar()) - bRet = ( nItemPos == static_cast< MenuBarWindow * > (pWindow)->GetHighlightedItem() ); + bRet = ( nItemPos == static_cast< MenuBarWindow * > (pWindow.get())->GetHighlightedItem() ); else - bRet = ( nItemPos == static_cast< MenuFloatingWindow * > (pWindow)->GetHighlightedItem() ); + bRet = ( nItemPos == static_cast< MenuFloatingWindow * > (pWindow.get())->GetHighlightedItem() ); } return bRet; @@ -2395,13 +2395,13 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) { if (IsMenuBar()) { - MenuBarWindow* pMenuWin = static_cast< MenuBarWindow* >( pWindow ); + MenuBarWindow* pMenuWin = static_cast< MenuBarWindow* >( pWindow.get() ); pMenuWin->SetAutoPopup( false ); pMenuWin->ChangeHighlightItem( nItemPos, false ); } else { - static_cast< MenuFloatingWindow* >( pWindow )->ChangeHighlightItem( nItemPos, false ); + static_cast< MenuFloatingWindow* >( pWindow.get() )->ChangeHighlightItem( nItemPos, false ); } } } @@ -2411,7 +2411,7 @@ IMenuBarWindow* MenuBar::getMenuBarWindow() { // so far just a dynamic_cast, hopefully to be turned into something saner // at some stage - IMenuBarWindow *pWin = dynamic_cast<IMenuBarWindow*>(pWindow); + IMenuBarWindow *pWin = dynamic_cast<IMenuBarWindow*>(pWindow.get()); //either there is no window (fdo#87663) or it is an IMenuBarWindow assert(!pWindow || pWin); return pWin; @@ -3009,9 +3009,9 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_ { sal_uInt16 aPos; if (pSFrom->IsMenuBar()) - aPos = static_cast<MenuBarWindow *>(pSFrom->pWindow)->GetHighlightedItem(); + aPos = static_cast<MenuBarWindow *>(pSFrom->pWindow.get())->GetHighlightedItem(); else - aPos = static_cast<MenuFloatingWindow *>(pSFrom->pWindow)->GetHighlightedItem(); + aPos = static_cast<MenuFloatingWindow *>(pSFrom->pWindow.get())->GetHighlightedItem(); pWin->SetPosInParent( aPos ); // store position to be sent in SUBMENUDEACTIVATE pSFrom->ImplCallEventListeners( VCLEVENT_MENU_SUBMENUACTIVATE, aPos ); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 9ea6a12e764e..ac2170b8cc87 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -349,8 +349,8 @@ void MenuBarWindow::KillActivePopup() { if ( pActivePopup ) { - if( pActivePopup->pWindow != NULL ) - if( static_cast<FloatingWindow *>(pActivePopup->pWindow)->IsInCleanUp() ) + if( pActivePopup->pWindow ) + if( static_cast<FloatingWindow *>(pActivePopup->pWindow.get())->IsInCleanUp() ) return; // kill it later if ( pActivePopup->bInCallback ) @@ -457,7 +457,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b if( !bStayActive ) { // #105406# avoid saving the focus when we already have the focus - bool bNoSaveFocus = (this == ImplGetSVData()->maWinData.mpFocusWin ); + bool bNoSaveFocus = (this == ImplGetSVData()->maWinData.mpFocusWin.get() ); if( nSaveFocusId ) { diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index e6fe541c9371..66297ea3f5c3 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -413,8 +413,8 @@ void MenuFloatingWindow::KillActivePopup( PopupMenu* pThisOnly ) { if ( pActivePopup && ( !pThisOnly || ( pThisOnly == pActivePopup ) ) ) { - if( pActivePopup->pWindow != NULL ) - if( static_cast<FloatingWindow *>(pActivePopup->pWindow)->IsInCleanUp() ) + if( pActivePopup->pWindow ) + if( static_cast<FloatingWindow *>(pActivePopup->pWindow.get())->IsInCleanUp() ) return; // kill it later if ( pActivePopup->bInCallback ) pActivePopup->bCanceled = true; diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 3691a0a50625..f445b08d45b6 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -215,7 +215,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) // For a lack of design we need a little hack here to // ensure that dialogs on close pass the focus back to // the correct window - if ( mpWindowImpl->mpLastFocusWindow && (mpWindowImpl->mpLastFocusWindow != this) && + if ( mpWindowImpl->mpLastFocusWindow && (mpWindowImpl->mpLastFocusWindow.get() != this) && !(mpWindowImpl->mnDlgCtrlFlags & WINDOW_DLGCTRL_WANTFOCUS) && mpWindowImpl->mpLastFocusWindow->IsEnabled() && mpWindowImpl->mpLastFocusWindow->IsInputEnabled() && @@ -231,7 +231,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) // For a lack of design we need a little hack here to // ensure that dialogs on close pass the focus back to // the correct window - if ( mpWindowImpl->mpLastFocusWindow && (mpWindowImpl->mpLastFocusWindow != this) && + if ( mpWindowImpl->mpLastFocusWindow && (mpWindowImpl->mpLastFocusWindow.get() != this) && !(mpWindowImpl->mnDlgCtrlFlags & WINDOW_DLGCTRL_WANTFOCUS) && mpWindowImpl->mpLastFocusWindow->IsEnabled() && mpWindowImpl->mpLastFocusWindow->IsInputEnabled() && @@ -257,7 +257,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) vcl::Window *pFrame = pSVData->maWinData.mpFirstFrame; while( pFrame ) { - if( pFrame != mpWindowImpl->mpFrameWindow && pFrame->mpWindowImpl->mpFrameData->mnFocusId ) + if( pFrame != mpWindowImpl->mpFrameWindow.get() && pFrame->mpWindowImpl->mpFrameData->mnFocusId ) { bAsyncFocusWaiting = true; break; @@ -283,13 +283,13 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) pParent = pParent->mpWindowImpl->mpParent; } - if ( ( pSVData->maWinData.mpFocusWin != this && + if ( ( pSVData->maWinData.mpFocusWin.get() != this && mpWindowImpl && !mpWindowImpl->mbInDispose ) || ( bAsyncFocusWaiting && !bHasFocus && !bMustNotGrabFocus ) ) { // EndExtTextInput if it is not the same window if ( pSVData->maWinData.mpExtTextInputWin && - (pSVData->maWinData.mpExtTextInputWin != this) ) + (pSVData->maWinData.mpExtTextInputWin.get() != this) ) pSVData->maWinData.mpExtTextInputWin->EndExtTextInput( EXTTEXTINPUT_END_COMPLETE ); // mark this windows as the last FocusWindow @@ -360,7 +360,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) pOldFocusWindow->ImplCallDeactivateListeners( this ); } - if ( pSVData->maWinData.mpFocusWin == this ) + if ( pSVData->maWinData.mpFocusWin.get() == this ) { if ( mpWindowImpl->mpSysObj ) { @@ -369,7 +369,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) mpWindowImpl->mpSysObj->GrabFocus(); } - if ( pSVData->maWinData.mpFocusWin == this ) + if ( pSVData->maWinData.mpFocusWin.get() == this ) { if ( mpWindowImpl->mpCursor ) mpWindowImpl->mpCursor->ImplShow(); @@ -452,13 +452,13 @@ void Window::CaptureMouse() ImplSVData* pSVData = ImplGetSVData(); // possibly stop tracking - if ( pSVData->maWinData.mpTrackWin != this ) + if ( pSVData->maWinData.mpTrackWin.get() != this ) { if ( pSVData->maWinData.mpTrackWin ) pSVData->maWinData.mpTrackWin->EndTracking( ENDTRACK_CANCEL ); } - if ( pSVData->maWinData.mpCaptureWin != this ) + if ( pSVData->maWinData.mpCaptureWin.get() != this ) { pSVData->maWinData.mpCaptureWin = this; mpWindowImpl->mpFrame->CaptureMouse( true ); @@ -470,10 +470,10 @@ void Window::ReleaseMouse() ImplSVData* pSVData = ImplGetSVData(); - DBG_ASSERTWARNING( pSVData->maWinData.mpCaptureWin == this, + DBG_ASSERTWARNING( pSVData->maWinData.mpCaptureWin.get() == this, "Window::ReleaseMouse(): window doesn't have the mouse capture" ); - if ( pSVData->maWinData.mpCaptureWin == this ) + if ( pSVData->maWinData.mpCaptureWin.get() == this ) { pSVData->maWinData.mpCaptureWin = NULL; mpWindowImpl->mpFrame->CaptureMouse( false ); diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index b4c49b4dca11..64bce64a7eb3 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -156,15 +156,9 @@ MessBox::~MessBox() void MessBox::dispose() { - delete mpVCLMultiLineEdit; - mpVCLMultiLineEdit = NULL; - - delete mpFixedImage; - mpFixedImage = NULL; - - delete mpCheckBox; - mpCheckBox = NULL; - + mpVCLMultiLineEdit.clear(); + mpFixedImage.clear(); + mpCheckBox.clear(); ButtonDialog::dispose(); } @@ -202,17 +196,12 @@ void MessBox::ImplPosControls() WinBits nWinStyle = WB_LEFT | WB_NOLABEL; sal_uInt16 nTextStyle = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | TEXT_DRAW_LEFT; - delete mpVCLMultiLineEdit; - if ( mpFixedImage ) - { - delete mpFixedImage; - mpFixedImage = NULL; - } + mpVCLMultiLineEdit.clear(); + mpFixedImage.clear(); if ( mpCheckBox ) { mbCheck = mpCheckBox->IsChecked(); - delete mpCheckBox; - mpCheckBox = NULL; + mpCheckBox.clear(); } // Clean up message text with tabs diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 1384dfe3d8f2..a2bbfda232a7 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -43,7 +43,7 @@ class PaintHelper { private: - vcl::Window* m_pWindow; + VclPtr<vcl::Window> m_pWindow; vcl::Region* m_pChildRegion; Rectangle m_aSelectionRect; Rectangle m_aPaintRect; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index ead659fcac08..bf4081aa2ae1 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -80,6 +80,18 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( vcl::Window* i_pParent ) maVertDim->SetText( OUString( "2.0in" ) ); } +PrintDialog::PrintPreviewWindow::~PrintPreviewWindow() +{ + dispose(); +} + +void PrintDialog::PrintPreviewWindow::dispose() +{ + maHorzDim.clear(); + maVertDim.clear(); + Window::dispose(); +} + const sal_Int32 PrintDialog::PrintPreviewWindow::PREVIEW_BITMAP_WIDTH = 1600; void PrintDialog::PrintPreviewWindow::DataChanged( const DataChangedEvent& i_rDCEvt ) @@ -250,13 +262,6 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi Invalidate(); } -void PrintDialog::PrintPreviewWindow::dispose() -{ - maHorzDim.disposeAndClear(); - maVertDim.disposeAndClear(); - Window::dispose(); -} - void PrintDialog::PrintPreviewWindow::preparePreviewBitmap() { GDIMetaFile aMtf( maMtf ); @@ -717,6 +722,15 @@ PrintDialog::~PrintDialog() void PrintDialog::dispose() { delete mpCustomOptionsUIBuilder; + mpTabCtrl.clear(); + mpPreviewWindow.clear(); + mpPageEdit.clear(); + mpNumPagesText.clear(); + mpBackwardBtn.clear(); + mpForwardBtn.clear(); + mpOKButton.clear(); + mpCancelButton.clear(); + mpHelpButton.clear(); ModalDialog::dispose(); } @@ -1212,7 +1226,7 @@ void PrintDialog::checkControlDependencies() void PrintDialog::checkOptionalControlDependencies() { - for( std::map< vcl::Window*, OUString >::iterator it = maControlToPropertyMap.begin(); + for( auto it = maControlToPropertyMap.begin(); it != maControlToPropertyMap.end(); ++it ) { bool bShouldbeEnabled = maPController->isUIOptionEnabled( it->second ); @@ -1234,9 +1248,9 @@ void PrintDialog::checkOptionalControlDependencies() } } - if( bShouldbeEnabled && dynamic_cast<RadioButton*>(it->first) ) + if( bShouldbeEnabled && dynamic_cast<RadioButton*>(it->first.get()) ) { - std::map< vcl::Window*, sal_Int32 >::const_iterator r_it = maControlToNumValMap.find( it->first ); + auto r_it = maControlToNumValMap.find( it->first ); if( r_it != maControlToNumValMap.end() ) { bShouldbeEnabled = maPController->isUIChoiceEnabled( it->second, r_it->second ); @@ -1655,7 +1669,7 @@ IMPL_LINK_NOARG(PrintDialog, UIOptionsChanged) PropertyValue* PrintDialog::getValueForWindow( vcl::Window* i_pWindow ) const { PropertyValue* pVal = NULL; - std::map< vcl::Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); + auto it = maControlToPropertyMap.find( i_pWindow ); if( it != maControlToPropertyMap.end() ) { pVal = maPController->getValue( it->second ); @@ -1671,10 +1685,10 @@ PropertyValue* PrintDialog::getValueForWindow( vcl::Window* i_pWindow ) const void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) { beans::PropertyValue* pValue = maPController->getValue( i_rProperty ); - std::map< OUString, std::vector< vcl::Window* > >::const_iterator it = maPropertyToWindowMap.find( i_rProperty ); + auto it = maPropertyToWindowMap.find( i_rProperty ); if( pValue && it != maPropertyToWindowMap.end() ) { - const std::vector< vcl::Window* >& rWindows( it->second ); + const std::vector< VclPtr<vcl::Window> >& rWindows( it->second ); if( ! rWindows.empty() ) { bool bVal = false; @@ -1682,7 +1696,7 @@ void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) if( pValue->Value >>= bVal ) { // we should have a CheckBox for this one - CheckBox* pBox = dynamic_cast< CheckBox* >( rWindows.front() ); + CheckBox* pBox = dynamic_cast< CheckBox* >( rWindows.front().get() ); if( pBox ) { pBox->Check( bVal ); @@ -1703,14 +1717,14 @@ void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) else if( pValue->Value >>= nVal ) { // this could be a ListBox or a RadioButtonGroup - ListBox* pList = dynamic_cast< ListBox* >( rWindows.front() ); + ListBox* pList = dynamic_cast< ListBox* >( rWindows.front().get() ); if( pList ) { pList->SelectEntryPos( static_cast< sal_uInt16 >(nVal) ); } else if( nVal >= 0 && nVal < sal_Int32(rWindows.size() ) ) { - RadioButton* pBtn = dynamic_cast< RadioButton* >( rWindows[nVal] ); + RadioButton* pBtn = dynamic_cast< RadioButton* >( rWindows[nVal].get() ); DBG_ASSERT( pBtn, "unexpected control for property" ); if( pBtn ) pBtn->Check(); @@ -1722,7 +1736,7 @@ void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) void PrintDialog::makeEnabled( vcl::Window* i_pWindow ) { - std::map< vcl::Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); + auto it = maControlToPropertyMap.find( i_pWindow ); if( it != maControlToPropertyMap.end() ) { OUString aDependency( maPController->makeEnabled( it->second ) ); @@ -1757,7 +1771,7 @@ IMPL_LINK( PrintDialog, UIOption_RadioHdl, RadioButton*, i_pBtn ) if( i_pBtn->IsChecked() ) { PropertyValue* pVal = getValueForWindow( i_pBtn ); - std::map< vcl::Window*, sal_Int32 >::const_iterator it = maControlToNumValMap.find( i_pBtn ); + auto it = maControlToNumValMap.find( i_pBtn ); if( pVal && it != maControlToNumValMap.end() ) { makeEnabled( i_pBtn ); @@ -1900,6 +1914,19 @@ PrintProgressDialog::PrintProgressDialog(vcl::Window* i_pParent, int i_nMax) } +PrintProgressDialog::~PrintProgressDialog() +{ + dispose(); +} + +void PrintProgressDialog::dispose() +{ + mpText.clear(); + mpProgress.clear(); + mpButton.clear(); + ModelessDialog::dispose(); +} + IMPL_LINK( PrintProgressDialog, ClickHdl, Button*, pButton ) { if( pButton == mpButton ) diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index f678900783f8..8201ea14627b 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -162,6 +162,7 @@ void Splitter::dispose() TaskPaneList *pTList = pSysWin->GetTaskPaneList(); pTList->RemoveWindow(this); } + mpRefWin.clear(); Window::dispose(); } diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 2b701e9dcd07..0e43c0cbe2ef 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -53,9 +53,9 @@ struct ImplSplitItem long mnOldWidth; long mnOldHeight; ImplSplitSet* mpSet; - vcl::Window* mpWindow; - vcl::Window* mpOrgParent; - sal_uInt16 mnId; + VclPtr<vcl::Window> mpWindow; + VclPtr<vcl::Window> mpOrgParent; + sal_uInt16 mnId; SplitWindowItemBits mnBits; bool mbFixed; bool mbSubSize; diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 5b58e2abb097..9e967ec6eb4b 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -46,8 +46,8 @@ using ::com::sun::star::awt::XTopWindow; struct ImplCalcToTopData { - ImplCalcToTopData* mpNext; - vcl::Window* mpWindow; + ImplCalcToTopData* mpNext; + VclPtr<vcl::Window> mpWindow; vcl::Region* mpInvalidateRegion; }; @@ -117,12 +117,12 @@ void Window::ImplRemoveWindow( bool bRemoveFrameData ) { if ( ImplIsOverlapWindow() ) { - if ( mpWindowImpl->mpFrameData->mpFirstOverlap == this ) + if ( mpWindowImpl->mpFrameData->mpFirstOverlap.get() == this ) mpWindowImpl->mpFrameData->mpFirstOverlap = mpWindowImpl->mpNextOverlap; else { vcl::Window* pTempWin = mpWindowImpl->mpFrameData->mpFirstOverlap; - while ( pTempWin->mpWindowImpl->mpNextOverlap != this ) + while ( pTempWin->mpWindowImpl->mpNextOverlap.get() != this ) pTempWin = pTempWin->mpWindowImpl->mpNextOverlap; pTempWin->mpWindowImpl->mpNextOverlap = mpWindowImpl->mpNextOverlap; } @@ -194,7 +194,7 @@ void Window::reorderWithinParent(sal_uInt16 nNewPosition) void Window::ImplToBottomChild() { - if ( !ImplIsOverlapWindow() && !mpWindowImpl->mbReallyVisible && (mpWindowImpl->mpParent->mpWindowImpl->mpLastChild != this) ) + if ( !ImplIsOverlapWindow() && !mpWindowImpl->mbReallyVisible && (mpWindowImpl->mpParent->mpWindowImpl->mpLastChild.get() != this) ) { // put the window to the end of the list if ( mpWindowImpl->mpPrev ) @@ -265,7 +265,7 @@ void Window::ImplToTop( sal_uInt16 nFlags ) } else { - if ( mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap != this ) + if ( mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap.get() != this ) { // remove window from the list mpWindowImpl->mpPrev->mpWindowImpl->mpNext = mpWindowImpl->mpNext; @@ -477,7 +477,7 @@ void Window::SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ) DBG_ASSERT( pRefWindow->mpWindowImpl->mpParent == mpWindowImpl->mpParent, "Window::SetZOrder() - pRefWindow has other parent" ); if ( nFlags & WINDOW_ZORDER_BEFOR ) { - if ( pRefWindow->mpWindowImpl->mpPrev == this ) + if ( pRefWindow->mpWindowImpl->mpPrev.get() == this ) return; if ( ImplIsOverlapWindow() ) @@ -515,7 +515,7 @@ void Window::SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ) } else if ( nFlags & WINDOW_ZORDER_BEHIND ) { - if ( pRefWindow->mpWindowImpl->mpNext == this ) + if ( pRefWindow->mpWindowImpl->mpNext.get() == this ) return; if ( ImplIsOverlapWindow() ) @@ -879,9 +879,8 @@ void Window::SetParent( vcl::Window* pNewParent ) // remove ownerdraw decorated windows from list in the top-most frame window if( (GetStyle() & WB_OWNERDRAWDECORATION) && mpWindowImpl->mbFrame ) { - ::std::vector< vcl::Window* >& rList = ImplGetOwnerDrawList(); - ::std::vector< vcl::Window* >::iterator p; - p = ::std::find( rList.begin(), rList.end(), this ); + ::std::vector< VclPtr<vcl::Window> >& rList = ImplGetOwnerDrawList(); + auto p = ::std::find( rList.begin(), rList.end(), VclPtr<vcl::Window>(this) ); if( p != rList.end() ) rList.erase( p ); } @@ -895,7 +894,7 @@ void Window::SetParent( vcl::Window* pNewParent ) return; } - if ( mpWindowImpl->mpParent == pNewParent ) + if ( mpWindowImpl->mpParent.get() == pNewParent ) return; if ( mpWindowImpl->mbFrame ) @@ -912,7 +911,7 @@ void Window::SetParent( vcl::Window* pNewParent ) else { pNewOverlapWindow = pNewParent->ImplGetFirstOverlapWindow(); - if ( mpWindowImpl->mpOverlapWindow != pNewOverlapWindow ) + if ( mpWindowImpl->mpOverlapWindow.get() != pNewOverlapWindow ) pOldOverlapWindow = mpWindowImpl->mpOverlapWindow; else pOldOverlapWindow = NULL; @@ -1110,17 +1109,17 @@ vcl::Window* Window::GetWindow( sal_uInt16 nType ) const return const_cast<vcl::Window*>(this); case WINDOW_FIRSTTOPWINDOWCHILD: - return ImplGetWinData()->maTopWindowChildren.empty() ? NULL : *ImplGetWinData()->maTopWindowChildren.begin(); + return ImplGetWinData()->maTopWindowChildren.empty() ? NULL : (*ImplGetWinData()->maTopWindowChildren.begin()).get(); case WINDOW_LASTTOPWINDOWCHILD: - return ImplGetWinData()->maTopWindowChildren.empty() ? NULL : *ImplGetWinData()->maTopWindowChildren.rbegin(); + return ImplGetWinData()->maTopWindowChildren.empty() ? NULL : (*ImplGetWinData()->maTopWindowChildren.rbegin()).get(); case WINDOW_PREVTOPWINDOWSIBLING: { if ( !mpWindowImpl->mpRealParent ) return NULL; - const ::std::list< vcl::Window* >& rTopWindows( mpWindowImpl->mpRealParent->ImplGetWinData()->maTopWindowChildren ); - ::std::list< vcl::Window* >::const_iterator myPos = + const ::std::list< VclPtr<vcl::Window> >& rTopWindows( mpWindowImpl->mpRealParent->ImplGetWinData()->maTopWindowChildren ); + ::std::list< VclPtr<vcl::Window> >::const_iterator myPos = ::std::find( rTopWindows.begin(), rTopWindows.end(), this ); if ( myPos == rTopWindows.end() ) return NULL; @@ -1133,8 +1132,8 @@ vcl::Window* Window::GetWindow( sal_uInt16 nType ) const { if ( !mpWindowImpl->mpRealParent ) return NULL; - const ::std::list< vcl::Window* >& rTopWindows( mpWindowImpl->mpRealParent->ImplGetWinData()->maTopWindowChildren ); - ::std::list< vcl::Window* >::const_iterator myPos = + const ::std::list< VclPtr<vcl::Window> >& rTopWindows( mpWindowImpl->mpRealParent->ImplGetWinData()->maTopWindowChildren ); + ::std::list< VclPtr<vcl::Window> >::const_iterator myPos = ::std::find( rTopWindows.begin(), rTopWindows.end(), this ); if ( ( myPos == rTopWindows.end() ) || ( ++myPos == rTopWindows.end() ) ) return NULL; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 3bc802fc73e7..e13f1a2d5a67 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -120,6 +120,7 @@ void SystemWindow::dispose() mpWindowImpl->mbSysWin = false; disposeBuilder(); + mpDialogParent.clear(); Window::dispose(); } diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index 9612ada17206..02220ba58860 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -226,7 +226,8 @@ TabDialog::~TabDialog() void TabDialog::dispose() { - delete mpFixedLine; + mpFixedLine.clear(); + mpViewWindow.clear(); Dialog::dispose(); } diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 2089172df14d..af4f617205ae 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -95,11 +95,8 @@ void TaskPaneList::AddWindow( vcl::Window *pWindow ) { if( pWindow ) { - ::std::vector< vcl::Window* >::iterator insertionPos = mTaskPanes.end(); - for ( ::std::vector< vcl::Window* >::iterator p = mTaskPanes.begin(); - p != mTaskPanes.end(); - ++p - ) + auto insertionPos = mTaskPanes.end(); + for ( auto p = mTaskPanes.begin(); p != mTaskPanes.end(); ++p ) { if ( *p == pWindow ) // avoid duplicates @@ -131,8 +128,7 @@ void TaskPaneList::AddWindow( vcl::Window *pWindow ) void TaskPaneList::RemoveWindow( vcl::Window *pWindow ) { - ::std::vector< vcl::Window* >::iterator p; - p = ::std::find( mTaskPanes.begin(), mTaskPanes.end(), pWindow ); + auto p = ::std::find( mTaskPanes.begin(), mTaskPanes.end(), VclPtr<vcl::Window>(pWindow) ); if( p != mTaskPanes.end() ) { mTaskPanes.erase( p ); @@ -142,8 +138,7 @@ void TaskPaneList::RemoveWindow( vcl::Window *pWindow ) bool TaskPaneList::IsInList( vcl::Window *pWindow ) { - ::std::vector< vcl::Window* >::iterator p; - p = ::std::find( mTaskPanes.begin(), mTaskPanes.end(), pWindow ); + auto p = ::std::find( mTaskPanes.begin(), mTaskPanes.end(), VclPtr<vcl::Window>(pWindow) ); if( p != mTaskPanes.end() ) return true; else @@ -172,7 +167,7 @@ bool TaskPaneList::HandleKeyEvent(const KeyEvent& rKeyEvent) bSplitterOnly = aKeyCode.IsMod1() && aKeyCode.IsShift(); // is the focus in the list ? - ::std::vector< vcl::Window* >::iterator p = mTaskPanes.begin(); + auto p = mTaskPanes.begin(); while( p != mTaskPanes.end() ) { vcl::Window *pWin = *p; @@ -245,7 +240,7 @@ vcl::Window* TaskPaneList::FindNextSplitter( vcl::Window *pWindow, bool bForward else ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSortBackward() ); - ::std::vector< vcl::Window* >::iterator p = mTaskPanes.begin(); + auto p = mTaskPanes.begin(); while( p != mTaskPanes.end() ) { if( !pWindow || *p == pWindow ) @@ -282,7 +277,7 @@ vcl::Window* TaskPaneList::FindNextFloat( vcl::Window *pWindow, bool bForward ) else ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSortBackward() ); - ::std::vector< vcl::Window* >::iterator p = mTaskPanes.begin(); + auto p = mTaskPanes.begin(); while( p != mTaskPanes.end() ) { if( !pWindow || *p == pWindow ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index f95c020681f4..678bd438f997 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -90,7 +90,7 @@ class ImplTBDragMgr { private: ImplTBList* mpBoxList; - ToolBox* mpDragBox; + VclPtr<ToolBox> mpDragBox; Point maMouseOff; Rectangle maRect; Rectangle maStartRect; @@ -1609,6 +1609,7 @@ void ToolBox::dispose() pSVData->maCtrlData.mpTBDragMgr = NULL; } } + mpFloatWin.clear(); DockingWindow::dispose(); } @@ -2639,7 +2640,7 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) // do not reset data if the dropdown handler opened a floating window // see ImplFloatControl() - if( mpFloatWin == NULL ) + if( !mpFloatWin ) { // no floater was opened Deactivate(); @@ -2961,7 +2962,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); // no gradient background for items that have a popup open - bool bHasOpenPopup = (mpFloatWin != NULL) && (mnDownItemId==pItem->mnId); + bool bHasOpenPopup = mpFloatWin && (mnDownItemId==pItem->mnId); bool bHighContrastWhite = false; // check the face color as highcontrast indicator @@ -3873,7 +3874,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) // do not reset data if the dropdown handler opened a floating window // see ImplFloatControl() - if( mpFloatWin == NULL ) + if( !mpFloatWin ) { // no floater was opened Deactivate(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d21b70c06113..c2ac77f66d70 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -33,6 +33,7 @@ #include <vcl/syschild.hxx> #include <vcl/dockwin.hxx> #include <vcl/wall.hxx> +#include <vcl/fixed.hxx> #include <vcl/gradient.hxx> #include <vcl/button.hxx> #include <vcl/taskpanelist.hxx> @@ -176,9 +177,8 @@ void Window::dispose() // remove ownerdraw decorated windows from list in the top-most frame window if( (GetStyle() & WB_OWNERDRAWDECORATION) && mpWindowImpl->mbFrame ) { - ::std::vector< vcl::Window* >& rList = ImplGetOwnerDrawList(); - ::std::vector< vcl::Window* >::iterator p; - p = ::std::find( rList.begin(), rList.end(), this ); + ::std::vector< VclPtr<vcl::Window> >& rList = ImplGetOwnerDrawList(); + auto p = ::std::find( rList.begin(), rList.end(), VclPtr<vcl::Window>(this) ); if( p != rList.end() ) rList.erase( p ); } @@ -241,9 +241,9 @@ void Window::dispose() if ( pSVData->maHelpData.mpHelpWin && (pSVData->maHelpData.mpHelpWin->GetParent() == this) ) ImplDestroyHelpWindow( true ); - DBG_ASSERT( pSVData->maWinData.mpTrackWin != this, + DBG_ASSERT( pSVData->maWinData.mpTrackWin.get() != this, "Window::~Window(): Window is in TrackingMode" ); - DBG_ASSERT( pSVData->maWinData.mpCaptureWin != this, + DBG_ASSERT( pSVData->maWinData.mpCaptureWin.get() != this, "Window::~Window(): Window has the mouse captured" ); // due to old compatibility @@ -390,9 +390,8 @@ void Window::dispose() remove_from_all_size_groups(); // clear mnemonic labels - std::vector<FixedText*> aMnemonicLabels(list_mnemonic_labels()); - for (std::vector<FixedText*>::iterator aI = aMnemonicLabels.begin(); - aI != aMnemonicLabels.end(); ++aI) + std::vector<VclPtr<FixedText> > aMnemonicLabels(list_mnemonic_labels()); + for (auto aI = aMnemonicLabels.begin(); aI != aMnemonicLabels.end(); ++aI) { remove_mnemonic_label(*aI); } @@ -508,7 +507,7 @@ void Window::dispose() while ( pDelData ) { pDelData->mbDel = true; - pDelData->mpWindow = NULL; // #112873# pDel is not associated with a Window anymore + pDelData->mpWindow.clear(); // #112873# pDel is not associated with a Window anymore pDelData = pDelData->mpNext; } @@ -523,8 +522,8 @@ void Window::dispose() { ImplWinData* pParentWinData = mpWindowImpl->mpRealParent->ImplGetWinData(); - ::std::list< vcl::Window* >::iterator myPos = ::std::find( pParentWinData->maTopWindowChildren.begin(), - pParentWinData->maTopWindowChildren.end(), this ); + auto myPos = ::std::find( pParentWinData->maTopWindowChildren.begin(), + pParentWinData->maTopWindowChildren.end(), VclPtr<vcl::Window>(this) ); DBG_ASSERT( myPos != pParentWinData->maTopWindowChildren.end(), "Window::~Window: inconsistency in top window chain!" ); if ( myPos != pParentWinData->maTopWindowChildren.end() ) pParentWinData->maTopWindowChildren.erase( myPos ); @@ -563,10 +562,10 @@ void Window::dispose() else { vcl::Window* pSysWin = pSVData->maWinData.mpFirstFrame; - while ( pSysWin->mpWindowImpl->mpFrameData->mpNextFrame != this ) + while ( pSysWin->mpWindowImpl->mpFrameData->mpNextFrame.get() != this ) pSysWin = pSysWin->mpWindowImpl->mpFrameData->mpNextFrame; - assert (mpWindowImpl->mpFrameData->mpNextFrame != pSysWin); + assert (mpWindowImpl->mpFrameData->mpNextFrame.get() != pSysWin); pSysWin->mpWindowImpl->mpFrameData->mpNextFrame = mpWindowImpl->mpFrameData->mpNextFrame; } mpWindowImpl->mpFrame->SetCallback( NULL, NULL ); @@ -1005,7 +1004,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p mpWindowImpl->mpOverlapWindow = this; // set frame data - assert (pSVData->maWinData.mpFirstFrame != this); + assert (pSVData->maWinData.mpFirstFrame.get() != this); mpWindowImpl->mpFrameData->mpNextFrame = pSVData->maWinData.mpFirstFrame; pSVData->maWinData.mpFirstFrame = this; mpWindowImpl->mpFrameData->mpFirstOverlap = NULL; @@ -2508,7 +2507,7 @@ Size Window::GetSizePixel() const // #i43257# trigger pending resize handler to assure correct window sizes if( mpWindowImpl->mpFrameData->maResizeIdle.IsActive() ) { - ImplDelData aDogtag( this ); + ImplDelData aDogtag( const_cast<Window*>(this) ); mpWindowImpl->mpFrameData->maResizeIdle.Stop(); mpWindowImpl->mpFrameData->maResizeIdle.GetIdleHdl().Call( NULL ); if( aDogtag.IsDead() ) @@ -2561,7 +2560,7 @@ void Window::Enable( bool bEnable, bool bChild ) // window was disabled when the frame focus changed ImplSVData* pSVData = ImplGetSVData(); if( bEnable && - pSVData->maWinData.mpFocusWin == NULL && + pSVData->maWinData.mpFocusWin == nullptr && mpWindowImpl->mpFrameData->mbHasFocus && mpWindowImpl->mpFrameData->mpFocusWin == this ) pSVData->maWinData.mpFocusWin = this; @@ -2644,7 +2643,7 @@ void Window::EnableInput( bool bEnable, bool bChild ) // window was disabled when the frame focus changed ImplSVData* pSVData = ImplGetSVData(); if( bEnable && - pSVData->maWinData.mpFocusWin == NULL && + pSVData->maWinData.mpFocusWin == nullptr && mpWindowImpl->mpFrameData->mbHasFocus && mpWindowImpl->mpFrameData->mpFocusWin == this ) pSVData->maWinData.mpFocusWin = this; @@ -2716,8 +2715,8 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, // the same for ownerdraw floating windows if( mpWindowImpl->mbFrame ) { - ::std::vector< vcl::Window* >& rList = mpWindowImpl->mpFrameData->maOwnerDrawList; - ::std::vector< vcl::Window* >::iterator p = rList.begin(); + ::std::vector< VclPtr<vcl::Window> >& rList = mpWindowImpl->mpFrameData->maOwnerDrawList; + auto p = rList.begin(); while( p != rList.end() ) { // Is Window in the path from this window @@ -3083,7 +3082,7 @@ Rectangle Window::ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bo if( pRelativeWindow ) { // #106399# express coordinates relative to borderwindow - vcl::Window *pRelWin = (!bClientOnly && pRelativeWindow->mpWindowImpl->mpBorderWindow) ? pRelativeWindow->mpWindowImpl->mpBorderWindow : pRelativeWindow; + vcl::Window *pRelWin = (!bClientOnly && pRelativeWindow->mpWindowImpl->mpBorderWindow) ? pRelativeWindow->mpWindowImpl->mpBorderWindow.get() : pRelativeWindow; aPos = pRelWin->AbsoluteScreenToOutputPixel( aPos ); } return Rectangle( aPos, aSize ); @@ -3636,7 +3635,7 @@ void Window::ImplIncModalCount() { pParent = pParent->GetParent(); } - pFrameWindow = pParent ? pParent->mpWindowImpl->mpFrameWindow : NULL; + pFrameWindow = pParent ? pParent->mpWindowImpl->mpFrameWindow.get() : NULL; } } void Window::ImplDecModalCount() @@ -3650,7 +3649,7 @@ void Window::ImplDecModalCount() { pParent = pParent->GetParent(); } - pFrameWindow = pParent ? pParent->mpWindowImpl->mpFrameWindow : NULL; + pFrameWindow = pParent ? pParent->mpWindowImpl->mpFrameWindow.get() : NULL; } } diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 1e60f08900cb..25b599b2a1d8 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -375,7 +375,7 @@ void Window::StartTracking( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); - if ( pSVData->maWinData.mpTrackWin != this ) + if ( pSVData->maWinData.mpTrackWin.get() != this ) { if ( pSVData->maWinData.mpTrackWin ) pSVData->maWinData.mpTrackWin->EndTracking( ENDTRACK_CANCEL ); @@ -402,7 +402,7 @@ void Window::EndTracking( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); - if ( pSVData->maWinData.mpTrackWin == this ) + if ( pSVData->maWinData.mpTrackWin.get() == this ) { // due to DbgChkThis in brackets, as the window could be destroyed // in the handler @@ -449,7 +449,7 @@ void Window::StartAutoScroll( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); - if ( pSVData->maWinData.mpAutoScrollWin != this ) + if ( pSVData->maWinData.mpAutoScrollWin.get() != this ) { if ( pSVData->maWinData.mpAutoScrollWin ) pSVData->maWinData.mpAutoScrollWin->EndAutoScroll(); @@ -464,7 +464,7 @@ void Window::EndAutoScroll() { ImplSVData* pSVData = ImplGetSVData(); - if ( pSVData->maWinData.mpAutoScrollWin == this ) + if ( pSVData->maWinData.mpAutoScrollWin.get() == this ) { pSVData->maWinData.mpAutoScrollWin = NULL; pSVData->maWinData.mnAutoScrollFlags = 0; @@ -938,7 +938,7 @@ void Window::EnableDocking( bool bEnable ) } // retrieves the list of owner draw decorated windows for this window hiearchy -::std::vector<vcl::Window *>& Window::ImplGetOwnerDrawList() +::std::vector<VclPtr<vcl::Window> >& Window::ImplGetOwnerDrawList() { return ImplGetTopmostFrameWindow()->mpWindowImpl->mpFrameData->maOwnerDrawList; } @@ -1016,7 +1016,7 @@ const vcl::Window* Window::ImplGetFirstOverlapWindow() const vcl::Window* Window::ImplGetFrameWindow() const { - return mpWindowImpl ? mpWindowImpl->mpFrameWindow : NULL; + return mpWindowImpl ? mpWindowImpl->mpFrameWindow.get() : NULL; } bool Window::IsDockingWindow() const @@ -1222,7 +1222,7 @@ bool Window::IsInPaint() const vcl::Window* Window::GetParent() const { - return mpWindowImpl ? mpWindowImpl->mpRealParent : NULL; + return mpWindowImpl ? mpWindowImpl->mpRealParent.get() : NULL; } bool Window::IsVisible() const @@ -1457,9 +1457,8 @@ void Window::queue_resize(StateChangedType eReason) WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl; if (pWindowImpl->m_xSizeGroup && pWindowImpl->m_xSizeGroup->get_mode() != VCL_SIZE_GROUP_NONE) { - std::set<vcl::Window*> &rWindows = pWindowImpl->m_xSizeGroup->get_widgets(); - for (std::set<vcl::Window*>::iterator aI = rWindows.begin(), - aEnd = rWindows.end(); aI != aEnd; ++aI) + std::set<VclPtr<vcl::Window> > &rWindows = pWindowImpl->m_xSizeGroup->get_widgets(); + for (auto aI = rWindows.begin(), aEnd = rWindows.end(); aI != aEnd; ++aI) { vcl::Window *pOther = *aI; if (pOther == this) @@ -1754,9 +1753,8 @@ Size Window::get_preferred_size() const if (eMode != VCL_SIZE_GROUP_NONE) { const bool bIgnoreInHidden = pWindowImpl->m_xSizeGroup->get_ignore_hidden(); - const std::set<vcl::Window*> &rWindows = pWindowImpl->m_xSizeGroup->get_widgets(); - for (std::set<vcl::Window*>::const_iterator aI = rWindows.begin(), - aEnd = rWindows.end(); aI != aEnd; ++aI) + const std::set<VclPtr<vcl::Window> > &rWindows = pWindowImpl->m_xSizeGroup->get_widgets(); + for (auto aI = rWindows.begin(), aEnd = rWindows.end(); aI != aEnd; ++aI) { const vcl::Window *pOther = *aI; if (pOther == this) @@ -2040,8 +2038,8 @@ void Window::remove_from_all_size_groups() void Window::add_mnemonic_label(FixedText *pLabel) { - std::vector<FixedText*>& v = mpWindowImpl->m_aMnemonicLabels; - if (std::find(v.begin(), v.end(), pLabel) != v.end()) + std::vector<VclPtr<FixedText> >& v = mpWindowImpl->m_aMnemonicLabels; + if (std::find(v.begin(), v.end(), VclPtr<FixedText>(pLabel)) != v.end()) return; v.push_back(pLabel); pLabel->set_mnemonic_widget(this); @@ -2049,15 +2047,15 @@ void Window::add_mnemonic_label(FixedText *pLabel) void Window::remove_mnemonic_label(FixedText *pLabel) { - std::vector<FixedText*>& v = mpWindowImpl->m_aMnemonicLabels; - std::vector<FixedText*>::iterator aFind = std::find(v.begin(), v.end(), pLabel); + std::vector<VclPtr<FixedText> >& v = mpWindowImpl->m_aMnemonicLabels; + auto aFind = std::find(v.begin(), v.end(), VclPtr<FixedText>(pLabel)); if (aFind == v.end()) return; v.erase(aFind); pLabel->set_mnemonic_widget(NULL); } -std::vector<FixedText*> Window::list_mnemonic_labels() const +std::vector<VclPtr<FixedText> > Window::list_mnemonic_labels() const { return mpWindowImpl->m_aMnemonicLabels; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 890cb61a9452..4570b750c5b5 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -243,7 +243,7 @@ static bool ImplCallCommand( vcl::Window* pChild, sal_uInt16 nEvt, void* pData = struct ContextMenuEvent { - vcl::Window* pWindow; + VclPtr<vcl::Window> pWindow; ImplDelData aDelData; Point aChildPos; }; @@ -377,13 +377,13 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool // no mouse messages to disabled windows // #106845# if the window was disabed during capturing we have to pass the mouse events to release capturing - if ( pSVData->maWinData.mpCaptureWin != pChild && (!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalNonRefMode() ) ) + if ( pSVData->maWinData.mpCaptureWin.get() != pChild && (!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalNonRefMode() ) ) { ImplHandleMouseFloatMode( pChild, aMousePos, nCode, nSVEvent, bMouseLeave ); if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) { ImplHandleMouseHelpRequest( pChild, aMousePos ); - if( pWinFrameData->mpMouseMoveWin != pChild ) + if( pWinFrameData->mpMouseMoveWin.get() != pChild ) nMode |= MouseEventModifiers::ENTERWINDOW; } @@ -1726,7 +1726,7 @@ void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ) { // #i42750# presentation wants to be informed about resize // as early as possible - WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pWindow->ImplGetWindowImpl()->mpClientWindow); + WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pWindow->ImplGetWindowImpl()->mpClientWindow.get()); if( ! pWorkWindow || pWorkWindow->IsPresentationMode() ) bStartTimer = false; } @@ -1972,7 +1972,7 @@ static void ImplHandleLoseFocus( vcl::Window* pWindow ) struct DelayedCloseEvent { - vcl::Window* pWindow; + VclPtr<vcl::Window> pWindow; ImplDelData aDelData; }; @@ -1985,9 +1985,9 @@ static sal_IntPtr DelayedCloseEventLink( void* pCEvent, void* ) pEv->pWindow->ImplRemoveDel( &pEv->aDelData ); // dispatch to correct window type if( pEv->pWindow->IsSystemWindow() ) - static_cast<SystemWindow*>(pEv->pWindow)->Close(); + static_cast<SystemWindow*>(pEv->pWindow.get())->Close(); else if( pEv->pWindow->IsDockingWindow() ) - static_cast<DockingWindow*>(pEv->pWindow)->Close(); + static_cast<DockingWindow*>(pEv->pWindow.get())->Close(); } delete pEv; |