From ebd195b2ae254bfc9b52c9c673a57cd3bdf0cad8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 15 Jan 2015 15:47:39 +0200 Subject: vcl: VclPtr conversion in cui Change-Id: I8597247296645fe72d5306e35b2ea3c0866d147a --- cui/source/customize/macropg.cxx | 74 +++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 31 deletions(-) (limited to 'cui/source/customize/macropg.cxx') diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 5f83f286784f..13ae5f461a00 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -83,32 +83,32 @@ static long nTabs[] = IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) { - DBG_ASSERT( pBar == &maHeaderBar, "*MacroEventListBox::HeaderEndDrag_Impl: something is wrong here..." ); + DBG_ASSERT( pBar == maHeaderBar.get(), "*MacroEventListBox::HeaderEndDrag_Impl: something is wrong here..." ); (void)pBar; - if( !maHeaderBar.GetCurItemId() ) + if( !maHeaderBar->GetCurItemId() ) return 0; - if( !maHeaderBar.IsItemMode() ) + if( !maHeaderBar->IsItemMode() ) { Size aSz; - sal_uInt16 _nTabs = maHeaderBar.GetItemCount(); - long nWidth = maHeaderBar.GetItemSize( ITEMID_EVENT ); - long nBarWidth = maHeaderBar.GetSizePixel().Width(); + sal_uInt16 _nTabs = maHeaderBar->GetItemCount(); + long nWidth = maHeaderBar->GetItemSize( ITEMID_EVENT ); + long nBarWidth = maHeaderBar->GetSizePixel().Width(); if( nWidth < TAB_WIDTH_MIN ) - maHeaderBar.SetItemSize( ITEMID_EVENT, TAB_WIDTH_MIN ); + maHeaderBar->SetItemSize( ITEMID_EVENT, TAB_WIDTH_MIN ); else if( ( nBarWidth - nWidth ) < TAB_WIDTH_MIN ) - maHeaderBar.SetItemSize( ITEMID_EVENT, nBarWidth - TAB_WIDTH_MIN ); + maHeaderBar->SetItemSize( ITEMID_EVENT, nBarWidth - TAB_WIDTH_MIN ); { long nTmpSz = 0; for( sal_uInt16 i = 1 ; i < _nTabs ; ++i ) { - long _nWidth = maHeaderBar.GetItemSize( i ); + long _nWidth = maHeaderBar->GetItemSize( i ); aSz.Width() = _nWidth + nTmpSz; nTmpSz += _nWidth; - maListBox.SetTab( i, PixelToLogic( aSz, MapMode( MAP_APPFONT ) ).Width(), MAP_APPFONT ); + maListBox->SetTab( i, PixelToLogic( aSz, MapMode( MAP_APPFONT ) ).Width(), MAP_APPFONT ); } } } @@ -121,8 +121,8 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt ) if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { - if ( rNEvt.GetWindow() != &maListBox ) - maListBox.GrabFocus(); + if ( rNEvt.GetWindow() != maListBox.get() ) + maListBox->GrabFocus(); } return nRet; @@ -130,13 +130,25 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt ) MacroEventListBox::MacroEventListBox( vcl::Window* pParent, WinBits nStyle ) : Control( pParent, nStyle ) - , maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) - , maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ) + , maHeaderBar( new HeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) ) + , maListBox( new SvHeaderTabListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ) ) { - maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX ); + maListBox->SetHelpId( HID_MACRO_HEADERTABLISTBOX ); // enable the cell focus to show visible focus - maListBox.EnableCellFocus(); + maListBox->EnableCellFocus(); +} + +MacroEventListBox::~MacroEventListBox() +{ + dispose(); +} + +void MacroEventListBox::dispose() +{ + maHeaderBar.disposeAndClear(); + maListBox.disposeAndClear(); + Control::dispose(); } extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeMacroEventListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) @@ -161,15 +173,15 @@ void MacroEventListBox::Resize() // calc pos and size of header bar Point aPnt( 0, 0 ); - Size aSize( maHeaderBar.CalcWindowSizePixel() ); + Size aSize( maHeaderBar->CalcWindowSizePixel() ); Size aCtrlSize( GetOutputSizePixel() ); aSize.Width() = aCtrlSize.Width(); - maHeaderBar.SetPosSizePixel( aPnt, aSize ); + maHeaderBar->SetPosSizePixel( aPnt, aSize ); // calc pos and size of ListBox aPnt.Y() += aSize.Height(); aSize.Height() = aCtrlSize.Height() - aSize.Height(); - maListBox.SetPosSizePixel( aPnt, aSize ); + maListBox->SetPosSizePixel( aPnt, aSize ); } void MacroEventListBox::ConnectElements( void ) @@ -177,21 +189,21 @@ void MacroEventListBox::ConnectElements( void ) Resize(); // set handler - maHeaderBar.SetEndDragHdl( LINK( this, MacroEventListBox, HeaderEndDrag_Impl ) ); + maHeaderBar->SetEndDragHdl( LINK( this, MacroEventListBox, HeaderEndDrag_Impl ) ); - maListBox.InitHeaderBar( &maHeaderBar ); + maListBox->InitHeaderBar( maHeaderBar.get() ); } void MacroEventListBox::Show( bool bVisible, sal_uInt16 nFlags ) { - maListBox.Show( bVisible, nFlags ); - maHeaderBar.Show( bVisible, nFlags ); + maListBox->Show( bVisible, nFlags ); + maHeaderBar->Show( bVisible, nFlags ); } void MacroEventListBox::Enable( bool bEnable, bool bChild ) { - maListBox.Enable( bEnable, bChild ); - maHeaderBar.Enable( bEnable, bChild ); + maListBox->Enable( bEnable, bChild ); + maHeaderBar->Enable( bEnable, bChild ); } // assign button ("Add Command") is enabled only if it is not read only @@ -225,8 +237,14 @@ _SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID, } _SvxMacroTabPage::~_SvxMacroTabPage() +{ + dispose(); +} + +void _SvxMacroTabPage::dispose() { DELETEZ( mpImpl ); + SfxTabPage::dispose(); } void _SvxMacroTabPage::InitResources() @@ -870,12 +888,6 @@ AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUStr mpMethodEdit->SetText( aMethodName, Selection( 0, SELECTION_MAX ) ); } -AssignComponentDialog::~AssignComponentDialog() -{ -} - - - IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) { (void)pButton; //unused -- cgit v1.2.3 From 1c4025babd7037a3292aa530c7d45ab8d6ef6dcb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 9 Mar 2015 14:29:30 +0200 Subject: 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 --- .../extended/accessibleiconchoicectrlentry.hxx | 3 +- .../extended/accessibletabbarbase.hxx | 3 +- .../extended/accessibletablistbox.hxx | 2 +- .../extended/accessibletablistboxtable.hxx | 2 +- .../accessibility/extended/listboxaccessible.hxx | 5 +- .../extended/textwindowaccessibility.hxx | 2 +- .../standard/vclxaccessiblemenubar.hxx | 3 +- .../standard/vclxaccessiblestatusbar.hxx | 3 +- .../standard/vclxaccessiblestatusbaritem.hxx | 8 +- .../standard/vclxaccessibletabcontrol.hxx | 3 +- .../standard/vclxaccessibletabpage.hxx | 3 +- .../standard/vclxaccessibletabpagewindow.hxx | 5 +- .../standard/vclxaccessibletoolboxitem.hxx | 13 +- .../source/extended/AccessibleToolPanelDeck.cxx | 6 +- .../extended/AccessibleToolPanelDeckTabBar.cxx | 4 +- .../extended/AccessibleToolPanelDeckTabBarItem.cxx | 4 +- .../extended/accessibleiconchoicectrlentry.cxx | 2 +- .../source/extended/textwindowaccessibility.cxx | 6 +- .../source/standard/vclxaccessibleradiobutton.cxx | 6 +- .../standard/vclxaccessibletabpagewindow.cxx | 2 +- avmedia/inc/mediacontrol.hxx | 2 +- avmedia/source/framework/mediacontrol.cxx | 3 +- avmedia/source/framework/mediaplayer.cxx | 2 +- avmedia/source/viewer/mediaevent_impl.cxx | 14 +- avmedia/source/viewer/mediaevent_impl.hxx | 3 +- avmedia/source/viewer/mediawindow_impl.cxx | 3 +- avmedia/source/viewer/mediawindow_impl.hxx | 2 +- basctl/source/basicide/basicrenderable.hxx | 2 +- basctl/source/basicide/baside2.cxx | 1 + basctl/source/basicide/baside2.hxx | 12 +- basctl/source/basicide/baside2b.cxx | 15 +- basctl/source/basicide/baside3.cxx | 6 +- basctl/source/basicide/basides1.cxx | 28 +- basctl/source/basicide/basides2.cxx | 8 +- basctl/source/basicide/basides3.cxx | 4 +- basctl/source/basicide/basidesh.cxx | 12 +- basctl/source/basicide/bastypes.cxx | 15 +- basctl/source/basicide/brkdlg.cxx | 15 + basctl/source/basicide/brkdlg.hxx | 14 +- basctl/source/basicide/layout.cxx | 11 + basctl/source/basicide/layout.hxx | 7 +- basctl/source/basicide/linenumberwindow.cxx | 11 + basctl/source/basicide/linenumberwindow.hxx | 4 +- basctl/source/basicide/macrodlg.cxx | 14 + basctl/source/basicide/macrodlg.hxx | 30 +- basctl/source/basicide/moduldl2.cxx | 46 ++- basctl/source/basicide/moduldlg.cxx | 33 +- basctl/source/basicide/moduldlg.hxx | 62 ++-- basctl/source/dlged/managelang.cxx | 20 ++ basctl/source/inc/accessibledialogcontrolshape.hxx | 3 +- basctl/source/inc/accessibledialogwindow.hxx | 3 +- basctl/source/inc/baside3.hxx | 4 +- basctl/source/inc/basidesh.hxx | 8 +- basctl/source/inc/bastypes.hxx | 9 +- basctl/source/inc/dlged.hxx | 5 +- basctl/source/inc/managelang.hxx | 22 +- chart2/inc/ChartModel.hxx | 2 +- .../accessibility/AccessibleViewForwarder.hxx | 3 +- .../dialogs/ChartTypeDialogController.hxx | 4 +- chart2/source/controller/dialogs/dlg_ChartType.cxx | 3 +- .../controller/dialogs/dlg_CreationWizard_UNO.cxx | 12 +- .../source/controller/dialogs/dlg_DataEditor.cxx | 1 + .../source/controller/dialogs/dlg_DataSource.cxx | 10 +- .../controller/dialogs/dlg_InsertAxis_Grid.cxx | 17 ++ chart2/source/controller/dialogs/dlg_View3D.cxx | 14 +- .../source/controller/dialogs/res_BarGeometry.hxx | 4 +- chart2/source/controller/dialogs/res_DataLabel.hxx | 38 +-- chart2/source/controller/dialogs/res_Trendline.hxx | 46 +-- .../controller/dialogs/tp_3D_SceneAppearance.cxx | 14 + .../controller/dialogs/tp_3D_SceneAppearance.hxx | 10 +- .../controller/dialogs/tp_3D_SceneGeometry.cxx | 18 ++ .../controller/dialogs/tp_3D_SceneGeometry.hxx | 16 +- .../controller/dialogs/tp_3D_SceneIllumination.cxx | 15 +- .../controller/dialogs/tp_3D_SceneIllumination.hxx | 32 +- chart2/source/controller/dialogs/tp_AxisLabel.cxx | 17 ++ chart2/source/controller/dialogs/tp_AxisLabel.hxx | 34 +-- .../source/controller/dialogs/tp_AxisPositions.cxx | 24 ++ .../source/controller/dialogs/tp_AxisPositions.hxx | 38 +-- chart2/source/controller/dialogs/tp_ChartType.cxx | 63 ++-- chart2/source/controller/dialogs/tp_ChartType.hxx | 6 +- chart2/source/controller/dialogs/tp_DataSource.cxx | 28 ++ chart2/source/controller/dialogs/tp_DataSource.hxx | 42 +-- .../controller/dialogs/tp_LegendPosition.cxx | 12 + .../controller/dialogs/tp_LegendPosition.hxx | 4 +- .../source/controller/dialogs/tp_PolarOptions.cxx | 16 + .../source/controller/dialogs/tp_PolarOptions.hxx | 14 +- .../source/controller/dialogs/tp_RangeChooser.cxx | 24 ++ .../source/controller/dialogs/tp_RangeChooser.hxx | 28 +- chart2/source/controller/dialogs/tp_Scale.cxx | 35 +++ chart2/source/controller/dialogs/tp_Scale.hxx | 66 ++-- .../source/controller/dialogs/tp_SeriesToAxis.cxx | 24 ++ .../source/controller/dialogs/tp_SeriesToAxis.hxx | 36 +-- .../source/controller/dialogs/tp_TitleRotation.cxx | 7 + .../source/controller/dialogs/tp_TitleRotation.hxx | 14 +- .../dialogs/tp_Wizard_TitlesAndObjects.cxx | 13 + .../dialogs/tp_Wizard_TitlesAndObjects.hxx | 8 +- chart2/source/controller/inc/dlg_ChartType.hxx | 2 +- .../controller/inc/dlg_CreationWizard_UNO.hxx | 2 +- chart2/source/controller/inc/dlg_DataEditor.hxx | 2 +- chart2/source/controller/inc/dlg_DataSource.hxx | 8 +- .../source/controller/inc/dlg_InsertAxis_Grid.hxx | 14 +- chart2/source/controller/inc/dlg_View3D.hxx | 8 +- chart2/source/controller/inc/res_ErrorBar.hxx | 54 ++-- .../source/controller/inc/res_LegendPosition.hxx | 10 +- chart2/source/controller/inc/res_Titles.hxx | 28 +- chart2/source/controller/main/ChartController.hxx | 2 +- chart2/source/controller/main/ChartWindow.cxx | 5 +- chart2/source/controller/main/ChartWindow.hxx | 2 +- chart2/source/controller/main/ShapeController.cxx | 12 +- chart2/source/view/charttypes/GL3DBarChart.cxx | 2 +- chart2/source/view/inc/GL3DBarChart.hxx | 2 +- chart2/source/view/main/ChartView.cxx | 2 +- compilerplugins/clang/vclwidgets.cxx | 205 +++++++++---- cui/source/customize/acccfg.cxx | 23 ++ cui/source/customize/cfg.cxx | 115 +++++-- cui/source/customize/cfgutil.cxx | 1 + cui/source/customize/eventdlg.cxx | 1 + cui/source/customize/eventdlg.hxx | 2 +- cui/source/customize/macropg.cxx | 12 + cui/source/customize/macropg_impl.hxx | 14 +- cui/source/customize/selector.cxx | 17 ++ cui/source/dialogs/SpellDialog.cxx | 20 ++ cui/source/dialogs/about.cxx | 17 ++ cui/source/dialogs/colorpicker.cxx | 82 +++-- cui/source/dialogs/cuicharmap.cxx | 19 ++ cui/source/dialogs/cuifmsearch.cxx | 30 +- cui/source/dialogs/cuigaldlg.cxx | 86 +++++- cui/source/dialogs/cuigrfflt.cxx | 72 +++++ cui/source/dialogs/cuiimapwnd.cxx | 15 + cui/source/dialogs/cuitbxform.cxx | 11 + cui/source/dialogs/dlgname.cxx | 41 +++ cui/source/dialogs/hangulhanjadlg.cxx | 84 +++++- cui/source/dialogs/hldocntp.cxx | 5 + cui/source/dialogs/hldoctp.cxx | 15 + cui/source/dialogs/hlinettp.cxx | 21 +- cui/source/dialogs/hlmailtp.cxx | 14 + cui/source/dialogs/hlmarkwn.cxx | 15 + cui/source/dialogs/hltpbase.cxx | 14 +- cui/source/dialogs/hyphen.cxx | 18 ++ cui/source/dialogs/iconcdlg.cxx | 20 +- cui/source/dialogs/insdlg.cxx | 45 +++ cui/source/dialogs/insrc.cxx | 13 + cui/source/dialogs/linkdlg.cxx | 20 ++ cui/source/dialogs/multipat.cxx | 21 +- cui/source/dialogs/newtabledlg.cxx | 12 + cui/source/dialogs/passwdomdlg.cxx | 18 +- cui/source/dialogs/pastedlg.cxx | 13 + cui/source/dialogs/postdlg.cxx | 7 + cui/source/dialogs/scriptdlg.cxx | 18 ++ cui/source/dialogs/showcols.cxx | 11 + cui/source/dialogs/splitcelldlg.cxx | 14 + cui/source/dialogs/srchxtra.cxx | 25 ++ cui/source/dialogs/thesdlg.cxx | 39 +++ cui/source/dialogs/zoom.cxx | 13 + cui/source/factory/cuiexp.cxx | 29 ++ cui/source/factory/dlgfact.cxx | 2 - cui/source/factory/dlgfact.hxx | 5 +- cui/source/inc/ControlFocusHelper.hxx | 4 +- cui/source/inc/SpellDialog.hxx | 40 +-- cui/source/inc/about.hxx | 16 +- cui/source/inc/acccfg.hxx | 26 +- cui/source/inc/align.hxx | 52 ++-- cui/source/inc/autocdlg.hxx | 114 +++---- cui/source/inc/backgrnd.hxx | 58 ++-- cui/source/inc/border.hxx | 66 ++-- cui/source/inc/cfg.hxx | 77 +++-- cui/source/inc/cfgutil.hxx | 2 +- cui/source/inc/chardlg.hxx | 180 +++++------ cui/source/inc/connect.hxx | 26 +- cui/source/inc/cuicharmap.hxx | 22 +- cui/source/inc/cuifmsearch.hxx | 54 ++-- cui/source/inc/cuigaldlg.hxx | 70 +++-- cui/source/inc/cuigrfflt.hxx | 34 ++- cui/source/inc/cuihyperdlg.hxx | 2 +- cui/source/inc/cuiimapwnd.hxx | 12 +- cui/source/inc/cuioptgenrl.hxx | 4 +- cui/source/inc/cuisrchdlg.hxx | 4 +- cui/source/inc/cuitabarea.hxx | 280 ++++++++--------- cui/source/inc/cuitabline.hxx | 110 +++---- cui/source/inc/cuitbxform.hxx | 4 +- cui/source/inc/dbregister.hxx | 10 +- cui/source/inc/dlgname.hxx | 29 +- cui/source/inc/dstribut.hxx | 26 +- cui/source/inc/grfpage.hxx | 42 +-- cui/source/inc/hangulhanjadlg.hxx | 92 +++--- cui/source/inc/hldocntp.hxx | 10 +- cui/source/inc/hldoctp.hxx | 12 +- cui/source/inc/hlinettp.hxx | 20 +- cui/source/inc/hlmailtp.hxx | 10 +- cui/source/inc/hlmarkwn.hxx | 12 +- cui/source/inc/hltpbase.hxx | 14 +- cui/source/inc/hyphen.hxx | 18 +- cui/source/inc/iconcdlg.hxx | 26 +- cui/source/inc/insdlg.hxx | 54 ++-- cui/source/inc/insrc.hxx | 8 +- cui/source/inc/labdlg.hxx | 22 +- cui/source/inc/linkdlg.hxx | 22 +- cui/source/inc/measure.hxx | 36 +-- cui/source/inc/multipat.hxx | 12 +- cui/source/inc/newtabledlg.hxx | 6 +- cui/source/inc/numfmt.hxx | 60 ++-- cui/source/inc/numpages.hxx | 128 ++++---- cui/source/inc/optasian.hxx | 26 +- cui/source/inc/optdict.hxx | 30 +- cui/source/inc/optlingu.hxx | 36 +-- cui/source/inc/optpath.hxx | 8 +- cui/source/inc/page.hxx | 58 ++-- cui/source/inc/paragrph.hxx | 130 ++++---- cui/source/inc/pastedlg.hxx | 10 +- cui/source/inc/postdlg.hxx | 14 +- cui/source/inc/scriptdlg.hxx | 20 +- cui/source/inc/selector.hxx | 16 +- cui/source/inc/showcols.hxx | 6 +- cui/source/inc/splitcelldlg.hxx | 10 +- cui/source/inc/srchxtra.hxx | 16 +- cui/source/inc/swpossizetabpage.hxx | 54 ++-- cui/source/inc/tabstpge.hxx | 56 ++-- cui/source/inc/textanim.hxx | 37 +-- cui/source/inc/textattr.hxx | 35 ++- cui/source/inc/thesdlg.hxx | 23 +- cui/source/inc/transfrm.hxx | 62 ++-- cui/source/inc/treeopt.hxx | 10 +- cui/source/inc/zoom.hxx | 26 +- cui/source/options/certpath.cxx | 6 +- cui/source/options/certpath.hxx | 8 +- cui/source/options/connpooloptions.cxx | 17 ++ cui/source/options/connpooloptions.hxx | 18 +- cui/source/options/cuisrchdlg.cxx | 11 + cui/source/options/dbregister.cxx | 7 +- cui/source/options/doclinkdialog.cxx | 14 + cui/source/options/doclinkdialog.hxx | 10 +- cui/source/options/fontsubs.cxx | 12 +- cui/source/options/fontsubs.hxx | 24 +- cui/source/options/optaboutconfig.cxx | 26 ++ cui/source/options/optaboutconfig.hxx | 16 +- cui/source/options/optaccessibility.cxx | 9 + cui/source/options/optaccessibility.hxx | 18 +- cui/source/options/optasian.cxx | 13 + cui/source/options/optbasic.cxx | 16 + cui/source/options/optbasic.hxx | 14 +- cui/source/options/optchart.cxx | 5 + cui/source/options/optchart.hxx | 10 +- cui/source/options/optcolor.cxx | 61 ++-- cui/source/options/optcolor.hxx | 8 +- cui/source/options/optctl.cxx | 16 + cui/source/options/optctl.hxx | 14 +- cui/source/options/optdict.cxx | 31 ++ cui/source/options/optfltr.cxx | 23 +- cui/source/options/optfltr.hxx | 22 +- cui/source/options/optgdlg.cxx | 54 ++++ cui/source/options/optgdlg.hxx | 92 +++--- cui/source/options/optgenrl.cxx | 14 +- cui/source/options/opthtml.cxx | 26 ++ cui/source/options/opthtml.hxx | 34 ++- cui/source/options/optinet2.cxx | 49 ++- cui/source/options/optinet2.hxx | 72 ++--- cui/source/options/optjava.cxx | 35 ++- cui/source/options/optjava.hxx | 44 +-- cui/source/options/optjsearch.cxx | 28 ++ cui/source/options/optjsearch.hxx | 42 +-- cui/source/options/optlingu.cxx | 35 ++- cui/source/options/optmemory.cxx | 17 ++ cui/source/options/optmemory.hxx | 16 +- cui/source/options/optopencl.cxx | 49 ++- cui/source/options/optopencl.hxx | 41 +-- cui/source/options/optpath.cxx | 6 +- cui/source/options/optsave.cxx | 17 ++ cui/source/options/optsave.hxx | 38 +-- cui/source/options/optupdt.cxx | 19 ++ cui/source/options/optupdt.hxx | 22 +- cui/source/options/personalization.cxx | 39 +++ cui/source/options/personalization.hxx | 36 ++- cui/source/options/securityoptions.cxx | 18 ++ cui/source/options/securityoptions.hxx | 18 +- cui/source/options/treeopt.cxx | 21 +- cui/source/options/webconninfo.cxx | 6 +- cui/source/options/webconninfo.hxx | 8 +- cui/source/tabpages/align.cxx | 24 ++ cui/source/tabpages/autocdlg.cxx | 113 ++++++- cui/source/tabpages/backgrnd.cxx | 27 ++ cui/source/tabpages/border.cxx | 34 +++ cui/source/tabpages/chardlg.cxx | 116 ++++++- cui/source/tabpages/connect.cxx | 22 ++ cui/source/tabpages/dstribut.cxx | 32 ++ cui/source/tabpages/grfpage.cxx | 18 ++ cui/source/tabpages/labdlg.cxx | 20 ++ cui/source/tabpages/macroass.cxx | 20 +- cui/source/tabpages/measure.cxx | 25 ++ cui/source/tabpages/numfmt.cxx | 26 +- cui/source/tabpages/numpages.cxx | 61 +++- cui/source/tabpages/page.cxx | 29 ++ cui/source/tabpages/paragrph.cxx | 99 ++++++ cui/source/tabpages/swpossizetabpage.cxx | 37 +++ cui/source/tabpages/tabstpge.cxx | 35 ++- cui/source/tabpages/textanim.cxx | 26 ++ cui/source/tabpages/textattr.cxx | 24 ++ cui/source/tabpages/tparea.cxx | 72 +++++ cui/source/tabpages/tpbitmap.cxx | 15 +- cui/source/tabpages/tpcolor.cxx | 32 +- cui/source/tabpages/tpgradnt.cxx | 28 ++ cui/source/tabpages/tphatch.cxx | 21 ++ cui/source/tabpages/tpline.cxx | 29 ++ cui/source/tabpages/tplnedef.cxx | 25 ++ cui/source/tabpages/tplneend.cxx | 18 ++ cui/source/tabpages/tpshadow.cxx | 17 ++ cui/source/tabpages/transfrm.cxx | 58 ++++ .../ext/macromigration/macromigrationpages.cxx | 42 +++ .../ext/macromigration/macromigrationpages.hxx | 34 ++- .../source/ext/macromigration/rangeprogressbar.hxx | 2 +- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 1 - dbaccess/source/ui/app/AppDetailView.cxx | 3 +- dbaccess/source/ui/app/AppDetailView.hxx | 4 +- dbaccess/source/ui/app/AppTitleWindow.cxx | 2 +- dbaccess/source/ui/app/AppTitleWindow.hxx | 2 +- dbaccess/source/ui/app/AppView.cxx | 14 +- dbaccess/source/ui/app/AppView.hxx | 8 +- dbaccess/source/ui/app/subcomponentmanager.cxx | 1 + dbaccess/source/ui/browser/brwview.cxx | 23 +- dbaccess/source/ui/browser/dbtreeview.cxx | 3 +- dbaccess/source/ui/browser/dbtreeview.hxx | 2 +- dbaccess/source/ui/browser/genericcontroller.cxx | 10 + dbaccess/source/ui/control/FieldDescControl.cxx | 109 ++++--- dbaccess/source/ui/control/TableGrantCtrl.cxx | 4 +- dbaccess/source/ui/control/VertSplitView.cxx | 4 +- dbaccess/source/ui/control/curledit.cxx | 6 +- dbaccess/source/ui/control/sqledit.cxx | 1 + dbaccess/source/ui/dlg/CollectionView.cxx | 16 + dbaccess/source/ui/dlg/ConnectionHelper.cxx | 12 +- dbaccess/source/ui/dlg/ConnectionHelper.hxx | 9 +- dbaccess/source/ui/dlg/ConnectionPage.cxx | 19 ++ dbaccess/source/ui/dlg/ConnectionPage.hxx | 24 +- dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 12 + dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 6 +- dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 114 ++++++- dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 109 ++++--- dbaccess/source/ui/dlg/DbAdminImpl.hxx | 3 +- dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx | 13 + dbaccess/source/ui/dlg/RelationDlg.cxx | 20 ++ dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 31 +- dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 40 +-- dbaccess/source/ui/dlg/UserAdmin.cxx | 24 +- dbaccess/source/ui/dlg/UserAdmin.hxx | 8 +- dbaccess/source/ui/dlg/admincontrols.cxx | 22 ++ dbaccess/source/ui/dlg/admincontrols.hxx | 27 +- dbaccess/source/ui/dlg/adminpages.hxx | 2 +- dbaccess/source/ui/dlg/adtabdlg.cxx | 6 + dbaccess/source/ui/dlg/advancedsettings.cxx | 88 ++++-- dbaccess/source/ui/dlg/advancedsettings.hxx | 56 ++-- dbaccess/source/ui/dlg/dbfindex.cxx | 19 ++ dbaccess/source/ui/dlg/dbfindex.hxx | 20 +- dbaccess/source/ui/dlg/dbwizsetup.cxx | 11 +- dbaccess/source/ui/dlg/detailpages.cxx | 102 ++++++- dbaccess/source/ui/dlg/detailpages.hxx | 80 ++--- dbaccess/source/ui/dlg/directsql.cxx | 7 + dbaccess/source/ui/dlg/dlgsave.cxx | 16 +- dbaccess/source/ui/dlg/dlgsize.cxx | 13 + dbaccess/source/ui/dlg/dsselect.cxx | 14 + dbaccess/source/ui/dlg/dsselect.hxx | 11 +- dbaccess/source/ui/dlg/generalpage.cxx | 30 ++ dbaccess/source/ui/dlg/generalpage.hxx | 26 +- dbaccess/source/ui/dlg/indexdialog.cxx | 9 + dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 4 +- dbaccess/source/ui/dlg/paramdialog.cxx | 5 + dbaccess/source/ui/dlg/queryfilter.cxx | 21 ++ dbaccess/source/ui/dlg/queryorder.cxx | 18 ++ dbaccess/source/ui/dlg/sqlmessage.cxx | 11 +- dbaccess/source/ui/dlg/tablespage.cxx | 3 + dbaccess/source/ui/dlg/tablespage.hxx | 6 +- dbaccess/source/ui/dlg/textconnectionsettings.cxx | 11 + dbaccess/source/ui/inc/CollectionView.hxx | 15 +- dbaccess/source/ui/inc/ConnectionLine.hxx | 3 +- dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 3 +- dbaccess/source/ui/inc/FieldDescControl.hxx | 70 ++--- dbaccess/source/ui/inc/JAccess.hxx | 3 +- dbaccess/source/ui/inc/JoinController.hxx | 2 +- dbaccess/source/ui/inc/JoinDesignView.hxx | 4 +- dbaccess/source/ui/inc/JoinTableView.hxx | 26 +- dbaccess/source/ui/inc/QueryDesignView.hxx | 2 +- dbaccess/source/ui/inc/QueryPropertiesDialog.hxx | 9 +- dbaccess/source/ui/inc/QueryTextView.hxx | 2 +- dbaccess/source/ui/inc/QueryViewSwitch.hxx | 4 +- dbaccess/source/ui/inc/RelationControl.hxx | 6 +- dbaccess/source/ui/inc/RelationDlg.hxx | 20 +- dbaccess/source/ui/inc/RelationTableView.hxx | 2 +- dbaccess/source/ui/inc/TableConnection.hxx | 2 +- dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 2 +- dbaccess/source/ui/inc/TableDesignView.hxx | 6 +- dbaccess/source/ui/inc/TableFieldDescription.hxx | 3 +- dbaccess/source/ui/inc/TableGrantCtrl.hxx | 4 +- dbaccess/source/ui/inc/TableWindow.hxx | 2 +- dbaccess/source/ui/inc/TableWindowAccess.hxx | 3 +- dbaccess/source/ui/inc/TableWindowListBox.hxx | 4 +- dbaccess/source/ui/inc/TableWindowTitle.hxx | 2 +- dbaccess/source/ui/inc/TokenWriter.hxx | 2 +- dbaccess/source/ui/inc/VertSplitView.hxx | 6 +- dbaccess/source/ui/inc/WCPage.hxx | 24 +- dbaccess/source/ui/inc/WColumnSelect.hxx | 12 +- dbaccess/source/ui/inc/WCopyTable.hxx | 10 +- dbaccess/source/ui/inc/WNameMatch.hxx | 23 +- dbaccess/source/ui/inc/WTabPage.hxx | 4 +- dbaccess/source/ui/inc/WTypeSelect.hxx | 22 +- dbaccess/source/ui/inc/adtabdlg.hxx | 12 +- dbaccess/source/ui/inc/brwview.hxx | 10 +- dbaccess/source/ui/inc/curledit.hxx | 2 +- dbaccess/source/ui/inc/datasourceconnector.hxx | 7 +- dbaccess/source/ui/inc/dbwizsetup.hxx | 6 +- dbaccess/source/ui/inc/directsql.hxx | 14 +- dbaccess/source/ui/inc/dlgsize.hxx | 6 +- dbaccess/source/ui/inc/indexdialog.hxx | 18 +- dbaccess/source/ui/inc/indexfieldscontrol.hxx | 4 +- dbaccess/source/ui/inc/linkeddocuments.hxx | 3 +- dbaccess/source/ui/inc/paramdialog.hxx | 10 +- dbaccess/source/ui/inc/querycontainerwindow.hxx | 4 +- dbaccess/source/ui/inc/queryfilter.hxx | 24 +- dbaccess/source/ui/inc/queryorder.hxx | 18 +- dbaccess/source/ui/inc/sqledit.hxx | 2 +- dbaccess/source/ui/inc/textconnectionsettings.hxx | 4 +- dbaccess/source/ui/inc/undosqledit.hxx | 3 +- dbaccess/source/ui/inc/unodatbr.hxx | 10 +- dbaccess/source/ui/misc/ToolBoxHelper.cxx | 2 +- dbaccess/source/ui/misc/WCPage.cxx | 23 ++ dbaccess/source/ui/misc/WColumnSelect.cxx | 17 ++ dbaccess/source/ui/misc/WCopyTable.cxx | 10 +- dbaccess/source/ui/misc/WNameMatch.cxx | 20 ++ dbaccess/source/ui/misc/WTypeSelect.cxx | 54 +++- dbaccess/source/ui/misc/singledoccontroller.cxx | 1 + .../source/ui/querydesign/ConnectionLineAccess.cxx | 9 +- dbaccess/source/ui/querydesign/JoinController.cxx | 2 +- dbaccess/source/ui/querydesign/JoinDesignView.cxx | 6 +- dbaccess/source/ui/querydesign/JoinTableView.cxx | 50 ++-- dbaccess/source/ui/querydesign/QTableWindow.cxx | 2 +- .../ui/querydesign/QueryDesignFieldUndoAct.hxx | 2 +- .../ui/querydesign/QueryDesignUndoAction.hxx | 3 +- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 59 ++-- .../ui/querydesign/QueryMoveTabWinUndoAct.hxx | 2 +- .../ui/querydesign/QuerySizeTabWinUndoAct.hxx | 2 +- .../ui/querydesign/QueryTabConnUndoAction.cxx | 18 +- .../ui/querydesign/QueryTabConnUndoAction.hxx | 2 +- .../source/ui/querydesign/QueryTabWinUndoAct.cxx | 8 +- .../source/ui/querydesign/QueryTabWinUndoAct.hxx | 6 +- dbaccess/source/ui/querydesign/QueryTableView.cxx | 54 ++-- dbaccess/source/ui/querydesign/QueryTextView.cxx | 3 +- .../source/ui/querydesign/SelectionBrowseBox.cxx | 22 +- .../source/ui/querydesign/SelectionBrowseBox.hxx | 12 +- dbaccess/source/ui/querydesign/TableConnection.cxx | 2 +- .../ui/querydesign/TableFieldDescription.cxx | 1 + dbaccess/source/ui/querydesign/TableWindow.cxx | 5 +- .../source/ui/querydesign/TableWindowAccess.cxx | 8 +- .../source/ui/querydesign/TableWindowListBox.cxx | 2 +- .../source/ui/querydesign/TableWindowTitle.cxx | 8 +- .../source/ui/querydesign/limitboxcontroller.cxx | 3 +- .../source/ui/querydesign/limitboxcontroller.hxx | 3 +- .../source/ui/querydesign/querycontainerwindow.cxx | 5 +- dbaccess/source/ui/querydesign/querydlg.cxx | 5 + dbaccess/source/ui/querydesign/querydlg.hxx | 10 +- .../source/ui/relationdesign/RelationTableView.cxx | 5 +- dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 3 +- dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 2 +- dbaccess/source/ui/tabledesign/TEditControl.cxx | 9 +- dbaccess/source/ui/tabledesign/TEditControl.hxx | 12 +- .../source/ui/tabledesign/TableDesignHelpBar.cxx | 3 +- dbaccess/source/ui/tabledesign/TableDesignView.cxx | 17 +- .../source/ui/tabledesign/TableFieldDescWin.cxx | 15 +- .../source/ui/tabledesign/TableFieldDescWin.hxx | 6 +- dbaccess/source/ui/tabledesign/TableUndo.hxx | 7 +- dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 2 +- dbaccess/source/ui/uno/composerdialogs.cxx | 6 +- dbaccess/source/ui/uno/copytablewizard.cxx | 2 +- desktop/source/app/cmdlinehelp.hxx | 8 +- .../deployment/gui/dp_gui_dependencydialog.cxx | 10 + .../deployment/gui/dp_gui_dependencydialog.hxx | 4 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 43 ++- desktop/source/deployment/gui/dp_gui_dialog2.hxx | 42 +-- .../source/deployment/gui/dp_gui_extlistbox.cxx | 14 +- .../source/deployment/gui/dp_gui_extlistbox.hxx | 6 +- desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 17 +- desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 6 +- .../source/deployment/gui/dp_gui_updatedialog.cxx | 16 +- .../source/deployment/gui/dp_gui_updatedialog.hxx | 30 +- .../deployment/gui/dp_gui_updateinstalldialog.cxx | 7 + .../deployment/gui/dp_gui_updateinstalldialog.hxx | 14 +- desktop/source/deployment/gui/license_dialog.cxx | 29 +- editeng/source/editeng/impedit.hxx | 3 +- editeng/source/editeng/textconv.hxx | 3 +- editeng/source/misc/hangulhanja.cxx | 2 +- editeng/source/misc/splwrap.cxx | 4 +- extensions/source/abpilot/abpfinalpage.cxx | 6 + extensions/source/abpilot/abpfinalpage.hxx | 13 +- extensions/source/abpilot/admininvokationimpl.hxx | 3 +- extensions/source/abpilot/admininvokationpage.cxx | 11 +- extensions/source/abpilot/admininvokationpage.hxx | 7 +- extensions/source/abpilot/fieldmappingpage.cxx | 12 + extensions/source/abpilot/fieldmappingpage.hxx | 8 +- extensions/source/abpilot/tableselectionpage.cxx | 10 + extensions/source/abpilot/tableselectionpage.hxx | 6 +- extensions/source/abpilot/typeselectionpage.cxx | 11 + extensions/source/abpilot/typeselectionpage.hxx | 25 +- extensions/source/abpilot/unodialogabp.cxx | 2 +- extensions/source/bibliography/bibbeam.cxx | 7 +- extensions/source/bibliography/bibbeam.hxx | 4 +- extensions/source/bibliography/bibcont.cxx | 7 +- extensions/source/bibliography/bibcont.hxx | 4 +- extensions/source/bibliography/bibmod.cxx | 1 + .../source/bibliography/bibshortcuthandler.hxx | 2 +- extensions/source/bibliography/bibview.cxx | 27 +- extensions/source/bibliography/bibview.hxx | 34 ++- extensions/source/bibliography/datman.cxx | 120 +++++--- extensions/source/bibliography/datman.hxx | 5 +- extensions/source/bibliography/framectr.cxx | 1 + extensions/source/bibliography/general.cxx | 62 +++- extensions/source/bibliography/general.hxx | 98 +++--- extensions/source/bibliography/toolbar.cxx | 1 + extensions/source/bibliography/toolbar.hxx | 4 +- extensions/source/dbpilots/commonpagesdbp.cxx | 39 +++ extensions/source/dbpilots/commonpagesdbp.hxx | 28 +- extensions/source/dbpilots/controlwizard.cxx | 12 + extensions/source/dbpilots/controlwizard.hxx | 13 +- extensions/source/dbpilots/gridwizard.cxx | 15 + extensions/source/dbpilots/gridwizard.hxx | 14 +- extensions/source/dbpilots/groupboxwiz.cxx | 50 +++- extensions/source/dbpilots/groupboxwiz.hxx | 28 +- extensions/source/dbpilots/listcombowizard.cxx | 33 ++ extensions/source/dbpilots/listcombowizard.hxx | 18 +- extensions/source/plugin/inc/plugin/plctrl.hxx | 13 +- extensions/source/propctrlr/browserline.cxx | 7 +- extensions/source/propctrlr/browserline.hxx | 8 +- extensions/source/propctrlr/browserview.cxx | 4 +- extensions/source/propctrlr/browserview.hxx | 2 +- extensions/source/propctrlr/commoncontrol.cxx | 9 +- extensions/source/propctrlr/commoncontrol.hxx | 2 +- extensions/source/propctrlr/controlfontdialog.cxx | 2 +- extensions/source/propctrlr/formlinkdialog.cxx | 27 +- extensions/source/propctrlr/formlinkdialog.hxx | 11 +- extensions/source/propctrlr/listselectiondlg.cxx | 11 + extensions/source/propctrlr/listselectiondlg.hxx | 4 +- extensions/source/propctrlr/newdatatype.cxx | 11 + extensions/source/propctrlr/newdatatype.hxx | 6 +- extensions/source/propctrlr/propcontroller.cxx | 1 + extensions/source/propctrlr/propcontroller.hxx | 4 +- extensions/source/propctrlr/propertyeditor.cxx | 6 +- extensions/source/propctrlr/propertyeditor.hxx | 2 +- extensions/source/propctrlr/selectlabeldialog.cxx | 3 + extensions/source/propctrlr/selectlabeldialog.hxx | 6 +- extensions/source/propctrlr/standardcontrol.cxx | 16 +- extensions/source/propctrlr/standardcontrol.hxx | 4 +- extensions/source/propctrlr/taborder.cxx | 5 + extensions/source/propctrlr/taborder.hxx | 10 +- extensions/source/scanner/grid.cxx | 14 + extensions/source/scanner/grid.hxx | 11 +- extensions/source/scanner/sanedlg.cxx | 32 +- extensions/source/scanner/sanedlg.hxx | 48 +-- filter/source/flash/impswfdialog.cxx | 13 + filter/source/flash/impswfdialog.hxx | 17 +- filter/source/flash/swfdialog.cxx | 2 +- filter/source/pdf/impdialog.cxx | 124 +++++++- filter/source/pdf/impdialog.hxx | 192 ++++++------ filter/source/pdf/pdfdialog.cxx | 2 +- filter/source/pdf/pdffilter.cxx | 4 +- filter/source/svg/svgdialog.cxx | 2 +- .../source/xsltdialog/xmlfilterdialogcomponent.cxx | 10 +- .../source/xsltdialog/xmlfiltersettingsdialog.cxx | 31 +- .../source/xsltdialog/xmlfiltersettingsdialog.hxx | 30 +- filter/source/xsltdialog/xmlfiltertabdialog.cxx | 6 +- filter/source/xsltdialog/xmlfiltertabdialog.hxx | 8 +- filter/source/xsltdialog/xmlfiltertabpagebasic.cxx | 12 + filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 11 +- filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 14 + filter/source/xsltdialog/xmlfiltertabpagexslt.hxx | 17 +- filter/source/xsltdialog/xmlfiltertestdialog.cxx | 16 +- filter/source/xsltdialog/xmlfiltertestdialog.hxx | 30 +- forms/source/richtext/richtextimplcontrol.cxx | 19 +- forms/source/richtext/richtextimplcontrol.hxx | 14 +- forms/source/solar/control/navtoolbar.cxx | 10 +- forms/source/solar/inc/navtoolbar.hxx | 4 +- formula/source/ui/dlg/ControlHelper.hxx | 18 +- formula/source/ui/dlg/formula.cxx | 66 ++-- formula/source/ui/dlg/funcpage.cxx | 12 + formula/source/ui/dlg/funcpage.hxx | 6 +- formula/source/ui/dlg/funcutl.cxx | 55 +++- formula/source/ui/dlg/parawin.cxx | 20 ++ formula/source/ui/dlg/parawin.hxx | 50 ++-- formula/source/ui/dlg/structpg.cxx | 11 + formula/source/ui/dlg/structpg.hxx | 4 +- fpicker/source/office/OfficeControlAccess.hxx | 2 +- fpicker/source/office/PlacesListBox.cxx | 14 +- fpicker/source/office/PlacesListBox.hxx | 12 +- fpicker/source/office/QueryFolderName.hxx | 8 +- fpicker/source/office/asyncfilepicker.hxx | 5 +- fpicker/source/office/commonpicker.cxx | 10 +- fpicker/source/office/commonpicker.hxx | 3 +- fpicker/source/office/iodlg.cxx | 43 ++- fpicker/source/office/iodlg.hxx | 22 +- fpicker/source/office/iodlgimp.cxx | 5 +- fpicker/source/office/iodlgimp.hxx | 52 ++-- framework/inc/classes/fwktabwindow.hxx | 6 +- framework/inc/dispatch/closedispatcher.hxx | 3 +- framework/inc/helper/vclstatusindicator.hxx | 2 +- .../inc/uielement/buttontoolbarcontroller.hxx | 7 +- .../inc/uielement/comboboxtoolbarcontroller.hxx | 2 +- .../inc/uielement/complextoolbarcontroller.hxx | 5 +- .../inc/uielement/dropdownboxtoolbarcontroller.hxx | 3 +- framework/inc/uielement/edittoolbarcontroller.hxx | 2 +- .../inc/uielement/generictoolbarcontroller.hxx | 11 +- .../inc/uielement/spinfieldtoolbarcontroller.hxx | 3 +- framework/inc/uielement/statusbaritem.hxx | 3 +- framework/inc/uielement/statusbarmanager.hxx | 11 +- framework/inc/uielement/toolbarmanager.hxx | 2 +- framework/inc/uielement/toolbarmerger.hxx | 2 +- framework/source/helper/vclstatusindicator.cxx | 3 +- framework/source/services/tabwindowservice.cxx | 8 +- .../source/uielement/buttontoolbarcontroller.cxx | 2 +- .../source/uielement/comboboxtoolbarcontroller.cxx | 4 +- .../source/uielement/complextoolbarcontroller.cxx | 2 +- .../uielement/dropdownboxtoolbarcontroller.cxx | 4 +- .../source/uielement/edittoolbarcontroller.cxx | 4 +- .../source/uielement/generictoolbarcontroller.cxx | 2 +- .../uielement/spinfieldtoolbarcontroller.cxx | 4 +- framework/source/uielement/statusbarmanager.cxx | 51 ++-- framework/source/uielement/toolbarmanager.cxx | 8 +- include/dbaccess/ToolBoxHelper.hxx | 3 +- include/dbaccess/genericcontroller.hxx | 7 +- include/editeng/splwrap.hxx | 3 +- include/formula/funcutl.hxx | 6 +- include/sfx2/basedlgs.hxx | 16 +- include/sfx2/checkin.hxx | 8 +- include/sfx2/childwin.hxx | 8 +- include/sfx2/dinfdlg.hxx | 86 +++--- include/sfx2/fcontnr.hxx | 5 +- include/sfx2/frame.hxx | 3 +- include/sfx2/infobar.hxx | 17 +- include/sfx2/ipclient.hxx | 2 +- include/sfx2/mgetempl.hxx | 24 +- include/sfx2/newstyle.hxx | 4 +- include/sfx2/passwd.hxx | 30 +- include/sfx2/printopt.hxx | 43 +-- include/sfx2/prnmon.hxx | 2 +- include/sfx2/sidebar/SidebarPanelBase.hxx | 3 +- include/sfx2/stbitem.hxx | 6 +- include/sfx2/tabdlg.hxx | 20 +- include/sfx2/templatedlg.hxx | 20 +- include/sfx2/templateinfodlg.hxx | 8 +- include/sfx2/thumbnailview.hxx | 2 +- include/sfx2/thumbnailviewitem.hxx | 2 +- include/sfx2/viewsh.hxx | 3 +- include/svtools/GraphicExportOptionsDialog.hxx | 9 +- include/svtools/PlaceEditDialog.hxx | 13 +- include/svtools/ServerDetailsControls.hxx | 26 +- include/svtools/accessibleruler.hxx | 3 +- include/svtools/addresstemplate.hxx | 8 +- include/svtools/brwbox.hxx | 16 +- include/svtools/brwhead.hxx | 5 +- include/svtools/calendar.hxx | 8 +- include/svtools/colrdlg.hxx | 8 +- include/svtools/editbrowsebox.hxx | 10 +- include/svtools/fileview.hxx | 4 +- include/svtools/generictoolboxcontroller.hxx | 4 +- include/svtools/genericunodialog.hxx | 3 +- include/svtools/prnsetup.hxx | 14 +- include/svtools/simptabl.hxx | 4 +- include/svtools/tabbar.hxx | 2 + include/svtools/treelistbox.hxx | 4 +- include/svtools/wizardmachine.hxx | 13 +- include/svtools/wizdlg.hxx | 10 +- include/svx/AccessibleShapeTreeInfo.hxx | 3 +- include/svx/bmpmask.hxx | 50 ++-- include/svx/compressgraphicdialog.hxx | 34 ++- include/svx/contdlg.hxx | 6 +- include/svx/ctredlin.hxx | 56 ++-- include/svx/dialcontrol.hxx | 2 +- include/svx/fillctrl.hxx | 10 +- include/svx/fmshell.hxx | 2 +- include/svx/fontworkgallery.hxx | 10 +- include/svx/hdft.hxx | 32 +- include/svx/imapdlg.hxx | 18 +- include/svx/lboxctrl.hxx | 2 +- include/svx/linkwarn.hxx | 2 +- include/svx/optgrid.hxx | 40 +-- include/svx/passwd.hxx | 14 +- include/svx/rubydialog.hxx | 46 +-- include/svx/ruler.hxx | 2 +- include/svx/sidebar/Popup.hxx | 3 +- include/svx/srchdlg.hxx | 100 +++---- include/svx/svdedxv.hxx | 4 +- include/svx/svdpntv.hxx | 4 +- include/svx/tbxcolorupdate.hxx | 7 +- include/tools/errinf.hxx | 5 +- include/vcl/builder.hxx | 20 +- include/vcl/button.hxx | 4 +- include/vcl/combobox.hxx | 6 +- include/vcl/controllayout.hxx | 4 +- include/vcl/cursor.hxx | 3 +- include/vcl/dialog.hxx | 2 +- include/vcl/dockwin.hxx | 14 +- include/vcl/event.hxx | 3 +- include/vcl/field.hxx | 2 +- include/vcl/fixed.hxx | 2 +- include/vcl/floatwin.hxx | 4 +- include/vcl/fltcall.hxx | 2 +- include/vcl/layout.hxx | 30 +- include/vcl/lstbox.hxx | 8 +- include/vcl/menu.hxx | 2 +- include/vcl/msgbox.hxx | 16 +- include/vcl/opengl/OpenGLContext.hxx | 8 +- include/vcl/seleng.hxx | 2 +- include/vcl/split.hxx | 2 +- include/vcl/syswin.hxx | 2 +- include/vcl/tabdlg.hxx | 4 +- include/vcl/tabpage.hxx | 2 +- include/vcl/taskpanelist.hxx | 2 +- include/vcl/toolbox.hxx | 4 +- include/vcl/vclevent.hxx | 7 +- include/vcl/vclptr.hxx | 40 ++- include/vcl/waitobj.hxx | 2 +- include/vcl/window.hxx | 4 +- reportdesign/source/ui/dlg/AddField.cxx | 9 +- reportdesign/source/ui/dlg/CondFormat.cxx | 9 + reportdesign/source/ui/dlg/Condition.cxx | 17 +- reportdesign/source/ui/dlg/Condition.hxx | 32 +- reportdesign/source/ui/dlg/DateTime.cxx | 13 + reportdesign/source/ui/dlg/Formula.cxx | 2 + reportdesign/source/ui/dlg/GroupsSorting.cxx | 75 +++-- reportdesign/source/ui/dlg/Navigator.cxx | 2 +- reportdesign/source/ui/dlg/PageNumber.cxx | 12 + reportdesign/source/ui/inc/CondFormat.hxx | 12 +- reportdesign/source/ui/inc/DateTime.hxx | 15 +- reportdesign/source/ui/inc/DesignView.hxx | 8 +- reportdesign/source/ui/inc/Formula.hxx | 6 +- reportdesign/source/ui/inc/GroupsSorting.hxx | 20 +- reportdesign/source/ui/inc/PageNumber.hxx | 13 +- reportdesign/source/ui/inc/ReportController.hxx | 2 +- reportdesign/source/ui/inc/ReportSection.hxx | 2 +- reportdesign/source/ui/inc/ReportWindow.hxx | 8 +- reportdesign/source/ui/inc/ScrollHelper.hxx | 2 +- reportdesign/source/ui/inc/SectionView.hxx | 4 +- reportdesign/source/ui/inc/SectionWindow.hxx | 2 +- reportdesign/source/ui/inc/StartMarker.hxx | 2 +- reportdesign/source/ui/inc/ViewsWindow.hxx | 12 +- reportdesign/source/ui/inc/dlgedfunc.hxx | 2 +- reportdesign/source/ui/inc/propbrw.hxx | 2 +- reportdesign/source/ui/report/DesignView.cxx | 12 +- reportdesign/source/ui/report/ReportSection.cxx | 1 + reportdesign/source/ui/report/ReportWindow.cxx | 2 + reportdesign/source/ui/report/ScrollHelper.cxx | 1 + reportdesign/source/ui/report/SectionWindow.cxx | 1 + reportdesign/source/ui/report/StartMarker.cxx | 1 + reportdesign/source/ui/report/ViewsWindow.cxx | 1 + reportdesign/source/ui/report/propbrw.cxx | 1 + sc/inc/AccessibleFilterMenu.hxx | 3 +- sc/inc/AccessibleFilterMenuItem.hxx | 3 +- sc/inc/scmod.hxx | 4 +- sc/inc/scopetools.hxx | 3 +- sc/inc/waitoff.hxx | 2 +- sc/source/ui/Accessibility/AccessibleText.cxx | 24 +- .../StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 13 +- .../ExponentialSmoothingDialog.cxx | 10 +- .../ui/StatisticsDialogs/MovingAverageDialog.cxx | 10 +- .../RandomNumberGeneratorDialog.cxx | 28 +- sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 25 +- .../StatisticsInputOutputDialog.cxx | 19 +- .../StatisticsTwoVariableDialog.cxx | 24 +- sc/source/ui/app/inputhdl.cxx | 5 + sc/source/ui/app/scmod.cxx | 14 +- sc/source/ui/attrdlg/scdlgfact.hxx | 6 +- sc/source/ui/attrdlg/scuiexp.cxx | 30 ++ sc/source/ui/attrdlg/tabpages.cxx | 14 + sc/source/ui/cctrl/checklistmenu.cxx | 18 ++ sc/source/ui/condformat/colorformat.cxx | 23 ++ sc/source/ui/condformat/condformatdlg.cxx | 24 ++ sc/source/ui/condformat/condformatmgr.cxx | 5 +- sc/source/ui/dbgui/PivotLayoutDialog.cxx | 40 ++- sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx | 12 +- sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx | 2 +- sc/source/ui/dbgui/consdlg.cxx | 17 ++ sc/source/ui/dbgui/dapidata.cxx | 13 + sc/source/ui/dbgui/dapitype.cxx | 23 ++ sc/source/ui/dbgui/dbnamdlg.cxx | 15 + sc/source/ui/dbgui/dpgroupdlg.cxx | 39 +++ sc/source/ui/dbgui/filtdlg.cxx | 32 ++ sc/source/ui/dbgui/pfiltdlg.cxx | 18 ++ sc/source/ui/dbgui/pvfundlg.cxx | 78 +++++ sc/source/ui/dbgui/scendlg.cxx | 18 ++ sc/source/ui/dbgui/scuiasciiopt.cxx | 22 ++ sc/source/ui/dbgui/scuiimoptdlg.cxx | 12 + sc/source/ui/dbgui/sfiltdlg.cxx | 19 ++ sc/source/ui/dbgui/sortdlg.cxx | 13 + sc/source/ui/dbgui/subtdlg.cxx | 11 + sc/source/ui/dbgui/textimportoptions.cxx | 12 + sc/source/ui/dbgui/tpsort.cxx | 30 +- sc/source/ui/dbgui/tpsubt.cxx | 18 ++ sc/source/ui/dbgui/validate.cxx | 59 ++++ sc/source/ui/dialogs/searchresults.cxx | 2 +- sc/source/ui/docshell/tablink.cxx | 6 +- sc/source/ui/docshell/tpstat.cxx | 10 + sc/source/ui/drawfunc/fupoor.cxx | 2 - sc/source/ui/formdlg/dwfunctr.cxx | 1 + sc/source/ui/inc/AccessibleCsvControl.hxx | 3 +- sc/source/ui/inc/AccessibleEditObject.hxx | 2 +- sc/source/ui/inc/AccessibleText.hxx | 4 +- sc/source/ui/inc/AnalysisOfVarianceDialog.hxx | 9 +- sc/source/ui/inc/ExponentialSmoothingDialog.hxx | 3 +- sc/source/ui/inc/MovingAverageDialog.hxx | 3 +- sc/source/ui/inc/PivotLayoutDialog.hxx | 55 ++-- sc/source/ui/inc/PivotLayoutTreeListBase.hxx | 3 +- sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 31 +- sc/source/ui/inc/SamplingDialog.hxx | 29 +- sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 21 +- sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 27 +- sc/source/ui/inc/acredlin.hxx | 8 +- sc/source/ui/inc/anyrefdg.hxx | 18 +- sc/source/ui/inc/areasdlg.hxx | 24 +- sc/source/ui/inc/checklistmenu.hxx | 13 +- sc/source/ui/inc/colorformat.hxx | 29 +- sc/source/ui/inc/condformatdlg.hxx | 19 +- sc/source/ui/inc/condformatmgr.hxx | 8 +- sc/source/ui/inc/conflictsdlg.hxx | 11 +- sc/source/ui/inc/consdlg.hxx | 34 +-- sc/source/ui/inc/content.hxx | 3 +- sc/source/ui/inc/corodlg.hxx | 11 +- sc/source/ui/inc/crdlg.hxx | 10 +- sc/source/ui/inc/crnrdlg.hxx | 25 +- sc/source/ui/inc/dapidata.hxx | 8 +- sc/source/ui/inc/dapitype.hxx | 23 +- sc/source/ui/inc/datafdlg.hxx | 19 +- sc/source/ui/inc/datastreamdlg.hxx | 36 +-- sc/source/ui/inc/dbnamdlg.hxx | 36 +-- sc/source/ui/inc/delcldlg.hxx | 10 +- sc/source/ui/inc/delcodlg.hxx | 19 +- sc/source/ui/inc/dpgroupdlg.hxx | 55 ++-- sc/source/ui/inc/dwfunctr.hxx | 2 +- sc/source/ui/inc/filldlg.hxx | 41 +-- sc/source/ui/inc/filtdlg.hxx | 120 ++++---- sc/source/ui/inc/foptmgr.hxx | 24 +- sc/source/ui/inc/fupoor.hxx | 4 +- sc/source/ui/inc/gridwin.hxx | 4 +- sc/source/ui/inc/groupdlg.hxx | 6 +- sc/source/ui/inc/highred.hxx | 16 +- sc/source/ui/inc/inputhdl.hxx | 9 +- sc/source/ui/inc/inscldlg.hxx | 9 +- sc/source/ui/inc/inscodlg.hxx | 52 ++-- sc/source/ui/inc/instbdlg.hxx | 26 +- sc/source/ui/inc/lbseldlg.hxx | 4 +- sc/source/ui/inc/linkarea.hxx | 15 +- sc/source/ui/inc/mtrindlg.hxx | 6 +- sc/source/ui/inc/mvtabdlg.hxx | 15 +- sc/source/ui/inc/namecrea.hxx | 11 +- sc/source/ui/inc/namedefdlg.hxx | 25 +- sc/source/ui/inc/namedlg.hxx | 28 +- sc/source/ui/inc/namepast.hxx | 8 +- sc/source/ui/inc/navipi.hxx | 2 +- sc/source/ui/inc/notemark.hxx | 8 +- sc/source/ui/inc/opredlin.hxx | 10 +- sc/source/ui/inc/optsolver.hxx | 127 ++++---- sc/source/ui/inc/pfiltdlg.hxx | 42 +-- sc/source/ui/inc/prevwsh.hxx | 10 +- sc/source/ui/inc/protectiondlg.hxx | 15 +- sc/source/ui/inc/pvfundlg.hxx | 88 +++--- sc/source/ui/inc/reffact.hxx | 2 +- sc/source/ui/inc/retypepassdlg.hxx | 26 +- sc/source/ui/inc/scendlg.hxx | 19 +- sc/source/ui/inc/scuiasciiopt.hxx | 44 +-- sc/source/ui/inc/scuiautofmt.hxx | 28 +- sc/source/ui/inc/scuiimoptdlg.hxx | 24 +- sc/source/ui/inc/scuitphfedit.hxx | 43 +-- sc/source/ui/inc/searchresults.hxx | 2 +- sc/source/ui/inc/sharedocdlg.hxx | 6 +- sc/source/ui/inc/shtabdlg.hxx | 6 +- sc/source/ui/inc/simpref.hxx | 11 +- sc/source/ui/inc/solveroptions.hxx | 18 +- sc/source/ui/inc/solvrdlg.hxx | 21 +- sc/source/ui/inc/sortdlg.hxx | 8 +- sc/source/ui/inc/sortkeydlg.hxx | 12 +- sc/source/ui/inc/strindlg.hxx | 7 +- sc/source/ui/inc/subtdlg.hxx | 4 +- sc/source/ui/inc/tabbgcolordlg.hxx | 11 +- sc/source/ui/inc/tabopdlg.hxx | 25 +- sc/source/ui/inc/tabpages.hxx | 11 +- sc/source/ui/inc/tabview.hxx | 10 +- sc/source/ui/inc/textimportoptions.hxx | 12 +- sc/source/ui/inc/tpcalc.hxx | 32 +- sc/source/ui/inc/tpcompatibility.hxx | 6 +- sc/source/ui/inc/tpdefaults.hxx | 5 +- sc/source/ui/inc/tpformula.hxx | 24 +- sc/source/ui/inc/tphf.hxx | 13 +- sc/source/ui/inc/tpprint.hxx | 10 +- sc/source/ui/inc/tpsort.hxx | 34 +-- sc/source/ui/inc/tpstat.hxx | 10 +- sc/source/ui/inc/tpsubt.hxx | 26 +- sc/source/ui/inc/tptable.hxx | 48 +-- sc/source/ui/inc/tpusrlst.hxx | 24 +- sc/source/ui/inc/tpview.hxx | 88 +++--- sc/source/ui/inc/validate.hxx | 62 ++-- sc/source/ui/inc/xmlsourcedlg.hxx | 20 +- sc/source/ui/miscdlgs/acredlin.cxx | 5 +- sc/source/ui/miscdlgs/anyrefdg.cxx | 18 +- sc/source/ui/miscdlgs/conflictsdlg.cxx | 11 + sc/source/ui/miscdlgs/crdlg.cxx | 15 + sc/source/ui/miscdlgs/crnrdlg.cxx | 20 +- sc/source/ui/miscdlgs/datafdlg.cxx | 14 + sc/source/ui/miscdlgs/datastreamdlg.cxx | 27 ++ sc/source/ui/miscdlgs/delcldlg.cxx | 15 + sc/source/ui/miscdlgs/delcodlg.cxx | 23 +- sc/source/ui/miscdlgs/filldlg.cxx | 26 ++ sc/source/ui/miscdlgs/groupdlg.cxx | 14 +- sc/source/ui/miscdlgs/highred.cxx | 8 +- sc/source/ui/miscdlgs/inscldlg.cxx | 18 +- sc/source/ui/miscdlgs/inscodlg.cxx | 22 ++ sc/source/ui/miscdlgs/instbdlg.cxx | 13 + sc/source/ui/miscdlgs/lbseldlg.cxx | 12 + sc/source/ui/miscdlgs/linkarea.cxx | 13 + sc/source/ui/miscdlgs/mtrindlg.cxx | 12 + sc/source/ui/miscdlgs/mvtabdlg.cxx | 13 + sc/source/ui/miscdlgs/namecrea.cxx | 14 + sc/source/ui/miscdlgs/optsolver.cxx | 95 +++++- sc/source/ui/miscdlgs/protectiondlg.cxx | 13 + sc/source/ui/miscdlgs/retypepassdlg.cxx | 25 +- sc/source/ui/miscdlgs/scuiautofmt.cxx | 23 ++ sc/source/ui/miscdlgs/sharedocdlg.cxx | 4 +- sc/source/ui/miscdlgs/shtabdlg.cxx | 12 + sc/source/ui/miscdlgs/simpref.cxx | 11 + sc/source/ui/miscdlgs/solveroptions.cxx | 27 ++ sc/source/ui/miscdlgs/solvrdlg.cxx | 18 +- sc/source/ui/miscdlgs/strindlg.cxx | 12 + sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 23 ++ sc/source/ui/miscdlgs/tabopdlg.cxx | 19 ++ sc/source/ui/namedlg/namedefdlg.cxx | 21 ++ sc/source/ui/namedlg/namedlg.cxx | 15 +- sc/source/ui/namedlg/namepast.cxx | 5 +- sc/source/ui/navipi/content.cxx | 7 + sc/source/ui/optdlg/calcoptionsdlg.cxx | 22 +- sc/source/ui/optdlg/calcoptionsdlg.hxx | 33 +- sc/source/ui/optdlg/opredlin.cxx | 10 + sc/source/ui/optdlg/tpcalc.cxx | 16 + sc/source/ui/optdlg/tpcompatibility.cxx | 7 + sc/source/ui/optdlg/tpdefaults.cxx | 8 + sc/source/ui/optdlg/tpformula.cxx | 17 ++ sc/source/ui/optdlg/tpprint.cxx | 9 + sc/source/ui/optdlg/tpusrlst.cxx | 12 + sc/source/ui/optdlg/tpview.cxx | 43 +++ sc/source/ui/pagedlg/areasdlg.cxx | 12 + sc/source/ui/pagedlg/scuitphfedit.cxx | 26 ++ sc/source/ui/pagedlg/tphf.cxx | 8 + sc/source/ui/pagedlg/tptable.cxx | 27 ++ sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 14 + sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 20 +- .../ui/sidebar/CellAppearancePropertyPanel.cxx | 10 + .../ui/sidebar/CellAppearancePropertyPanel.hxx | 12 +- sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 12 + sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 15 +- sc/source/ui/vba/vbaeventshelper.cxx | 8 +- sc/source/ui/view/gridwin.cxx | 27 +- sc/source/ui/view/gridwin2.cxx | 2 +- sc/source/ui/view/prevwsh.cxx | 8 +- sc/source/ui/view/reffact.cxx | 30 +- sc/source/ui/view/tabview.cxx | 2 +- sc/source/ui/view/tabview5.cxx | 7 +- sc/source/ui/xmlsource/xmlsourcedlg.cxx | 21 +- sd/inc/Outliner.hxx | 2 +- sd/source/filter/html/pubdlg.cxx | 108 ++++++- .../ui/accessibility/AccessibleSlideSorterView.cxx | 16 +- .../ui/animations/CustomAnimationCreateDialog.cxx | 24 +- .../ui/animations/CustomAnimationCreateDialog.hxx | 4 +- sd/source/ui/animations/CustomAnimationDialog.cxx | 178 +++++++---- sd/source/ui/animations/CustomAnimationDialog.hxx | 8 +- sd/source/ui/animations/CustomAnimationList.cxx | 2 +- sd/source/ui/animations/CustomAnimationPane.cxx | 23 +- sd/source/ui/animations/CustomAnimationPane.hxx | 34 +-- sd/source/ui/animations/SlideTransitionPane.cxx | 15 +- sd/source/ui/animations/SlideTransitionPane.hxx | 26 +- sd/source/ui/annotations/annotationtag.hxx | 2 +- sd/source/ui/annotations/annotationwindow.cxx | 13 +- sd/source/ui/annotations/annotationwindow.hxx | 9 +- sd/source/ui/controller/slidelayoutcontroller.cxx | 13 +- sd/source/ui/dlg/PaneChildWindows.cxx | 4 +- sd/source/ui/dlg/PhotoAlbumDialog.cxx | 17 ++ sd/source/ui/dlg/PhotoAlbumDialog.hxx | 24 +- sd/source/ui/dlg/RemoteDialog.cxx | 13 + sd/source/ui/dlg/RemoteDialog.hxx | 8 +- sd/source/ui/dlg/RemoteDialogClientBox.hxx | 2 +- sd/source/ui/dlg/animobjs.cxx | 22 +- sd/source/ui/dlg/brkdlg.cxx | 6 +- sd/source/ui/dlg/copydlg.cxx | 36 +-- sd/source/ui/dlg/custsdlg.cxx | 29 ++ sd/source/ui/dlg/dlgass.cxx | 122 ++++---- sd/source/ui/dlg/dlgfield.cxx | 15 + sd/source/ui/dlg/dlgsnap.cxx | 19 ++ sd/source/ui/dlg/headerfooterdlg.cxx | 66 ++-- sd/source/ui/dlg/ins_paste.cxx | 12 + sd/source/ui/dlg/inspagob.cxx | 9 + sd/source/ui/dlg/layeroptionsdlg.cxx | 16 + sd/source/ui/dlg/masterlayoutdlg.cxx | 15 + sd/source/ui/dlg/morphdlg.cxx | 9 + sd/source/ui/dlg/paragr.cxx | 16 +- sd/source/ui/dlg/present.cxx | 33 ++ sd/source/ui/dlg/prntopts.cxx | 27 +- sd/source/ui/dlg/sddlgfact.cxx | 14 +- sd/source/ui/dlg/sddlgfact.hxx | 3 +- sd/source/ui/dlg/sdpreslt.cxx | 10 + sd/source/ui/dlg/sdtreelb.cxx | 4 +- sd/source/ui/dlg/sduiexp.cxx | 15 + sd/source/ui/dlg/tpaction.cxx | 19 ++ sd/source/ui/dlg/tpoption.cxx | 42 +++ sd/source/ui/dlg/vectdlg.cxx | 16 + .../ui/framework/factories/ChildWindowPane.cxx | 2 +- .../ui/framework/factories/FullScreenPane.cxx | 12 +- sd/source/ui/framework/factories/Pane.cxx | 2 +- sd/source/ui/func/fupoor.cxx | 8 +- sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 2 +- sd/source/ui/inc/AccessibleSlideSorterView.hxx | 3 +- sd/source/ui/inc/BreakDlg.hxx | 8 +- sd/source/ui/inc/FormShellManager.hxx | 3 +- sd/source/ui/inc/Ruler.hxx | 2 +- sd/source/ui/inc/ViewShell.hxx | 4 +- sd/source/ui/inc/Window.hxx | 2 +- sd/source/ui/inc/WindowUpdater.hxx | 3 +- sd/source/ui/inc/animobjs.hxx | 46 +-- sd/source/ui/inc/copydlg.hxx | 22 +- sd/source/ui/inc/custsdlg.hxx | 41 +-- sd/source/ui/inc/dlgfield.hxx | 11 +- sd/source/ui/inc/dlgsnap.hxx | 20 +- sd/source/ui/inc/framework/Pane.hxx | 3 +- sd/source/ui/inc/fupoor.hxx | 6 +- sd/source/ui/inc/headerfooterdlg.hxx | 12 +- sd/source/ui/inc/ins_paste.hxx | 6 +- sd/source/ui/inc/inspagob.hxx | 7 +- sd/source/ui/inc/layeroptionsdlg.hxx | 15 +- sd/source/ui/inc/masterlayoutdlg.hxx | 12 +- sd/source/ui/inc/morphdlg.hxx | 9 +- sd/source/ui/inc/navigatr.hxx | 4 +- sd/source/ui/inc/present.hxx | 48 +-- sd/source/ui/inc/prntopts.hxx | 39 +-- sd/source/ui/inc/pubdlg.hxx | 169 +++++------ sd/source/ui/inc/sdpreslt.hxx | 11 +- sd/source/ui/inc/sdtreelb.hxx | 4 +- .../ui/inc/taskpane/SlideSorterCacheDisplay.hxx | 2 +- sd/source/ui/inc/tpaction.hxx | 31 +- sd/source/ui/inc/tpoption.hxx | 62 ++-- sd/source/ui/inc/vectdlg.hxx | 21 +- sd/source/ui/slideshow/slideshow.cxx | 2 +- sd/source/ui/slideshow/slideshowimpl.cxx | 14 +- sd/source/ui/slideshow/slideshowimpl.hxx | 12 +- sd/source/ui/table/TableDesignPane.hxx | 4 +- sd/source/ui/view/FormShellManager.cxx | 4 +- sd/source/ui/view/sdruler.cxx | 1 + sd/source/ui/view/sdview2.cxx | 2 +- sd/source/ui/view/sdwindow.cxx | 1 + sd/source/ui/view/viewshe2.cxx | 2 +- sd/source/ui/view/viewshel.cxx | 2 +- sfx2/inc/srchdlg.hxx | 12 +- sfx2/source/appl/childwin.cxx | 18 +- sfx2/source/appl/fileobj.hxx | 2 +- sfx2/source/appl/helpinterceptor.hxx | 3 +- sfx2/source/appl/impldde.cxx | 24 +- sfx2/source/appl/lnkbase2.cxx | 4 +- sfx2/source/appl/newhelp.cxx | 79 ++++- sfx2/source/appl/newhelp.hxx | 58 ++-- sfx2/source/appl/workwin.cxx | 16 +- sfx2/source/control/thumbnailview.cxx | 2 +- sfx2/source/control/thumbnailviewacc.cxx | 2 +- sfx2/source/control/thumbnailviewacc.hxx | 5 +- sfx2/source/control/thumbnailviewitem.cxx | 5 +- sfx2/source/dialog/alienwarn.cxx | 2 + sfx2/source/dialog/backingwindow.cxx | 27 +- sfx2/source/dialog/backingwindow.hxx | 58 ++-- sfx2/source/dialog/basedlgs.cxx | 13 +- sfx2/source/dialog/checkin.cxx | 13 + sfx2/source/dialog/dinfdlg.cxx | 102 ++++++- sfx2/source/dialog/dockwin.cxx | 10 +- sfx2/source/dialog/documentfontsdialog.cxx | 11 + sfx2/source/dialog/filedlgimpl.hxx | 2 +- sfx2/source/dialog/infobar.cxx | 31 +- sfx2/source/dialog/inputdlg.cxx | 14 + sfx2/source/dialog/mgetempl.cxx | 12 + sfx2/source/dialog/navigat.cxx | 2 +- sfx2/source/dialog/newstyle.cxx | 2 + sfx2/source/dialog/partwnd.cxx | 8 +- sfx2/source/dialog/passwd.cxx | 22 ++ sfx2/source/dialog/printopt.cxx | 30 ++ sfx2/source/dialog/recfloat.cxx | 3 +- sfx2/source/dialog/securitypage.cxx | 8 +- sfx2/source/dialog/splitwin.cxx | 19 +- sfx2/source/dialog/srchdlg.cxx | 6 + sfx2/source/dialog/tabdlg.cxx | 44 +-- sfx2/source/dialog/templateinfodlg.cxx | 6 +- sfx2/source/dialog/templdlg.cxx | 9 +- sfx2/source/dialog/versdlg.cxx | 31 +- sfx2/source/doc/new.cxx | 22 +- sfx2/source/doc/templatedlg.cxx | 14 +- sfx2/source/inc/alienwarn.hxx | 4 +- sfx2/source/inc/documentfontsdialog.hxx | 4 +- sfx2/source/inc/inputdlg.hxx | 10 +- sfx2/source/inc/recfloat.hxx | 2 +- sfx2/source/inc/splitwin.hxx | 10 +- sfx2/source/inc/templdgi.hxx | 10 +- sfx2/source/inc/versdlg.hxx | 40 +-- sfx2/source/inc/workwin.hxx | 12 +- sfx2/source/sidebar/FocusManager.cxx | 24 +- sfx2/source/sidebar/FocusManager.hxx | 10 +- sfx2/source/sidebar/PanelTitleBar.cxx | 19 +- sfx2/source/sidebar/PanelTitleBar.hxx | 4 +- sfx2/source/sidebar/SidebarChildWindow.cxx | 2 +- sfx2/source/sidebar/SidebarController.cxx | 18 +- sfx2/source/sidebar/SidebarController.hxx | 4 +- sfx2/source/sidebar/SidebarPanelBase.cxx | 16 +- sfx2/source/statbar/stbitem.cxx | 2 +- sfx2/source/toolbox/imgmgr.cxx | 2 +- sfx2/source/toolbox/tbxitem.cxx | 26 +- sfx2/source/view/frame.cxx | 2 +- sfx2/source/view/frame2.cxx | 2 +- sfx2/source/view/impframe.hxx | 14 +- sfx2/source/view/impviewframe.hxx | 4 +- sfx2/source/view/printer.cxx | 2 +- sfx2/source/view/sfxbasecontroller.cxx | 2 +- sfx2/source/view/viewfrm.cxx | 4 +- sfx2/source/view/viewprn.cxx | 4 +- starmath/inc/ElementsDockingWindow.hxx | 4 +- starmath/inc/dialog.hxx | 156 +++++----- starmath/inc/edit.hxx | 6 +- starmath/inc/toolbox.hxx | 6 +- starmath/inc/view.hxx | 2 +- starmath/source/ElementsDockingWindow.cxx | 3 +- starmath/source/accessibility.hxx | 4 +- starmath/source/dialog.cxx | 141 +++++++++ starmath/source/edit.cxx | 10 +- starmath/source/toolbox.cxx | 8 +- starmath/source/view.cxx | 2 +- svtools/inc/vclxaccessibleheaderbar.hxx | 2 +- svtools/inc/vclxaccessibleheaderbaritem.hxx | 3 +- svtools/source/brwbox/brwbox1.cxx | 28 +- svtools/source/brwbox/brwbox2.cxx | 32 +- svtools/source/brwbox/brwhead.cxx | 12 + svtools/source/brwbox/datwin.cxx | 12 + svtools/source/brwbox/datwin.hxx | 10 +- svtools/source/brwbox/ebbcontrols.cxx | 2 +- svtools/source/brwbox/editbrowsebox.cxx | 6 +- svtools/source/contnr/fileview.cxx | 19 +- svtools/source/contnr/imivctl.hxx | 4 +- svtools/source/contnr/imivctl1.cxx | 4 +- svtools/source/contnr/simptabl.cxx | 11 + svtools/source/contnr/svtabbx.cxx | 2 +- svtools/source/contnr/treelistbox.cxx | 2 +- svtools/source/control/calendar.cxx | 42 +-- svtools/source/control/inettbc.cxx | 8 +- svtools/source/control/roadmap.cxx | 4 +- svtools/source/control/tabbar.cxx | 36 ++- svtools/source/control/toolbarmenu.cxx | 12 +- svtools/source/control/toolbarmenuimp.hxx | 2 +- svtools/source/control/valueacc.cxx | 2 +- svtools/source/control/valueimp.hxx | 4 +- svtools/source/dialogs/PlaceEditDialog.cxx | 16 + svtools/source/dialogs/addresstemplate.cxx | 4 + svtools/source/dialogs/colrdlg.cxx | 1 + svtools/source/dialogs/prnsetup.cxx | 8 + svtools/source/dialogs/restartdialog.cxx | 15 +- svtools/source/dialogs/roadmapwizard.cxx | 7 +- svtools/source/dialogs/wizardmachine.cxx | 10 +- svtools/source/dialogs/wizdlg.cxx | 8 +- .../source/filter/GraphicExportOptionsDialog.cxx | 13 + svtools/source/filter/exportdialog.cxx | 33 ++ svtools/source/filter/exportdialog.hxx | 66 ++-- svtools/source/hatchwindow/hatchwindow.cxx | 2 +- svtools/source/inc/hatchwindow.hxx | 2 +- svtools/source/inc/svimpbox.hxx | 4 +- svtools/source/misc/dialogcontrolling.cxx | 4 +- svtools/source/table/tablecontrol_impl.cxx | 20 +- svtools/source/table/tablecontrol_impl.hxx | 6 +- svtools/source/toolpanel/paneltabbarpeer.cxx | 4 +- svtools/source/toolpanel/paneltabbarpeer.hxx | 2 +- svtools/source/toolpanel/toolpaneldeckpeer.cxx | 4 +- svtools/source/toolpanel/toolpaneldeckpeer.hxx | 2 +- svtools/source/uno/addrtempuno.cxx | 2 +- svtools/source/uno/generictoolboxcontroller.cxx | 6 +- svtools/source/uno/genericunodialog.cxx | 3 +- svtools/source/uno/popupwindowcontroller.cxx | 6 +- svtools/source/uno/treecontrolpeer.hxx | 2 +- svtools/source/uno/wizard/unowizard.cxx | 20 +- svtools/source/uno/wizard/wizardshell.hxx | 2 +- svx/inc/extrusiondepthdialog.hxx | 4 +- svx/inc/galbrws2.hxx | 6 +- svx/inc/svdibrow.hxx | 2 +- svx/inc/tbunosearchcontrollers.hxx | 4 +- .../accessibility/AccessibleShapeTreeInfo.cxx | 1 + .../accessibility/GraphCtlAccessibleContext.cxx | 6 +- svx/source/dialog/_bmpmask.cxx | 33 +- svx/source/dialog/_contdlg.cxx | 21 +- svx/source/dialog/compressgraphicdialog.cxx | 25 ++ svx/source/dialog/contimp.hxx | 8 +- svx/source/dialog/ctredlin.cxx | 52 +++- svx/source/dialog/docrecovery.cxx | 47 ++- svx/source/dialog/fontwork.cxx | 332 +-------------------- svx/source/dialog/hdft.cxx | 16 + svx/source/dialog/imapdlg.cxx | 12 +- svx/source/dialog/linkwarn.cxx | 1 + svx/source/dialog/optgrid.cxx | 27 ++ svx/source/dialog/orienthelper.cxx | 2 +- svx/source/dialog/passwd.cxx | 15 + svx/source/dialog/rubydialog.cxx | 33 ++ svx/source/dialog/srchdlg.cxx | 44 ++- svx/source/dialog/svxruler.cxx | 1 + svx/source/fmcomp/gridcell.cxx | 321 ++++++++++---------- svx/source/fmcomp/gridctrl.cxx | 6 +- svx/source/form/datanavi.cxx | 121 +++++++- svx/source/form/filtnav.cxx | 4 +- svx/source/form/fmPropBrw.cxx | 3 +- svx/source/form/fmexpl.cxx | 4 +- svx/source/form/tabwin.cxx | 15 +- svx/source/form/xfm_addcondition.cxx | 2 +- svx/source/gallery2/galbrws1.cxx | 3 +- svx/source/gallery2/galbrws1.hxx | 2 +- svx/source/gallery2/galbrws2.cxx | 16 +- svx/source/inc/AccessibleFrameSelector.hxx | 3 +- svx/source/inc/GraphCtlAccessibleContext.hxx | 2 +- svx/source/inc/charmapacc.hxx | 2 +- svx/source/inc/datalistener.hxx | 3 +- svx/source/inc/datanavi.hxx | 134 +++++---- svx/source/inc/docrecovery.hxx | 38 ++- svx/source/inc/filtnav.hxx | 2 +- svx/source/inc/fmexch.hxx | 2 +- svx/source/inc/fmexpl.hxx | 2 +- svx/source/inc/fmvwimp.hxx | 3 +- svx/source/inc/gridcell.hxx | 12 +- svx/source/inc/svxrectctaccessiblecontext.hxx | 3 +- svx/source/inc/tabwin.hxx | 6 +- svx/source/inc/tbxform.hxx | 2 +- svx/source/sidebar/area/AreaPropertyPanel.cxx | 17 ++ svx/source/sidebar/area/AreaPropertyPanel.hxx | 20 +- .../sidebar/graphic/GraphicPropertyPanel.cxx | 17 ++ .../sidebar/graphic/GraphicPropertyPanel.hxx | 19 +- svx/source/sidebar/insert/InsertPropertyPanel.cxx | 6 +- svx/source/sidebar/insert/InsertPropertyPanel.hxx | 4 +- svx/source/sidebar/line/LinePropertyPanel.cxx | 23 ++ svx/source/sidebar/line/LinePropertyPanel.hxx | 29 +- .../sidebar/paragraph/ParaLineSpacingControl.cxx | 29 +- .../sidebar/paragraph/ParaLineSpacingControl.hxx | 20 +- svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 20 ++ svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 23 +- .../sidebar/possize/PosSizePropertyPanel.cxx | 23 ++ .../sidebar/possize/PosSizePropertyPanel.hxx | 31 +- svx/source/sidebar/text/TextPropertyPanel.cxx | 15 + svx/source/sidebar/text/TextPropertyPanel.hxx | 13 +- svx/source/sidebar/tools/Popup.cxx | 6 +- svx/source/svdraw/sdrpaintwindow.cxx | 12 +- svx/source/svdraw/svdedxv.cxx | 22 +- svx/source/svdraw/svdibrow.cxx | 17 +- svx/source/svdraw/svdmrkv.cxx | 2 +- svx/source/svdraw/svdpntv.cxx | 20 +- svx/source/svdraw/svdview.cxx | 4 +- svx/source/tbxctrls/bulletsnumbering.cxx | 15 +- svx/source/tbxctrls/colorwindow.hxx | 14 +- svx/source/tbxctrls/extrusioncontrols.cxx | 33 ++ svx/source/tbxctrls/extrusioncontrols.hxx | 8 +- svx/source/tbxctrls/fillctrl.cxx | 4 +- svx/source/tbxctrls/fontworkgallery.cxx | 22 ++ svx/source/tbxctrls/lboxctrl.cxx | 23 +- svx/source/tbxctrls/tbcontrl.cxx | 16 + svx/source/tbxctrls/tbunocontroller.cxx | 5 +- svx/source/tbxctrls/tbunosearchcontrollers.cxx | 6 +- .../chinese_dictionarydialog.cxx | 31 +- .../chinese_dictionarydialog.hxx | 40 +-- .../chinese_translation_unodialog.cxx | 3 +- .../chinese_translation_unodialog.hxx | 3 +- .../chinese_translationdialog.cxx | 7 +- .../chinese_translationdialog.hxx | 12 +- svx/source/unodraw/recoveryui.cxx | 2 +- svx/source/unodraw/unoshtxt.cxx | 2 +- sw/inc/PostItMgr.hxx | 5 +- sw/inc/SidebarWin.hxx | 10 +- sw/inc/colwd.hxx | 6 +- sw/inc/hhcwrp.hxx | 2 +- sw/inc/postithelper.hxx | 2 +- sw/inc/viewsh.hxx | 2 +- sw/qa/tiledrendering/tiledrendering.cxx | 31 +- sw/source/core/access/accdoc.hxx | 2 +- sw/source/core/access/accfrmobj.cxx | 2 +- sw/source/core/access/accfrmobj.hxx | 3 +- sw/source/core/view/viewsh.cxx | 2 +- sw/source/ui/chrdlg/break.cxx | 21 +- sw/source/ui/chrdlg/chardlg.cxx | 10 + sw/source/ui/chrdlg/drpcps.cxx | 22 +- sw/source/ui/chrdlg/numpara.cxx | 20 ++ sw/source/ui/chrdlg/swuiccoll.cxx | 10 + sw/source/ui/config/mailconfigpage.cxx | 127 +++++--- sw/source/ui/config/optcomp.cxx | 4 + sw/source/ui/config/optload.cxx | 42 +++ sw/source/ui/config/optpage.cxx | 165 ++++++++++ sw/source/ui/dbui/addresslistdialog.cxx | 10 +- sw/source/ui/dbui/addresslistdialog.hxx | 18 +- sw/source/ui/dbui/createaddresslistdialog.cxx | 62 ++-- sw/source/ui/dbui/createaddresslistdialog.hxx | 38 +-- sw/source/ui/dbui/customizeaddresslistdialog.cxx | 33 +- sw/source/ui/dbui/customizeaddresslistdialog.hxx | 20 +- sw/source/ui/dbui/dbinsdlg.cxx | 33 +- sw/source/ui/dbui/dbtablepreviewdialog.cxx | 2 + sw/source/ui/dbui/dbtablepreviewdialog.hxx | 4 +- sw/source/ui/dbui/mmaddressblockpage.cxx | 144 +++++++-- sw/source/ui/dbui/mmaddressblockpage.hxx | 99 +++--- sw/source/ui/dbui/mmdocselectpage.cxx | 15 + sw/source/ui/dbui/mmdocselectpage.hxx | 19 +- sw/source/ui/dbui/mmgreetingspage.cxx | 21 ++ sw/source/ui/dbui/mmgreetingspage.hxx | 52 ++-- sw/source/ui/dbui/mmlayoutpage.cxx | 11 + sw/source/ui/dbui/mmlayoutpage.hxx | 22 +- sw/source/ui/dbui/mmmergepage.cxx | 19 ++ sw/source/ui/dbui/mmmergepage.hxx | 18 +- sw/source/ui/dbui/mmoutputpage.cxx | 44 ++- sw/source/ui/dbui/mmoutputpage.hxx | 84 +++--- sw/source/ui/dbui/mmoutputtypepage.cxx | 36 ++- sw/source/ui/dbui/mmoutputtypepage.hxx | 12 +- sw/source/ui/dbui/mmpreparemergepage.cxx | 18 ++ sw/source/ui/dbui/mmpreparemergepage.hxx | 18 +- sw/source/ui/dbui/selectdbtabledialog.cxx | 3 +- sw/source/ui/dbui/selectdbtabledialog.hxx | 4 +- sw/source/ui/dialog/abstract.cxx | 12 + sw/source/ui/dialog/ascfldlg.cxx | 15 + sw/source/ui/dialog/docstdlg.cxx | 19 +- sw/source/ui/dialog/swdlgfact.cxx | 1 - sw/source/ui/dialog/swdlgfact.hxx | 5 +- sw/source/ui/dialog/swmessdialog.cxx | 15 + sw/source/ui/dialog/swuiexp.cxx | 25 ++ sw/source/ui/dialog/uiregionsw.cxx | 74 +++++ sw/source/ui/dialog/wordcountdialog.cxx | 13 + sw/source/ui/dochdl/selglos.cxx | 11 + sw/source/ui/envelp/envfmt.cxx | 21 ++ sw/source/ui/envelp/envfmt.hxx | 22 +- sw/source/ui/envelp/envlop1.cxx | 14 + sw/source/ui/envelp/envprt.cxx | 17 ++ sw/source/ui/envelp/envprt.hxx | 16 +- sw/source/ui/envelp/label1.cxx | 80 +++++ sw/source/ui/envelp/labfmt.cxx | 35 +++ sw/source/ui/envelp/labfmt.hxx | 41 +-- sw/source/ui/envelp/labprt.cxx | 9 + sw/source/ui/envelp/labprt.hxx | 22 +- sw/source/ui/envelp/mailmrge.cxx | 54 ++++ sw/source/ui/envelp/swuilabimp.hxx | 110 +++---- sw/source/ui/fldui/DropDownFieldDialog.cxx | 14 + sw/source/ui/fldui/changedb.cxx | 5 + sw/source/ui/fldui/flddb.cxx | 18 ++ sw/source/ui/fldui/flddb.hxx | 25 +- sw/source/ui/fldui/flddinf.cxx | 12 + sw/source/ui/fldui/flddinf.hxx | 13 +- sw/source/ui/fldui/flddok.cxx | 21 ++ sw/source/ui/fldui/flddok.hxx | 29 +- sw/source/ui/fldui/fldedt.cxx | 3 + sw/source/ui/fldui/fldfunc.cxx | 31 ++ sw/source/ui/fldui/fldfunc.hxx | 51 ++-- sw/source/ui/fldui/fldref.cxx | 15 + sw/source/ui/fldui/fldref.hxx | 19 +- sw/source/ui/fldui/fldvar.cxx | 22 ++ sw/source/ui/fldui/fldvar.hxx | 33 +- sw/source/ui/fldui/inpdlg.cxx | 14 + sw/source/ui/fldui/javaedit.cxx | 10 + sw/source/ui/frmdlg/column.cxx | 26 +- sw/source/ui/frmdlg/cption.cxx | 37 ++- sw/source/ui/frmdlg/frmpage.cxx | 95 +++++- sw/source/ui/frmdlg/wrap.cxx | 20 ++ sw/source/ui/index/cnttab.cxx | 174 +++++++++-- sw/source/ui/index/multmrk.cxx | 13 +- sw/source/ui/index/swuiidxmrk.cxx | 30 +- sw/source/ui/misc/bookmark.cxx | 9 + sw/source/ui/misc/docfnote.cxx | 31 +- sw/source/ui/misc/glosbib.cxx | 12 + sw/source/ui/misc/glossary.cxx | 41 ++- sw/source/ui/misc/impfnote.hxx | 35 +-- sw/source/ui/misc/insfnote.cxx | 10 + sw/source/ui/misc/linenum.cxx | 22 ++ sw/source/ui/misc/num.cxx | 28 +- sw/source/ui/misc/outline.cxx | 39 ++- sw/source/ui/misc/pgfnote.cxx | 17 ++ sw/source/ui/misc/pggrid.cxx | 29 +- sw/source/ui/misc/srtdlg.cxx | 30 +- sw/source/ui/misc/titlepage.cxx | 12 + sw/source/ui/table/colwd.cxx | 12 + sw/source/ui/table/convert.cxx | 14 + sw/source/ui/table/instable.cxx | 11 + sw/source/ui/table/mergetbl.cxx | 12 + sw/source/ui/table/rowht.cxx | 12 + sw/source/ui/table/splittbl.cxx | 14 + sw/source/ui/table/tabledlg.cxx | 72 ++++- sw/source/ui/table/tautofmt.cxx | 23 +- sw/source/ui/utlui/swrenamexnameddlg.cxx | 12 + sw/source/uibase/dbui/dbui.cxx | 33 ++ sw/source/uibase/dbui/mailmergechildwindow.cxx | 13 +- sw/source/uibase/docvw/HeaderFooterWin.cxx | 2 +- sw/source/uibase/docvw/PageBreakWin.cxx | 7 +- sw/source/uibase/docvw/PostItMgr.cxx | 11 +- sw/source/uibase/docvw/SidebarWin.cxx | 17 +- sw/source/uibase/docvw/srcedtw.cxx | 7 +- sw/source/uibase/envelp/syncbtn.cxx | 13 +- sw/source/uibase/inc/DropDownFieldDialog.hxx | 10 +- sw/source/uibase/inc/FrameControl.hxx | 2 +- sw/source/uibase/inc/FrameControlsManager.hxx | 2 +- sw/source/uibase/inc/HeaderFooterWin.hxx | 4 +- sw/source/uibase/inc/PageBreakWin.hxx | 2 +- sw/source/uibase/inc/abstract.hxx | 8 +- sw/source/uibase/inc/ascfldlg.hxx | 17 +- sw/source/uibase/inc/bookmark.hxx | 7 +- sw/source/uibase/inc/break.hxx | 15 +- sw/source/uibase/inc/changedb.hxx | 10 +- sw/source/uibase/inc/chrdlg.hxx | 22 +- sw/source/uibase/inc/column.hxx | 56 ++-- sw/source/uibase/inc/conttree.hxx | 6 +- sw/source/uibase/inc/convert.hxx | 28 +- sw/source/uibase/inc/cption.hxx | 30 +- sw/source/uibase/inc/dbinsdlg.hxx | 50 ++-- sw/source/uibase/inc/dbui.hxx | 20 +- sw/source/uibase/inc/docstdlg.hxx | 23 +- sw/source/uibase/inc/drawbase.hxx | 2 +- sw/source/uibase/inc/drpcps.hxx | 33 +- sw/source/uibase/inc/envlop.hxx | 19 +- sw/source/uibase/inc/fldedt.hxx | 6 +- sw/source/uibase/inc/fldmgr.hxx | 3 +- sw/source/uibase/inc/frmpage.hxx | 163 +++++----- sw/source/uibase/inc/glosbib.hxx | 13 +- sw/source/uibase/inc/glossary.hxx | 24 +- sw/source/uibase/inc/inpdlg.hxx | 10 +- sw/source/uibase/inc/inputwin.hxx | 4 +- sw/source/uibase/inc/insfnote.hxx | 20 +- sw/source/uibase/inc/instable.hxx | 22 +- sw/source/uibase/inc/javaedit.hxx | 20 +- sw/source/uibase/inc/label.hxx | 2 +- sw/source/uibase/inc/linenum.hxx | 31 +- sw/source/uibase/inc/mailconfigpage.hxx | 20 +- sw/source/uibase/inc/mailmergechildwindow.hxx | 4 +- sw/source/uibase/inc/mailmergehelper.hxx | 2 +- sw/source/uibase/inc/mailmrge.hxx | 89 +++--- sw/source/uibase/inc/mergetbl.hxx | 4 +- sw/source/uibase/inc/multmrk.hxx | 5 +- sw/source/uibase/inc/navipi.hxx | 4 +- sw/source/uibase/inc/num.hxx | 48 +-- sw/source/uibase/inc/numpara.hxx | 29 +- sw/source/uibase/inc/optcomp.hxx | 8 +- sw/source/uibase/inc/optload.hxx | 74 ++--- sw/source/uibase/inc/optpage.hxx | 268 +++++++++-------- sw/source/uibase/inc/outline.hxx | 23 +- sw/source/uibase/inc/pgfnote.hxx | 25 +- sw/source/uibase/inc/pggrid.hxx | 46 +-- sw/source/uibase/inc/prcntfld.hxx | 2 +- sw/source/uibase/inc/pview.hxx | 12 +- sw/source/uibase/inc/redlndlg.hxx | 6 +- sw/source/uibase/inc/regionsw.hxx | 128 ++++---- sw/source/uibase/inc/rowht.hxx | 6 +- sw/source/uibase/inc/selglos.hxx | 5 +- sw/source/uibase/inc/shdwcrsr.hxx | 2 +- sw/source/uibase/inc/splittbl.hxx | 10 +- sw/source/uibase/inc/srcedtw.hxx | 6 +- sw/source/uibase/inc/srtdlg.hxx | 64 ++-- sw/source/uibase/inc/swmessdialog.hxx | 12 +- sw/source/uibase/inc/swrenamexnameddlg.hxx | 6 +- sw/source/uibase/inc/swruler.hxx | 3 +- sw/source/uibase/inc/swuiccoll.hxx | 18 +- sw/source/uibase/inc/swuicnttab.hxx | 214 ++++++------- sw/source/uibase/inc/swuiidxmrk.hxx | 90 +++--- sw/source/uibase/inc/syncbtn.hxx | 4 +- sw/source/uibase/inc/tautofmt.hxx | 26 +- sw/source/uibase/inc/titlepage.hxx | 24 +- sw/source/uibase/inc/view.hxx | 20 +- sw/source/uibase/inc/wordcountdialog.hxx | 26 +- sw/source/uibase/inc/workctrl.hxx | 4 +- sw/source/uibase/inc/wrap.hxx | 29 +- sw/source/uibase/misc/redlndlg.cxx | 2 +- sw/source/uibase/misc/swruler.cxx | 7 + sw/source/uibase/ribbar/inputwin.cxx | 2 +- sw/source/uibase/ribbar/workctrl.cxx | 3 +- sw/source/uibase/shells/txtattr.cxx | 1 + sw/source/uibase/shells/txtcrsr.cxx | 1 + sw/source/uibase/sidebar/PageColumnControl.cxx | 2 +- sw/source/uibase/sidebar/PageColumnControl.hxx | 2 +- sw/source/uibase/sidebar/PageMarginControl.cxx | 2 +- sw/source/uibase/sidebar/PageMarginControl.hxx | 2 +- .../uibase/sidebar/PageOrientationControl.cxx | 2 +- .../uibase/sidebar/PageOrientationControl.hxx | 2 +- sw/source/uibase/sidebar/PagePropertyPanel.cxx | 4 + sw/source/uibase/sidebar/PagePropertyPanel.hxx | 8 +- sw/source/uibase/sidebar/PageSizeControl.cxx | 2 +- sw/source/uibase/sidebar/PageSizeControl.hxx | 2 +- sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 12 + sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 15 +- sw/source/uibase/table/tablepg.hxx | 87 +++--- sw/source/uibase/uiview/pview.cxx | 37 ++- sw/source/uibase/uiview/view.cxx | 14 +- sw/source/uibase/uiview/viewling.cxx | 6 +- sw/source/uibase/uiview/viewmdi.cxx | 16 +- sw/source/uibase/utlui/content.cxx | 1 + sw/source/uibase/utlui/glbltree.cxx | 1 + sw/source/uibase/utlui/gloslst.cxx | 23 +- sw/source/uibase/utlui/navipi.cxx | 5 +- tools/source/ref/errinf.cxx | 1 + uui/source/authfallbackdlg.cxx | 15 + uui/source/authfallbackdlg.hxx | 12 +- uui/source/fltdlg.cxx | 12 + uui/source/fltdlg.hxx | 6 +- uui/source/logindlg.cxx | 25 ++ uui/source/logindlg.hxx | 32 +- uui/source/masterpasscrtdlg.cxx | 13 + uui/source/masterpasscrtdlg.hxx | 8 +- uui/source/masterpassworddlg.cxx | 12 + uui/source/masterpassworddlg.hxx | 6 +- uui/source/nameclashdlg.cxx | 15 + uui/source/nameclashdlg.hxx | 12 +- uui/source/passworddlg.cxx | 15 + uui/source/passworddlg.hxx | 12 +- uui/source/secmacrowarnings.cxx | 15 + uui/source/secmacrowarnings.hxx | 19 +- uui/source/unknownauthdlg.cxx | 14 + uui/source/unknownauthdlg.hxx | 10 +- vcl/generic/print/genprnpsp.cxx | 16 +- vcl/generic/print/prtsetup.cxx | 42 ++- vcl/generic/print/prtsetup.hxx | 44 +-- vcl/inc/brdwin.hxx | 6 +- vcl/inc/dndevdis.hxx | 4 +- vcl/inc/ilstbox.hxx | 13 +- vcl/inc/printdlg.hxx | 109 +++---- vcl/inc/salframe.hxx | 9 +- vcl/inc/svdata.hxx | 41 ++- vcl/inc/toolbox.h | 2 +- vcl/inc/unx/i18n_status.hxx | 3 +- vcl/inc/window.h | 58 ++-- vcl/source/app/salvtables.cxx | 9 + vcl/source/app/svapp.cxx | 30 +- vcl/source/app/svdata.cxx | 2 + vcl/source/app/vclevent.cxx | 9 + vcl/source/control/button.cxx | 28 +- vcl/source/control/combobox.cxx | 8 +- vcl/source/control/ctrl.cxx | 4 + vcl/source/control/fixed.cxx | 1 + vcl/source/control/ilstbox.cxx | 18 +- vcl/source/control/lstbox.cxx | 16 +- vcl/source/control/tabctrl.cxx | 28 +- vcl/source/edit/textview.cxx | 2 +- vcl/source/edit/vclmedit.cxx | 23 +- vcl/source/gdi/print3.cxx | 6 +- vcl/source/window/accel.cxx | 1 + vcl/source/window/accessibility.cxx | 5 +- vcl/source/window/brdwin.cxx | 2 +- vcl/source/window/btndlg.cxx | 22 +- vcl/source/window/builder.cxx | 27 +- vcl/source/window/clipping.cxx | 2 +- vcl/source/window/cursor.cxx | 4 +- vcl/source/window/dialog.cxx | 3 +- vcl/source/window/dlgctrl.cxx | 20 +- vcl/source/window/dndevdis.cxx | 6 +- vcl/source/window/dockmgr.cxx | 17 +- vcl/source/window/dockwin.cxx | 16 +- vcl/source/window/event.cxx | 23 +- vcl/source/window/floatwin.cxx | 6 +- vcl/source/window/introwin.cxx | 6 +- vcl/source/window/layout.cxx | 35 ++- vcl/source/window/menu.cxx | 20 +- vcl/source/window/menubarwindow.cxx | 6 +- vcl/source/window/menufloatingwindow.cxx | 4 +- vcl/source/window/mouse.cxx | 22 +- vcl/source/window/msgbox.cxx | 23 +- vcl/source/window/paint.cxx | 2 +- vcl/source/window/printdlg.cxx | 63 ++-- vcl/source/window/split.cxx | 1 + vcl/source/window/splitwin.cxx | 6 +- vcl/source/window/stacking.cxx | 37 ++- vcl/source/window/syswin.cxx | 1 + vcl/source/window/tabdlg.cxx | 3 +- vcl/source/window/taskpanelist.cxx | 19 +- vcl/source/window/toolbox.cxx | 9 +- vcl/source/window/window.cxx | 43 ++- vcl/source/window/window2.cxx | 34 +-- vcl/source/window/winproc.cxx | 14 +- vcl/unx/generic/app/i18n_status.cxx | 4 +- vcl/unx/generic/printer/cupsmgr.cxx | 22 +- vcl/workben/icontest.cxx | 5 +- vcl/workben/mtfdemo.cxx | 2 +- vcl/workben/vcldemo.cxx | 19 +- xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 6 +- xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 39 +-- .../inc/xmlsecurity/digitalsignaturesdialog.hxx | 36 +-- xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 40 +-- xmlsecurity/source/dialogs/certificatechooser.cxx | 4 +- xmlsecurity/source/dialogs/certificateviewer.cxx | 45 ++- .../source/dialogs/digitalsignaturesdialog.cxx | 17 +- xmlsecurity/source/dialogs/macrosecurity.cxx | 39 ++- 1576 files changed, 20932 insertions(+), 10073 deletions(-) (limited to 'cui/source/customize/macropg.cxx') diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx index 098c8e5d0d43..363a54450e52 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx @@ -35,6 +35,7 @@ #include #include #include +#include // forward @@ -63,7 +64,7 @@ namespace accessibility { private: /** The treelistbox control */ - SvtIconChoiceCtrl* m_pIconCtrl; + VclPtr m_pIconCtrl; sal_Int32 m_nIndex; protected: diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx index 81401f177564..ed920c89399d 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx @@ -22,6 +22,7 @@ #include #include +#include class TabBar; class VCLExternalSolarLock; @@ -57,7 +58,7 @@ private: protected: VCLExternalSolarLock* m_pExternalLock; - TabBar* m_pTabBar; + VclPtr m_pTabBar; }; diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx index e5e16809b038..f6e1d416bf30 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx @@ -43,7 +43,7 @@ class AccessibleTabListBox ,public ::svt::IAccessibleTabListBox { private: - SvHeaderTabListBox* m_pTabListBox; + VclPtr m_pTabListBox; public: /** ctor() diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx index 92e6fe996706..89bfd7ef437c 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx @@ -37,7 +37,7 @@ typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelecti class AccessibleTabListBoxTable : public AccessibleBrowseBoxTable, public AccessibleTabListBoxTableImplHelper { private: - SvHeaderTabListBox* m_pTabListBox; + VclPtr m_pTabListBox; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xCurChild; diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx index fc3bb245b2c4..4ce38c5090b6 100644 --- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx +++ b/accessibility/inc/accessibility/extended/listboxaccessible.hxx @@ -22,6 +22,7 @@ #include #include +#include class SvTreeListBox; class VclSimpleEvent; @@ -41,7 +42,7 @@ namespace accessibility class ListBoxAccessibleBase { private: - SvTreeListBox* m_pWindow; + VclPtr m_pWindow; protected: inline SvTreeListBox* getListBox() const @@ -49,7 +50,7 @@ namespace accessibility return const_cast< ListBoxAccessibleBase* >( this )->m_pWindow; } - inline bool isAlive() const { return NULL != m_pWindow; } + inline bool isAlive() const { return nullptr != m_pWindow; } public: ListBoxAccessibleBase( SvTreeListBox& _rWindow ); diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index a24e8c94af77..2846113057a2 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -99,7 +99,7 @@ public: private: ::Link m_aListener; - vcl::Window * m_pNotifier; + VclPtr m_pNotifier; }; class ParagraphInfo diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx index 2ca6def7ba42..b6dc89864fec 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx @@ -21,6 +21,7 @@ #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX #include +#include class VclSimpleEvent; class VclWindowEvent; @@ -34,7 +35,7 @@ namespace vcl { class Window; } class VCLXAccessibleMenuBar : public OAccessibleMenuComponent { protected: - vcl::Window* m_pWindow; + VclPtr m_pWindow; virtual bool IsFocused() SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx index a07e4502c111..249f5cafa6ec 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx @@ -21,6 +21,7 @@ #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX #include +#include #include @@ -36,7 +37,7 @@ private: typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; - StatusBar* m_pStatusBar; + VclPtr m_pStatusBar; protected: void UpdateShowing( sal_Int32 i, bool bShowing ); diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx index f720374f3af5..0432abc9db7a 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx @@ -24,7 +24,7 @@ #include #include #include - +#include class StatusBar; class VCLExternalSolarLock; @@ -51,14 +51,14 @@ class VCLXAccessibleStatusBarItem : public AccessibleTextHelper_BASE, private: VCLExternalSolarLock* m_pExternalLock; - StatusBar* m_pStatusBar; + VclPtr m_pStatusBar; sal_uInt16 m_nItemId; OUString m_sItemName; OUString m_sItemText; - bool m_bShowing; + bool m_bShowing; protected: - bool IsShowing(); + bool IsShowing(); void SetShowing( bool bShowing ); void SetItemName( const OUString& sItemName ); OUString GetItemName(); diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx index b4e7b54fd197..358213855df2 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx @@ -22,6 +22,7 @@ #include #include +#include #include @@ -42,7 +43,7 @@ private: typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; - TabControl* m_pTabControl; + VclPtr m_pTabControl; protected: void UpdateFocused(); diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx index 182235a0ad12..8c0aa5dcac5b 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx @@ -24,6 +24,7 @@ #include #include #include +#include class TabControl; @@ -51,7 +52,7 @@ class VCLXAccessibleTabPage : public AccessibleTextHelper_BASE, private: VCLExternalSolarLock* m_pExternalLock; - TabControl* m_pTabControl; + VclPtr m_pTabControl; sal_uInt16 m_nPageId; bool m_bFocused; bool m_bSelected; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx index 0fb8f614bd0c..9393579b6883 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx @@ -21,6 +21,7 @@ #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX #include +#include class TabControl; @@ -34,8 +35,8 @@ class TabPage; class VCLXAccessibleTabPageWindow : public VCLXAccessibleComponent { private: - TabControl* m_pTabControl; - TabPage* m_pTabPage; + VclPtr m_pTabControl; + VclPtr m_pTabPage; sal_uInt16 m_nPageId; protected: diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx index b7d3c15fd3f8..a05f31b89d1f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx @@ -30,6 +30,7 @@ #include #include #include +#include class ToolBox; @@ -46,13 +47,13 @@ class VCLXAccessibleToolBoxItem : public AccessibleTextHelper_BASE, { private: OUString m_sOldName; - ToolBox* m_pToolBox; + VclPtr m_pToolBox; VCLExternalSolarLock* m_pExternalLock; sal_Int32 m_nIndexInParent; sal_Int16 m_nRole; - sal_uInt16 m_nItemId; - bool m_bHasFocus; - bool m_bIsChecked; + sal_uInt16 m_nItemId; + bool m_bHasFocus; + bool m_bIsChecked; bool m_bIndeterminate; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xChild; @@ -80,9 +81,9 @@ public: VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos ); void SetFocus( bool _bFocus ); - inline bool HasFocus() const { return m_bHasFocus; } + inline bool HasFocus() const { return m_bHasFocus; } void SetChecked( bool _bCheck ); - inline bool IsChecked() const { return m_bIsChecked; } + inline bool IsChecked() const { return m_bIsChecked; } void SetIndeterminate( bool _bIndeterminate ); inline bool IsIndeterminate() const { return m_bIndeterminate; } inline void ReleaseToolBox() { m_pToolBox = NULL; } diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index dfb8ede26120..4f69764bcf29 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -76,7 +76,7 @@ namespace accessibility ); void checkDisposed(); - bool isDisposed() const { return m_pPanelDeck == NULL; } + bool isDisposed() const { return m_pPanelDeck == nullptr; } void dispose(); virtual ~AccessibleToolPanelDeck_Impl(); @@ -95,7 +95,7 @@ namespace accessibility public: AccessibleToolPanelDeck& m_rAntiImpl; Reference< XAccessible > m_xAccessibleParent; - ::svt::ToolPanelDeck* m_pPanelDeck; + VclPtr<::svt::ToolPanelDeck> m_pPanelDeck; Reference< XAccessible > m_xActivePanelAccessible; }; @@ -141,7 +141,7 @@ namespace accessibility { ENSURE_OR_RETURN_VOID( !isDisposed(), "disposed twice" ); m_pPanelDeck->RemoveListener( *this ); - m_pPanelDeck = NULL; + m_pPanelDeck.clear(); m_xAccessibleParent.clear(); } diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 757c45257c6e..1700aed946b1 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -120,7 +120,7 @@ namespace accessibility AccessibleToolPanelTabBar& m_rAntiImpl; Reference< XAccessible > m_xAccessibleParent; ::svt::IToolPanelDeck* m_pPanelDeck; - ::svt::PanelTabBar* m_pTabBar; + VclPtr<::svt::PanelTabBar> m_pTabBar; ::std::vector< Reference< XAccessible > > m_aChildren; }; @@ -163,7 +163,7 @@ namespace accessibility m_pTabBar->GetScrollButton( true ).RemoveEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) ); m_pTabBar->GetScrollButton( false ).RemoveEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) ); - m_pTabBar = NULL; + m_pTabBar.clear(); m_xAccessibleParent.clear(); } diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 33bca93ae759..f89cb3d7f807 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -105,7 +105,7 @@ namespace accessibility AccessibleToolPanelDeckTabBarItem& m_rAntiImpl; Reference< XAccessible > m_xAccessibleParent; ::svt::IToolPanelDeck* m_pPanelDeck; - ::svt::PanelTabBar* m_pTabBar; + VclPtr<::svt::PanelTabBar> m_pTabBar; size_t m_nItemPos; }; @@ -139,7 +139,7 @@ namespace accessibility m_xAccessibleParent.clear(); m_pPanelDeck->RemoveListener( *this ); m_pPanelDeck = NULL; - m_pTabBar = NULL; + m_pTabBar.clear(); } Reference< XAccessibleComponent > AccessibleToolPanelDeckTabBarItem_Impl::getParentAccessibleComponent() const diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index a24d05bc9135..794524017735 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -91,7 +91,7 @@ throw(RuntimeException, std::exception) if ( _rSource.Source == m_xParent ) { dispose(); - OSL_ENSURE( !m_xParent.is() && ( NULL == m_pIconCtrl ), "" ); + OSL_ENSURE( !m_xParent.is() && ( nullptr == m_pIconCtrl ), "" ); } } diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 2dd16ace0380..fbe72a0e9d07 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -47,17 +47,17 @@ void SfxListenerGuard::endListening() void WindowListenerGuard::startListening(vcl::Window & rNotifier) { - OSL_ENSURE(m_pNotifier == 0, "called more than once"); + OSL_ENSURE(m_pNotifier == nullptr, "called more than once"); m_pNotifier = &rNotifier; m_pNotifier->AddEventListener(m_aListener); } void WindowListenerGuard::endListening() { - if (m_pNotifier != 0) + if (m_pNotifier) { m_pNotifier->RemoveEventListener(m_aListener); - m_pNotifier = 0; + m_pNotifier = nullptr; } } diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index baabdd5555f1..c76babf32697 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -93,13 +93,13 @@ void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelati RadioButton* pRadioButton = dynamic_cast< RadioButton* >( GetWindow() ); if ( pRadioButton ) { - ::std::vector< RadioButton* > aGroup(pRadioButton->GetRadioButtonGroup(true)); + ::std::vector< VclPtr > aGroup(pRadioButton->GetRadioButtonGroup(true)); if (!aGroup.empty()) { sal_Int32 i = 0; Sequence< Reference< XInterface > > aSequence( static_cast< sal_Int32 >( aGroup.size() ) ); - ::std::vector< RadioButton* >::const_iterator aEndItr = aGroup.end(); - for ( ::std::vector< RadioButton* >::const_iterator aItr = aGroup.begin(); aItr < aEndItr; ++aItr ) + auto aEndItr = aGroup.end(); + for ( auto aItr = aGroup.begin(); aItr < aEndItr; ++aItr ) { aSequence[i++] = (*aItr)->GetAccessible(); } diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index 6b43aa3d4b2c..d8d47320f9c9 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx @@ -50,7 +50,7 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo for ( sal_uInt16 i = 0, nCount = m_pTabControl->GetPageCount(); i < nCount; ++i ) { sal_uInt16 nPageId = m_pTabControl->GetPageId( i ); - if ( m_pTabControl->GetTabPage( nPageId ) == m_pTabPage ) + if ( m_pTabControl->GetTabPage( nPageId ) == m_pTabPage.get() ) m_nPageId = nPageId; } } diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 9a1933b7e0a8..b24e1a590ee7 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -95,7 +95,7 @@ private: VclPtr maMuteToolBox; VclPtr maVolumeSlider; VclPtr maZoomToolBox; - ListBox* mpZoomListBox; + VclPtr mpZoomListBox; VclPtr maTimeEdit; Size maMinSize; MediaControlStyle meControlStyle; diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 617bbc340e08..24defd8d3141 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -202,8 +202,7 @@ MediaControl::~MediaControl() void MediaControl::dispose() { maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, NULL ); - delete mpZoomListBox; - mpZoomListBox = NULL; + mpZoomListBox.clear(); maTimeEdit.disposeAndClear(); maZoomToolBox.disposeAndClear(); maVolumeSlider.disposeAndClear(); diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index f9dee9a3bf16..deccd8f17ea4 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -42,7 +42,7 @@ MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _p { pWindow = new MediaFloater( _pBindings, this, _pParent ); eChildAlignment = SfxChildAlignment::NOALIGNMENT; - static_cast< MediaFloater* >( pWindow )->Initialize( pInfo ); + static_cast< MediaFloater* >( pWindow.get() )->Initialize( pInfo ); }; diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 86e18175101c..3e42ebb223b4 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -45,7 +45,7 @@ MediaEventListenersImpl::~MediaEventListenersImpl() void MediaEventListenersImpl::cleanUp() { - Application::RemoveMouseAndKeyEvents( reinterpret_cast< vcl::Window* >( mpNotifyWindow ) ); + Application::RemoveMouseAndKeyEvents( reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ) ); mpNotifyWindow = NULL; } @@ -72,7 +72,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt:: ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); - Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); + Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt ); } } @@ -91,7 +91,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt: ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) | ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); - Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); + Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt ); } } @@ -112,7 +112,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); } } @@ -133,7 +133,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); } } @@ -174,7 +174,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); } } @@ -189,7 +189,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt:: if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); } } diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx index 63e1a0d77ba2..27676c749d84 100644 --- a/avmedia/source/viewer/mediaevent_impl.hxx +++ b/avmedia/source/viewer/mediaevent_impl.hxx @@ -26,6 +26,7 @@ #include #include #include +#include namespace avmedia { @@ -69,7 +70,7 @@ namespace avmedia private: - vcl::Window* mpNotifyWindow; + VclPtr mpNotifyWindow; mutable ::osl::Mutex maMutex; }; } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index b2716eebf5cc..c43f6829955d 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -204,8 +204,7 @@ void MediaWindowImpl::dispose() mpEmptyBmpEx = NULL; delete mpAudioBmpEx; mpAudioBmpEx = NULL; - delete mpMediaWindowControl; - mpMediaWindowControl = NULL; + mpMediaWindowControl.clear(); Control::dispose(); } diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index 1311a2b4855f..40131c3c6fe2 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -173,7 +173,7 @@ namespace avmedia MediaEventListenersImpl* mpEvents; bool mbEventTransparent; std::unique_ptr mpChildWindow; - MediaWindowControl* mpMediaWindowControl; + VclPtr mpMediaWindowControl; BitmapEx* mpEmptyBmpEx; BitmapEx* mpAudioBmpEx; }; diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx index f91a5ef8a9d3..db96dfc66ea5 100644 --- a/basctl/source/basicide/basicrenderable.hxx +++ b/basctl/source/basicide/basicrenderable.hxx @@ -33,7 +33,7 @@ class Renderable : public cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >, public vcl::PrinterOptionsHelper { - BaseWindow* mpWindow; + VclPtr mpWindow; osl::Mutex maMutex; Printer* getPrinter(); diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 9b4837673dbe..33ddae459da9 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -1484,6 +1484,7 @@ void ModulWindowLayout::dispose() { aWatchWindow.disposeAndClear(); aStackWindow.disposeAndClear(); + pChild.clear(); Layout::dispose(); } diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 48874b01c69b..addef49f60a9 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -445,7 +445,7 @@ protected: private: // main child window - ModulWindow* pChild; + VclPtr pChild; // dockable windows VclPtr aWatchWindow; VclPtr aStackWindow; @@ -475,7 +475,7 @@ private: // the configuration svtools::ColorConfig aConfig; // the active editor - EditorWindow* pEditor; + VclPtr pEditor; } aSyntaxColors; }; @@ -489,7 +489,7 @@ private: /* a buffer to build up function name when typing * a function name, used for showing/hiding listbox values * */ - CodeCompleteWindow* pCodeCompleteWindow; // parent window + VclPtr pCodeCompleteWindow; // parent window void SetMatchingEntries(); // sets the visible entries based on aFuncBuffer variable void HideAndRestoreFocus(); @@ -497,6 +497,8 @@ private: public: CodeCompleteListBox( CodeCompleteWindow* pPar ); + virtual ~CodeCompleteListBox(); + virtual void dispose() SAL_OVERRIDE; void InsertSelectedEntry(); //insert the selected entry DECL_LINK(ImplDoubleClickHdl, void*); @@ -510,9 +512,9 @@ class CodeCompleteWindow: public vcl::Window { friend class CodeCompleteListBox; private: - EditorWindow* pParent; // parent window + VclPtr pParent; // parent window TextSelection aTextSelection; - CodeCompleteListBox* pListBox; + VclPtr pListBox; void InitListBox(); // initialize the ListBox diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 4afce39c3dfc..f405491cce56 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2685,6 +2685,17 @@ pCodeCompleteWindow( pPar ) SetSelectHdl(LINK(this, CodeCompleteListBox, ImplSelectHdl)); } +CodeCompleteListBox::~CodeCompleteListBox() +{ + dispose(); +} + +void CodeCompleteListBox::dispose() +{ + pCodeCompleteWindow.clear(); + ListBox::dispose(); +} + IMPL_LINK_NOARG(CodeCompleteListBox, ImplDoubleClickHdl) { InsertSelectedEntry(); @@ -2863,8 +2874,8 @@ CodeCompleteWindow::~CodeCompleteWindow() void CodeCompleteWindow::dispose() { - delete pListBox; - pListBox = NULL; + pListBox.clear(); + pParent.clear(); vcl::Window::dispose(); } diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index a85d0e0fd67f..4c08dcbb770e 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1413,12 +1413,12 @@ DialogWindowLayout::~DialogWindowLayout() void DialogWindowLayout::dispose() { - if (pPropertyBrowser != 0) + if (pPropertyBrowser) { Remove(pPropertyBrowser); - delete pPropertyBrowser; - pPropertyBrowser = 0; } + pPropertyBrowser.clear(); + pChild.clear(); Layout::dispose(); } diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index c6374bf8e43d..c9aaa23447c7 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -126,7 +126,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) break; if (it != aWindowTable.end()) ++it; - BaseWindow* pWin = it != aWindowTable.end() ? it->second : 0; + BaseWindow* pWin = it != aWindowTable.end() ? it->second.get() : 0; bool bSearchedFromStart = false; while ( !nFound && !bCanceled && ( pWin || !bSearchedFromStart ) ) @@ -166,7 +166,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) { if ( it != aWindowTable.end() ) ++it; - pWin = it != aWindowTable.end() ? it->second : 0; + pWin = it != aWindowTable.end() ? it->second.get() : 0; } else pWin = 0; @@ -202,7 +202,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) case SID_BASICSTOP: { // maybe do not simply stop if on breakpoint! - if (ModulWindow* pMCurWin = dynamic_cast(pCurWin)) + if (ModulWindow* pMCurWin = dynamic_cast(pCurWin.get())) pMCurWin->BasicStop(); StopBasic(); } @@ -769,7 +769,7 @@ void Shell::GetState(SfxItemSet &rSet) case SID_BASICSAVEAS: case SID_BASICIDE_MATCHGROUP: { - if (!dynamic_cast(pCurWin)) + if (!dynamic_cast(pCurWin.get())) rSet.DisableItem( nWh ); else if ( ( nWh == SID_BASICLOAD ) && ( StarBASIC::IsRunning() || ( pCurWin && pCurWin->IsReadOnly() ) ) ) rSet.DisableItem( nWh ); @@ -782,7 +782,7 @@ void Shell::GetState(SfxItemSet &rSet) case SID_BASICIDE_TOGGLEBRKPNT: case SID_BASICIDE_MANAGEBRKPNTS: { - if (ModulWindow* pMCurWin = dynamic_cast(pCurWin)) + if (ModulWindow* pMCurWin = dynamic_cast(pCurWin.get())) { if (StarBASIC::IsRunning() && !pMCurWin->GetBasicStatus().bIsInReschedule) rSet.DisableItem(nWh); @@ -793,7 +793,7 @@ void Shell::GetState(SfxItemSet &rSet) break; case SID_BASICCOMPILE: { - if (StarBASIC::IsRunning() || !dynamic_cast(pCurWin)) + if (StarBASIC::IsRunning() || !dynamic_cast(pCurWin.get())) rSet.DisableItem( nWh ); } break; @@ -814,7 +814,7 @@ void Shell::GetState(SfxItemSet &rSet) case SID_INSERT_FORM_HSCROLL: case SID_INSERT_FORM_SPIN: { - if (!dynamic_cast(pCurWin)) + if (!dynamic_cast(pCurWin.get())) rSet.DisableItem( nWh ); } break; @@ -945,7 +945,7 @@ void Shell::GetState(SfxItemSet &rSet) // if this is not a module window hide the // setting, doesn't make sense for example if the // dialog editor is open - if (pCurWin && !dynamic_cast(pCurWin)) + if (pCurWin && !dynamic_cast(pCurWin.get())) { rSet.DisableItem( nWh ); rSet.Put(SfxVisibilityItem(nWh, false)); @@ -968,7 +968,7 @@ bool Shell::HasUIFeature( sal_uInt32 nFeature ) if ( (nFeature & BASICIDE_UI_FEATURE_SHOW_BROWSER) == BASICIDE_UI_FEATURE_SHOW_BROWSER ) { // fade out (in) property browser in module (dialog) windows - if (dynamic_cast(pCurWin) && !pCurWin->IsReadOnly()) + if (dynamic_cast(pCurWin.get()) && !pCurWin->IsReadOnly()) bResult = true; } @@ -1035,7 +1035,7 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe aObjectCatalog->SetCurrentEntry(pCurWin); SetUndoManager( pCurWin ? pCurWin->GetUndoManager() : 0 ); InvalidateBasicIDESlots(); - EnableScrollbars(pCurWin != 0); + EnableScrollbars(pCurWin != nullptr); if ( m_pCurLocalizationMgr ) m_pCurLocalizationMgr->handleTranslationbar(); @@ -1067,7 +1067,7 @@ void Shell::ManageToolbars() if ( xLayoutManager.is() ) { xLayoutManager->lock(); - if (dynamic_cast(pCurWin)) + if (dynamic_cast(pCurWin.get())) { xLayoutManager->destroyElement( aMacroBarResName ); @@ -1213,7 +1213,7 @@ void Shell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) } if (pLayout) - pLayout->SetPosSizePixel(rPos, dynamic_cast(pCurWin) ? aSz : aOutSz); + pLayout->SetPosSizePixel(rPos, dynamic_cast(pCurWin.get()) ? aSz : aOutSz); } Reference< XModel > Shell::GetCurrentDocument() const @@ -1230,7 +1230,7 @@ void Shell::Activate( bool bMDI ) if ( bMDI ) { - if (DialogWindow* pDCurWin = dynamic_cast(pCurWin)) + if (DialogWindow* pDCurWin = dynamic_cast(pCurWin.get())) pDCurWin->UpdateBrowser(); } } @@ -1241,7 +1241,7 @@ void Shell::Deactivate( bool bMDI ) // deactivate due to a MessageBox bMDI is false if ( bMDI ) { - if (DialogWindow* pXDlgWin = dynamic_cast(pCurWin)) + if (DialogWindow* pXDlgWin = dynamic_cast(pCurWin.get())) { pXDlgWin->DisableBrowser(); if( pXDlgWin->IsModified() ) diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 70cda63abde1..3e88d55a9e98 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -44,7 +44,7 @@ Reference< view::XRenderable > Shell::GetRenderable() bool Shell::HasSelection( bool /* bText */ ) const { - if (ModulWindow* pMCurWin = dynamic_cast(pCurWin)) + if (ModulWindow* pMCurWin = dynamic_cast(pCurWin.get())) { TextView* pEditView = pMCurWin->GetEditView(); if ( pEditView && pEditView->HasSelection() ) @@ -56,7 +56,7 @@ bool Shell::HasSelection( bool /* bText */ ) const OUString Shell::GetSelectionText( bool bWholeWord ) { OUString aText; - if (ModulWindow* pMCurWin = dynamic_cast(pCurWin)) + if (ModulWindow* pMCurWin = dynamic_cast(pCurWin.get())) { if (TextView* pEditView = pMCurWin->GetEditView()) { @@ -220,14 +220,14 @@ void Shell::Move() void Shell::ShowCursor( bool bOn ) { - if (ModulWindow* pMCurWin = dynamic_cast(pCurWin)) + if (ModulWindow* pMCurWin = dynamic_cast(pCurWin.get())) pMCurWin->ShowCursor(bOn); } // only if basic window above: void Shell::ExecuteBasic( SfxRequest& rReq ) { - if (dynamic_cast(pCurWin)) + if (dynamic_cast(pCurWin.get())) { pCurWin->ExecuteCommand( rReq ); if (nShellCount) diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx index 8112a1790d5c..5b2f93d3beca 100644 --- a/basctl/source/basicide/basides3.cxx +++ b/basctl/source/basicide/basides3.cxx @@ -128,7 +128,7 @@ sal_uInt16 Shell::GetWindowId(const BaseWindow* pWin) const SdrView* Shell::GetCurDlgView() const { - if (DialogWindow* pDCurWin = dynamic_cast(pCurWin)) + if (DialogWindow* pDCurWin = dynamic_cast(pCurWin.get())) return &pDCurWin->GetView(); else return 0; @@ -137,7 +137,7 @@ SdrView* Shell::GetCurDlgView() const // only if dialogue window above: void Shell::ExecuteDialog( SfxRequest& rReq ) { - if (pCurWin && (dynamic_cast(pCurWin) || rReq.GetSlot() == SID_IMPORT_DIALOG)) + if (pCurWin && (dynamic_cast(pCurWin.get()) || rReq.GetSlot() == SID_IMPORT_DIALOG)) pCurWin->ExecuteCommand(rReq); } diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index bf9af424fe6f..e1d92e1e88b2 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -232,11 +232,8 @@ Shell::~Shell() SetWindow( 0 ); SetCurWindow( 0 ); - for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it) - { - // no store; does already happen when the BasicManagers are destroyed - delete it->second; - } + // no store; does already happen when the BasicManagers are destroyed + aWindowTable.clear(); // Destroy all ContainerListeners for Basic Container. if (ContainerListenerImpl* pListener = static_cast(m_xLibListener.get())) @@ -255,7 +252,10 @@ void Shell::onDocumentCreated( const ScriptDocument& /*_rDocument*/ ) // for VBA documents, show a warning that we can save them only in ODF if (pCurWin->GetDocument().isInVBAMode()) - GetViewFrame()->AppendInfoBar("vba_save", IDE_RESSTR(RID_STR_CANNOTSAVEVBA)); + { + std::vector< VclPtr > aButtons; + GetViewFrame()->AppendInfoBar("vba_save", IDE_RESSTR(RID_STR_CANNOTSAVEVBA), aButtons); + } } UpdateWindows(); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 3a6be366accc..7e0bfeafe149 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -64,6 +64,8 @@ void BaseWindow::dispose() pShellVScrollBar->SetScrollHdl( Link() ); if ( pShellHScrollBar ) pShellHScrollBar->SetScrollHdl( Link() ); + pShellVScrollBar.clear(); + pShellHScrollBar.clear(); vcl::Window::dispose(); } @@ -279,6 +281,17 @@ DockingWindow::DockingWindow (Layout* pParent) : nShowCount(0) { } +DockingWindow::~DockingWindow() +{ + dispose(); +} + +void DockingWindow::dispose() +{ + pLayout.clear(); + ::DockingWindow::dispose(); +} + // Sets the position and the size of the docking window. This property is saved // when the window is floating. Called by Layout. void DockingWindow::ResizeIfDocking (Point const& rPos, Size const& rSize) @@ -526,7 +539,7 @@ void TabBar::Command( const CommandEvent& rCEvt ) { Shell::WindowTable& aWindowTable = pShell->GetWindowTable(); Shell::WindowTableIt it = aWindowTable.find( GetCurPageId() ); - if (it != aWindowTable.end() && dynamic_cast(it->second)) + if (it != aWindowTable.end() && dynamic_cast(it->second.get())) { SbModule* pActiveModule = pBasic->FindModule( it->second->GetName() ); if( pActiveModule && ( pActiveModule->GetModuleType() == script::ModuleType::DOCUMENT ) ) diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index b5b2ef17d9dc..321f68bd9a9d 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -106,6 +106,21 @@ BreakPointDialog::BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkPn CheckButtons(); } +BreakPointDialog::~BreakPointDialog() +{ + dispose(); +} + +void BreakPointDialog::dispose() +{ + m_pComboBox.clear(); + m_pOKButton.clear(); + m_pNewButton.clear(); + m_pDelButton.clear(); + m_pNumericField.clear(); + ModalDialog::dispose(); +} + void BreakPointDialog::SetCurrentBreakPoint( BreakPoint* pBrk ) { OUString aStr( "# " + OUString::number(pBrk->nLine) ); diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index 703744efd345..5c78e7ce6674 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -31,12 +31,12 @@ namespace basctl class BreakPointDialog : public ModalDialog { private: - ComboBox* m_pComboBox; - OKButton* m_pOKButton; - PushButton* m_pNewButton; - PushButton* m_pDelButton; - ::CheckBox* m_pCheckBox; - NumericField* m_pNumericField; + VclPtr m_pComboBox; + VclPtr m_pOKButton; + VclPtr m_pNewButton; + VclPtr m_pDelButton; + ::VclPtr m_pCheckBox; + VclPtr m_pNumericField; BreakPointList & m_rOriginalBreakPointList; BreakPointList m_aModifiedBreakPointList; @@ -53,6 +53,8 @@ protected: public: BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkList ); + virtual ~BreakPointDialog(); + virtual void dispose() SAL_OVERRIDE; void SetCurrentBreakPoint( BreakPoint* pBrk ); }; diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 58db3a74dbb1..14a3b54af1a0 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -53,6 +53,17 @@ Layout::Layout (vcl::Window* pParent) : SetFont(aFont); } +Layout::~Layout() +{ + dispose(); +} + +void Layout::dispose() +{ + pChild.clear(); + Window::dispose(); +} + // removes a docking window void Layout::Remove (DockingWindow* pWin) { diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx index 56e69a2f28f9..ad19ad93e5f1 100644 --- a/basctl/source/basicide/layout.hxx +++ b/basctl/source/basicide/layout.hxx @@ -50,6 +50,9 @@ public: virtual void GetState (SfxItemSet&, unsigned nWhich) = 0; virtual void UpdateDebug (bool bBasicStopped ) = 0; + virtual ~Layout(); + virtual void dispose() SAL_OVERRIDE; + protected: Layout (vcl::Window* pParent); @@ -67,7 +70,7 @@ protected: private: // the main child window (either ModulWindow or DialogWindow) - BaseWindow* pChild; + VclPtr pChild; // when this window has at first (nonempty) size bool bFirstSize; @@ -101,7 +104,7 @@ private: struct Item { // pointer to the dockable window - DockingWindow* pWin; + VclPtr pWin; // starting and ending position in the strip // They may be different from the actual window position, because // the window may fill the space of the adjacent currently diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index e3b49bf2dc39..97c1fd9e9b77 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -25,6 +25,17 @@ LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2; } +LineNumberWindow::~LineNumberWindow() +{ + dispose(); +} + +void LineNumberWindow::dispose() +{ + m_pModulWindow.clear(); + Window::dispose(); +} + void LineNumberWindow::Paint( const Rectangle& ) { if(SyncYOffset()) diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index 6a6bcd201714..65498937eda8 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -19,7 +19,7 @@ class ModulWindow; class LineNumberWindow : public vcl::Window { private: - ModulWindow* m_pModulWindow; + VclPtr m_pModulWindow; int m_nWidth; long m_nCurYOffset; int m_nBaseWidth; @@ -30,6 +30,8 @@ protected: public: LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin); + virtual ~LineNumberWindow(); + virtual void dispose() SAL_OVERRIDE; void DoScroll( long nHorzScroll, long nVertScroll ); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 31d8bccecd19..104d3650ac96 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -122,6 +122,20 @@ void MacroChooser::dispose() SfxGetpApp()->SaveBasicAndDialogContainer(); bForceStoreBasic = false; } + m_pMacroNameEdit.clear(); + m_pMacroFromTxT.clear(); + m_pMacrosSaveInTxt.clear(); + m_pBasicBox.clear(); + m_pMacrosInTxt.clear(); + m_pMacroBox.clear(); + m_pRunButton.clear(); + m_pCloseButton.clear(); + m_pAssignButton.clear(); + m_pEditButton.clear(); + m_pDelButton.clear(); + m_pOrganizeButton.clear(); + m_pNewLibButton.clear(); + m_pNewModButton.clear(); SfxModalDialog::dispose(); } diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index 71892b3ea1a8..d8388204904c 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -45,22 +45,22 @@ public: }; private: - Edit* m_pMacroNameEdit; - FixedText* m_pMacroFromTxT; - FixedText* m_pMacrosSaveInTxt; - TreeListBox* m_pBasicBox; - FixedText* m_pMacrosInTxt; + VclPtr m_pMacroNameEdit; + VclPtr m_pMacroFromTxT; + VclPtr m_pMacrosSaveInTxt; + VclPtr m_pBasicBox; + VclPtr m_pMacrosInTxt; OUString m_aMacrosInTxtBaseStr; - SvTreeListBox* m_pMacroBox; - - PushButton* m_pRunButton; - CloseButton* m_pCloseButton; - PushButton* m_pAssignButton; - PushButton* m_pEditButton; - PushButton* m_pDelButton; - PushButton* m_pOrganizeButton; - PushButton* m_pNewLibButton; - PushButton* m_pNewModButton; + VclPtr m_pMacroBox; + + VclPtr m_pRunButton; + VclPtr m_pCloseButton; + VclPtr m_pAssignButton; + VclPtr m_pEditButton; + VclPtr m_pDelButton; + VclPtr m_pOrganizeButton; + VclPtr m_pNewLibButton; + VclPtr m_pNewModButton; bool bNewDelIsDel; bool bForceStoreBasic; diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index f7cfbb5adfd2..9174328463cc 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -392,6 +392,18 @@ NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode, m_pOKButton->SetClickHdl(LINK(this, NewObjectDialog, OkButtonHandler)); } +NewObjectDialog::~NewObjectDialog() +{ + dispose(); +} + +void NewObjectDialog::dispose() +{ + m_pEdit.clear(); + m_pOKButton.clear(); + ModalDialog::dispose(); +} + // GotoLineDialog GotoLineDialog::GotoLineDialog(vcl::Window * pParent ) : ModalDialog(pParent, "GotoLineDialog", @@ -403,6 +415,18 @@ GotoLineDialog::GotoLineDialog(vcl::Window * pParent ) m_pOKButton->SetClickHdl(LINK(this, GotoLineDialog, OkButtonHandler)); } +GotoLineDialog::~GotoLineDialog() +{ + dispose(); +} + +void GotoLineDialog::dispose() +{ + m_pEdit.clear(); + m_pOKButton.clear(); + ModalDialog::dispose(); +} + sal_Int32 GotoLineDialog::GetLineNumber() const { return m_pEdit->GetText().toInt32(); @@ -437,6 +461,18 @@ ExportDialog::ExportDialog(vcl::Window * pParent) m_pOKButton->SetClickHdl(LINK(this, ExportDialog, OkButtonHandler)); } +ExportDialog::~ExportDialog() +{ + dispose(); +} + +void ExportDialog::dispose() +{ + m_pExportAsPackageButton.clear(); + m_pOKButton.clear(); + ModalDialog::dispose(); +} + // LibPage LibPage::LibPage(vcl::Window * pParent) : TabPage(pParent, "LibPage", @@ -497,8 +533,16 @@ void LibPage::dispose() DocumentEntry* pEntry = static_cast(m_pBasicsBox->GetEntryData( i )); delete pEntry; } - m_pBasicsBox = NULL; } + m_pBasicsBox.clear(); + m_pLibBox.clear(); + m_pEditButton.clear(); + m_pPasswordButton.clear(); + m_pNewLibButton.clear(); + m_pInsertLibButton.clear(); + m_pExportButton.clear(); + m_pDelButton.clear(); + pTabDlg.clear(); TabPage::dispose(); } diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 216fb1d3c92b..d80dbc18ba98 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -495,8 +495,8 @@ void OrganizeDialog::dispose() { for ( sal_uInt16 i = 0; i < m_pTabCtrl->GetPageCount(); i++ ) delete m_pTabCtrl->GetTabPage( m_pTabCtrl->GetPageId( i ) ); - m_pTabCtrl = NULL; } + m_pTabCtrl.clear(); TabDialog::dispose(); }; @@ -598,6 +598,22 @@ ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nM CheckButtons(); } +ObjectPage::~ObjectPage() +{ + dispose(); +} + +void ObjectPage::dispose() +{ + m_pBasicBox.clear(); + m_pEditButton.clear(); + m_pNewModButton.clear(); + m_pNewDlgButton.clear(); + m_pDelButton.clear(); + pTabDlg.clear(); + TabPage::dispose(); +} + void ObjectPage::SetCurrentEntry (EntryDescriptor& rDesc) { m_pBasicBox->SetCurrentEntry( rDesc ); @@ -927,6 +943,21 @@ LibDialog::LibDialog( vcl::Window* pParent ) m_pLibBox->set_width_request(m_pLibBox->approximate_char_width() * 32); } +LibDialog::~LibDialog() +{ + dispose(); +} + +void LibDialog::dispose() +{ + m_pStorageFrame.clear(); + m_pLibBox.clear(); + m_pReferenceBox.clear(); + m_pReplaceBox.clear(); + ModalDialog::dispose(); +} + + void LibDialog::SetStorageName( const OUString& rName ) { OUString aName( IDE_RESSTR(RID_STR_FILENAME) ); diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 00abbe158ca9..12907c0c2342 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -48,12 +48,14 @@ namespace ObjectMode class NewObjectDialog : public ModalDialog { private: - Edit* m_pEdit; - OKButton* m_pOKButton; + VclPtr m_pEdit; + VclPtr m_pOKButton; DECL_LINK(OkButtonHandler, void *); public: NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false); + virtual ~NewObjectDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName( const OUString& rName ) { @@ -64,19 +66,21 @@ public: class GotoLineDialog : public ModalDialog { - Edit* m_pEdit; - OKButton* m_pOKButton; + VclPtr m_pEdit; + VclPtr m_pOKButton; DECL_LINK(OkButtonHandler, void *); public: GotoLineDialog(vcl::Window * pParent); + virtual ~GotoLineDialog(); + virtual void dispose() SAL_OVERRIDE; sal_Int32 GetLineNumber() const; }; class ExportDialog : public ModalDialog { private: - RadioButton* m_pExportAsPackageButton; - OKButton* m_pOKButton; + VclPtr m_pExportAsPackageButton; + VclPtr m_pOKButton; bool mbExportAsPackage; @@ -84,6 +88,8 @@ private: public: ExportDialog( vcl::Window * pParent ); + virtual ~ExportDialog(); + virtual void dispose() SAL_OVERRIDE; bool isExportAsPackage () const { return mbExportAsPackage; } }; @@ -141,13 +147,15 @@ public: class LibDialog: public ModalDialog { private: - VclFrame* m_pStorageFrame; - CheckBox* m_pLibBox; - ::CheckBox* m_pReferenceBox; - ::CheckBox* m_pReplaceBox; + VclPtr m_pStorageFrame; + VclPtr m_pLibBox; + VclPtr<::CheckBox> m_pReferenceBox; + VclPtr<::CheckBox> m_pReplaceBox; public: LibDialog( vcl::Window* pParent ); + virtual ~LibDialog(); + virtual void dispose() SAL_OVERRIDE; void SetStorageName( const OUString& rName ); @@ -162,7 +170,7 @@ public: class OrganizeDialog : public TabDialog { private: - TabControl* m_pTabCtrl; + VclPtr m_pTabCtrl; EntryDescriptor m_aCurEntry; public: @@ -178,11 +186,11 @@ public: class ObjectPage: public TabPage { protected: - ExtTreeListBox* m_pBasicBox; - PushButton* m_pEditButton; - PushButton* m_pNewModButton; - PushButton* m_pNewDlgButton; - PushButton* m_pDelButton; + VclPtr m_pBasicBox; + VclPtr m_pEditButton; + VclPtr m_pNewModButton; + VclPtr m_pNewDlgButton; + VclPtr m_pDelButton; DECL_LINK( BasicBoxHighlightHdl, TreeListBox * ); DECL_LINK( ButtonHdl, Button * ); @@ -193,13 +201,15 @@ protected: void NewDialog(); void EndTabDialog( sal_uInt16 nRet ); - TabDialog* pTabDlg; + VclPtr pTabDlg; virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; public: ObjectPage(vcl::Window* pParent, const OString& rName, sal_uInt16 nMode); + virtual ~ObjectPage(); + virtual void dispose() SAL_OVERRIDE; void SetCurrentEntry( EntryDescriptor& rDesc ); void SetTabDlg( TabDialog* p ) { pTabDlg = p;} @@ -209,14 +219,14 @@ public: class LibPage: public TabPage { protected: - ListBox* m_pBasicsBox; - CheckBox* m_pLibBox; - PushButton* m_pEditButton; - PushButton* m_pPasswordButton; - PushButton* m_pNewLibButton; - PushButton* m_pInsertLibButton; - PushButton* m_pExportButton; - PushButton* m_pDelButton; + VclPtr m_pBasicsBox; + VclPtr m_pLibBox; + VclPtr m_pEditButton; + VclPtr m_pPasswordButton; + VclPtr m_pNewLibButton; + VclPtr m_pInsertLibButton; + VclPtr m_pExportButton; + VclPtr m_pDelButton; ScriptDocument m_aCurDocument; LibraryLocation m_eCurLocation; @@ -242,7 +252,7 @@ protected: virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; - TabDialog* pTabDlg; + VclPtr pTabDlg; public: LibPage( vcl::Window* pParent ); diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 953f96b92316..cb0ec81910fd 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -81,6 +81,10 @@ ManageLanguageDialog::~ManageLanguageDialog() void ManageLanguageDialog::dispose() { ClearLanguageBox(); + m_pLanguageLB.clear(); + m_pAddPB.clear(); + m_pDeletePB.clear(); + m_pMakeDefPB.clear(); ModalDialog::dispose(); } @@ -253,6 +257,22 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, boost:: FillLanguageBox(); } +SetDefaultLanguageDialog::~SetDefaultLanguageDialog() +{ + dispose(); +} + +void SetDefaultLanguageDialog::dispose() +{ + m_pLanguageFT.clear(); + m_pLanguageLB.clear(); + m_pCheckLangFT.clear(); + m_pCheckLangLB.clear(); + m_pDefinedFT.clear(); + m_pAddedFT.clear(); + ModalDialog::dispose(); +} + void SetDefaultLanguageDialog::FillLanguageBox() { // fill list with all languages diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index 7192763c27dc..bc0d52b33eec 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -24,6 +24,7 @@ #include #include #include +#include namespace vcl { class Window; } class VCLExternalSolarLock; @@ -56,7 +57,7 @@ class AccessibleDialogControlShape : public AccessibleExtendedComponentHelper private: VCLExternalSolarLock* m_pExternalLock; - DialogWindow* m_pDialogWindow; + VclPtr m_pDialogWindow; DlgEdObj* m_pDlgEdObj; bool m_bFocused; bool m_bSelected; diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index c57b2590ae71..bd2739440160 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -26,6 +26,7 @@ #include #include #include +#include class VCLExternalSolarLock; class VclSimpleEvent; @@ -80,7 +81,7 @@ private: AccessibleChildren m_aAccessibleChildren; VCLExternalSolarLock* m_pExternalLock; - basctl::DialogWindow* m_pDialogWindow; + VclPtr m_pDialogWindow; DlgEditor* m_pDlgEditor; DlgEdModel* m_pDlgEdModel; diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 644ccbad2721..de17eb08403c 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -146,12 +146,12 @@ protected: private: // child window - DialogWindow* pChild; + VclPtr pChild; // dockable windows: // object catalog (owned by Shell) ObjectCatalog& rObjectCatalog; // property browser (created by this, deleted by toolkit) - PropBrw* pPropertyBrowser; + VclPtr pPropertyBrowser; private: void AddPropertyBrowser (); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 216f06518316..0baeb579dda1 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -56,7 +56,7 @@ class Shell : public DocumentEventListener { public: - typedef std::map WindowTable; + typedef std::map > WindowTable; typedef WindowTable::const_iterator WindowTableIt; private: @@ -64,9 +64,9 @@ private: friend class LocalizationMgr; friend bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx - WindowTable aWindowTable; + WindowTable aWindowTable; sal_uInt16 nCurKey; - BaseWindow* pCurWin; + VclPtr pCurWin; ScriptDocument m_aCurDocument; OUString m_aCurLibName; boost::shared_ptr m_pCurLocalizationMgr; @@ -81,7 +81,7 @@ private: boost::scoped_ptr pModulLayout; boost::scoped_ptr pDialogLayout; // the active layout window - Layout* pLayout; + VclPtr pLayout; // common object catalog window VclPtr aObjectCatalog; diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 37e11306111d..8423874c19a9 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -80,7 +80,8 @@ class DockingWindow : public ::DockingWindow public: DockingWindow (vcl::Window* pParent); DockingWindow (Layout* pParent); -public: + virtual ~DockingWindow(); + virtual void dispose() SAL_OVERRIDE; void ResizeIfDocking (Point const&, Size const&); void ResizeIfDocking (Size const&); Size GetDockingSize () const { return aDockingRect.GetSize(); } @@ -102,7 +103,7 @@ private: // the position and the size of the docking window Rectangle aDockingRect; // the parent layout window (only when docking) - Layout* pLayout; + VclPtr pLayout; // > 0: shown, <= 0: hidden, ++ by Show() and -- by Hide() int nShowCount; @@ -148,8 +149,8 @@ class EntryDescriptor; class BaseWindow : public vcl::Window { private: - ScrollBar* pShellHScrollBar; - ScrollBar* pShellVScrollBar; + VclPtr pShellHScrollBar; + VclPtr pShellVScrollBar; DECL_LINK( ScrollHdl, ScrollBar * ); int nStatus; diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 6371ac67b72f..18883daa3854 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -106,8 +107,8 @@ private: void Print( Printer* pPrinter, const OUString& rTitle ); private: - ScrollBar* pHScroll; - ScrollBar* pVScroll; + VclPtr pHScroll; + VclPtr pVScroll; boost::scoped_ptr pDlgEdModel; // never nullptr DlgEdPage* pDlgEdPage; // never nullptr boost::scoped_ptr pDlgEdView; // never nullptr diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index ab6fb62ceab9..f7b9335e5e24 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -52,10 +52,10 @@ extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft, class ManageLanguageDialog : public ModalDialog { private: - ListBox* m_pLanguageLB; - PushButton* m_pAddPB; - PushButton* m_pDeletePB; - PushButton* m_pMakeDefPB; + VclPtr m_pLanguageLB; + VclPtr m_pAddPB; + VclPtr m_pDeletePB; + VclPtr m_pMakeDefPB; boost::shared_ptr m_xLocalizationMgr; @@ -80,12 +80,12 @@ public: class SetDefaultLanguageDialog : public ModalDialog { private: - FixedText* m_pLanguageFT; - SvxLanguageBox* m_pLanguageLB; - FixedText* m_pCheckLangFT; - SvxCheckListBox* m_pCheckLangLB; - FixedText* m_pDefinedFT; - FixedText* m_pAddedFT; + VclPtr m_pLanguageFT; + VclPtr m_pLanguageLB; + VclPtr m_pCheckLangFT; + VclPtr m_pCheckLangLB; + VclPtr m_pDefinedFT; + VclPtr m_pAddedFT; boost::shared_ptr m_xLocalizationMgr; @@ -93,6 +93,8 @@ private: public: SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr xLMgr); + virtual ~SetDefaultLanguageDialog(); + virtual void dispose() SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > GetLocales() const; }; diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 1fe210fc2a43..529d9ed1769a 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -622,7 +622,7 @@ private: sal_Int32 mnStart; sal_Int32 mnEnd; bool bSet; - OpenGLWindow* mpOpenGLWindow; + VclPtr mpOpenGLWindow; }; } // namespace chart diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index e0b65406b31e..b2d55cb8784f 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -20,6 +20,7 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_ACCESSIBILITY_ACCESSIBLEVIEWFORWARDER_HXX #include +#include #include namespace vcl { class Window; } @@ -48,7 +49,7 @@ private: AccessibleViewForwarder& operator=( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION; AccessibleChartView* m_pAccChartView; - vcl::Window* m_pWindow; + VclPtr m_pWindow; MapMode m_aMapMode; }; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 14ce8e13b5da..7ea6c1c4b0c7 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -281,8 +281,8 @@ private: DECL_LINK( ChangeLineCountHdl, void* ); private: - FixedText* m_pFT_NumberOfLines; - NumericField* m_pMF_NumberOfLines; + VclPtr m_pFT_NumberOfLines; + VclPtr m_pMF_NumberOfLines; }; class BubbleChartDialogController : public ChartTypeDialogController diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 33cf74763515..44436109dddd 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -60,8 +60,7 @@ ChartTypeDialog::~ChartTypeDialog() void ChartTypeDialog::dispose() { - delete m_pChartTypeTabPage; - m_pChartTypeTabPage = NULL; + m_pChartTypeTabPage.clear(); ModalDialog::dispose(); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 5a777db94004..66af10a37ccb 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -54,11 +54,7 @@ CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponen CreationWizardUnoDlg::~CreationWizardUnoDlg() { SolarMutexGuard aSolarGuard; - if( m_pDialog ) - { - delete m_pDialog; - m_pDialog = 0; - } + m_pDialog.clear(); } // lang::XServiceInfo OUString SAL_CALL CreationWizardUnoDlg::getImplementationName() @@ -272,11 +268,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing() m_xParentWindow.clear(); SolarMutexGuard aSolarGuard; - if( m_pDialog ) - { - delete m_pDialog; - m_pDialog = 0; - } + m_pDialog.clear(); try { diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 02a5578b99a0..5230792f51f2 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -106,6 +106,7 @@ void DataEditor::dispose() aMiscOptions.RemoveListenerLink( LINK( this, DataEditor, MiscHdl ) ); OSL_TRACE( "DataEditor: DTOR" ); + m_pTbxData.clear(); ModalDialog::dispose(); } diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 88c1a41f64fd..09e55375e734 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -164,16 +164,14 @@ DataSourceDialog::~DataSourceDialog() void DataSourceDialog::dispose() { - delete m_pRangeChooserTabePage; - m_pRangeChooserTabePage = NULL; - delete m_pDataSourceTabPage; - m_pDataSourceTabPage = NULL; if (m_pTabControl) { m_nLastPageId = m_pTabControl->GetCurPageId(); - delete m_pTabControl; - m_pTabControl = NULL; } + m_pRangeChooserTabePage.clear(); + m_pDataSourceTabPage.clear(); + m_pTabControl.clear(); + m_pBtnOK.clear(); TabDialog::dispose(); } diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 345a6d79f150..670979af96ee 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -81,6 +81,23 @@ SchAxisDlg::SchAxisDlg(vcl::Window* pWindow, m_pCbSecondaryZ->Enable( rInput.aPossibilityList[5] ); } +SchAxisDlg::~SchAxisDlg() +{ + dispose(); +} + +void SchAxisDlg::dispose() +{ + m_pCbPrimaryX.clear(); + m_pCbPrimaryY.clear(); + m_pCbPrimaryZ.clear(); + m_pCbSecondaryX.clear(); + m_pCbSecondaryY.clear(); + m_pCbSecondaryZ.clear(); + ModalDialog::dispose(); +} + + void SchAxisDlg::getResult( InsertAxisOrGridDialogData& rOutput ) { rOutput.aExistenceList[0]=m_pCbPrimaryX->IsChecked(); diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 3769f2ef91c6..bb28a878bbb3 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -71,14 +71,12 @@ View3DDialog::~View3DDialog() void View3DDialog::dispose() { - delete m_pGeometry; - m_pGeometry = NULL; - delete m_pAppearance; - m_pAppearance = NULL; - delete m_pIllumination; - m_pIllumination = NULL; - - m_nLastPageId = m_pTabControl->GetCurPageId(); + if (m_pTabControl) + m_nLastPageId = m_pTabControl->GetCurPageId(); + m_pGeometry.clear(); + m_pAppearance.clear(); + m_pIllumination.clear(); + m_pTabControl.clear(); TabDialog::dispose(); } diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx index 60af3af3ccd8..7a9eeb8c17f8 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.hxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx @@ -41,8 +41,8 @@ public: void SetSelectHdl( const Link& rLink ); private: - FixedText* m_pFT_Geometry; - ListBox* m_pLB_Geometry; + VclPtr m_pFT_Geometry; + VclPtr m_pLB_Geometry; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index 9d6d0e01cd90..cfb4758cc29b 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -45,28 +45,28 @@ public: void SetNumberFormatter( SvNumberFormatter* pFormatter ); private: - CheckBox* m_pCBNumber; - PushButton* m_pPB_NumberFormatForValue; - CheckBox* m_pCBPercent; - PushButton* m_pPB_NumberFormatForPercent; - FixedText* m_pFT_NumberFormatForPercent; - CheckBox* m_pCBCategory; - CheckBox* m_pCBSymbol; - - VclHBox* m_pSeparatorResources; - ListBox* m_pLB_Separator; + VclPtr m_pCBNumber; + VclPtr m_pPB_NumberFormatForValue; + VclPtr m_pCBPercent; + VclPtr m_pPB_NumberFormatForPercent; + VclPtr m_pFT_NumberFormatForPercent; + VclPtr m_pCBCategory; + VclPtr m_pCBSymbol; + + VclPtr m_pSeparatorResources; + VclPtr m_pLB_Separator; OUString m_aEntryMap[NUMBER_SEPARATORS]; - VclHBox* m_pBxLabelPlacement; - ListBox* m_pLB_LabelPlacement; + VclPtr m_pBxLabelPlacement; + VclPtr m_pLB_LabelPlacement; - VclHBox* m_pBxOrientation; - svx::DialControl* m_pDC_Dial; - FixedText* m_pFT_Dial; - NumericField* m_pNF_Degrees; + VclPtr m_pBxOrientation; + VclPtr m_pDC_Dial; + VclPtr m_pFT_Dial; + VclPtr m_pNF_Degrees; - VclHBox* m_pBxTextDirection; - TextDirectionListBox* m_pLB_TextDirection; + VclPtr m_pBxTextDirection; + VclPtr m_pLB_TextDirection; ::std::map< sal_Int32, sal_uInt16 > m_aPlacementToListBoxMap; ::std::map< sal_uInt16, sal_Int32 > m_aListBoxToPlacementMap; @@ -82,7 +82,7 @@ private: bool m_bSourceFormatForValue; bool m_bSourceFormatForPercent; - vcl::Window* m_pWindow; + VclPtr m_pWindow; SfxItemPool* m_pPool; DECL_LINK(NumberFormatDialogHdl, PushButton * ); diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 0d4be04cdf4d..03c3ebe3bd87 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -46,29 +46,29 @@ public: void SetNbPoints( sal_Int32 nNbPoints ); private: - RadioButton* m_pRB_Linear; - RadioButton* m_pRB_Logarithmic; - RadioButton* m_pRB_Exponential; - RadioButton* m_pRB_Power; - RadioButton* m_pRB_Polynomial; - RadioButton* m_pRB_MovingAverage; - - FixedImage* m_pFI_Linear; - FixedImage* m_pFI_Logarithmic; - FixedImage* m_pFI_Exponential; - FixedImage* m_pFI_Power; - FixedImage* m_pFI_Polynomial; - FixedImage* m_pFI_MovingAverage; - - NumericField* m_pNF_Degree; - NumericField* m_pNF_Period; - Edit* m_pEE_Name; - FormattedField* m_pFmtFld_ExtrapolateForward; - FormattedField* m_pFmtFld_ExtrapolateBackward; - CheckBox* m_pCB_SetIntercept; - FormattedField* m_pFmtFld_InterceptValue; - CheckBox* m_pCB_ShowEquation; - CheckBox* m_pCB_ShowCorrelationCoeff; + VclPtr m_pRB_Linear; + VclPtr m_pRB_Logarithmic; + VclPtr m_pRB_Exponential; + VclPtr m_pRB_Power; + VclPtr m_pRB_Polynomial; + VclPtr m_pRB_MovingAverage; + + VclPtr m_pFI_Linear; + VclPtr m_pFI_Logarithmic; + VclPtr m_pFI_Exponential; + VclPtr m_pFI_Power; + VclPtr m_pFI_Polynomial; + VclPtr m_pFI_MovingAverage; + + VclPtr m_pNF_Degree; + VclPtr m_pNF_Period; + VclPtr m_pEE_Name; + VclPtr m_pFmtFld_ExtrapolateForward; + VclPtr m_pFmtFld_ExtrapolateBackward; + VclPtr m_pCB_SetIntercept; + VclPtr m_pFmtFld_InterceptValue; + VclPtr m_pCB_ShowEquation; + VclPtr m_pCB_ShowCorrelationCoeff; SvxChartRegress m_eTrendLineType; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index ff20319c8eb9..d25e226fb19d 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -120,6 +120,20 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( initControlsFromModel(); } +ThreeD_SceneAppearance_TabPage::~ThreeD_SceneAppearance_TabPage() +{ + dispose(); +} + +void ThreeD_SceneAppearance_TabPage::dispose() +{ + m_pLB_Scheme.clear(); + m_pCB_Shading.clear(); + m_pCB_ObjectLines.clear(); + m_pCB_RoundedEdge.clear(); + TabPage::dispose(); +} + void ThreeD_SceneAppearance_TabPage::ActivatePage() { updateScheme(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index 23749c9da5d3..80720d031e87 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -38,6 +38,8 @@ public: vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, ControllerLockHelper & rControllerLockHelper ); + virtual ~ThreeD_SceneAppearance_TabPage(); + virtual void dispose() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; @@ -55,11 +57,11 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; - ListBox* m_pLB_Scheme; + VclPtr m_pLB_Scheme; - CheckBox* m_pCB_Shading; - CheckBox* m_pCB_ObjectLines; - CheckBox* m_pCB_RoundedEdge; + VclPtr m_pCB_Shading; + VclPtr m_pCB_ObjectLines; + VclPtr m_pCB_RoundedEdge; bool m_bUpdateOtherControls; bool m_bCommitToModel; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 0428b2d892be..b1f4dba975b1 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -147,6 +147,24 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow m_pMFPerspective->SetAccessibleRelationLabeledBy(m_pCbxPerspective); } +ThreeD_SceneGeometry_TabPage::~ThreeD_SceneGeometry_TabPage() +{ + dispose(); +} + +void ThreeD_SceneGeometry_TabPage::dispose() +{ + m_pCbxRightAngledAxes.clear(); + m_pMFXRotation.clear(); + m_pMFYRotation.clear(); + m_pFtZRotation.clear(); + m_pMFZRotation.clear(); + m_pCbxPerspective.clear(); + m_pMFPerspective.clear(); + TabPage::dispose(); +} + + void ThreeD_SceneGeometry_TabPage::commitPendingChanges() { ControllerLockHelperGuard aGuard( m_rControllerLockHelper ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index bc19444f6403..cfd16ff23bd6 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -39,6 +39,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSceneProperties, ControllerLockHelper & rControllerLockHelper ); + virtual ~ThreeD_SceneGeometry_TabPage(); + virtual void dispose() SAL_OVERRIDE; // has to be called in case the dialog was closed with OK void commitPendingChanges(); @@ -63,17 +65,17 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSceneProperties; - CheckBox* m_pCbxRightAngledAxes; + VclPtr m_pCbxRightAngledAxes; - MetricField* m_pMFXRotation; + VclPtr m_pMFXRotation; - MetricField* m_pMFYRotation; + VclPtr m_pMFYRotation; - FixedText* m_pFtZRotation; - MetricField* m_pMFZRotation; + VclPtr m_pFtZRotation; + VclPtr m_pMFZRotation; - CheckBox* m_pCbxPerspective; - MetricField* m_pMFPerspective; + VclPtr m_pCbxPerspective; + VclPtr m_pMFPerspective; //to keep old values when switching to right angled axes sal_Int64 m_nXRotation; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 2c92a7521c1f..a4683a5b5cdb 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -78,7 +78,7 @@ struct LightSource struct LightSourceInfo { - LightButton* pButton; + VclPtr pButton; LightSource aLightSource; LightSourceInfo(); @@ -301,6 +301,19 @@ void ThreeD_SceneIllumination_TabPage::dispose() { delete[] m_pLightSourceInfoList; m_pLightSourceInfoList = NULL; + m_pBtn_Light1.clear(); + m_pBtn_Light2.clear(); + m_pBtn_Light3.clear(); + m_pBtn_Light4.clear(); + m_pBtn_Light5.clear(); + m_pBtn_Light6.clear(); + m_pBtn_Light7.clear(); + m_pBtn_Light8.clear(); + m_pLB_LightSource.clear(); + m_pBtn_LightSource_Color.clear(); + m_pLB_AmbientLight.clear(); + m_pBtn_AmbientLight_Color.clear(); + m_pCtl_Preview.clear(); TabPage::dispose(); } diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 06e27ae02650..b7f46f26e964 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -74,22 +74,22 @@ private: void applyLightSourceToModel( sal_uInt32 nLightNumber ); void applyLightSourcesToModel(); - LightButton* m_pBtn_Light1; - LightButton* m_pBtn_Light2; - LightButton* m_pBtn_Light3; - LightButton* m_pBtn_Light4; - LightButton* m_pBtn_Light5; - LightButton* m_pBtn_Light6; - LightButton* m_pBtn_Light7; - LightButton* m_pBtn_Light8; - - ColorLB* m_pLB_LightSource; - PushButton* m_pBtn_LightSource_Color; - - ColorLB* m_pLB_AmbientLight; - PushButton* m_pBtn_AmbientLight_Color; - - SvxLightCtl3D* m_pCtl_Preview; + VclPtr m_pBtn_Light1; + VclPtr m_pBtn_Light2; + VclPtr m_pBtn_Light3; + VclPtr m_pBtn_Light4; + VclPtr m_pBtn_Light5; + VclPtr m_pBtn_Light6; + VclPtr m_pBtn_Light7; + VclPtr m_pBtn_Light8; + + VclPtr m_pLB_LightSource; + VclPtr m_pBtn_LightSource_Color; + + VclPtr m_pLB_AmbientLight; + VclPtr m_pBtn_AmbientLight_Color; + + VclPtr m_pCtl_Preview; LightSourceInfo* m_pLightSourceInfoList; diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 0cded264a300..06d810b47815 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -79,6 +79,23 @@ void SchAxisLabelTabPage::dispose() { delete m_pOrientHlp; m_pOrientHlp = NULL; + m_pCbShowDescription.clear(); + m_pFlOrder.clear(); + m_pRbSideBySide.clear(); + m_pRbUpDown.clear(); + m_pRbDownUp.clear(); + m_pRbAuto.clear(); + m_pFlTextFlow.clear(); + m_pCbTextOverlap.clear(); + m_pCbTextBreak.clear(); + m_pFtABCD.clear(); + m_pFlOrient.clear(); + m_pCtrlDial.clear(); + m_pFtRotate.clear(); + m_pNfRotate.clear(); + m_pCbStacked.clear(); + m_pFtTextDirection.clear(); + m_pLbTextDirection.clear(); SfxTabPage::dispose(); } diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 95474b805941..2f01f32e5ae8 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -35,27 +35,27 @@ namespace chart class SchAxisLabelTabPage : public SfxTabPage { private: - CheckBox* m_pCbShowDescription; + VclPtr m_pCbShowDescription; - FixedText* m_pFlOrder; - RadioButton* m_pRbSideBySide; - RadioButton* m_pRbUpDown; - RadioButton* m_pRbDownUp; - RadioButton* m_pRbAuto; + VclPtr m_pFlOrder; + VclPtr m_pRbSideBySide; + VclPtr m_pRbUpDown; + VclPtr m_pRbDownUp; + VclPtr m_pRbAuto; - FixedText* m_pFlTextFlow; - CheckBox* m_pCbTextOverlap; - CheckBox* m_pCbTextBreak; - FixedText* m_pFtABCD; - FixedText* m_pFlOrient; - svx::DialControl* m_pCtrlDial; - FixedText* m_pFtRotate; - NumericField* m_pNfRotate; - TriStateBox* m_pCbStacked; + VclPtr m_pFlTextFlow; + VclPtr m_pCbTextOverlap; + VclPtr m_pCbTextBreak; + VclPtr m_pFtABCD; + VclPtr m_pFlOrient; + VclPtr m_pCtrlDial; + VclPtr m_pFtRotate; + VclPtr m_pNfRotate; + VclPtr m_pCbStacked; svx::OrientationHelper* m_pOrientHlp; - FixedText* m_pFtTextDirection; - TextDirectionListBox* m_pLbTextDirection; + VclPtr m_pFtTextDirection; + VclPtr m_pLbTextDirection; bool m_bShowStaggeringControls; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 9bcb6e8e2938..0d33af228b69 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -84,6 +84,30 @@ AxisPositionsTabPage::AxisPositionsTabPage(vcl::Window* pWindow,const SfxItemSet m_pLB_PlaceTicks->SetDropDownLineCount( m_pLB_PlaceTicks->GetEntryCount() ); } +AxisPositionsTabPage::~AxisPositionsTabPage() +{ + dispose(); +} + +void AxisPositionsTabPage::dispose() +{ + m_pFL_AxisLine.clear(); + m_pLB_CrossesAt.clear(); + m_pED_CrossesAt.clear(); + m_pED_CrossesAtCategory.clear(); + m_pCB_AxisBetweenCategories.clear(); + m_pFL_Labels.clear(); + m_pLB_PlaceLabels.clear(); + m_pED_LabelDistance.clear(); + m_pCB_TicksInner.clear(); + m_pCB_TicksOuter.clear(); + m_pCB_MinorInner.clear(); + m_pCB_MinorOuter.clear(); + m_pBxPlaceTicks.clear(); + m_pLB_PlaceTicks.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) { return new AxisPositionsTabPage(pWindow, *rOutAttrs); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 3dfeecd8f3ff..ee73d5240366 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -33,6 +33,8 @@ class AxisPositionsTabPage : public SfxTabPage { public: AxisPositionsTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~AxisPositionsTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; @@ -52,30 +54,30 @@ private: //methods: DECL_LINK( PlaceLabelsSelectHdl, void* ); private: //member: - VclFrame* m_pFL_AxisLine; - ListBox* m_pLB_CrossesAt; - FormattedField* m_pED_CrossesAt; - ComboBox* m_pED_CrossesAtCategory; - CheckBox* m_pCB_AxisBetweenCategories; + VclPtr m_pFL_AxisLine; + VclPtr m_pLB_CrossesAt; + VclPtr m_pED_CrossesAt; + VclPtr m_pED_CrossesAtCategory; + VclPtr m_pCB_AxisBetweenCategories; - VclFrame* m_pFL_Labels; - ListBox* m_pLB_PlaceLabels; - FormattedField* m_pED_LabelDistance; + VclPtr m_pFL_Labels; + VclPtr m_pLB_PlaceLabels; + VclPtr m_pED_LabelDistance; - CheckBox* m_pCB_TicksInner; - CheckBox* m_pCB_TicksOuter; + VclPtr m_pCB_TicksInner; + VclPtr m_pCB_TicksOuter; - CheckBox* m_pCB_MinorInner; - CheckBox* m_pCB_MinorOuter; + VclPtr m_pCB_MinorInner; + VclPtr m_pCB_MinorOuter; - VclBox* m_pBxPlaceTicks; - ListBox* m_pLB_PlaceTicks; + VclPtr m_pBxPlaceTicks; + VclPtr m_pLB_PlaceTicks; // Not implemented -// CheckBox* m_pCB_MajorGrid; -// PushButton* m_pPB_MajorGrid; -// CheckBox* m_pCB_MinorGrid; -// PushButton* m_pPB_MinorGrid; +// VclPtr m_pCB_MajorGrid; +// VclPtr m_pPB_MajorGrid; +// VclPtr m_pCB_MinorGrid; +// VclPtr m_pPB_MinorGrid; SvNumberFormatter* m_pNumFormatter; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index c7179039ae66..7618ef79adb0 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -56,8 +56,8 @@ private: DECL_LINK( SelectSchemeHdl, void* ); private: - CheckBox* m_pCB_3DLook; - ListBox* m_pLB_Scheme; + VclPtr m_pCB_3DLook; + VclPtr m_pLB_Scheme; }; Dim3DLookResourceGroup::Dim3DLookResourceGroup(VclBuilderContainer* pWindow) @@ -129,7 +129,7 @@ private: DECL_LINK( SortByXValuesCheckHdl, void* ); private: - CheckBox* m_pCB_XValueSorting; + VclPtr m_pCB_XValueSorting; }; SortByXValuesResourceGroup::SortByXValuesResourceGroup(VclBuilderContainer* pWindow ) @@ -176,10 +176,10 @@ private: DECL_LINK( StackingEnableHdl, void* ); private: - CheckBox* m_pCB_Stacked; - RadioButton* m_pRB_Stack_Y; - RadioButton* m_pRB_Stack_Y_Percent; - RadioButton* m_pRB_Stack_Z; + VclPtr m_pCB_Stacked; + VclPtr m_pRB_Stack_Y; + VclPtr m_pRB_Stack_Y_Percent; + VclPtr m_pRB_Stack_Z; bool m_bShowDeepStacking; }; @@ -278,7 +278,7 @@ public: private: DECL_LINK( SettingChangedHdl, void* ); private: - CheckBox* m_pCB_RoundedEdge; + VclPtr m_pCB_RoundedEdge; }; GL3DResourceGroup::GL3DResourceGroup( VclBuilderContainer* pWindow ) @@ -313,6 +313,8 @@ class SplinePropertiesDialog : public ModalDialog { public: SplinePropertiesDialog( vcl::Window* pParent ); + virtual ~SplinePropertiesDialog() { dispose(); } + virtual void dispose() SAL_OVERRIDE; void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines ); @@ -323,11 +325,11 @@ private: DECL_LINK( SplineTypeListBoxHdl, void* ); private: - ListBox* m_pLB_Spline_Type; + VclPtr m_pLB_Spline_Type; - NumericField* m_pMF_SplineResolution; - FixedText* m_pFT_SplineOrder; - NumericField* m_pMF_SplineOrder; + VclPtr m_pMF_SplineResolution; + VclPtr m_pFT_SplineOrder; + VclPtr m_pMF_SplineOrder; }; const sal_uInt16 CUBIC_SPLINE_POS = 0; @@ -346,6 +348,15 @@ SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent ) m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) ); } +void SplinePropertiesDialog::dispose() +{ + m_pLB_Spline_Type.clear(); + m_pMF_SplineResolution.clear(); + m_pFT_SplineOrder.clear(); + m_pMF_SplineOrder.clear(); + ModalDialog::dispose(); +} + void SplinePropertiesDialog::StateChanged( StateChangedType nType ) { Dialog::StateChanged( nType ); @@ -395,6 +406,8 @@ class SteppedPropertiesDialog : public ModalDialog { public: SteppedPropertiesDialog( vcl::Window* pParent ); + virtual ~SteppedPropertiesDialog() { dispose(); } + virtual void dispose() SAL_OVERRIDE; void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter, bool bSteppedLines ); @@ -404,10 +417,10 @@ public: private: private: - RadioButton* m_pRB_Start; - RadioButton* m_pRB_End; - RadioButton* m_pRB_CenterX; - RadioButton* m_pRB_CenterY; + VclPtr m_pRB_Start; + VclPtr m_pRB_End; + VclPtr m_pRB_CenterX; + VclPtr m_pRB_CenterY; }; SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent ) @@ -421,6 +434,15 @@ SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent ) SetText(SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES)); } +void SteppedPropertiesDialog::dispose() +{ + m_pRB_Start.clear(); + m_pRB_End.clear(); + m_pRB_CenterX.clear(); + m_pRB_CenterY.clear(); + ModalDialog::dispose(); +} + void SteppedPropertiesDialog::StateChanged( StateChangedType nType ) { Dialog::StateChanged( nType ); @@ -480,9 +502,9 @@ private: SteppedPropertiesDialog& getSteppedPropertiesDialog(); private: - FixedText* m_pFT_LineType; - ListBox* m_pLB_LineType; - PushButton* m_pPB_DetailsDialog; + VclPtr m_pFT_LineType; + VclPtr m_pLB_LineType; + VclPtr m_pPB_DetailsDialog; boost::scoped_ptr< SplinePropertiesDialog > m_pSplinePropertiesDialog; boost::scoped_ptr< SteppedPropertiesDialog > m_pSteppedPropertiesDialog; }; @@ -791,6 +813,9 @@ void ChartTypeTabPage::dispose() m_pSortByXValuesResourceGroup = NULL; delete m_pGL3DResourceGroup; m_pGL3DResourceGroup = NULL; + m_pFT_ChooseType.clear(); + m_pMainTypeList.clear(); + m_pSubTypeList.clear(); svt::OWizardPage::dispose(); } diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index a8cb43c97703..4ed830b10535 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -78,9 +78,9 @@ protected: DECL_LINK( SelectSubTypeHdl, void* ); protected: - FixedText* m_pFT_ChooseType; - ListBox* m_pMainTypeList; - ValueSet* m_pSubTypeList; + VclPtr m_pFT_ChooseType; + VclPtr m_pMainTypeList; + VclPtr m_pSubTypeList; Dim3DLookResourceGroup* m_pDim3DLookResourceGroup; StackingResourceGroup* m_pStackingResourceGroup; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 0aec36a88576..f59465a4460c 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -273,6 +273,34 @@ DataSourceTabPage::DataSourceTabPage( m_pBTN_DOWN->SetAccessibleName(SCH_RESSTR(STR_BUTTON_DOWN)); } +DataSourceTabPage::~DataSourceTabPage() +{ + dispose(); +} + +void DataSourceTabPage::dispose() +{ + m_pFT_CAPTION.clear(); + m_pFT_SERIES.clear(); + m_pLB_SERIES.clear(); + m_pBTN_ADD.clear(); + m_pBTN_REMOVE.clear(); + m_pBTN_UP.clear(); + m_pBTN_DOWN.clear(); + m_pFT_ROLE.clear(); + m_pLB_ROLE.clear(); + m_pFT_RANGE.clear(); + m_pEDT_RANGE.clear(); + m_pIMB_RANGE_MAIN.clear(); + m_pFT_CATEGORIES.clear(); + m_pFT_DATALABELS.clear(); + m_pEDT_CATEGORIES.clear(); + m_pIMB_RANGE_CAT.clear(); + m_pCurrentRangeChoosingField.clear(); + m_pParentDialog.clear(); + ::svt::OWizardPage::dispose(); +} + void DataSourceTabPage::ActivatePage() { OWizardPage::ActivatePage(); diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index b1ad81353d9e..59b92bf840c3 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -58,6 +58,8 @@ public: ChartTypeTemplateProvider* pTemplateProvider, Dialog * pParentDialog, bool bHideDescription = false ); + virtual ~DataSourceTabPage(); + virtual void dispose() SAL_OVERRIDE; void commitPage(); @@ -117,34 +119,34 @@ protected: void fillRoleListBox(); private: - FixedText* m_pFT_CAPTION; - FixedText* m_pFT_SERIES; - SvTreeListBox* m_pLB_SERIES; - PushButton* m_pBTN_ADD; - PushButton* m_pBTN_REMOVE; - PushButton* m_pBTN_UP; - PushButton* m_pBTN_DOWN; - - FixedText* m_pFT_ROLE; - SvTabListBox* m_pLB_ROLE; - FixedText* m_pFT_RANGE; - Edit* m_pEDT_RANGE; - PushButton* m_pIMB_RANGE_MAIN; - - FixedText* m_pFT_CATEGORIES; - FixedText* m_pFT_DATALABELS;//used for xy charts - Edit* m_pEDT_CATEGORIES; - PushButton* m_pIMB_RANGE_CAT; + VclPtr m_pFT_CAPTION; + VclPtr m_pFT_SERIES; + VclPtr m_pLB_SERIES; + VclPtr m_pBTN_ADD; + VclPtr m_pBTN_REMOVE; + VclPtr m_pBTN_UP; + VclPtr m_pBTN_DOWN; + + VclPtr m_pFT_ROLE; + VclPtr m_pLB_ROLE; + VclPtr m_pFT_RANGE; + VclPtr m_pEDT_RANGE; + VclPtr m_pIMB_RANGE_MAIN; + + VclPtr m_pFT_CATEGORIES; + VclPtr m_pFT_DATALABELS;//used for xy charts + VclPtr m_pEDT_CATEGORIES; + VclPtr m_pIMB_RANGE_CAT; OUString m_aFixedTextRange; ChartTypeTemplateProvider * m_pTemplateProvider; DialogModel & m_rDialogModel; - Edit * m_pCurrentRangeChoosingField; + VclPtr m_pCurrentRangeChoosingField; bool m_bIsDirty; sal_Int32 m_nLastChartTypeGroupIndex; - Dialog * m_pParentDialog; + VclPtr m_pParentDialog; TabPageNotifiable * m_pTabPageNotifiable; }; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index 707324fb8610..31aef92a297f 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -41,6 +41,18 @@ SchLegendPosTabPage::SchLegendPosTabPage(vcl::Window* pWindow, const SfxItemSet& m_pLbTextDirection->SetDropDownLineCount(3); } +SchLegendPosTabPage::~SchLegendPosTabPage() +{ + dispose(); +} + +void SchLegendPosTabPage::dispose() +{ + m_pLbTextDirection.clear(); + SfxTabPage::dispose(); +} + + SfxTabPage* SchLegendPosTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) { return new SchLegendPosTabPage(pWindow, *rOutAttrs); diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 0d4f4acf0d07..bbf8e1d54f2b 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -33,10 +33,12 @@ class SchLegendPosTabPage : public SfxTabPage private: LegendPositionResources m_aLegendPositionResources; - TextDirectionListBox* m_pLbTextDirection; + VclPtr m_pLbTextDirection; public: SchLegendPosTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); + virtual ~SchLegendPosTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index ff9db6088675..00fc6fe96a62 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -44,6 +44,22 @@ PolarOptionsTabPage::PolarOptionsTabPage( vcl::Window* pWindow,const SfxItemSet& m_pAngleDial->SetLinkedField( m_pNF_StartingAngle ); } +PolarOptionsTabPage::~PolarOptionsTabPage() +{ + dispose(); +} + +void PolarOptionsTabPage::dispose() +{ + m_pCB_Clockwise.clear(); + m_pFL_StartingAngle.clear(); + m_pAngleDial.clear(); + m_pNF_StartingAngle.clear(); + m_pFL_PlotOptions.clear(); + m_pCB_IncludeHiddenCells.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* PolarOptionsTabPage::Create( vcl::Window* pWindow,const SfxItemSet* rOutAttrs ) { return new PolarOptionsTabPage( pWindow, *rOutAttrs ); diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 4ade72189cf4..29e672857bb1 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -33,18 +33,20 @@ class PolarOptionsTabPage : public SfxTabPage public: PolarOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~PolarOptionsTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; private: - CheckBox* m_pCB_Clockwise; - VclFrame* m_pFL_StartingAngle; - svx::DialControl* m_pAngleDial; - NumericField* m_pNF_StartingAngle; - VclFrame* m_pFL_PlotOptions; - CheckBox* m_pCB_IncludeHiddenCells; + VclPtr m_pCB_Clockwise; + VclPtr m_pFL_StartingAngle; + VclPtr m_pAngleDial; + VclPtr m_pNF_StartingAngle; + VclPtr m_pFL_PlotOptions; + VclPtr m_pCB_IncludeHiddenCells; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 108aac0c77a8..700c3e04556f 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -122,6 +122,30 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent m_pEd_TimeEnd->SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); } +RangeChooserTabPage::~RangeChooserTabPage() +{ + dispose(); +} + +void RangeChooserTabPage::dispose() +{ + m_pFT_Caption.clear(); + m_pFT_Range.clear(); + m_pED_Range.clear(); + m_pIB_Range.clear(); + m_pRB_Rows.clear(); + m_pRB_Columns.clear(); + m_pCB_FirstRowAsLabel.clear(); + m_pCB_FirstColumnAsLabel.clear(); + m_pFTTitle.clear(); + m_pCB_TimeBased.clear(); + m_pEd_TimeStart.clear(); + m_pEd_TimeEnd.clear(); + m_pParentDialog.clear(); + OWizardPage::dispose(); +} + + void RangeChooserTabPage::ActivatePage() { OWizardPage::ActivatePage(); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index f7a0791fd6ff..5bcda3593f8b 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -48,6 +48,8 @@ public: , ChartTypeTemplateProvider* pTemplateProvider , Dialog * pParentDialog , bool bHideDescription = false ); + virtual ~RangeChooserTabPage(); + virtual void dispose() SAL_OVERRIDE; //RangeSelectionListenerParent virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE; @@ -75,21 +77,21 @@ protected: //methods protected: //member - FixedText* m_pFT_Caption; - FixedText* m_pFT_Range; - Edit* m_pED_Range; - PushButton* m_pIB_Range; + VclPtr m_pFT_Caption; + VclPtr m_pFT_Range; + VclPtr m_pED_Range; + VclPtr m_pIB_Range; - RadioButton* m_pRB_Rows; - RadioButton* m_pRB_Columns; + VclPtr m_pRB_Rows; + VclPtr m_pRB_Columns; - CheckBox* m_pCB_FirstRowAsLabel; - CheckBox* m_pCB_FirstColumnAsLabel; - FixedText* m_pFTTitle; + VclPtr m_pCB_FirstRowAsLabel; + VclPtr m_pCB_FirstColumnAsLabel; + VclPtr m_pFTTitle; - CheckBox* m_pCB_TimeBased; - Edit* m_pEd_TimeStart; - Edit* m_pEd_TimeEnd; + VclPtr m_pCB_TimeBased; + VclPtr m_pEd_TimeStart; + VclPtr m_pEd_TimeEnd; sal_Int32 m_nChangingControlCalls; bool m_bIsDirty; @@ -105,7 +107,7 @@ protected: //member ChartTypeTemplateProvider* m_pTemplateProvider; DialogModel & m_rDialogModel; - Dialog * m_pParentDialog; + VclPtr m_pParentDialog; TabPageNotifiable * m_pTabPageNotifiable; }; diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index bb92e78c095d..9db6bda24daf 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -122,6 +122,41 @@ ScaleTabPage::ScaleTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : HideAllControls(); } +ScaleTabPage::~ScaleTabPage() +{ + dispose(); +} + +void ScaleTabPage::dispose() +{ + m_pCbxReverse.clear(); + m_pCbxLogarithm.clear(); + m_pBxType.clear(); + m_pLB_AxisType.clear(); + m_pBxMinMax.clear(); + m_pFmtFldMin.clear(); + m_pCbxAutoMin.clear(); + m_pFmtFldMax.clear(); + m_pCbxAutoMax.clear(); + m_pBxResolution.clear(); + m_pLB_TimeResolution.clear(); + m_pCbx_AutoTimeResolution.clear(); + m_pTxtMain.clear(); + m_pFmtFldStepMain.clear(); + m_pMt_MainDateStep.clear(); + m_pLB_MainTimeUnit.clear(); + m_pCbxAutoStepMain.clear(); + m_pTxtHelpCount.clear(); + m_pTxtHelp.clear(); + m_pMtStepHelp.clear(); + m_pLB_HelpTimeUnit.clear(); + m_pCbxAutoStepHelp.clear(); + m_pFmtFldOrigin.clear(); + m_pCbxAutoOrigin.clear(); + m_pBxOrigin.clear(); + SfxTabPage::dispose(); +} + IMPL_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField*, pFmtFied ) { if( pFmtFied ) diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index ff8bbe7e9d1b..529641da2a6e 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -33,6 +33,8 @@ class ScaleTabPage : public SfxTabPage { public: ScaleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~ScaleTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; @@ -48,38 +50,38 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; private: - CheckBox* m_pCbxReverse; - CheckBox* m_pCbxLogarithm; - - VclBox* m_pBxType; - ListBox* m_pLB_AxisType; - - VclGrid* m_pBxMinMax; - FormattedField* m_pFmtFldMin; - CheckBox* m_pCbxAutoMin; - - FormattedField* m_pFmtFldMax; - CheckBox* m_pCbxAutoMax; - - VclBox* m_pBxResolution; - ListBox* m_pLB_TimeResolution; - CheckBox* m_pCbx_AutoTimeResolution; - - FixedText* m_pTxtMain; - FormattedField* m_pFmtFldStepMain; - MetricField* m_pMt_MainDateStep; - ListBox* m_pLB_MainTimeUnit; - CheckBox* m_pCbxAutoStepMain; - - FixedText* m_pTxtHelpCount; - FixedText* m_pTxtHelp; - MetricField* m_pMtStepHelp; - ListBox* m_pLB_HelpTimeUnit; - CheckBox* m_pCbxAutoStepHelp; - - FormattedField* m_pFmtFldOrigin; - CheckBox* m_pCbxAutoOrigin; - VclBox* m_pBxOrigin; + VclPtr m_pCbxReverse; + VclPtr m_pCbxLogarithm; + + VclPtr m_pBxType; + VclPtr m_pLB_AxisType; + + VclPtr m_pBxMinMax; + VclPtr m_pFmtFldMin; + VclPtr m_pCbxAutoMin; + + VclPtr m_pFmtFldMax; + VclPtr m_pCbxAutoMax; + + VclPtr m_pBxResolution; + VclPtr m_pLB_TimeResolution; + VclPtr m_pCbx_AutoTimeResolution; + + VclPtr m_pTxtMain; + VclPtr m_pFmtFldStepMain; + VclPtr m_pMt_MainDateStep; + VclPtr m_pLB_MainTimeUnit; + VclPtr m_pCbxAutoStepMain; + + VclPtr m_pTxtHelpCount; + VclPtr m_pTxtHelp; + VclPtr m_pMtStepHelp; + VclPtr m_pLB_HelpTimeUnit; + VclPtr m_pCbxAutoStepHelp; + + VclPtr m_pFmtFldOrigin; + VclPtr m_pCbxAutoOrigin; + VclPtr m_pBxOrigin; double fMin; double fMax; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 4f4a986df57a..0a5b50485d71 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -63,6 +63,30 @@ SchOptionTabPage::SchOptionTabPage(vcl::Window* pWindow,const SfxItemSet& rInAtt m_pRbtAxis2->SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl )); } +SchOptionTabPage::~SchOptionTabPage() +{ + dispose(); +} + +void SchOptionTabPage::dispose() +{ + m_pGrpAxis.clear(); + m_pRbtAxis1.clear(); + m_pRbtAxis2.clear(); + m_pGrpBar.clear(); + m_pMTGap.clear(); + m_pMTOverlap.clear(); + m_pCBConnect.clear(); + m_pCBAxisSideBySide.clear(); + m_pGrpPlotOptions.clear(); + m_pGridPlotOptions.clear(); + m_pRB_DontPaint.clear(); + m_pRB_AssumeZero.clear(); + m_pRB_ContinueLine.clear(); + m_pCBIncludeHiddenCells.clear(); + SfxTabPage::dispose(); +} + IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl) { if( m_nAllSeriesAxisIndex == 0 ) diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index f11c8e5ea24a..b50f90fff4fe 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -31,6 +31,8 @@ class SchOptionTabPage : public SfxTabPage { public: SchOptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); + virtual ~SchOptionTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; @@ -42,23 +44,23 @@ private: //methods void AdaptControlPositionsAndVisibility(); private: //member - VclFrame* m_pGrpAxis; - RadioButton* m_pRbtAxis1; - RadioButton* m_pRbtAxis2; - - VclFrame* m_pGrpBar; - MetricField* m_pMTGap; - MetricField* m_pMTOverlap; - CheckBox* m_pCBConnect; - CheckBox* m_pCBAxisSideBySide; - - VclFrame* m_pGrpPlotOptions; - VclGrid* m_pGridPlotOptions; - RadioButton* m_pRB_DontPaint; - RadioButton* m_pRB_AssumeZero; - RadioButton* m_pRB_ContinueLine; - - CheckBox* m_pCBIncludeHiddenCells; + VclPtr m_pGrpAxis; + VclPtr m_pRbtAxis1; + VclPtr m_pRbtAxis2; + + VclPtr m_pGrpBar; + VclPtr m_pMTGap; + VclPtr m_pMTOverlap; + VclPtr m_pCBConnect; + VclPtr m_pCBAxisSideBySide; + + VclPtr m_pGrpPlotOptions; + VclPtr m_pGridPlotOptions; + VclPtr m_pRB_DontPaint; + VclPtr m_pRB_AssumeZero; + VclPtr m_pRB_ContinueLine; + + VclPtr m_pCBIncludeHiddenCells; DECL_LINK(EnableHdl, void * ); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index a83373dcbc8b..c69eb46a482b 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -64,6 +64,13 @@ void SchAlignmentTabPage::dispose() { delete m_pOrientHlp; m_pOrientHlp = NULL; + m_pCtrlDial.clear(); + m_pFtRotate.clear(); + m_pNfRotate.clear(); + m_pCbStacked.clear(); + m_pFtTextDirection.clear(); + m_pLbTextDirection.clear(); + m_pFtABCD.clear(); SfxTabPage::dispose(); } diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index e5d2e240a153..8450d6a4a202 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -31,14 +31,14 @@ namespace chart class SchAlignmentTabPage : public SfxTabPage { private: - svx::DialControl* m_pCtrlDial; - FixedText* m_pFtRotate; - NumericField* m_pNfRotate; - TriStateBox* m_pCbStacked; + VclPtr m_pCtrlDial; + VclPtr m_pFtRotate; + VclPtr m_pNfRotate; + VclPtr m_pCbStacked; svx::OrientationHelper* m_pOrientHlp; - FixedText* m_pFtTextDirection; - TextDirectionListBox* m_pLbTextDirection; - FixedText* m_pFtABCD; + VclPtr m_pFtTextDirection; + VclPtr m_pLbTextDirection; + VclPtr m_pFtABCD; public: SchAlignmentTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true); diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index 90088b0b66ae..23986e1f2690 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -57,6 +57,19 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent m_pCB_Grid_Z->SetToggleHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl )); } +TitlesAndObjectsTabPage::~TitlesAndObjectsTabPage() +{ + dispose(); +} + +void TitlesAndObjectsTabPage::dispose() +{ + m_pCB_Grid_X.clear(); + m_pCB_Grid_Y.clear(); + m_pCB_Grid_Z.clear(); + OWizardPage::dispose(); +} + void TitlesAndObjectsTabPage::initializePage() { m_bCommitToModel = false; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 26e2cb2aebae..520453ce0452 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -44,6 +44,8 @@ public: ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + virtual ~TitlesAndObjectsTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual void initializePage() SAL_OVERRIDE; virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) SAL_OVERRIDE; @@ -57,9 +59,9 @@ protected: boost::scoped_ptr< TitleResources > m_xTitleResources; boost::scoped_ptr< LegendPositionResources > m_xLegendPositionResources; - CheckBox* m_pCB_Grid_X; - CheckBox* m_pCB_Grid_Y; - CheckBox* m_pCB_Grid_Z; + VclPtr m_pCB_Grid_X; + VclPtr m_pCB_Grid_Y; + VclPtr m_pCB_Grid_Z; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartModel; diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 008ba07b3310..d8fecf56782e 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -41,7 +41,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - ChartTypeTabPage* m_pChartTypeTabPage; + VclPtr m_pChartTypeTabPage; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index ce4f638dd442..a71d86aaf3ac 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -119,7 +119,7 @@ private: com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xParentWindow; - CreationWizard* m_pDialog; + VclPtr m_pDialog; bool m_bUnlockControllersOnExecute; }; diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 4432674fe6be..cff3f4fbbdc0 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -67,7 +67,7 @@ private: bool m_bReadOnly; boost::scoped_ptr m_xBrwData; - ToolBox* m_pTbxData; + VclPtr m_pTbxData; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDoc; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 5c6a60d72c36..bc3d22da9c8b 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -68,11 +68,11 @@ protected: ::std::unique_ptr< DialogModel > m_apDialogModel; private: - DataSourceTabControl* m_pTabControl; - OKButton* m_pBtnOK; + VclPtr m_pTabControl; + VclPtr m_pBtnOK; - RangeChooserTabPage * m_pRangeChooserTabePage; - DataSourceTabPage * m_pDataSourceTabPage; + VclPtr m_pRangeChooserTabePage; + VclPtr m_pDataSourceTabPage; bool m_bRangeChooserTabIsValid; bool m_bDataSourceTabIsValid; diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 960edffe422d..1ec0829f4eac 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -43,15 +43,17 @@ struct InsertAxisOrGridDialogData class SchAxisDlg : public ModalDialog { protected: - CheckBox* m_pCbPrimaryX; - CheckBox* m_pCbPrimaryY; - CheckBox* m_pCbPrimaryZ; - CheckBox* m_pCbSecondaryX; - CheckBox* m_pCbSecondaryY; - CheckBox* m_pCbSecondaryZ; + VclPtr m_pCbPrimaryX; + VclPtr m_pCbPrimaryY; + VclPtr m_pCbPrimaryZ; + VclPtr m_pCbSecondaryX; + VclPtr m_pCbSecondaryY; + VclPtr m_pCbSecondaryZ; public: SchAxisDlg(vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true); + virtual ~SchAxisDlg(); + virtual void dispose() SAL_OVERRIDE; void getResult( InsertAxisOrGridDialogData& rOutput ); }; diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index 64228fe8ea85..0ef93e8d1fea 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -47,11 +47,11 @@ public: virtual short Execute() SAL_OVERRIDE; private: - TabControl* m_pTabControl; + VclPtr m_pTabControl; - ThreeD_SceneGeometry_TabPage* m_pGeometry; - ThreeD_SceneAppearance_TabPage* m_pAppearance; - ThreeD_SceneIllumination_TabPage* m_pIllumination; + VclPtr m_pGeometry; + VclPtr m_pAppearance; + VclPtr m_pIllumination; ControllerLockHelper m_aControllerLocker; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 0ad485c39990..85917809db48 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -67,36 +67,36 @@ public: private: // category - RadioButton* m_pRbNone; - RadioButton* m_pRbConst; - RadioButton* m_pRbPercent; - RadioButton* m_pRbFunction; - RadioButton* m_pRbRange; - ListBox* m_pLbFunction; + VclPtr m_pRbNone; + VclPtr m_pRbConst; + VclPtr m_pRbPercent; + VclPtr m_pRbFunction; + VclPtr m_pRbRange; + VclPtr m_pLbFunction; // parameters - VclFrame* m_pFlParameters; - VclBox* m_pBxPositive; - MetricField* m_pMfPositive; - Edit* m_pEdRangePositive; - PushButton* m_pIbRangePositive; - VclBox* m_pBxNegative; - MetricField* m_pMfNegative; - Edit* m_pEdRangeNegative; - PushButton* m_pIbRangeNegative; - CheckBox* m_pCbSyncPosNeg; + VclPtr m_pFlParameters; + VclPtr m_pBxPositive; + VclPtr m_pMfPositive; + VclPtr m_pEdRangePositive; + VclPtr m_pIbRangePositive; + VclPtr m_pBxNegative; + VclPtr m_pMfNegative; + VclPtr m_pEdRangeNegative; + VclPtr m_pIbRangeNegative; + VclPtr m_pCbSyncPosNeg; // indicator - RadioButton* m_pRbBoth; - RadioButton* m_pRbPositive; - RadioButton* m_pRbNegative; - FixedImage* m_pFiBoth; - FixedImage* m_pFiPositive; - FixedImage* m_pFiNegative; + VclPtr m_pRbBoth; + VclPtr m_pRbPositive; + VclPtr m_pRbNegative; + VclPtr m_pFiBoth; + VclPtr m_pFiPositive; + VclPtr m_pFiNegative; - FixedText* m_pUIStringPos; - FixedText* m_pUIStringNeg; - FixedText* m_pUIStringRbRange; + VclPtr m_pUIStringPos; + VclPtr m_pUIStringNeg; + VclPtr m_pUIStringRbRange; SvxChartKindError m_eErrorKind; SvxChartIndicate m_eIndicate; @@ -116,9 +116,9 @@ private: double m_fPlusValue; double m_fMinusValue; - Dialog * m_pParentDialog; + VclPtr m_pParentDialog; boost::scoped_ptr< RangeSelectionHelper > m_apRangeSelectionHelper; - Edit * m_pCurrentRangeChoosingField; + VclPtr m_pCurrentRangeChoosingField; bool m_bHasInternalDataProvider; bool m_bEnableDataTableDialog; diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx index c8292db200af..7801895a6308 100644 --- a/chart2/source/controller/inc/res_LegendPosition.hxx +++ b/chart2/source/controller/inc/res_LegendPosition.hxx @@ -60,12 +60,12 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC; - CheckBox* m_pCbxShow; + VclPtr m_pCbxShow; - RadioButton* m_pRbtLeft; - RadioButton* m_pRbtRight; - RadioButton* m_pRbtTop; - RadioButton* m_pRbtBottom; + VclPtr m_pRbtLeft; + VclPtr m_pRbtRight; + VclPtr m_pRbtTop; + VclPtr m_pRbtBottom; Link m_aChangeLink; }; diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx index 1e4e8c67cd91..396c87af598f 100644 --- a/chart2/source/controller/inc/res_Titles.hxx +++ b/chart2/source/controller/inc/res_Titles.hxx @@ -40,22 +40,22 @@ public: void ClearModifyFlag(); private: - FixedText* m_pFT_Main; - FixedText* m_pFT_Sub; - Edit* m_pEd_Main; - Edit* m_pEd_Sub; + VclPtr m_pFT_Main; + VclPtr m_pFT_Sub; + VclPtr m_pEd_Main; + VclPtr m_pEd_Sub; - FixedText* m_pFT_XAxis; - FixedText* m_pFT_YAxis; - FixedText* m_pFT_ZAxis; - Edit* m_pEd_XAxis; - Edit* m_pEd_YAxis; - Edit* m_pEd_ZAxis; + VclPtr m_pFT_XAxis; + VclPtr m_pFT_YAxis; + VclPtr m_pFT_ZAxis; + VclPtr m_pEd_XAxis; + VclPtr m_pEd_YAxis; + VclPtr m_pEd_ZAxis; - FixedText* m_pFT_SecondaryXAxis; - FixedText* m_pFT_SecondaryYAxis; - Edit* m_pEd_SecondaryXAxis; - Edit* m_pEd_SecondaryYAxis; + VclPtr m_pFT_SecondaryXAxis; + VclPtr m_pFT_SecondaryYAxis; + VclPtr m_pEd_SecondaryXAxis; + VclPtr m_pEd_SecondaryYAxis; }; } //namespace chart diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 81382eadaab1..827e549c8e6b 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -508,7 +508,7 @@ private: TheModelRef m_aModel; //view - ChartWindow* m_pChartWindow; + VclPtr m_pChartWindow; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xViewWindow; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 4a37ec38e583..d5275e1a0808 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -64,7 +64,7 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi { m_pOpenGLWindow->Show(); uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(pController->getModel(), uno::UNO_QUERY_THROW); - sal_uInt64 nWindowPtr = reinterpret_cast(m_pOpenGLWindow); + sal_uInt64 nWindowPtr = reinterpret_cast(m_pOpenGLWindow.get()); x3DWindowProvider->setWindow(nWindowPtr); x3DWindowProvider->update(); } @@ -83,8 +83,7 @@ void ChartWindow::dispose() x3DWindowProvider->setWindow(0); x3DWindowProvider->update(); } - delete m_pOpenGLWindow; - m_pOpenGLWindow = NULL; + m_pOpenGLWindow.clear(); vcl::Window::dispose(); } diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 73be579f6d6d..cd0afaa07d0a 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -68,7 +68,7 @@ public: private: ChartController* m_pWindowController; bool m_bInPaint; - OpenGLWindow* m_pOpenGLWindow; + VclPtr m_pOpenGLWindow; void adjustHighContrastMode(); }; diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 52b5f1f6d4e4..afea41029282 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -252,7 +252,7 @@ void ShapeController::executeDispatch_FormatLine() SolarMutexGuard aGuard; if ( m_pChartController ) { - vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow.get() ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -292,7 +292,7 @@ void ShapeController::executeDispatch_FormatArea() SolarMutexGuard aGuard; if ( m_pChartController ) { - vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow.get() ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -335,7 +335,7 @@ void ShapeController::executeDispatch_TextAttributes() SolarMutexGuard aGuard; if ( m_pChartController ) { - vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow.get() ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { @@ -372,7 +372,7 @@ void ShapeController::executeDispatch_TransformDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow.get() ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { @@ -541,7 +541,7 @@ void ShapeController::executeDispatch_FontDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow.get() ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -564,7 +564,7 @@ void ShapeController::executeDispatch_ParagraphDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow.get() ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 6b778138309c..3fe29b0d7c0b 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -1487,7 +1487,7 @@ IMPL_LINK_NOARG(GL3DBarChart, UpdateTimerHdl) void GL3DBarChart::setOpenGLWindow(OpenGLWindow* pWindow) { - if (mpWindow != pWindow) + if (mpWindow.get() != pWindow) { mpWindow = pWindow; Size aSize = mpWindow->GetSizePixel(); diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index c68a38510d66..eaff13a4ed93 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -124,7 +124,7 @@ private: boost::ptr_vector maShapes; boost::scoped_ptr mpRenderer; - OpenGLWindow* mpWindow; + VclPtr mpWindow; opengl3D::Camera* mpCamera; bool mbValidContext; diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index b9a1e37f348e..9ac3ad84d253 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1090,7 +1090,7 @@ public: private: ChartView* mpView; bool mbContextDestroyed; - OpenGLWindow* mpWindow; + VclPtr mpWindow; }; GL2DRenderer::GL2DRenderer(ChartView* pView): diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx index bf1f86e441d9..ba7da08dbc43 100644 --- a/compilerplugins/clang/vclwidgets.cxx +++ b/compilerplugins/clang/vclwidgets.cxx @@ -8,6 +8,7 @@ */ #include +#include #include "plugin.hxx" #include "compat.hxx" @@ -41,6 +42,8 @@ public: bool VisitCXXDestructorDecl(const CXXDestructorDecl *); + bool VisitCXXDeleteExpr(const CXXDeleteExpr *); + private: bool isDisposeCallingSuperclassDispose(const CXXMethodDecl* pMethodDecl); }; @@ -55,10 +58,11 @@ bool BaseCheckNotWindowSubclass(const CXXRecordDecl *BaseDefinition, void *) { } bool isDerivedFromWindow(const CXXRecordDecl *decl) { - if (!decl->hasDefinition()) - return false; if (decl->getQualifiedNameAsString().compare("vcl::Window") == 0) return true; + if (!decl->hasDefinition()) { + return false; + } if (// not sure what hasAnyDependentBases() does, // but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1 !decl->hasAnyDependentBases() && @@ -68,9 +72,11 @@ bool isDerivedFromWindow(const CXXRecordDecl *decl) { return false; } -bool isPointerToWindowSubclass(const QualType& pType) { - if (!pType->isPointerType()) +bool isPointerToWindowSubclass(const Type* pType0) { + const Type* pType = pType0->getUnqualifiedDesugaredType(); + if (!pType->isPointerType()) { return false; + } QualType pointeeType = pType->getPointeeType(); const RecordType *recordType = pointeeType->getAs(); if (recordType == nullptr) { @@ -80,7 +86,27 @@ bool isPointerToWindowSubclass(const QualType& pType) { if (recordDecl == nullptr) { return false; } - return isDerivedFromWindow(recordDecl); + bool b = isDerivedFromWindow(recordDecl); + return b; +} + +bool containsPointerToWindowSubclass(const Type* pType0) { + const Type* pType = pType0->getUnqualifiedDesugaredType(); + const CXXRecordDecl* pRecordDecl = pType->getAsCXXRecordDecl(); + if (pRecordDecl) { + const ClassTemplateSpecializationDecl* pTemplate = dyn_cast(pRecordDecl); + if (pTemplate) { + for(unsigned i=0; igetTemplateArgs().size(); ++i) { + const TemplateArgument& rArg = pTemplate->getTemplateArgs()[i]; + if (rArg.getKind() == TemplateArgument::ArgKind::Type && + containsPointerToWindowSubclass(rArg.getAsType().getTypePtr())) + { + return true; + } + } + } + } + return isPointerToWindowSubclass(pType); } bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorDecl) @@ -88,7 +114,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD if (ignoreLocation(pCXXDestructorDecl)) { return true; } - if (!pCXXDestructorDecl->hasBody()) { + if (!pCXXDestructorDecl->isThisDeclarationADefinition()) { return true; } const CXXRecordDecl * pRecordDecl = pCXXDestructorDecl->getParent(); @@ -120,20 +146,20 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD } const CompoundStmt *pCompoundStatement = dyn_cast(pCXXDestructorDecl->getBody()); // having an empty body and no dispose() method is fine - if (!foundVclPtrField && !foundDispose && pCompoundStatement->size() == 0) { + if (!foundVclPtrField && !foundDispose && pCompoundStatement && pCompoundStatement->size() == 0) { return true; } - if (foundVclPtrField && pCompoundStatement->size() == 0) { + if (foundVclPtrField && pCompoundStatement && pCompoundStatement->size() == 0) { report( DiagnosticsEngine::Warning, "vcl::Window subclass with VclPtr field must call dispose() from it's destructor.", - pCXXDestructorDecl->getBody()->getLocStart()) - << pCXXDestructorDecl->getBody()->getSourceRange(); + pCXXDestructorDecl->getLocStart()) + << pCXXDestructorDecl->getSourceRange(); return true; } // check that the destructor for a vcl::Window subclass does nothing except call into the dispose() method bool ok = false; - if (pCompoundStatement->size() == 1) { + if (pCompoundStatement && pCompoundStatement->size() == 1) { const CXXMemberCallExpr *pCallExpr = dyn_cast(*pCompoundStatement->body_begin()); if (pCallExpr) { ok = true; @@ -143,9 +169,8 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD report( DiagnosticsEngine::Warning, "vcl::Window subclass should have nothing in it's destructor but a call to dispose().", - pCXXDestructorDecl->getBody()->getLocStart()) - << pCXXDestructorDecl->getBody()->getSourceRange() - << pCXXDestructorDecl->getCanonicalDecl()->getSourceRange(); + pCXXDestructorDecl->getLocStart()) + << pCXXDestructorDecl->getSourceRange(); return true; } return true; @@ -183,13 +208,13 @@ bool VCLWidgets::VisitFieldDecl(const FieldDecl * fieldDecl) { if (fieldDecl->isBitField()) { return true; } - if (isPointerToWindowSubclass(fieldDecl->getType())) { -/* report( - DiagnosticsEngine::Remark, + if (containsPointerToWindowSubclass(fieldDecl->getType().getTypePtr())) { + report( + DiagnosticsEngine::Warning, "vcl::Window subclass declared as a pointer field, should be wrapped in VclPtr.", fieldDecl->getLocation()) << fieldDecl->getSourceRange(); - return true;*/ + return true; } const RecordType *recordType = fieldDecl->getType()->getAs(); @@ -245,7 +270,15 @@ bool VCLWidgets::VisitParmVarDecl(ParmVarDecl const * pvDecl) && pMethodDecl->getParent()->getQualifiedNameAsString().find("VclPtr") != std::string::npos) { return true; } - if (pvDecl->getType().getAsString().find("VclPtr") != std::string::npos) { + // we exclude this method in VclBuilder because it's so useful to have it like this + if (pMethodDecl + && pMethodDecl->getNameAsString() == "get" + && (pMethodDecl->getParent()->getQualifiedNameAsString() == "VclBuilder" + || pMethodDecl->getParent()->getQualifiedNameAsString() == "VclBuilderContainer")) + { + return true; + } + if (!pvDecl->getType()->isReferenceType() && pvDecl->getType().getAsString().find("VclPtr") != std::string::npos) { report( DiagnosticsEngine::Warning, "vcl::Window subclass passed as a VclPtr parameter, should be passed as a raw pointer.", @@ -255,6 +288,43 @@ bool VCLWidgets::VisitParmVarDecl(ParmVarDecl const * pvDecl) return true; } +static void findDisposeAndClearStatements2(std::vector& aVclPtrFields, const Stmt *pStmt); + +static void findDisposeAndClearStatements(std::vector& aVclPtrFields, const CompoundStmt *pCompoundStatement) +{ + for(const Stmt* pStmt : pCompoundStatement->body()) { + findDisposeAndClearStatements2(aVclPtrFields, pStmt); + } +} + +static void findDisposeAndClearStatements2(std::vector& aVclPtrFields, const Stmt *pStmt) +{ + if (isa(pStmt)) { + findDisposeAndClearStatements(aVclPtrFields, dyn_cast(pStmt)); + return; + } + if (!isa(pStmt)) return; + const CallExpr *pCallExpr = dyn_cast(pStmt); + + if (!pCallExpr->getDirectCallee()) return; + if (!isa(pCallExpr->getDirectCallee())) return; + const CXXMethodDecl *pCalleeMethodDecl = dyn_cast(pCallExpr->getDirectCallee()); + if (pCalleeMethodDecl->getNameAsString() != "disposeAndClear") return; + + if (!pCallExpr->getCallee()) return; + + if (!isa(pCallExpr->getCallee())) return; + const MemberExpr *pCalleeMemberExpr = dyn_cast(pCallExpr->getCallee()); + + if (!pCalleeMemberExpr->getBase()) return; + if (!isa(pCalleeMemberExpr->getBase())) return; + const MemberExpr *pCalleeMemberExprBase = dyn_cast(pCalleeMemberExpr->getBase()); + + std::string xxx = pCalleeMemberExprBase->getMemberDecl()->getNameAsString(); + aVclPtrFields.erase(std::remove(aVclPtrFields.begin(), aVclPtrFields.end(), xxx), aVclPtrFields.end()); +} + + bool VCLWidgets::VisitFunctionDecl( const FunctionDecl* functionDecl ) { if (ignoreLocation(functionDecl)) { @@ -263,16 +333,16 @@ bool VCLWidgets::VisitFunctionDecl( const FunctionDecl* functionDecl ) // ignore the stuff in the VclPtr template class const CXXMethodDecl *pMethodDecl = dyn_cast(functionDecl); if (pMethodDecl - && pMethodDecl->getParent()->getQualifiedNameAsString().find("VclPtr") != std::string::npos) { + && pMethodDecl->getParent()->getQualifiedNameAsString() == "VclPtr") { return true; } // ignore the vcl::Window::dispose() method if (pMethodDecl - && pMethodDecl->getParent()->getQualifiedNameAsString().compare("vcl::Window") == 0) { + && pMethodDecl->getParent()->getQualifiedNameAsString() == "vcl::Window") { return true; } QualType t1 { compat::getReturnType(*functionDecl) }; - if (t1.getAsString().find("VclPtr") != std::string::npos) { + if (t1.getAsString().find("VclPtr") == 0) { report( DiagnosticsEngine::Warning, "VclPtr declared as a return type from a method/function, should be passed as a raw pointer.", @@ -286,55 +356,89 @@ bool VCLWidgets::VisitFunctionDecl( const FunctionDecl* functionDecl ) report( DiagnosticsEngine::Warning, "vcl::Window subclass dispose() method MUST call it's superclass dispose() as the last thing it does", - functionDecl->getBody()->getLocStart()) - << functionDecl->getBody()->getSourceRange(); + functionDecl->getLocStart()) + << functionDecl->getSourceRange(); } } } // check dispose method to make sure we are actually disposing all of the VclPtr fields - if (pMethodDecl && pMethodDecl->isInstance() && pMethodDecl->getBody() && pMethodDecl->param_size()==0 - && pMethodDecl->getNameAsString() == "dispose") + if (pMethodDecl && pMethodDecl->isInstance() && pMethodDecl->getBody() + && pMethodDecl->param_size()==0 + && pMethodDecl->getNameAsString() == "dispose" + && isDerivedFromWindow(pMethodDecl->getParent()) ) { + // exclude a couple of methods with hard-to-parse code + if (pMethodDecl->getQualifiedNameAsString() == "SvxRubyDialog::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "SvxPersonalizationTabPage::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "SelectPersonaDialog::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "MappingDialog_Impl::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "BibGeneralPage::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "SwCreateAuthEntryDlg_Impl::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "SwTableColumnPage::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "SwAssignFieldsControl::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "ScOptSolverDlg::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "ScPivotFilterDlg::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "SmToolBoxWindow::dispose") + return true; + if (pMethodDecl->getQualifiedNameAsString() == "dbaui::DlgOrderCrit::dispose") + return true; + std::vector aVclPtrFields; for(auto fieldDecl : pMethodDecl->getParent()->fields()) { - const RecordType *pFieldRecordType = fieldDecl->getType()->getAs(); - if (pFieldRecordType) { - const CXXRecordDecl *pFieldRecordTypeDecl = dyn_cast(pFieldRecordType->getDecl()); - if (pFieldRecordTypeDecl->getQualifiedNameAsString().compare(0, strlen(sVclPtr), sVclPtr) == 0) { - aVclPtrFields.push_back(fieldDecl->getNameAsString()); - } - } + if (fieldDecl->getType().getAsString().compare(0, strlen(sVclPtr), sVclPtr) == 0) { + aVclPtrFields.push_back(fieldDecl->getNameAsString()); + } } if (!aVclPtrFields.empty()) { - const CompoundStmt *pCompoundStatement = dyn_cast(pMethodDecl->getBody()); - for(const Stmt* pStmt : pCompoundStatement->body()) { - const CallExpr *pCallExpr = dyn_cast(pStmt); - if (!pCallExpr) continue; - if (!pCallExpr->getDirectCallee()) continue; - const CXXMethodDecl *pCalleeMethodDecl = dyn_cast(pCallExpr->getDirectCallee()); - if (!pCalleeMethodDecl) continue; - if (pCalleeMethodDecl->getNameAsString() != "disposeAndClear") continue; - const MemberExpr *pCalleeMemberExpr = dyn_cast(pCallExpr->getCallee()); - if (!pCalleeMemberExpr) continue; - const MemberExpr *pCalleeMemberExprBase = dyn_cast(pCalleeMemberExpr->getBase()); - std::string xxx = pCalleeMemberExprBase->getMemberDecl()->getNameAsString(); - aVclPtrFields.erase(std::remove(aVclPtrFields.begin(), aVclPtrFields.end(), xxx), aVclPtrFields.end()); - } + if (pMethodDecl->getBody() && isa(pMethodDecl->getBody())) + findDisposeAndClearStatements( aVclPtrFields, dyn_cast(pMethodDecl->getBody()) ); if (!aVclPtrFields.empty()) { + //pMethodDecl->dump(); std::string aMessage = "vcl::Window subclass dispose() method does not call disposeAndClear() on the following field(s) "; for(auto s : aVclPtrFields) - aMessage += ", " + s; + aMessage += "\n " + s + ".clear();"; report( DiagnosticsEngine::Warning, aMessage, - functionDecl->getBody()->getLocStart()) - << functionDecl->getBody()->getSourceRange(); + functionDecl->getLocStart()) + << functionDecl->getSourceRange(); } } } return true; } +bool VCLWidgets::VisitCXXDeleteExpr(const CXXDeleteExpr *pCXXDeleteExpr) +{ + if (ignoreLocation(pCXXDeleteExpr)) { + return true; + } + const ImplicitCastExpr* pImplicitCastExpr = dyn_cast(pCXXDeleteExpr->getArgument()); + if (!pImplicitCastExpr) { + return true; + } + if (pImplicitCastExpr->getCastKind() != CK_UserDefinedConversion) { + return true; + } + report( + DiagnosticsEngine::Warning, + "calling delete on instance of VclPtr, must rather call disposeAndClear()", + pCXXDeleteExpr->getLocStart()) + << pCXXDeleteExpr->getSourceRange(); + return true; +} + + /** The AST looks like: `-CXXMemberCallExpr 0xb06d8b0 'void' @@ -347,6 +451,7 @@ bool VCLWidgets::isDisposeCallingSuperclassDispose(const CXXMethodDecl* pMethodD { const CompoundStmt *pCompoundStatement = dyn_cast(pMethodDecl->getBody()); if (!pCompoundStatement) return false; + if (pCompoundStatement->size() == 0) return false; // find the last statement const CXXMemberCallExpr *pCallExpr = dyn_cast(*pCompoundStatement->body_rbegin()); if (!pCallExpr) return false; diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index a65e56568cdb..82e314ed58bf 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -672,6 +672,17 @@ void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry, SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind); } +SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl() +{ + dispose(); +} + +void SfxAccCfgTabListBox_Impl::dispose() +{ + m_pAccelConfigPage.clear(); + SvTabListBox::dispose(); +} + /** select the entry, which match the current key input ... excepting keys, which are used for the dialog itself. */ @@ -830,6 +841,18 @@ void SfxAcceleratorConfigPage::dispose() delete m_pFileDlg; m_pFileDlg = NULL; + m_pEntriesBox.clear(); + m_pOfficeButton.clear(); + m_pModuleButton.clear(); + m_pChangeButton.clear(); + m_pRemoveButton.clear(); + m_pGroupLBox.clear(); + m_pFunctionBox.clear(); + m_pKeyBox.clear(); + m_pLoadButton.clear(); + m_pSaveButton.clear(); + m_pResetButton.clear(); + SfxTabPage::dispose(); } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 8fc2b26db078..3d0462fb7300 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1395,6 +1395,17 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(vcl::Window* pParent, SvxConfigPage SV_DRAGDROP_APP_DROP); } +SvxMenuEntriesListBox::~SvxMenuEntriesListBox() +{ + dispose(); +} + +void SvxMenuEntriesListBox::dispose() +{ + pPage.clear(); + SvTreeListBox::dispose(); +} + // drag and drop support DragDropMode SvxMenuEntriesListBox::NotifyStartDrag( TransferDataContainer& aTransferDataContainer, SvTreeListEntry* pEntry ) @@ -1542,6 +1553,32 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) m_pDescriptionField->EnableCursor( false ); } +SvxConfigPage::~SvxConfigPage() +{ + dispose(); +} + +void SvxConfigPage::dispose() +{ + m_pTopLevel.clear(); + m_pTopLevelLabel.clear(); + m_pTopLevelListBox.clear(); + m_pNewTopLevelButton.clear(); + m_pModifyTopLevelButton.clear(); + m_pContents.clear(); + m_pContentsLabel.clear(); + m_pEntries.clear(); + m_pContentsListBox.clear(); + m_pAddCommandsButton.clear(); + m_pModifyCommandButton.clear(); + m_pMoveUpButton.clear(); + m_pMoveDownButton.clear(); + m_pSaveInListBox.clear(); + m_pDescriptionField.clear(); + m_pSelectorDlg.clear(); + SfxTabPage::dispose(); +} + void SvxConfigPage::Reset( const SfxItemSet* ) { // If we haven't initialised our XMultiServiceFactory reference @@ -2206,6 +2243,11 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe LINK( this, SvxMenuConfigPage, EntrySelectHdl ) ); } +SvxMenuConfigPage::~SvxMenuConfigPage() +{ + dispose(); +} + // Populates the Menu combo box void SvxMenuConfigPage::Init() { @@ -2219,11 +2261,6 @@ void SvxMenuConfigPage::Init() m_pTopLevelListBox->GetSelectHdl().Call(this); } -SvxMenuConfigPage::~SvxMenuConfigPage() -{ - dispose(); -} - void SvxMenuConfigPage::dispose() { for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i ) @@ -2235,11 +2272,8 @@ void SvxMenuConfigPage::dispose() } m_pSaveInListBox->Clear(); - delete m_pSelectorDlg; - m_pSelectorDlg = NULL; - delete m_pContentsListBox; - m_pContentsListBox = NULL; - + m_pSelectorDlg.clear(); + m_pContentsListBox.clear(); SvxConfigPage::dispose(); } @@ -2547,7 +2581,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton ) { (void)pButton; - if ( m_pSelectorDlg == NULL ) + if ( m_pSelectorDlg == nullptr ) { // Create Script Selector which also shows builtin commands m_pSelectorDlg = new SvxScriptSelectorDialog( this, true, m_xFrame ); @@ -2660,6 +2694,21 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) ); } +SvxMainMenuOrganizerDialog::~SvxMainMenuOrganizerDialog() +{ + dispose(); +} + +void SvxMainMenuOrganizerDialog::dispose() +{ + m_pMenuBox.clear(); + m_pMenuNameEdit.clear(); + m_pMenuListBox.clear(); + m_pMoveUpButton.clear(); + m_pMoveDownButton.clear(); + ModalDialog::dispose(); +} + IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit) { (void)pEdit; @@ -2931,12 +2980,8 @@ void SvxToolbarConfigPage::dispose() } m_pSaveInListBox->Clear(); - delete m_pSelectorDlg; - m_pSelectorDlg = NULL; - - delete m_pContentsListBox; - m_pContentsListBox = NULL; - + m_pSelectorDlg.clear(); + m_pContentsListBox.clear(); SvxConfigPage::dispose(); } @@ -4457,7 +4502,7 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton ) { (void)pButton; - if ( m_pSelectorDlg == NULL ) + if ( m_pSelectorDlg == nullptr ) { // Create Script Selector which shows slot commands m_pSelectorDlg = new SvxScriptSelectorDialog( this, true, m_xFrame ); @@ -4537,6 +4582,7 @@ void SvxToolbarEntriesListBox::dispose() delete m_pButtonData; m_pButtonData = NULL; + pPage.clear(); SvxMenuEntriesListBox::dispose(); } @@ -4688,7 +4734,7 @@ TriState SvxToolbarEntriesListBox::NotifyCopying( if ( !m_bIsInternalDrag ) { // if the target is NULL then add function to the start of the list - static_cast(pPage)->AddFunction( pTarget, pTarget == NULL ); + static_cast(pPage.get())->AddFunction( pTarget, pTarget == NULL ); // Instant Apply changes to UI SvxConfigEntry* pToolbar = pPage->GetTopLevelSelection(); @@ -4720,6 +4766,20 @@ SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& r m_pEdtName->SetModifyHdl(LINK(this, SvxNewToolbarDialog, ModifyHdl)); } +SvxNewToolbarDialog::~SvxNewToolbarDialog() +{ + dispose(); +} + +void SvxNewToolbarDialog::dispose() +{ + m_pEdtName.clear(); + m_pBtnOK.clear(); + m_pSaveInListBox.clear(); + ModalDialog::dispose(); +} + + IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit) { (void)pEdit; @@ -4940,9 +5000,12 @@ void SvxIconSelectorDialog::dispose() if ( xi != NULL ) xi->release(); } - pTbSymbol = NULL; } + pTbSymbol.clear(); + pFtNote.clear(); + pBtnImport.clear(); + pBtnDelete.clear(); ModalDialog::dispose(); } @@ -5388,4 +5451,16 @@ SvxIconChangeDialog::SvxIconChangeDialog( pLineEditDescription->SetText(aMessage); } +SvxIconChangeDialog::~SvxIconChangeDialog() +{ + dispose(); +} + +void SvxIconChangeDialog::dispose() +{ + pFImageInfo.clear(); + pLineEditDescription.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 373f3b924421..0f399fda43f5 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -435,6 +435,7 @@ SfxConfigGroupListBox::~SfxConfigGroupListBox() void SfxConfigGroupListBox::dispose() { ClearAll(); + pFunctionListBox.clear(); SvTreeListBox::dispose(); } diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 79453fc1848d..3ab1816f37d5 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -118,6 +118,7 @@ void SvxEventConfigPage::dispose() pE->SetUserData((void*)0); pE = SvTreeListBox::NextSibling( pE ); } + m_pSaveInListBox.clear(); _SvxMacroTabPage::dispose(); } diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 56ea3c41ddab..385df86d1bbb 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -29,7 +29,7 @@ class SvxEventConfigPage : public _SvxMacroTabPage { - ListBox* m_pSaveInListBox; + VclPtr m_pSaveInListBox; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocumentEvents; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 13ae5f461a00..656a2414ddd1 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -888,6 +888,18 @@ AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUStr mpMethodEdit->SetText( aMethodName, Selection( 0, SELECTION_MAX ) ); } +AssignComponentDialog::~AssignComponentDialog() +{ + dispose(); +} + +void AssignComponentDialog::dispose() +{ + mpMethodEdit.clear(); + mpOKButton.clear(); + ModalDialog::dispose(); +} + IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) { (void)pButton; //unused diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 6ec8709a971e..d99a9712e1ff 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -25,14 +25,14 @@ class _SvxMacroTabPage_Impl public: _SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ); - PushButton* pAssignPB; - PushButton* pAssignComponentPB; - PushButton* pDeletePB; + VclPtr pAssignPB; + VclPtr pAssignComponentPB; + VclPtr pDeletePB; Image aMacroImg; Image aComponentImg; OUString sStrEvent; OUString sAssignedMacro; - MacroEventListBox* pEventLB; + VclPtr pEventLB; bool bReadOnly; bool bIDEDialogMode; }; @@ -40,8 +40,8 @@ public: class AssignComponentDialog : public ModalDialog { private: - Edit* mpMethodEdit; - OKButton* mpOKButton; + VclPtr mpMethodEdit; + VclPtr mpOKButton; OUString maURL; @@ -49,6 +49,8 @@ private: public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); + virtual ~AssignComponentDialog(); + virtual void dispose() SAL_OVERRIDE; OUString getURL( void ) const { return maURL; } diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 5d0ffe6a9209..3aefef32d24b 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -239,6 +239,7 @@ SvxConfigGroupListBox::~SvxConfigGroupListBox() void SvxConfigGroupListBox::dispose() { ClearAll(); + pFunctionListBox.clear(); SvTreeListBox::dispose(); } @@ -918,6 +919,22 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog( UpdateUI(); } +SvxScriptSelectorDialog::~SvxScriptSelectorDialog() +{ + dispose(); +} + +void SvxScriptSelectorDialog::dispose() +{ + m_pDialogDescription.clear(); + m_pCategories.clear(); + m_pCommands.clear(); + m_pOKButton.clear(); + m_pCancelButton.clear(); + m_pDescriptionText.clear(); + ModelessDialog::dispose(); +} + IMPL_LINK( SvxScriptSelectorDialog, SelectHdl, Control*, pCtrl ) { if (pCtrl == m_pCategories) diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 5c81f1c02206..ac8aca049c02 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -261,6 +261,26 @@ void SpellDialog::dispose() delete pImpl; pImpl = NULL; } + m_pLanguageFT.clear(); + m_pLanguageLB.clear(); + m_pExplainFT.clear(); + m_pExplainLink.clear(); + m_pNotInDictFT.clear(); + m_pSentenceED.clear(); + m_pSuggestionFT.clear(); + m_pSuggestionLB.clear(); + m_pIgnorePB.clear(); + m_pIgnoreAllPB.clear(); + m_pIgnoreRulePB.clear(); + m_pAddToDictPB.clear(); + m_pAddToDictMB.clear(); + m_pChangePB.clear(); + m_pChangeAllPB.clear(); + m_pAutoCorrPB.clear(); + m_pCheckGrammarCB.clear(); + m_pOptionsPB.clear(); + m_pUndoPB.clear(); + m_pClosePB.clear(); SfxModelessDialog::dispose(); } diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 867c8ce281e6..f146e698e49f 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -98,6 +98,23 @@ AboutDialog::AboutDialog(vcl::Window* pParent) get("close")->GrabFocus(); } +AboutDialog::~AboutDialog() +{ + dispose(); +} + +void AboutDialog::dispose() +{ + m_pVersion.clear(); + m_pDescriptionText.clear(); + m_pCopyrightText.clear(); + m_pLogoImage.clear(); + m_pLogoReplacement.clear(); + m_pCreditsButton.clear(); + m_pWebsiteButton.clear(); + SfxModalDialog::dispose(); +} + IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) { OUString sURL = ""; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 7edff10bf399..ad1f3e0d8f81 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -973,6 +973,8 @@ class ColorPickerDialog : public ModalDialog { public: ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ); + virtual ~ColorPickerDialog() { dispose(); } + virtual void dispose() SAL_OVERRIDE; void update_color( sal_uInt16 n = UPDATE_ALL ); @@ -992,35 +994,35 @@ private: double mdCyan, mdMagenta, mdYellow, mdKey; private: - ColorFieldControl* mpColorField; - ColorSliderControl* mpColorSlider; - ColorPreviewControl* mpColorPreview; - ColorPreviewControl* mpColorPrevious; + VclPtr mpColorField; + VclPtr mpColorSlider; + VclPtr mpColorPreview; + VclPtr mpColorPrevious; - FixedImage* mpFISliderLeft; - FixedImage* mpFISliderRight; + VclPtr mpFISliderLeft; + VclPtr mpFISliderRight; Image maSliderImage; - RadioButton* mpRBRed; - RadioButton* mpRBGreen; - RadioButton* mpRBBlue; - RadioButton* mpRBHue; - RadioButton* mpRBSaturation; - RadioButton* mpRBBrightness; - - MetricField* mpMFRed; - MetricField* mpMFGreen; - MetricField* mpMFBlue; - HexColorControl* mpEDHex; - - MetricField* mpMFHue; - MetricField* mpMFSaturation; - MetricField* mpMFBrightness; - - MetricField* mpMFCyan; - MetricField* mpMFMagenta; - MetricField* mpMFYellow; - MetricField* mpMFKey; + VclPtr mpRBRed; + VclPtr mpRBGreen; + VclPtr mpRBBlue; + VclPtr mpRBHue; + VclPtr mpRBSaturation; + VclPtr mpRBBrightness; + + VclPtr mpMFRed; + VclPtr mpMFGreen; + VclPtr mpMFBlue; + VclPtr mpEDHex; + + VclPtr mpMFHue; + VclPtr mpMFSaturation; + VclPtr mpMFBrightness; + + VclPtr mpMFCyan; + VclPtr mpMFMagenta; + VclPtr mpMFYellow; + VclPtr mpMFKey; }; ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ) @@ -1126,6 +1128,34 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa update_color(); } +void ColorPickerDialog::dispose() +{ + mpColorField.clear(); + mpColorSlider.clear(); + mpColorPreview.clear(); + mpColorPrevious.clear(); + mpFISliderLeft.clear(); + mpFISliderRight.clear(); + mpRBRed.clear(); + mpRBGreen.clear(); + mpRBBlue.clear(); + mpRBHue.clear(); + mpRBSaturation.clear(); + mpRBBrightness.clear(); + mpMFRed.clear(); + mpMFGreen.clear(); + mpMFBlue.clear(); + mpEDHex.clear(); + mpMFHue.clear(); + mpMFSaturation.clear(); + mpMFBrightness.clear(); + mpMFCyan.clear(); + mpMFMagenta.clear(); + mpMFYellow.clear(); + mpMFKey.clear(); + ModalDialog::dispose(); +} + static int toInt( double dValue, double dRange ) { return static_cast< int >( std::floor((dValue * dRange) + 0.5 ) ); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index e992ab28d064..44f03fed1481 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -100,6 +100,25 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte CreateOutputItemSet( pSet ? *pSet->GetPool() : SfxGetpApp()->GetPool() ); } +SvxCharacterMap::~SvxCharacterMap() +{ + dispose(); +} + +void SvxCharacterMap::dispose() +{ + m_pShowSet.clear(); + m_pShowText.clear(); + m_pOKBtn.clear(); + m_pFontText.clear(); + m_pFontLB.clear(); + m_pSubsetText.clear(); + m_pSubsetLB.clear(); + m_pSymbolText.clear(); + m_pShowChar.clear(); + m_pCharCodeText.clear(); + SfxModalDialog::dispose(); +} void SvxCharacterMap::SetChar( sal_UCS4 c ) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index c8bbf0abab69..7e3a767a3bdd 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -176,6 +176,34 @@ void FmSearchDialog::dispose() delete m_pSearchEngine; m_pSearchEngine = NULL; + m_prbSearchForText.clear(); + m_prbSearchForNull.clear(); + m_prbSearchForNotNull.clear(); + m_pcmbSearchText.clear(); + m_pftForm.clear(); + m_plbForm.clear(); + m_prbAllFields.clear(); + m_prbSingleField.clear(); + m_plbField.clear(); + m_pftPosition.clear(); + m_plbPosition.clear(); + m_pcbUseFormat.clear(); + m_pcbCase.clear(); + m_pcbBackwards.clear(); + m_pcbStartOver.clear(); + m_pcbWildCard.clear(); + m_pcbRegular.clear(); + m_pcbApprox.clear(); + m_ppbApproxSettings.clear(); + m_pHalfFullFormsCJK.clear(); + m_pSoundsLikeCJK.clear(); + m_pSoundsLikeCJKSettings.clear(); + m_pftRecord.clear(); + m_pftHint.clear(); + m_pbSearchAgain.clear(); + m_pbClose.clear(); + m_pPreSearchFocus.clear(); + ModalDialog::dispose(); } @@ -609,7 +637,7 @@ void FmSearchDialog::EnableSearchUI(bool bEnable) m_pPreSearchFocus->GrabFocus(); if ( WINDOW_EDIT == m_pPreSearchFocus->GetType() ) { - Edit* pEdit = static_cast< Edit* >( m_pPreSearchFocus ); + Edit* pEdit = static_cast< Edit* >( m_pPreSearchFocus.get() ); pEdit->SetSelection( Selection( 0, pEdit->GetText().getLength() ) ); } } diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ac330ae95173..87e8a6ae6921 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -215,6 +215,19 @@ SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStar m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) ); } +SearchProgress::~SearchProgress() +{ + dispose(); +} + +void SearchProgress::dispose() +{ + m_pFtSearchDir.clear(); + m_pFtSearchType.clear(); + m_pBtnCancel.clear(); + parent_.clear(); + ModalDialog::dispose(); +} void SearchProgress::Terminate() @@ -260,7 +273,7 @@ void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl ) { assert(!maSearchThread.is()); maSearchThread = new SearchThread( - this, static_cast< TPGalleryThemeProperties * >(parent_), startUrl_); + this, static_cast< TPGalleryThemeProperties * >(parent_.get()), startUrl_); maSearchThread->launch(); ModalDialog::StartExecuteModal( rEndDialogHdl ); } @@ -345,6 +358,19 @@ TakeProgress::TakeProgress(vcl::Window* pWindow) m_pBtnCancel->SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) ); } +TakeProgress::~TakeProgress() +{ + dispose(); +} + +void TakeProgress::dispose() +{ + m_pFtTakeFile.clear(); + m_pBtnCancel.clear(); + window_.clear(); + ModalDialog::dispose(); +} + void TakeProgress::Terminate() { if (maTakeThread.is()) @@ -425,7 +451,7 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl ) { assert(!maTakeThread.is()); maTakeThread = new TakeThread( - this, static_cast< TPGalleryThemeProperties * >(window_), maTakenList); + this, static_cast< TPGalleryThemeProperties * >(window_.get()), maTakenList); maTakeThread->launch(); ModalDialog::StartExecuteModal( rEndDialogHdl ); } @@ -443,6 +469,18 @@ ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm) m_pBtnCancel->SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) ); } +ActualizeProgress::~ActualizeProgress() +{ + dispose(); +} + +void ActualizeProgress::dispose() +{ + m_pFtActualizeFile.clear(); + m_pBtnCancel.clear(); + ModalDialog::dispose(); +} + short ActualizeProgress::Execute() { short nRet; @@ -511,6 +549,17 @@ TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle) m_pEdit->GrabFocus(); } +TitleDialog::~TitleDialog() +{ + dispose(); +} + +void TitleDialog::dispose() +{ + m_pEdit.clear(); + ModalDialog::dispose(); +} + // - GalleryIdDialog - @@ -532,7 +581,17 @@ GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm ) m_pBtnOk->SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) ); } +GalleryIdDialog::~GalleryIdDialog() +{ + dispose(); +} +void GalleryIdDialog::dispose() +{ + m_pBtnOk.clear(); + m_pLbResName.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) { @@ -616,6 +675,22 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItem get(m_pFtMSShowChangeDate, "modified"); } +TPGalleryThemeGeneral::~TPGalleryThemeGeneral() +{ + dispose(); +} + +void TPGalleryThemeGeneral::dispose() +{ + m_pFiMSImage.clear(); + m_pEdtMSName.clear(); + m_pFtMSShowType.clear(); + m_pFtMSShowPath.clear(); + m_pFtMSShowContent.clear(); + m_pFtMSShowChangeDate.clear(); + SfxTabPage::dispose(); +} + void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) { pData = _pData; @@ -769,6 +844,13 @@ void TPGalleryThemeProperties::dispose() } aFilterEntryList.clear(); + m_pCbbFileType.clear(); + m_pLbxFound.clear(); + m_pBtnSearch.clear(); + m_pBtnTake.clear(); + m_pBtnTakeAll.clear(); + m_pCbxPreview.clear(); + m_pWndPreview.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 9eb47497865e..6fd0cf74a4c7 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -153,6 +153,16 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent, mpPreview->init(&rGraphic, maModifyHdl); } +GraphicFilterDialog::~GraphicFilterDialog() +{ + dispose(); +} + +void GraphicFilterDialog::dispose() +{ + mpPreview.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl) @@ -204,7 +214,18 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r mpMtrWidth->GrabFocus(); } +GraphicFilterMosaic::~GraphicFilterMosaic() +{ + dispose(); +} +void GraphicFilterMosaic::dispose() +{ + mpMtrWidth.clear(); + mpMtrHeight.clear(); + mpCbxEdges.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) @@ -257,6 +278,16 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r mpMtrRadius->GrabFocus(); } +GraphicFilterSmooth::~GraphicFilterSmooth() +{ + dispose(); +} + +void GraphicFilterSmooth::dispose() +{ + mpMtrRadius.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) @@ -305,6 +336,17 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi mpCbxInvert->SetToggleHdl( GetModifyHdl() ); } +GraphicFilterSolarize::~GraphicFilterSolarize() +{ + dispose(); +} + +void GraphicFilterSolarize::dispose() +{ + mpMtrThreshold.clear(); + mpCbxInvert.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, @@ -356,6 +398,16 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr mpMtrSepia->SetModifyHdl( GetModifyHdl() ); } +GraphicFilterSepia::~GraphicFilterSepia() +{ + dispose(); +} + +void GraphicFilterSepia::dispose() +{ + mpMtrSepia.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, @@ -399,6 +451,16 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG mpNumPoster->SetModifyHdl( GetModifyHdl() ); } +GraphicFilterPoster::~GraphicFilterPoster() +{ + dispose(); +} + +void GraphicFilterPoster::dispose() +{ + mpNumPoster.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, @@ -462,6 +524,16 @@ GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent, mpCtlLight->GrabFocus(); } +GraphicFilterEmboss::~GraphicFilterEmboss() +{ + dispose(); +} + +void GraphicFilterEmboss::dispose() +{ + mpCtlLight.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 118da3fc5c50..d86558bccdba 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -73,4 +73,19 @@ URLDlg::URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlt m_pCbbTargets->SetText( rTarget ); } +URLDlg::~URLDlg() +{ + dispose(); +} + +void URLDlg::dispose() +{ + m_pEdtURL.clear(); + m_pCbbTargets.clear(); + m_pEdtName.clear(); + m_pEdtAlternativeText.clear(); + m_pEdtDescription.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 46ae5b5e78d6..1670025e3195 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -41,4 +41,15 @@ FmInputRecordNoDialog::FmInputRecordNoDialog(vcl::Window * pParent) m_pRecordNo->SetDecimalDigits(0); } +FmInputRecordNoDialog::~FmInputRecordNoDialog() +{ + dispose(); +} + +void FmInputRecordNoDialog::dispose() +{ + m_pRecordNo.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 4a49494243d1..3aa778fac86f 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -45,6 +45,19 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl)); } +SvxNameDialog::~SvxNameDialog() +{ + dispose(); +} + +void SvxNameDialog::dispose() +{ + pFtDescription.clear(); + pEdtName.clear(); + pBtnOK.clear(); + ModalDialog::dispose(); +} + IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) { if(aCheckNameHdl.IsSet()) @@ -73,6 +86,19 @@ SvxObjectNameDialog::SvxObjectNameDialog( pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl)); } +SvxObjectNameDialog::~SvxObjectNameDialog() +{ + dispose(); +} + +void SvxObjectNameDialog::dispose() +{ + pEdtName.clear(); + pBtnOK.clear(); + ModalDialog::dispose(); +} + + IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl) { if(aCheckNameHdl.IsSet()) @@ -105,6 +131,17 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( pEdtTitle->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); } +SvxObjectTitleDescDialog::~SvxObjectTitleDescDialog() +{ + dispose(); +} + +void SvxObjectTitleDescDialog::dispose() +{ + pEdtTitle.clear(); + pEdtDescription.clear(); + ModalDialog::dispose(); +} /************************************************************************* @@ -145,6 +182,10 @@ void SvxMessDialog::dispose() { delete pImage; pImage = NULL; + pFtDescription.clear(); + pBtn1.clear(); + pBtn2.clear(); + pFtImage.clear(); ModalDialog::dispose(); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 6d8e10123d7f..273bffaa70f9 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -605,6 +605,35 @@ namespace svx m_pSuggestions->SetHelpIds(); } + HangulHanjaConversionDialog::~HangulHanjaConversionDialog() + { + dispose(); + } + + void HangulHanjaConversionDialog::dispose() + { + m_pFind.clear(); + m_pIgnore.clear(); + m_pIgnoreAll.clear(); + m_pReplace.clear(); + m_pReplaceAll.clear(); + m_pOptions.clear(); + m_pSuggestions.clear(); + m_pSimpleConversion.clear(); + m_pHangulBracketed.clear(); + m_pHanjaBracketed.clear(); + m_pWordInput.clear(); + m_pOriginalWord.clear(); + m_pHanjaAbove.clear(); + m_pHanjaBelow.clear(); + m_pHangulAbove.clear(); + m_pHangulBelow.clear(); + m_pHangulOnly.clear(); + m_pHanjaOnly.clear(); + m_pReplaceByChar.clear(); + m_pIgnoreNonPrimary.clear(); + ModalDialog::dispose(); + } void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ) { @@ -1139,17 +1168,28 @@ namespace svx void HangulHanjaOptionsDialog::dispose() { - SvTreeListEntry* pEntry = m_pDictsLB->First(); - while( pEntry ) + if (m_pDictsLB) { - delete static_cast(pEntry->GetUserData()); - pEntry->SetUserData(NULL); - pEntry = m_pDictsLB->Next( pEntry ); + SvTreeListEntry* pEntry = m_pDictsLB->First(); + while( pEntry ) + { + delete static_cast(pEntry->GetUserData()); + pEntry->SetUserData( NULL ); + pEntry = m_pDictsLB->Next( pEntry ); + } } delete m_pCheckButtonData; m_pCheckButtonData = NULL; + m_pDictsLB.clear(); + m_pIgnorepostCB.clear(); + m_pShowrecentlyfirstCB.clear(); + m_pAutoreplaceuniqueCB.clear(); + m_pNewPB.clear(); + m_pEditPB.clear(); + m_pDeletePB.clear(); + m_pOkPB.clear(); ModalDialog::dispose(); } @@ -1197,6 +1237,18 @@ namespace svx m_pDictNameED->SetModifyHdl( LINK( this, HangulHanjaNewDictDialog, ModifyHdl ) ); } + HangulHanjaNewDictDialog::~HangulHanjaNewDictDialog() + { + dispose(); + } + + void HangulHanjaNewDictDialog::dispose() + { + m_pDictNameED.clear(); + m_pOkBtn.clear(); + ModalDialog::dispose(); + } + bool HangulHanjaNewDictDialog::GetName( OUString& _rRetName ) const { if( m_bEntered ) @@ -1372,6 +1424,19 @@ namespace svx { } + SuggestionEdit::~SuggestionEdit() + { + dispose(); + } + + void SuggestionEdit::dispose() + { + m_pPrev.clear(); + m_pNext.clear(); + m_pScrollBar.clear(); + Edit::dispose(); + } + bool SuggestionEdit::PreNotify( NotifyEvent& rNEvt ) { bool nHandled = false; @@ -1787,6 +1852,15 @@ namespace svx { delete m_pSuggestions; m_pSuggestions = NULL; + m_aBookLB.clear(); + m_aOriginalLB.clear(); + m_aEdit1.clear(); + m_aEdit2.clear(); + m_aEdit3.clear(); + m_aEdit4.clear(); + m_aScrollSB.clear(); + m_aNewPB.clear(); + m_aDeletePB.clear(); ModalDialog::dispose(); } diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index ad1e7fafc64b..a02ff7d2eccd 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -140,6 +140,11 @@ void SvxHyperlinkNewDocTp::dispose() delete static_cast(m_pLbDocTypes->GetEntryData ( n )); m_pLbDocTypes = NULL; } + m_pRbtEditNow.clear(); + m_pRbtEditLater.clear(); + m_pCbbPath.clear(); + m_pBtCreate.clear(); + m_pLbDocTypes.clear(); SvxHyperlinkTabPageBase::dispose(); } diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 2e45746d7684..0a3f26922171 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -71,6 +71,21 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) ); } +SvxHyperlinkDocTp::~SvxHyperlinkDocTp() +{ + dispose(); +} + +void SvxHyperlinkDocTp::dispose() +{ + m_pCbbPath.clear(); + m_pBtFileopen.clear(); + m_pEdTarget.clear(); + m_pFtFullURL.clear(); + m_pBtBrowse.clear(); + SvxHyperlinkTabPageBase::dispose(); +} + /************************************************************************* |* |* Fill all dialog-controls except controls in groupbox "more..." diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 73ea0ddc6220..61760d772156 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -81,6 +81,25 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) ); } +SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp() +{ + dispose(); +} + +void SvxHyperlinkInternetTp::dispose() +{ + m_pRbtLinktypInternet.clear(); + m_pRbtLinktypFTP.clear(); + m_pCbbTarget.clear(); + m_pBtBrowse.clear(); + m_pFtLogin.clear(); + m_pEdLogin.clear(); + m_pFtPassword.clear(); + m_pEdPassword.clear(); + m_pCbAnonymous.clear(); + SvxHyperlinkTabPageBase::dispose(); +} + /************************************************************************* |* |* Fill the all dialog-controls except controls in groupbox "more..." @@ -397,7 +416,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) SfxBoolItem aBrowse( SID_BROWSE, true ); const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL }; - static_cast(mpDialog)->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); + static_cast(mpDialog.get())->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); return 0L; } diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index d110b292a73d..6e1da44b6fe4 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -66,6 +66,20 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* m_pBtAdrBook->Hide(); } +SvxHyperlinkMailTp::~SvxHyperlinkMailTp() +{ + dispose(); +} + +void SvxHyperlinkMailTp::dispose() +{ + m_pCbbReceiver.clear(); + m_pBtAdrBook.clear(); + m_pFtSubject.clear(); + m_pEdSubject.clear(); + SvxHyperlinkTabPageBase::dispose(); +} + /************************************************************************* |* |* Fill the all dialog-controls except controls in groupbox "more..." diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 02058c78c0ed..bfe9c67a1d60 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -72,6 +72,17 @@ SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle) SetNodeDefaultImages(); } +SvxHlmarkTreeLBox::~SvxHlmarkTreeLBox() +{ + dispose(); +} + +void SvxHlmarkTreeLBox::dispose() +{ + mpParentWnd.clear(); + SvTreeListBox::dispose(); +} + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHlmarkTreeLBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; @@ -156,6 +167,10 @@ SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd() void SvxHlinkDlgMarkWnd::dispose() { ClearTree(); + mpBtApply.clear(); + mpBtClose.clear(); + mpLbTree.clear(); + mpParent.clear(); ModalDialog::dispose(); } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 804442321f1d..7bc162e4c3f8 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -114,9 +114,13 @@ void SvxHyperlinkTabPageBase::dispose() { maTimer.Stop(); - delete mpMarkWnd; - mpMarkWnd = NULL; - + mpCbbFrame.clear(); + mpLbForm.clear(); + mpEdIndication.clear(); + mpEdText.clear(); + mpBtScript.clear(); + mpDialog.clear(); + mpMarkWnd.clear(); IconChoicePage::dispose(); } @@ -291,13 +295,13 @@ void SvxHyperlinkTabPageBase::SetInitFocus() // Ask dialog whether the curretn doc is a HTML-doc bool SvxHyperlinkTabPageBase::IsHTMLDoc() const { - return static_cast(mpDialog)->IsHTMLDoc(); + return static_cast(mpDialog.get())->IsHTMLDoc(); } // retrieve dispatcher SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const { - return static_cast(mpDialog)->GetDispatcher(); + return static_cast(mpDialog.get())->GetDispatcher(); } // Click on imagebutton : Script diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index af6d29876456..8c4ea99822f4 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -512,6 +512,24 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( Enable( false ); } +SvxHyphenWordDialog::~SvxHyphenWordDialog() +{ + dispose(); +} + +void SvxHyphenWordDialog::dispose() +{ + m_pWordEdit.clear(); + m_pLeftBtn.clear(); + m_pRightBtn.clear(); + m_pOkBtn.clear(); + m_pContBtn.clear(); + m_pDelBtn.clear(); + m_pHyphAll.clear(); + m_pCloseBtn.clear(); + SfxModalDialog::dispose(); +} + void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang ) { diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 0a1c70e7d70b..712d78fa969f 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -52,6 +52,16 @@ IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID, } +IconChoicePage::~IconChoicePage() +{ + dispose(); +} + +void IconChoicePage::dispose() +{ + pDialog.clear(); + TabPage::dispose(); +} /********************************************************************** | @@ -246,7 +256,6 @@ void IconChoiceDialog::dispose() SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i ); delete static_cast(pEntry->GetUserData()); } - m_pIconCtrl = NULL; } delete pRanges; @@ -254,6 +263,13 @@ void IconChoiceDialog::dispose() delete pOutSet; pOutSet = NULL; + m_pIconCtrl.clear(); + m_pOKBtn.clear(); + m_pApplyBtn.clear(); + m_pCancelBtn.clear(); + m_pHelpBtn.clear(); + m_pResetBtn.clear(); + m_pTabContainer.clear(); ModalDialog::dispose(); } @@ -540,7 +556,7 @@ bool IconChoiceDialog::DeActivatePageImpl () for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { IconChoicePageData* pObj = maPageList[ i ]; - if ( pObj->pPage != pPage ) + if ( pObj->pPage.get() != pPage ) pObj->bRefresh = true; else pObj->bRefresh = false; diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 4131c40c5c8a..db3bf1fef153 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -191,6 +191,24 @@ SvInsertOleDlg::SvInsertOleDlg RadioHdl( NULL ); } +SvInsertOleDlg::~SvInsertOleDlg() +{ + dispose(); +} + +void SvInsertOleDlg::dispose() +{ + m_pRbNewObject.clear(); + m_pRbObjectFromfile.clear(); + m_pObjectTypeFrame.clear(); + m_pLbObjecttype.clear(); + m_pFileFrame.clear(); + m_pEdFilepath.clear(); + m_pBtnFilepath.clear(); + m_pCbFilelink.clear(); + InsertObjectDialog_Impl::dispose(); +} + short SvInsertOleDlg::Execute() { short nRet = RET_OK; @@ -402,6 +420,9 @@ void SvInsertPlugInDialog::dispose() { delete m_pURL; m_pURL = NULL; + m_pEdFileurl.clear(); + m_pBtnFileurl.clear(); + m_pEdPluginsOptions.clear(); InsertObjectDialog_Impl::dispose(); } @@ -494,6 +515,30 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent Init(); } +SfxInsertFloatingFrameDialog::~SfxInsertFloatingFrameDialog() +{ + dispose(); +} + +void SfxInsertFloatingFrameDialog::dispose() +{ + m_pEDName.clear(); + m_pEDURL.clear(); + m_pBTOpen.clear(); + m_pRBScrollingOn.clear(); + m_pRBScrollingOff.clear(); + m_pRBScrollingAuto.clear(); + m_pRBFrameBorderOn.clear(); + m_pRBFrameBorderOff.clear(); + m_pFTMarginWidth.clear(); + m_pNMMarginWidth.clear(); + m_pCBMarginWidthDefault.clear(); + m_pFTMarginHeight.clear(); + m_pNMMarginHeight.clear(); + m_pCBMarginHeightDefault.clear(); + InsertObjectDialog_Impl::dispose(); +} + void SfxInsertFloatingFrameDialog::Init() { get(m_pEDName, "edname"); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index c3c167cca62d..75e85733940b 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -45,6 +45,19 @@ SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& SetHelpId( sHelpId ); } +SvxInsRowColDlg::~SvxInsRowColDlg() +{ + dispose(); +} + +void SvxInsRowColDlg::dispose() +{ + m_pCountEdit.clear(); + m_pBeforeBtn.clear(); + m_pAfterBtn.clear(); + ModalDialog::dispose(); +} + short SvxInsRowColDlg::Execute(void) { return ModalDialog::Execute(); diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 95c348d0a364..68a9c19b375b 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -143,6 +143,26 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b SetManager( pMgr ); } +SvBaseLinksDlg::~SvBaseLinksDlg() +{ + dispose(); +} + +void SvBaseLinksDlg::dispose() +{ + m_pTbLinks.clear(); + m_pFtFullFileName.clear(); + m_pFtFullSourceName.clear(); + m_pFtFullTypeName.clear(); + m_pRbAutomatic.clear(); + m_pRbManual.clear(); + m_pPbUpdateNow.clear(); + m_pPbOpenSource.clear(); + m_pPbChangeSource.clear(); + m_pPbBreakLink.clear(); + ModalDialog::dispose(); +} + /************************************************************************* |* SvBaseLinksDlg::Handler() *************************************************************************/ diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index ebb8fcdca031..9cbbef5f2160 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -229,16 +229,19 @@ SvxMultiPathDialog::~SvxMultiPathDialog() void SvxMultiPathDialog::dispose() { - sal_uInt16 nPos = (sal_uInt16)m_pRadioLB->GetEntryCount(); - while ( nPos-- ) + if (m_pRadioLB) { - SvTreeListEntry* pEntry = m_pRadioLB->GetEntry( nPos ); - delete static_cast(pEntry->GetUserData()); + sal_uInt16 nPos = (sal_uInt16)m_pRadioLB->GetEntryCount(); + while ( nPos-- ) + { + SvTreeListEntry* pEntry = m_pRadioLB->GetEntry( nPos ); + delete static_cast(pEntry->GetUserData()); + } } - delete m_pRadioLB; - m_pRadioLB = NULL; - + m_pRadioLB.clear(); + m_pAddBtn.clear(); + m_pDelBtn.clear(); ModalDialog::dispose(); } @@ -254,8 +257,10 @@ void SvxPathSelectDialog::dispose() sal_uInt16 nPos = m_pPathLB->GetEntryCount(); while ( nPos-- ) delete static_cast(m_pPathLB->GetEntryData(nPos)); - m_pPathLB = NULL; } + m_pPathLB.clear(); + m_pAddBtn.clear(); + m_pDelBtn.clear(); ModalDialog::dispose(); } diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index ab9058c0c975..3c2cba513fef 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -28,6 +28,18 @@ SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent ) get(mpNumColumns, "columns"); } +SvxNewTableDialog::~SvxNewTableDialog() +{ + dispose(); +} + +void SvxNewTableDialog::dispose() +{ + mpNumColumns.clear(); + mpNumRows.clear(); + ModalDialog::dispose(); +} + short SvxNewTableDialog::Execute(void) { return ModalDialog::Execute(); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index ccba00009552..ad4e26bfc711 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -31,15 +31,15 @@ struct PasswordToOpenModifyDialog_Impl { - PasswordToOpenModifyDialog * m_pParent; - - Edit* m_pPasswdToOpenED; - Edit* m_pReenterPasswdToOpenED; - VclExpander* m_pOptionsExpander; - OKButton* m_pOk; - CheckBox* m_pOpenReadonlyCB; - Edit* m_pPasswdToModifyED; - Edit* m_pReenterPasswdToModifyED; + VclPtr m_pParent; + + VclPtr m_pPasswdToOpenED; + VclPtr m_pReenterPasswdToOpenED; + VclPtr m_pOptionsExpander; + VclPtr m_pOk; + VclPtr m_pOpenReadonlyCB; + VclPtr m_pPasswdToModifyED; + VclPtr m_pReenterPasswdToModifyED; OUString m_aOneMismatch; OUString m_aTwoMismatch; diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 90610557f6fb..f7ae8397c63b 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -52,6 +52,19 @@ SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent ) ObjectLB().SetDoubleClickHdl( LINK( this, SvPasteObjectDialog, DoubleClickHdl ) ); } +SvPasteObjectDialog::~SvPasteObjectDialog() +{ + dispose(); +} + +void SvPasteObjectDialog::dispose() +{ + m_pFtObjectSource.clear(); + m_pLbInsertList.clear(); + m_pOKButton.clear(); + ModalDialog::dispose(); +} + void SvPasteObjectDialog::SelectObject() { if (m_pLbInsertList->GetEntryCount()) diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 86d0e5812f32..175d889a1e71 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -131,6 +131,13 @@ void SvxPostItDialog::dispose() { delete pOutSet; pOutSet = 0; + m_pLastEditFT.clear(); + m_pEditED.clear(); + m_pInsertAuthor.clear(); + m_pAuthorBtn.clear(); + m_pOKBtn.clear(); + m_pPrevBtn.clear(); + m_pNextBtn.clear(); SfxModalDialog::dispose(); } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 4013f71e6925..a5db7a283c0b 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -443,6 +443,17 @@ CuiInputDialog::CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode ) } } +CuiInputDialog::~CuiInputDialog() +{ + dispose(); +} + +void CuiInputDialog::dispose() +{ + m_pEdit.clear(); + ModalDialog::dispose(); +} + // ScriptOrgDialog ------------------------------------------------------------ @@ -500,6 +511,13 @@ void SvxScriptOrgDialog::dispose() { // clear the SelectHdl so that it isn't called during the dtor m_pScriptsBox->SetSelectHdl( Link() ); + m_pScriptsBox.clear(); + m_pRunButton.clear(); + m_pCloseButton.clear(); + m_pCreateButton.clear(); + m_pEditButton.clear(); + m_pRenameButton.clear(); + m_pDelButton.clear(); SfxModalDialog::dispose(); }; diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 94e286ecd92d..a58c9417bffa 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -39,6 +39,17 @@ FmShowColsDialog::FmShowColsDialog(vcl::Window* pParent) m_pOK->SetClickHdl( LINK( this, FmShowColsDialog, OnClickedOk ) ); } +FmShowColsDialog::~FmShowColsDialog() +{ + dispose(); +} + +void FmShowColsDialog::dispose() +{ + m_pList.clear(); + m_pOK.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) { diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index edce7998effe..171ea3a1bdc9 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -53,6 +53,20 @@ SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical, } } +SvxSplitTableDlg::~SvxSplitTableDlg() +{ + dispose(); +} + +void SvxSplitTableDlg::dispose() +{ + m_pCountEdit.clear(); + m_pHorzBox.clear(); + m_pVertBox.clear(); + m_pPropCB.clear(); + SvxStandardDialog::dispose(); +} + IMPL_LINK( SvxSplitTableDlg, ClickHdl, Button *, pButton ) { const bool bIsVert = pButton == m_pVertBox ; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index bb797e3d4dd8..4d1541347c71 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -178,6 +178,17 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent, m_pAttrLB->SelectEntryPos( 0 ); } +SvxSearchAttributeDialog::~SvxSearchAttributeDialog() +{ + dispose(); +} + +void SvxSearchAttributeDialog::dispose() +{ + m_pAttrLB.clear(); + m_pOKBtn.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) @@ -248,4 +259,18 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog m_pRelaxBox->Check( bRelax ); } +SvxSearchSimilarityDialog::~SvxSearchSimilarityDialog() +{ + dispose(); +} + +void SvxSearchSimilarityDialog::dispose() +{ + m_pOtherFld.clear(); + m_pLongerFld.clear(); + m_pShorterFld.clear(); + m_pRelaxBox.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index c0afe2a2c430..8a47ac55a292 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -66,6 +66,17 @@ LookUpComboBox::LookUpComboBox(vcl::Window *pParent) EnableAutocomplete( false ); } +LookUpComboBox::~LookUpComboBox() +{ + dispose(); +} + +void LookUpComboBox::dispose() +{ + m_pDialog.clear(); + ComboBox::dispose(); +} + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLookUpComboBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new LookUpComboBox(pParent); @@ -96,6 +107,18 @@ ReplaceEdit::ReplaceEdit(vcl::Window *pParent) { } +ReplaceEdit::~ReplaceEdit() +{ + dispose(); +} + +void ReplaceEdit::dispose() +{ + m_pBtn.clear(); + Edit::dispose(); +} + + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeReplaceEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new ReplaceEdit(pParent); @@ -176,6 +199,7 @@ ThesaurusAlternativesCtrl::~ThesaurusAlternativesCtrl() void ThesaurusAlternativesCtrl::dispose() { ClearExtraData(); + m_pDialog.clear(); SvxCheckListBox::dispose(); } @@ -514,6 +538,21 @@ SvxThesaurusDialog::SvxThesaurusDialog( Enable( false ); } +SvxThesaurusDialog::~SvxThesaurusDialog() +{ + dispose(); +} + +void SvxThesaurusDialog::dispose() +{ + m_pLeftBtn.clear(); + m_pWordCB.clear(); + m_pAlternativesCT.clear(); + m_pReplaceEdit.clear(); + m_pLangLB.clear(); + SvxStandardDialog::dispose(); +} + IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, EMPTYARG /*pBtn*/ ) { EndDialog(RET_OK); diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 190a0619b7d7..451de5506da4 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -297,6 +297,19 @@ void SvxZoomDialog::dispose() { delete pOutSet; pOutSet = 0; + m_pOptimalBtn.clear(); + m_pWholePageBtn.clear(); + m_pPageWidthBtn.clear(); + m_p100Btn.clear(); + m_pUserBtn.clear(); + m_pUserEdit.clear(); + m_pViewFrame.clear(); + m_pAutomaticBtn.clear(); + m_pSingleBtn.clear(); + m_pColumnsBtn.clear(); + m_pColumnsEdit.clear(); + m_pBookModeChk.clear(); + m_pOKBtn.clear(); SfxModalDialog::dispose(); } diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx index 8bb9d51ef1f6..754d8b47a092 100644 --- a/cui/source/factory/cuiexp.cxx +++ b/cui/source/factory/cuiexp.cxx @@ -17,6 +17,35 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sfx2/basedlgs.hxx" +#include "cuigaldlg.hxx" +#include "hlmarkwn.hxx" +#include "srchxtra.hxx" +#include "cuisrchdlg.hxx" +#include "transfrm.hxx" +#include "labdlg.hxx" +#include "cuitbxform.hxx" +#include "optdict.hxx" +#include "dlgname.hxx" +#include "cuiimapwnd.hxx" +#include "multipat.hxx" +#include "cuifmsearch.hxx" +#include "cuigrfflt.hxx" +#include "cuitabarea.hxx" +#include "insdlg.hxx" +#include "pastedlg.hxx" +#include "linkdlg.hxx" +#include "postdlg.hxx" +#include "passwdomdlg.hxx" +#include "cuihyperdlg.hxx" +#include "selector.hxx" +#include "SpellDialog.hxx" +#include "zoom.hxx" +#include "showcols.hxx" +#include "hyphen.hxx" +#include "thesdlg.hxx" +#include "hangulhanjadlg.hxx" +#include "dstribut.hxx" #include "dlgfact.hxx" #include "sal/types.h" diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index f2f368ad4dc1..4043f8c5f9ad 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -107,7 +107,6 @@ IMPL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl) AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl() \ { - delete pDlg; } short AbstractSvxZoomDialog_Impl::Execute() { @@ -154,7 +153,6 @@ IMPL_ABSTDLG_BASE(AbstractPasswordToOpenModifyDialog_Impl); // virtual VclAbstractDialog2_Impl::~VclAbstractDialog2_Impl() { - delete m_pDlg; } // virtual diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index ffb15778c5e1..d356bbab2181 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -61,7 +61,7 @@ class HangulHanjaConversionDialog; using namespace svx; #define DECL_ABSTDLG_BASE(Class,DialogClass) \ - DialogClass* pDlg; \ + VclPtr pDlg; \ public: \ Class( DialogClass* p) \ : pDlg(p) \ @@ -72,7 +72,6 @@ public: \ #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ { \ - delete pDlg; \ } \ short Class::Execute() \ { \ @@ -81,7 +80,7 @@ short Class::Execute() \ class VclAbstractDialog2_Impl : public VclAbstractDialog2 { - Dialog* m_pDlg; + VclPtr m_pDlg; Link m_aEndDlgHdl; public: VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index b984838fa09c..6530f3cf6740 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -26,11 +26,13 @@ class SvxControlFocusHelper : public Control { private: - Control* m_pFocusCtrl; + VclPtr m_pFocusCtrl; public: SvxControlFocusHelper( vcl::Window* pParent, const ResId& rId ) : Control( pParent, rId ), m_pFocusCtrl( NULL ) {} + virtual ~SvxControlFocusHelper(); + virtual void dispose() SAL_OVERRIDE; void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index e24334bd14b6..411df36dd123 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -124,33 +124,33 @@ class SpellDialog : public SfxModelessDialog friend class SentenceEditWindow_Impl; private: - FixedText* m_pLanguageFT; - SvxLanguageBox* m_pLanguageLB; + VclPtr m_pLanguageFT; + VclPtr m_pLanguageLB; - FixedText* m_pExplainFT; - FixedHyperlink* m_pExplainLink; + VclPtr m_pExplainFT; + VclPtr m_pExplainLink; - FixedText* m_pNotInDictFT; - SentenceEditWindow_Impl* m_pSentenceED; + VclPtr m_pNotInDictFT; + VclPtr m_pSentenceED; - FixedText* m_pSuggestionFT; - ListBox* m_pSuggestionLB; + VclPtr m_pSuggestionFT; + VclPtr m_pSuggestionLB; - PushButton* m_pIgnorePB; - PushButton* m_pIgnoreAllPB; - PushButton* m_pIgnoreRulePB; - PushButton* m_pAddToDictPB; - MenuButton* m_pAddToDictMB; + VclPtr m_pIgnorePB; + VclPtr m_pIgnoreAllPB; + VclPtr m_pIgnoreRulePB; + VclPtr m_pAddToDictPB; + VclPtr m_pAddToDictMB; - PushButton* m_pChangePB; - PushButton* m_pChangeAllPB; - PushButton* m_pAutoCorrPB; + VclPtr m_pChangePB; + VclPtr m_pChangeAllPB; + VclPtr m_pAutoCorrPB; - CheckBox* m_pCheckGrammarCB; + VclPtr m_pCheckGrammarCB; - PushButton* m_pOptionsPB; - PushButton* m_pUndoPB; - CloseButton* m_pClosePB; + VclPtr m_pOptionsPB; + VclPtr m_pUndoPB; + VclPtr m_pClosePB; OUString m_sResumeST; OUString m_sIgnoreOnceST; diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 132ab541702e..82cfac00ee18 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -34,13 +34,13 @@ private: BitmapEx aBackgroundBitmap; BitmapEx aLogoBitmap; - VclMultiLineEdit* m_pVersion; - FixedText* m_pDescriptionText; - FixedText* m_pCopyrightText; - FixedImage* m_pLogoImage; - FixedText* m_pLogoReplacement; - PushButton* m_pCreditsButton; - PushButton* m_pWebsiteButton; + VclPtr m_pVersion; + VclPtr m_pDescriptionText; + VclPtr m_pCopyrightText; + VclPtr m_pLogoImage; + VclPtr m_pLogoReplacement; + VclPtr m_pCreditsButton; + VclPtr m_pWebsiteButton; OUString m_aVersionTextStr; OUString m_aVendorTextStr; @@ -66,6 +66,8 @@ protected: public: AboutDialog(vcl::Window* pParent); + virtual ~AboutDialog(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( HandleClick, PushButton* ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index dc156cc914c6..6c487cabc80f 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -53,7 +53,7 @@ class SfxStringItem; class SfxAccCfgTabListBox_Impl : public SvTabListBox { - SfxAcceleratorConfigPage* m_pAccelConfigPage; + VclPtr m_pAccelConfigPage; void KeyInput( const KeyEvent &rKEvt ) SAL_OVERRIDE; @@ -67,6 +67,8 @@ public: , m_pAccelConfigPage(NULL) { } + virtual ~SfxAccCfgTabListBox_Impl(); + virtual void dispose() SAL_OVERRIDE; void SetAccelConfigPage(SfxAcceleratorConfigPage* pAccelConfigPage) { @@ -118,17 +120,17 @@ private: const SfxStringItem* m_pFontItem; sfx2::FileDialogHelper* m_pFileDlg; - SfxAccCfgTabListBox_Impl* m_pEntriesBox; - RadioButton* m_pOfficeButton; - RadioButton* m_pModuleButton; - PushButton* m_pChangeButton; - PushButton* m_pRemoveButton; - SfxConfigGroupListBox* m_pGroupLBox; - SfxConfigFunctionListBox* m_pFunctionBox; - SvTreeListBox* m_pKeyBox; - PushButton* m_pLoadButton; - PushButton* m_pSaveButton; - PushButton* m_pResetButton; + VclPtr m_pEntriesBox; + VclPtr m_pOfficeButton; + VclPtr m_pModuleButton; + VclPtr m_pChangeButton; + VclPtr m_pRemoveButton; + VclPtr m_pGroupLBox; + VclPtr m_pFunctionBox; + VclPtr m_pKeyBox; + VclPtr m_pLoadButton; + VclPtr m_pSaveButton; + VclPtr m_pResetButton; OUString aLoadAccelConfigStr; OUString aSaveAccelConfigStr; OUString aFilterAllStr; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 3f56d128e87b..0be6bc61d698 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -79,36 +79,36 @@ private: DECL_LINK( UpdateEnableHdl, void* ); private: - ListBox* m_pLbHorAlign; - FixedText* m_pFtIndent; - MetricField* m_pEdIndent; - FixedText* m_pFtVerAlign; - ListBox* m_pLbVerAlign; - - DialControl* m_pCtrlDial; - FixedText* m_pFtRotate; - NumericField* m_pNfRotate; - FixedText* m_pFtRefEdge; - ValueSet* m_pVsRefEdge; - TriStateBox* m_pCbStacked; - TriStateBox* m_pCbAsianMode; + VclPtr m_pLbHorAlign; + VclPtr m_pFtIndent; + VclPtr m_pEdIndent; + VclPtr m_pFtVerAlign; + VclPtr m_pLbVerAlign; + + VclPtr m_pCtrlDial; + VclPtr m_pFtRotate; + VclPtr m_pNfRotate; + VclPtr m_pFtRefEdge; + VclPtr m_pVsRefEdge; + VclPtr m_pCbStacked; + VclPtr m_pCbAsianMode; OrientationHelper* m_pOrientHlp; - VclHBox* m_pBoxDirection; - TriStateBox* m_pBtnWrap; - TriStateBox* m_pBtnHyphen; - TriStateBox* m_pBtnShrink; - FrameDirListBox* m_pLbFrameDir; + VclPtr m_pBoxDirection; + VclPtr m_pBtnWrap; + VclPtr m_pBtnHyphen; + VclPtr m_pBtnShrink; + VclPtr m_pLbFrameDir; // hidden labels/string - FixedText* m_pFtBotLock; - FixedText* m_pFtTopLock; - FixedText* m_pFtCelLock; - FixedText* m_pFtABCD; - - VclContainer* m_pAlignmentFrame; - VclContainer* m_pOrientFrame; - VclContainer* m_pPropertiesFrame; + VclPtr m_pFtBotLock; + VclPtr m_pFtTopLock; + VclPtr m_pFtCelLock; + VclPtr m_pFtABCD; + + VclPtr m_pAlignmentFrame; + VclPtr m_pOrientFrame; + VclPtr m_pPropertiesFrame; }; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 17e2bb64b66f..bed9ffc9b533 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -43,8 +43,8 @@ namespace editeng { class SortedAutoCompleteStrings; } class OfaAutoCorrDlg : public SfxTabDialog { - VclContainer* m_pLanguageBox; - SvxLanguageBox* m_pLanguageLB; + VclPtr m_pLanguageBox; + VclPtr m_pLanguageLB; sal_uInt16 m_nReplacePageId; sal_uInt16 m_nExceptionsPageId; @@ -53,6 +53,8 @@ class OfaAutoCorrDlg : public SfxTabDialog public: OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); + virtual ~OfaAutoCorrDlg(); + virtual void dispose() SAL_OVERRIDE; void EnableLanguage(bool bEnable); }; @@ -94,7 +96,7 @@ class OfaAutocorrOptionsPage : public SfxTabPage using TabPage::ActivatePage; private: - SvxCheckListBox *m_pCheckLB; + VclPtr m_pCheckLB; OUString m_sInput; OUString m_sDoubleCaps; @@ -107,6 +109,8 @@ private: public: OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet); + virtual ~OfaAutocorrOptionsPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -123,8 +127,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage { using TabPage::ActivatePage; - OfaACorrCheckListBox* m_pCheckLB; - PushButton* m_pEditPB; + VclPtr m_pCheckLB; + VclPtr m_pEditPB; OUString sDeleteEmptyPara; OUString sUseReplaceTbl; @@ -225,12 +229,12 @@ private: StringChangeTable aChangesTable; - CheckBox* m_pTextOnlyCB; - AutoCorrEdit* m_pShortED; - AutoCorrEdit* m_pReplaceED; - SvTabListBox* m_pReplaceTLB; - PushButton* m_pNewReplacePB; - PushButton* m_pDeleteReplacePB; + VclPtr m_pTextOnlyCB; + VclPtr m_pShortED; + VclPtr m_pReplaceED; + VclPtr m_pReplaceTLB; + VclPtr m_pNewReplacePB; + VclPtr m_pDeleteReplacePB; OUString sModify; OUString sNew; @@ -291,17 +295,17 @@ class OfaAutocorrExceptPage : public SfxTabPage using TabPage::DeactivatePage; private: - AutoCorrEdit* m_pAbbrevED; - ListBox* m_pAbbrevLB; - PushButton* m_pNewAbbrevPB; - PushButton* m_pDelAbbrevPB; - CheckBox* m_pAutoAbbrevCB; - - AutoCorrEdit* m_pDoubleCapsED; - ListBox* m_pDoubleCapsLB; - PushButton* m_pNewDoublePB; - PushButton* m_pDelDoublePB; - CheckBox* m_pAutoCapsCB; + VclPtr m_pAbbrevED; + VclPtr m_pAbbrevLB; + VclPtr m_pNewAbbrevPB; + VclPtr m_pDelAbbrevPB; + VclPtr m_pAutoAbbrevCB; + + VclPtr m_pDoubleCapsED; + VclPtr m_pDoubleCapsLB; + VclPtr m_pNewDoublePB; + VclPtr m_pDelDoublePB; + VclPtr m_pAutoCapsCB; StringsTable aStringsTable; CollatorWrapper* pCompareClass; @@ -338,29 +342,29 @@ class OfaQuoteTabPage : public SfxTabPage private: /// For anything but writer - SvxCheckListBox* m_pCheckLB; + VclPtr m_pCheckLB; /// Just for writer - OfaACorrCheckListBox* m_pSwCheckLB; + VclPtr m_pSwCheckLB; OUString sNonBrkSpace; OUString sOrdinal; SvLBoxButtonData* pCheckButtonData; - CheckBox* m_pSingleTypoCB; - PushButton* m_pSglStartQuotePB; - FixedText* m_pSglStartExFT; - PushButton* m_pSglEndQuotePB; - FixedText* m_pSglEndExFT; - PushButton* m_pSglStandardPB; + VclPtr m_pSingleTypoCB; + VclPtr m_pSglStartQuotePB; + VclPtr m_pSglStartExFT; + VclPtr m_pSglEndQuotePB; + VclPtr m_pSglEndExFT; + VclPtr m_pSglStandardPB; - CheckBox* m_pDoubleTypoCB; - PushButton* m_pDblStartQuotePB; - FixedText* m_pDblStartExFT; - PushButton* m_pDblEndQuotePB; - FixedText* m_pDblEndExFT; - PushButton* m_pDblStandardPB; + VclPtr m_pDoubleTypoCB; + VclPtr m_pDblStartQuotePB; + VclPtr m_pDblStartExFT; + VclPtr m_pDblEndQuotePB; + VclPtr m_pDblEndExFT; + VclPtr m_pDblStandardPB; OUString m_sStartQuoteDlg; OUString m_sEndQuoteDlg; @@ -401,31 +405,33 @@ class OfaAutoCompleteTabPage : public SfxTabPage public: class AutoCompleteMultiListBox : public MultiListBox { - OfaAutoCompleteTabPage* m_pPage; + VclPtr m_pPage; public: AutoCompleteMultiListBox(vcl::Window *pParent, WinBits nBits) : MultiListBox(pParent, nBits) , m_pPage(NULL) { } + virtual ~AutoCompleteMultiListBox(); + virtual void dispose() SAL_OVERRIDE; void SetPage(OfaAutoCompleteTabPage *pPage) { m_pPage = pPage; } virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; private: using TabPage::ActivatePage; - CheckBox* m_pCBActiv; /// m_pCBActiv; /// m_pCBAppendSpace;/// m_pCBAsTip; /// m_pCBCollect;/// m_pCBRemoveList;///<...save the list for later use... + + VclPtr m_pDCBExpandKey; + VclPtr m_pNFMinWordlen; + VclPtr m_pNFMaxEntries; + VclPtr m_pLBEntries; + VclPtr m_pPBEntries; editeng::SortedAutoCompleteStrings* m_pAutoCompleteList; sal_uInt16 m_nAutoCmpltListCnt; @@ -434,6 +440,8 @@ private: OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: + virtual ~OfaAutoCompleteTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -458,9 +466,9 @@ class OfaSmartTagOptionsTabPage : public SfxTabPage private: // controls - CheckBox* m_pMainCB; - SvxCheckListBox* m_pSmartTagTypesLB; - PushButton* m_pPropertiesPB; + VclPtr m_pMainCB; + VclPtr m_pSmartTagTypesLB; + VclPtr m_pPropertiesPB; /// construction via Create() OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -498,6 +506,8 @@ private: DECL_LINK(SelectHdl, void *); public: + virtual ~OfaSmartTagOptionsTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 9a0b126e3d8c..57142af5ebf0 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -73,39 +73,39 @@ private: virtual ~SvxBackgroundTabPage(); virtual void dispose() SAL_OVERRIDE; - VclContainer* m_pAsGrid; - FixedText* m_pSelectTxt; - ListBox* m_pLbSelect; - FixedText* m_pTblDesc; - ListBox* m_pTblLBox; - ListBox* m_pParaLBox; + VclPtr m_pAsGrid; + VclPtr m_pSelectTxt; + VclPtr m_pLbSelect; + VclPtr m_pTblDesc; + VclPtr m_pTblLBox; + VclPtr m_pParaLBox; - VclFrame* m_pBackGroundColorFrame; - SvxColorValueSet* m_pBackgroundColorSet; - BackgroundPreviewImpl* m_pPreviewWin1; + VclPtr m_pBackGroundColorFrame; + VclPtr m_pBackgroundColorSet; + VclPtr m_pPreviewWin1; - FixedText* m_pColTransFT;/// m_pColTransFT;/// m_pColTransMF; + VclPtr m_pBtnPreview; // Background Bitmap ---------------------------------- - VclContainer* m_pBitmapContainer; - VclContainer* m_pFileFrame; - PushButton* m_pBtnBrowse; - CheckBox* m_pBtnLink; - FixedText* m_pFtUnlinked; - FixedText* m_pFtFile; - - VclContainer* m_pTypeFrame; - RadioButton* m_pBtnPosition; - RadioButton* m_pBtnArea; - RadioButton* m_pBtnTile; - SvxRectCtl* m_pWndPosition; - - VclContainer* m_pGraphTransFrame;/// m_pBitmapContainer; + VclPtr m_pFileFrame; + VclPtr m_pBtnBrowse; + VclPtr m_pBtnLink; + VclPtr m_pFtUnlinked; + VclPtr m_pFtFile; + + VclPtr m_pTypeFrame; + VclPtr m_pBtnPosition; + VclPtr m_pBtnArea; + VclPtr m_pBtnTile; + VclPtr m_pWndPosition; + + VclPtr m_pGraphTransFrame;/// m_pGraphTransMF; + + VclPtr m_pPreviewWin2; // DDListBox for Writer ------------------------------- diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index b05df65dd9f9..ff4b48ab3c7b 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -45,6 +45,8 @@ class SvxBorderTabPage : public SfxTabPage static const sal_uInt16 pRanges[]; public: + virtual ~SvxBorderTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges() { return pRanges; } @@ -63,37 +65,37 @@ private: SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); // Controls - ValueSet* m_pWndPresets; - FixedText* m_pUserDefFT; - svx::FrameSelector* m_pFrameSel; - - LineListBox* m_pLbLineStyle; - ColorListBox* m_pLbLineColor; - MetricField* m_pLineWidthMF; - - VclContainer* m_pSpacingFrame; - FixedText* m_pLeftFT; - MetricField* m_pLeftMF; - FixedText* m_pRightFT; - MetricField* m_pRightMF; - FixedText* m_pTopFT; - MetricField* m_pTopMF; - FixedText* m_pBottomFT; - MetricField* m_pBottomMF; - CheckBox* m_pSynchronizeCB; - - VclContainer* m_pShadowFrame; - ValueSet* m_pWndShadows; - FixedText* m_pFtShadowSize; - MetricField* m_pEdShadowSize; - FixedText* m_pFtShadowColor; - ColorListBox* m_pLbShadowColor; - - - VclContainer* m_pPropertiesFrame;///< properties - "Merge with next paragraph" in Writer - CheckBox* m_pMergeWithNextCB; + VclPtr m_pWndPresets; + VclPtr m_pUserDefFT; + VclPtr m_pFrameSel; + + VclPtr m_pLbLineStyle; + VclPtr m_pLbLineColor; + VclPtr m_pLineWidthMF; + + VclPtr m_pSpacingFrame; + VclPtr m_pLeftFT; + VclPtr m_pLeftMF; + VclPtr m_pRightFT; + VclPtr m_pRightMF; + VclPtr m_pTopFT; + VclPtr m_pTopMF; + VclPtr m_pBottomFT; + VclPtr m_pBottomMF; + VclPtr m_pSynchronizeCB; + + VclPtr m_pShadowFrame; + VclPtr m_pWndShadows; + VclPtr m_pFtShadowSize; + VclPtr m_pEdShadowSize; + VclPtr m_pFtShadowColor; + VclPtr m_pLbShadowColor; + + + VclPtr m_pPropertiesFrame;///< properties - "Merge with next paragraph" in Writer + VclPtr m_pMergeWithNextCB; // #i29550# - CheckBox* m_pMergeAdjacentBordersCB; + VclPtr m_pMergeAdjacentBordersCB; ImageList aShadowImgLstH; ImageList aShadowImgLst; @@ -113,8 +115,8 @@ private: std::set maUsedBorderStyles; // Handler - DECL_LINK( SelStyleHdl_Impl, ListBox* pLb ); - DECL_LINK( SelColHdl_Impl, ListBox* pLb ); + DECL_LINK( SelStyleHdl_Impl, ListBox* ); + DECL_LINK( SelColHdl_Impl, ListBox* ); DECL_LINK( SelPreHdl_Impl, void* ); DECL_LINK( SelSdwHdl_Impl, void* ); DECL_LINK( LinesChanged_Impl, void* ); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index fd9ef1a858f1..759b1406d3e6 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -315,13 +315,15 @@ public: class SvxMenuEntriesListBox : public SvTreeListBox { private: - SvxConfigPage* pPage; + VclPtr pPage; protected: bool m_bIsInternalDrag; public: SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*); + virtual ~SvxMenuEntriesListBox(); + virtual void dispose() SAL_OVERRIDE; virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; @@ -358,30 +360,30 @@ protected: // the top section of the tab page where top level menus and toolbars // are displayed in a listbox - VclFrame* m_pTopLevel; - FixedText* m_pTopLevelLabel; - ListBox* m_pTopLevelListBox; - PushButton* m_pNewTopLevelButton; - MenuButton* m_pModifyTopLevelButton; + VclPtr m_pTopLevel; + VclPtr m_pTopLevelLabel; + VclPtr m_pTopLevelListBox; + VclPtr m_pNewTopLevelButton; + VclPtr m_pModifyTopLevelButton; // the contents section where the contents of the selected // menu or toolbar are displayed - VclFrame* m_pContents; - FixedText* m_pContentsLabel; - VclContainer* m_pEntries; - SvTreeListBox* m_pContentsListBox; + VclPtr m_pContents; + VclPtr m_pContentsLabel; + VclPtr m_pEntries; + VclPtr m_pContentsListBox; - PushButton* m_pAddCommandsButton; - MenuButton* m_pModifyCommandButton; + VclPtr m_pAddCommandsButton; + VclPtr m_pModifyCommandButton; - PushButton* m_pMoveUpButton; - PushButton* m_pMoveDownButton; + VclPtr m_pMoveUpButton; + VclPtr m_pMoveDownButton; - ListBox* m_pSaveInListBox; + VclPtr m_pSaveInListBox; - VclMultiLineEdit* m_pDescriptionField; + VclPtr m_pDescriptionField; - SvxScriptSelectorDialog* m_pSelectorDlg; + VclPtr m_pSelectorDlg; /// the ResourceURL to select when opening the dialog OUString m_aURLToSelect; @@ -409,7 +411,7 @@ protected: SvTreeListEntry* pTarget = NULL, bool bFront = false ); - void AddSubMenusToUI( const OUString& rBaseTitle, + void AddSubMenusToUI( const OUString& rBaseTitle, SvxConfigEntry* pParentData ); SvTreeListEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData, @@ -422,6 +424,9 @@ protected: public: + virtual ~SvxConfigPage(); + virtual void dispose() SAL_OVERRIDE; + static bool CanConfig( const OUString& rModuleId ); SaveInData* GetSaveInData() { return pCurrentSaveInData; } @@ -495,11 +500,11 @@ public: class SvxMainMenuOrganizerDialog : public ModalDialog { - VclContainer* m_pMenuBox; - Edit* m_pMenuNameEdit; - SvTreeListBox* m_pMenuListBox; - PushButton* m_pMoveUpButton; - PushButton* m_pMoveDownButton; + VclPtr m_pMenuBox; + VclPtr m_pMenuNameEdit; + VclPtr m_pMenuListBox; + VclPtr m_pMoveUpButton; + VclPtr m_pMoveDownButton; SvxEntries* mpEntries; SvTreeListEntry* pNewMenuEntry; @@ -515,6 +520,8 @@ public: SvxMainMenuOrganizerDialog ( vcl::Window*, SvxEntries*, SvxConfigEntry*, bool bCreateMenu = false ); + virtual ~SvxMainMenuOrganizerDialog(); + virtual void dispose() SAL_OVERRIDE; SvxEntries* GetEntries() { return mpEntries;} void SetEntries( SvxEntries* ); @@ -526,7 +533,7 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox Size m_aCheckBoxImageSizePixel; Link m_aChangedListener; SvLBoxButtonData* m_pButtonData; - SvxConfigPage* pPage; + VclPtr pPage; void ChangeVisibility( SvTreeListEntry* pEntry ); @@ -662,8 +669,8 @@ public: class SvxNewToolbarDialog : public ModalDialog { private: - Edit* m_pEdtName; - OKButton* m_pBtnOK; + VclPtr m_pEdtName; + VclPtr m_pBtnOK; Link aCheckNameHdl; @@ -671,8 +678,10 @@ private: public: SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName); + virtual ~SvxNewToolbarDialog(); + virtual void dispose() SAL_OVERRIDE; - ListBox* m_pSaveInListBox; + VclPtr m_pSaveInListBox; OUString GetName() { @@ -702,10 +711,10 @@ struct SvxIconSelectorToolBoxItem class SvxIconSelectorDialog : public ModalDialog { private: - ToolBox* pTbSymbol; - FixedText* pFtNote; - PushButton* pBtnImport; - PushButton* pBtnDelete; + VclPtr pTbSymbol; + VclPtr pFtNote; + VclPtr pBtnImport; + VclPtr pBtnDelete; Size aTbSize; sal_uInt16 m_nNextId; @@ -770,10 +779,12 @@ public: class SvxIconChangeDialog : public ModalDialog { private: - FixedImage* pFImageInfo; - VclMultiLineEdit* pLineEditDescription; + VclPtr pFImageInfo; + VclPtr pLineEditDescription; public: SvxIconChangeDialog(vcl::Window *pWindow, const OUString& aMessage); + virtual ~SvxIconChangeDialog(); + virtual void dispose() SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index e4e557d5912d..984e8e9e4c80 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -128,7 +128,7 @@ struct SvxConfigGroupBoxResource_Impl; class SfxConfigGroupListBox : public SvTreeListBox { SvxConfigGroupBoxResource_Impl* pImp; - SfxConfigFunctionListBox* pFunctionListBox; + VclPtr pFunctionListBox; SfxGroupInfoArr_Impl aArr; OUString m_sModuleLongName; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index da60c36ab965..f1075a93dfd7 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -47,7 +47,7 @@ class FontList; class SvxCharBasePage : public SfxTabPage { protected: - SvxFontPrevWindow* m_pPreviewWin; + VclPtr m_pPreviewWin; bool m_bPreviewBackgroundToCharacter; @@ -61,6 +61,9 @@ protected: inline SvxFont& GetPreviewCTLFont(); public: + virtual ~SvxCharBasePage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -77,38 +80,38 @@ class SvxCharNamePage : public SvxCharBasePage private: static const sal_uInt16 pNameRanges[]; - VclContainer* m_pWestFrame; - FixedText* m_pWestFontNameFT; - FontNameBox* m_pWestFontNameLB; - FixedText* m_pWestFontStyleFT; - FontStyleBox* m_pWestFontStyleLB; - FixedText* m_pWestFontSizeFT; - FontSizeBox* m_pWestFontSizeLB; - FixedText* m_pWestFontLanguageFT; - SvxLanguageComboBox* m_pWestFontLanguageLB; - FixedText* m_pWestFontTypeFT; - - VclContainer* m_pEastFrame; - FixedText* m_pEastFontNameFT; - FontNameBox* m_pEastFontNameLB; - FixedText* m_pEastFontStyleFT; - FontStyleBox* m_pEastFontStyleLB; - FixedText* m_pEastFontSizeFT; - FontSizeBox* m_pEastFontSizeLB; - FixedText* m_pEastFontLanguageFT; - SvxLanguageBox* m_pEastFontLanguageLB; - FixedText* m_pEastFontTypeFT; - - VclContainer* m_pCTLFrame; - FixedText* m_pCTLFontNameFT; - FontNameBox* m_pCTLFontNameLB; - FixedText* m_pCTLFontStyleFT; - FontStyleBox* m_pCTLFontStyleLB; - FixedText* m_pCTLFontSizeFT; - FontSizeBox* m_pCTLFontSizeLB; - FixedText* m_pCTLFontLanguageFT; - SvxLanguageBox* m_pCTLFontLanguageLB; - FixedText* m_pCTLFontTypeFT; + VclPtr m_pWestFrame; + VclPtr m_pWestFontNameFT; + VclPtr m_pWestFontNameLB; + VclPtr m_pWestFontStyleFT; + VclPtr m_pWestFontStyleLB; + VclPtr m_pWestFontSizeFT; + VclPtr m_pWestFontSizeLB; + VclPtr m_pWestFontLanguageFT; + VclPtr m_pWestFontLanguageLB; + VclPtr m_pWestFontTypeFT; + + VclPtr m_pEastFrame; + VclPtr m_pEastFontNameFT; + VclPtr m_pEastFontNameLB; + VclPtr m_pEastFontStyleFT; + VclPtr m_pEastFontStyleLB; + VclPtr m_pEastFontSizeFT; + VclPtr m_pEastFontSizeLB; + VclPtr m_pEastFontLanguageFT; + VclPtr m_pEastFontLanguageLB; + VclPtr m_pEastFontTypeFT; + + VclPtr m_pCTLFrame; + VclPtr m_pCTLFontNameFT; + VclPtr m_pCTLFontNameLB; + VclPtr m_pCTLFontStyleFT; + VclPtr m_pCTLFontStyleLB; + VclPtr m_pCTLFontSizeFT; + VclPtr m_pCTLFontSizeLB; + VclPtr m_pCTLFontLanguageFT; + VclPtr m_pCTLFontLanguageLB; + VclPtr m_pCTLFontTypeFT; SvxCharNamePage_Impl* m_pImpl; @@ -175,37 +178,37 @@ class SvxCharEffectsPage : public SvxCharBasePage private: static const sal_uInt16 pEffectsRanges[]; - FixedText* m_pFontColorFT; - ColorListBox* m_pFontColorLB; + VclPtr m_pFontColorFT; + VclPtr m_pFontColorLB; - FixedText* m_pEffectsFT; - ListBox* m_pEffectsLB; + VclPtr m_pEffectsFT; + VclPtr m_pEffectsLB; - FixedText* m_pReliefFT; - ListBox* m_pReliefLB; + VclPtr m_pReliefFT; + VclPtr m_pReliefLB; - TriStateBox* m_pOutlineBtn; - TriStateBox* m_pShadowBtn; - TriStateBox* m_pBlinkingBtn; - TriStateBox* m_pHiddenBtn; + VclPtr m_pOutlineBtn; + VclPtr m_pShadowBtn; + VclPtr m_pBlinkingBtn; + VclPtr m_pHiddenBtn; - ListBox* m_pOverlineLB; - FixedText* m_pOverlineColorFT; - ColorListBox* m_pOverlineColorLB; + VclPtr m_pOverlineLB; + VclPtr m_pOverlineColorFT; + VclPtr m_pOverlineColorLB; - ListBox* m_pStrikeoutLB; + VclPtr m_pStrikeoutLB; - ListBox* m_pUnderlineLB; - FixedText* m_pUnderlineColorFT; - ColorListBox* m_pUnderlineColorLB; + VclPtr m_pUnderlineLB; + VclPtr m_pUnderlineColorFT; + VclPtr m_pUnderlineColorLB; - CheckBox* m_pIndividualWordsBtn; + VclPtr m_pIndividualWordsBtn; - FixedText* m_pEmphasisFT; - ListBox* m_pEmphasisLB; + VclPtr m_pEmphasisFT; + VclPtr m_pEmphasisLB; - FixedText* m_pPositionFT; - ListBox* m_pPositionLB; + VclPtr m_pPositionFT; + VclPtr m_pPositionLB; sal_uInt16 m_nHtmlMode; @@ -226,8 +229,10 @@ private: DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: - using SfxTabPage::DeactivatePage; + virtual ~SvxCharEffectsPage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: @@ -252,30 +257,30 @@ class SvxCharPositionPage : public SvxCharBasePage static const sal_uInt16 pPositionRanges[]; private: - RadioButton* m_pHighPosBtn; - RadioButton* m_pNormalPosBtn; - RadioButton* m_pLowPosBtn; - FixedText* m_pHighLowFT; - MetricField* m_pHighLowMF; - CheckBox* m_pHighLowRB; - FixedText* m_pFontSizeFT; - MetricField* m_pFontSizeMF; - - VclContainer* m_pRotationContainer; - - FixedText* m_pScalingFT; - FixedText* m_pScalingAndRotationFT; - RadioButton* m_p0degRB; - RadioButton* m_p90degRB; - RadioButton* m_p270degRB; - CheckBox* m_pFitToLineCB; - - MetricField* m_pScaleWidthMF; - - ListBox* m_pKerningLB; - FixedText* m_pKerningFT; - MetricField* m_pKerningMF; - CheckBox* m_pPairKerningBtn; + VclPtr m_pHighPosBtn; + VclPtr m_pNormalPosBtn; + VclPtr m_pLowPosBtn; + VclPtr m_pHighLowFT; + VclPtr m_pHighLowMF; + VclPtr m_pHighLowRB; + VclPtr m_pFontSizeFT; + VclPtr m_pFontSizeMF; + + VclPtr m_pRotationContainer; + + VclPtr m_pScalingFT; + VclPtr m_pScalingAndRotationFT; + VclPtr m_p0degRB; + VclPtr m_p90degRB; + VclPtr m_p270degRB; + VclPtr m_pFitToLineCB; + + VclPtr m_pScaleWidthMF; + + VclPtr m_pKerningLB; + VclPtr m_pKerningFT; + VclPtr m_pKerningMF; + VclPtr m_pPairKerningBtn; short m_nSuperEsc; short m_nSubEsc; @@ -304,6 +309,9 @@ private: DECL_LINK(ScaleWidthModifyHdl_Impl, void *); public: + virtual ~SvxCharPositionPage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -328,10 +336,10 @@ class SvxCharTwoLinesPage : public SvxCharBasePage { private: static const sal_uInt16 pTwoLinesRanges[]; - CheckBox* m_pTwoLinesBtn; - VclContainer* m_pEnclosingFrame; - ListBox* m_pStartBracketLB; - ListBox* m_pEndBracketLB; + VclPtr m_pTwoLinesBtn; + VclPtr m_pEnclosingFrame; + VclPtr m_pStartBracketLB; + VclPtr m_pEndBracketLB; sal_uInt16 m_nStartBracketPosition; sal_uInt16 m_nEndBracketPosition; @@ -347,13 +355,15 @@ private: DECL_LINK( CharacterMapHdl_Impl, ListBox* ); public: + virtual ~SvxCharTwoLinesPage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; -public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pTwoLinesRanges; } diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index b079eef1c591..aae2744538ce 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -34,21 +34,21 @@ class SvxConnectionPage : public SfxTabPage { private: static const sal_uInt16 pRanges[]; - ListBox* m_pLbType; + VclPtr m_pLbType; - FixedText* m_pFtLine1; - MetricField* m_pMtrFldLine1; - FixedText* m_pFtLine2; - MetricField* m_pMtrFldLine2; - FixedText* m_pFtLine3; - MetricField* m_pMtrFldLine3; + VclPtr m_pFtLine1; + VclPtr m_pMtrFldLine1; + VclPtr m_pFtLine2; + VclPtr m_pMtrFldLine2; + VclPtr m_pFtLine3; + VclPtr m_pMtrFldLine3; - MetricField* m_pMtrFldHorz1; - MetricField* m_pMtrFldVert1; - MetricField* m_pMtrFldHorz2; - MetricField* m_pMtrFldVert2; + VclPtr m_pMtrFldHorz1; + VclPtr m_pMtrFldVert1; + VclPtr m_pMtrFldHorz2; + VclPtr m_pMtrFldVert2; - SvxXConnectionPreview* m_pCtlPreview; + VclPtr m_pCtlPreview; const SfxItemSet& rOutAttrs; SfxItemSet aAttrSet; @@ -62,6 +62,8 @@ private: public: SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxConnectionPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index dfe0d989b3af..596d3231443e 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -67,16 +67,16 @@ private: void init(); - SvxShowCharSet* m_pShowSet; - Edit* m_pShowText; - PushButton* m_pOKBtn; - FixedText* m_pFontText; - ListBox* m_pFontLB; - FixedText* m_pSubsetText; - ListBox* m_pSubsetLB; - FixedText* m_pSymbolText; - SvxShowText* m_pShowChar; - FixedText* m_pCharCodeText; + VclPtr m_pShowSet; + VclPtr m_pShowText; + VclPtr m_pOKBtn; + VclPtr m_pFontText; + VclPtr m_pFontLB; + VclPtr m_pSubsetText; + VclPtr m_pSubsetLB; + VclPtr m_pSymbolText; + VclPtr m_pShowChar; + VclPtr m_pCharCodeText; vcl::Font aFont; bool bOne; const SubsetMap* pSubsetMap; @@ -93,6 +93,8 @@ private: public: SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); + virtual ~SvxCharacterMap(); + virtual void dispose() SAL_OVERRIDE; void DisableFontSelection(); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 96dacaf1d5b4..d56c9d5ee2a4 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -47,36 +47,36 @@ class FmSearchDialog : public ModalDialog friend class FmSearchEngine; // my all Controls - RadioButton *m_prbSearchForText; - RadioButton *m_prbSearchForNull; - RadioButton *m_prbSearchForNotNull; - ComboBox *m_pcmbSearchText; - FixedText *m_pftForm; - ListBox *m_plbForm; - RadioButton *m_prbAllFields; - RadioButton *m_prbSingleField; - ListBox *m_plbField; - FixedText *m_pftPosition; - ListBox *m_plbPosition; - CheckBox *m_pcbUseFormat; - CheckBox *m_pcbCase; - CheckBox *m_pcbBackwards; - CheckBox *m_pcbStartOver; - CheckBox *m_pcbWildCard; - CheckBox *m_pcbRegular; - CheckBox *m_pcbApprox; - PushButton *m_ppbApproxSettings; - CheckBox *m_pHalfFullFormsCJK; - CheckBox *m_pSoundsLikeCJK; - PushButton *m_pSoundsLikeCJKSettings; - FixedText *m_pftRecord; - FixedText *m_pftHint; - PushButton *m_pbSearchAgain; - CancelButton *m_pbClose; + VclPtr m_prbSearchForText; + VclPtr m_prbSearchForNull; + VclPtr m_prbSearchForNotNull; + VclPtr m_pcmbSearchText; + VclPtr m_pftForm; + VclPtr m_plbForm; + VclPtr m_prbAllFields; + VclPtr m_prbSingleField; + VclPtr m_plbField; + VclPtr m_pftPosition; + VclPtr m_plbPosition; + VclPtr m_pcbUseFormat; + VclPtr m_pcbCase; + VclPtr m_pcbBackwards; + VclPtr m_pcbStartOver; + VclPtr m_pcbWildCard; + VclPtr m_pcbRegular; + VclPtr m_pcbApprox; + VclPtr m_ppbApproxSettings; + VclPtr m_pHalfFullFormsCJK; + VclPtr m_pSoundsLikeCJK; + VclPtr m_pSoundsLikeCJKSettings; + VclPtr m_pftRecord; + VclPtr m_pftHint; + VclPtr m_pbSearchAgain; + VclPtr m_pbClose; OUString m_sSearch; OUString m_sCancel; - vcl::Window* m_pPreSearchFocus; + VclPtr m_pPreSearchFocus; Link m_lnkFoundHandler; ///< Handler for "found" Link m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 2c82170ea3a7..e02d6a1b5094 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -60,8 +60,8 @@ class SearchThread: public salhelper::Thread { private: - SearchProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; + VclPtr mpProgress; + VclPtr mpBrowser; INetURLObject maStartURL; void ImplSearch( const INetURLObject& rStartURL, @@ -81,10 +81,10 @@ public: class SearchProgress : public ModalDialog { private: - FixedText* m_pFtSearchDir; - FixedText* m_pFtSearchType; - CancelButton* m_pBtnCancel; - vcl::Window * parent_; + VclPtr m_pFtSearchDir; + VclPtr m_pFtSearchType; + VclPtr m_pBtnCancel; + VclPtr parent_; INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; @@ -93,6 +93,8 @@ private: public: SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ); + virtual ~SearchProgress(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( CleanUpHdl, void* ); @@ -106,8 +108,8 @@ class TakeThread: public salhelper::Thread { private: - TakeProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; + VclPtr mpProgress; + VclPtr mpBrowser; TokenList_impl& mrTakenList; virtual ~TakeThread(); @@ -125,9 +127,9 @@ public: class TakeProgress : public ModalDialog { private: - FixedText* m_pFtTakeFile; - CancelButton* m_pBtnCancel; - vcl::Window * window_; + VclPtr m_pFtTakeFile; + VclPtr m_pBtnCancel; + VclPtr window_; rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; @@ -137,6 +139,8 @@ private: public: TakeProgress( vcl::Window* pWindow ); + virtual ~TakeProgress(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( CleanUpHdl, void* ); @@ -148,8 +152,8 @@ public: class ActualizeProgress : public ModalDialog { private: - FixedText* m_pFtActualizeFile; - CancelButton* m_pBtnCancel; + VclPtr m_pFtActualizeFile; + VclPtr m_pBtnCancel; Idle* pIdle; GalleryTheme* pTheme; GalleryProgress aStatusProgress; @@ -160,6 +164,8 @@ private: public: ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); + virtual ~ActualizeProgress(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; }; @@ -167,23 +173,27 @@ public: class TitleDialog : public ModalDialog { private: - Edit* m_pEdit; + VclPtr m_pEdit; public: TitleDialog(vcl::Window* pParent, const OUString& rOldText); + virtual ~TitleDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetTitle() const { return m_pEdit->GetText(); } }; class GalleryIdDialog : public ModalDialog { private: - OKButton* m_pBtnOk; - ListBox* m_pLbResName; + VclPtr m_pBtnOk; + VclPtr m_pLbResName; GalleryTheme* pThm; DECL_LINK( ClickOkHdl, void* ); DECL_LINK( ClickResNameHdl, void* ); public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); + virtual ~GalleryIdDialog(); + virtual void dispose() SAL_OVERRIDE; sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); } }; @@ -204,12 +214,12 @@ class TPGalleryThemeGeneral : public SfxTabPage { private: - FixedImage* m_pFiMSImage; - Edit* m_pEdtMSName; - FixedText* m_pFtMSShowType; - FixedText* m_pFtMSShowPath; - FixedText* m_pFtMSShowContent; - FixedText* m_pFtMSShowChangeDate; + VclPtr m_pFiMSImage; + VclPtr m_pEdtMSName; + VclPtr m_pFtMSShowType; + VclPtr m_pFtMSShowPath; + VclPtr m_pFtMSShowContent; + VclPtr m_pFtMSShowChangeDate; ExchangeData* pData; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE {} @@ -219,6 +229,8 @@ private: public: TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~TPGalleryThemeGeneral(); + virtual void dispose() SAL_OVERRIDE; void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } @@ -234,13 +246,13 @@ class TPGalleryThemeProperties : public SfxTabPage friend class TakeProgress; friend class TakeThread; - ComboBox* m_pCbbFileType; - ListBox* m_pLbxFound; - PushButton* m_pBtnSearch; - PushButton* m_pBtnTake; - PushButton* m_pBtnTakeAll; - CheckBox* m_pCbxPreview; - GalleryPreview* m_pWndPreview; + VclPtr m_pCbbFileType; + VclPtr m_pLbxFound; + VclPtr m_pBtnSearch; + VclPtr m_pBtnTake; + VclPtr m_pBtnTakeAll; + VclPtr m_pCbxPreview; + VclPtr m_pWndPreview; ExchangeData* pData; StringList aFoundList; diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 1fb139375fd7..f43685d65fd2 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -77,7 +77,7 @@ private: DECL_LINK( ImplModifyHdl, void* p ); protected: - GraphicPreviewWindow* mpPreview; + VclPtr mpPreview; const Link& GetModifyHdl() const { return maModifyHdl; } const Size& GetGraphicSizePixel() const { return maSizePixel; } @@ -85,6 +85,8 @@ protected: public: GraphicFilterDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); + virtual ~GraphicFilterDialog(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; }; @@ -97,11 +99,13 @@ public: class GraphicFilterSmooth : public GraphicFilterDialog { private: - NumericField* mpMtrRadius; + VclPtr mpMtrRadius; public: GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius); + virtual ~GraphicFilterSmooth(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; } @@ -114,14 +118,16 @@ public: class GraphicFilterMosaic : public GraphicFilterDialog { private: - MetricField* mpMtrWidth; - MetricField* mpMtrHeight; - CheckBox* mpCbxEdges; + VclPtr mpMtrWidth; + VclPtr mpMtrHeight; + VclPtr mpCbxEdges; public: GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges); + virtual ~GraphicFilterMosaic(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; long GetTileWidth() const { return static_cast(mpMtrWidth->GetValue()); } @@ -136,13 +142,15 @@ public: class GraphicFilterSolarize : public GraphicFilterDialog { private: - MetricField* mpMtrThreshold; - CheckBox* mpCbxInvert; + VclPtr mpMtrThreshold; + VclPtr mpCbxInvert; public: GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert ); + virtual ~GraphicFilterSolarize(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt8 GetGreyThreshold() const { return( (sal_uInt8) FRound( mpMtrThreshold->GetValue() * 2.55 ) ); } @@ -156,10 +164,12 @@ public: class GraphicFilterSepia : public GraphicFilterDialog { private: - MetricField* mpMtrSepia; + VclPtr mpMtrSepia; public: GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); + virtual ~GraphicFilterSepia(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetSepiaPercent() const { @@ -174,10 +184,12 @@ public: class GraphicFilterPoster : public GraphicFilterDialog { private: - NumericField* mpNumPoster; + VclPtr mpNumPoster; public: GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); + virtual ~GraphicFilterPoster(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetPosterColorCount() const { return( (sal_uInt16) mpNumPoster->GetValue() ); } @@ -203,10 +215,12 @@ public: class GraphicFilterEmboss : public GraphicFilterDialog { private: - EmbossControl* mpCtlLight; + VclPtr mpCtlLight; public: GraphicFilterEmboss( vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ); + virtual ~GraphicFilterEmboss(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; RECT_POINT GetLightSource() const { return mpCtlLight->GetActualRP(); } diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 93de02f161cc..b85633738ddf 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -38,7 +38,7 @@ class SvxHpLinkDlg; class SvxHlinkCtrl : public SfxControllerItem { private : - SvxHpLinkDlg *pParent; + VclPtr pParent; SfxStatusForwarder aRdOnlyForwarder; diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 3266a2a3449c..87c7e546cc6a 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -33,11 +33,11 @@ class URLDlg : public ModalDialog { - Edit* m_pEdtURL; - ComboBox* m_pCbbTargets; - Edit* m_pEdtName; - Edit* m_pEdtAlternativeText; - VclMultiLineEdit* m_pEdtDescription; + VclPtr m_pEdtURL; + VclPtr m_pCbbTargets; + VclPtr m_pEdtName; + VclPtr m_pEdtAlternativeText; + VclPtr m_pEdtDescription; public: @@ -45,6 +45,8 @@ public: const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ); + virtual ~URLDlg(); + virtual void dispose() SAL_OVERRIDE; OUString GetURL() const { return m_pEdtURL->GetText(); } OUString GetAltText() const { return m_pEdtAlternativeText->GetText(); } diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 2febcb8d0976..2a4c295d60e4 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -40,7 +40,7 @@ class SvxGeneralTabPage : public SfxTabPage using TabPage::DeactivatePage; private: // the "Use data for document properties" checkbox - CheckBox* m_pUseDataCB; + VclPtr m_pUseDataCB; // rows struct Row; std::vector > vRows; @@ -64,6 +64,8 @@ protected: public: SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SvxGeneralTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 3dc19f0a1c97..376f9196a2d1 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -37,7 +37,7 @@ class SvxJSearchOptionsPage; class SvxJSearchOptionsDialog : public SfxSingleTabDialog { sal_Int32 nInitialTlFlags; - SvxJSearchOptionsPage *pPage; + VclPtr pPage; SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; @@ -45,6 +45,8 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog public: SvxJSearchOptionsDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags); + virtual ~SvxJSearchOptionsDialog(); + virtual void dispose() SAL_OVERRIDE; // Window virtual void Activate() SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index c3ebd3048dc3..42e668c31563 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -115,29 +115,29 @@ class SvxTransparenceTabPage : public SvxTabPage sal_uInt16 nDlgType; // main selection - RadioButton* m_pRbtTransOff; - RadioButton* m_pRbtTransLinear; - RadioButton* m_pRbtTransGradient; + VclPtr m_pRbtTransOff; + VclPtr m_pRbtTransLinear; + VclPtr m_pRbtTransGradient; /// linear transparency - MetricField* m_pMtrTransparent; + VclPtr m_pMtrTransparent; // gradient transparency - VclGrid* m_pGridGradient; - ListBox* m_pLbTrgrGradientType; - FixedText* m_pFtTrgrCenterX; - MetricField* m_pMtrTrgrCenterX; - FixedText* m_pFtTrgrCenterY; - MetricField* m_pMtrTrgrCenterY; - FixedText* m_pFtTrgrAngle; - MetricField* m_pMtrTrgrAngle; - MetricField* m_pMtrTrgrBorder; - MetricField* m_pMtrTrgrStartValue; - MetricField* m_pMtrTrgrEndValue; + VclPtr m_pGridGradient; + VclPtr m_pLbTrgrGradientType; + VclPtr m_pFtTrgrCenterX; + VclPtr m_pMtrTrgrCenterX; + VclPtr m_pFtTrgrCenterY; + VclPtr m_pMtrTrgrCenterY; + VclPtr m_pFtTrgrAngle; + VclPtr m_pMtrTrgrAngle; + VclPtr m_pMtrTrgrBorder; + VclPtr m_pMtrTrgrStartValue; + VclPtr m_pMtrTrgrEndValue; // preview - SvxXRectPreview* m_pCtlBitmapPreview; - SvxXRectPreview* m_pCtlXRectPreview; + VclPtr m_pCtlBitmapPreview; + VclPtr m_pCtlXRectPreview; bool bBitmap; XOutdevItemPool* pXPool; @@ -160,6 +160,8 @@ class SvxTransparenceTabPage : public SvxTabPage public: SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); + virtual ~SvxTransparenceTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window*, const SfxItemSet*); static const sal_uInt16* GetRanges() { return pTransparenceRanges; } @@ -183,48 +185,48 @@ class SvxAreaTabPage : public SvxTabPage using TabPage::DeactivatePage; static const sal_uInt16 pAreaRanges[]; private: - ListBox* m_pTypeLB; - - VclBox* m_pFillLB; - ColorLB* m_pLbColor; - GradientLB* m_pLbGradient; - HatchingLB* m_pLbHatching; - BitmapLB* m_pLbBitmap; - SvxXRectPreview* m_pCtlBitmapPreview; - - TriStateBox* m_pTsbStepCount; - VclFrame* m_pFlStepCount; - NumericField* m_pNumFldStepCount; - - VclFrame* m_pFlHatchBckgrd; - CheckBox* m_pCbxHatchBckgrd; - ColorLB* m_pLbHatchBckgrdColor; - - VclBox* m_pBxBitmap; - - VclFrame* m_pFlSize; - TriStateBox* m_pTsbOriginal; - TriStateBox* m_pTsbScale; - VclGrid* m_pGridX_Y; - FixedText* m_pFtXSize; - MetricField* m_pMtrFldXSize; - FixedText* m_pFtYSize; - MetricField* m_pMtrFldYSize; - - VclFrame* m_pFlPosition; - SvxRectCtl* m_pCtlPosition; - VclGrid* m_pGridOffset; - MetricField* m_pMtrFldXOffset; - MetricField* m_pMtrFldYOffset; - VclBox* m_pBxTile; - TriStateBox* m_pTsbTile; - TriStateBox* m_pTsbStretch; - VclFrame* m_pFlOffset; - RadioButton* m_pRbtRow; - RadioButton* m_pRbtColumn; - MetricField* m_pMtrFldOffset; - - SvxXRectPreview* m_pCtlXRectPreview; + VclPtr m_pTypeLB; + + VclPtr m_pFillLB; + VclPtr m_pLbColor; + VclPtr m_pLbGradient; + VclPtr m_pLbHatching; + VclPtr m_pLbBitmap; + VclPtr m_pCtlBitmapPreview; + + VclPtr m_pTsbStepCount; + VclPtr m_pFlStepCount; + VclPtr m_pNumFldStepCount; + + VclPtr m_pFlHatchBckgrd; + VclPtr m_pCbxHatchBckgrd; + VclPtr m_pLbHatchBckgrdColor; + + VclPtr m_pBxBitmap; + + VclPtr m_pFlSize; + VclPtr m_pTsbOriginal; + VclPtr m_pTsbScale; + VclPtr m_pGridX_Y; + VclPtr m_pFtXSize; + VclPtr m_pMtrFldXSize; + VclPtr m_pFtYSize; + VclPtr m_pMtrFldYSize; + + VclPtr m_pFlPosition; + VclPtr m_pCtlPosition; + VclPtr m_pGridOffset; + VclPtr m_pMtrFldXOffset; + VclPtr m_pMtrFldYOffset; + VclPtr m_pBxTile; + VclPtr m_pTsbTile; + VclPtr m_pTsbStretch; + VclPtr m_pFlOffset; + VclPtr m_pRbtRow; + VclPtr m_pRbtColumn; + VclPtr m_pMtrFldOffset; + + VclPtr m_pCtlXRectPreview; const SfxItemSet& rOutAttrs; RECT_POINT eRP; @@ -264,7 +266,7 @@ private: bool mbDirectGraphicSet; Graphic maDirectGraphic; OUString maDirectName; - PushButton* m_pBtnImport; + VclPtr m_pBtnImport; DECL_LINK(SelectDialogTypeHdl_Impl, void *); DECL_LINK( ModifyColorHdl_Impl, void * ); @@ -288,6 +290,8 @@ private: public: SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxAreaTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); @@ -326,13 +330,13 @@ class SvxShadowTabPage : public SvxTabPage static const sal_uInt16 pShadowRanges[]; private: - TriStateBox* m_pTsbShowShadow; - VclGrid* m_pGridShadow; - SvxRectCtl* m_pCtlPosition; - MetricField* m_pMtrDistance; - ColorLB* m_pLbShadowColor; - MetricField* m_pMtrTransparent; - SvxXShadowPreview* m_pCtlXRectPreview; + VclPtr m_pTsbShowShadow; + VclPtr m_pGridShadow; + VclPtr m_pCtlPosition; + VclPtr m_pMtrDistance; + VclPtr m_pLbShadowColor; + VclPtr m_pMtrTransparent; + VclPtr m_pCtlXRectPreview; const SfxItemSet& rOutAttrs; RECT_POINT eRP; @@ -355,6 +359,8 @@ private: public: SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxShadowTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); @@ -383,25 +389,25 @@ class SvxGradientTabPage : public SfxTabPage using TabPage::DeactivatePage; private: - ListBox* m_pLbGradientType; - FixedText* m_pFtCenterX; - MetricField* m_pMtrCenterX; - FixedText* m_pFtCenterY; - MetricField* m_pMtrCenterY; - FixedText* m_pFtAngle; - MetricField* m_pMtrAngle; - MetricField* m_pMtrBorder; - ColorLB* m_pLbColorFrom; - MetricField* m_pMtrColorFrom; - ColorLB* m_pLbColorTo; - MetricField* m_pMtrColorTo; - GradientLB* m_pLbGradients; - SvxXRectPreview* m_pCtlPreview; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; + VclPtr m_pLbGradientType; + VclPtr m_pFtCenterX; + VclPtr m_pMtrCenterX; + VclPtr m_pFtCenterY; + VclPtr m_pMtrCenterY; + VclPtr m_pFtAngle; + VclPtr m_pMtrAngle; + VclPtr m_pMtrBorder; + VclPtr m_pLbColorFrom; + VclPtr m_pMtrColorFrom; + VclPtr m_pLbColorTo; + VclPtr m_pMtrColorTo; + VclPtr m_pLbGradients; + VclPtr m_pCtlPreview; + VclPtr m_pBtnAdd; + VclPtr m_pBtnModify; + VclPtr m_pBtnDelete; + VclPtr m_pBtnLoad; + VclPtr m_pBtnSave; const SfxItemSet& rOutAttrs; @@ -434,6 +440,8 @@ private: public: SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxGradientTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); @@ -465,18 +473,18 @@ class SvxHatchTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - MetricField* m_pMtrDistance; - MetricField* m_pMtrAngle; - SvxRectCtl* m_pCtlAngle; - ListBox* m_pLbLineType; - ColorLB* m_pLbLineColor; - HatchingLB* m_pLbHatchings; - SvxXRectPreview* m_pCtlPreview; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; + VclPtr m_pMtrDistance; + VclPtr m_pMtrAngle; + VclPtr m_pCtlAngle; + VclPtr m_pLbLineType; + VclPtr m_pLbLineColor; + VclPtr m_pLbHatchings; + VclPtr m_pCtlPreview; + VclPtr m_pBtnAdd; + VclPtr m_pBtnModify; + VclPtr m_pBtnDelete; + VclPtr m_pBtnLoad; + VclPtr m_pBtnSave; const SfxItemSet& rOutAttrs; @@ -510,6 +518,8 @@ private: public: SvxHatchTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxHatchTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); @@ -545,19 +555,19 @@ class SvxBitmapTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - VclBox* m_pBxPixelEditor; - SvxPixelCtl* m_pCtlPixel; - ColorLB* m_pLbColor; - ColorLB* m_pLbBackgroundColor; - FixedText* m_pLbBitmapsHidden; - BitmapLB* m_pLbBitmaps; - SvxXRectPreview* m_pCtlPreview; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnImport; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; + VclPtr m_pBxPixelEditor; + VclPtr m_pCtlPixel; + VclPtr m_pLbColor; + VclPtr m_pLbBackgroundColor; + VclPtr m_pLbBitmapsHidden; + VclPtr m_pLbBitmaps; + VclPtr m_pCtlPreview; + VclPtr m_pBtnAdd; + VclPtr m_pBtnModify; + VclPtr m_pBtnImport; + VclPtr m_pBtnDelete; + VclPtr m_pBtnLoad; + VclPtr m_pBtnSave; SvxBitmapCtl* m_pBitmapCtl; @@ -642,11 +652,11 @@ class SvxColorTabPage : public SfxTabPage private: XPropertyListType meType; - Window *mpTopDlg; - CheckBox *m_pBoxEmbed; - PushButton *m_pBtnLoad; - PushButton *m_pBtnSave; - FixedText *m_pTableName; + VclPtr mpTopDlg; + VclPtr m_pBoxEmbed; + VclPtr m_pBtnLoad; + VclPtr m_pBtnSave; + VclPtr m_pTableName; DECL_LINK( EmbedToggleHdl_Impl, void * ); DECL_LINK( ClickLoadHdl_Impl, void * ); @@ -660,31 +670,31 @@ private: void EnableSave( bool bCanSave ); SvxColorTabPageShadow *pShadow; - Edit* m_pEdtName; - ColorLB* m_pLbColor; + VclPtr m_pEdtName; + VclPtr m_pLbColor; - SvxColorValueSet* m_pValSetColorList; + VclPtr m_pValSetColorList; - SvxXRectPreview* m_pCtlPreviewOld; - SvxXRectPreview* m_pCtlPreviewNew; + VclPtr m_pCtlPreviewOld; + VclPtr m_pCtlPreviewNew; - ListBox* m_pLbColorModel; + VclPtr m_pLbColorModel; - VclContainer* m_pRGB; - NumericField* m_pR; - NumericField* m_pG; - NumericField* m_pB; + VclPtr m_pRGB; + VclPtr m_pR; + VclPtr m_pG; + VclPtr m_pB; - VclContainer* m_pCMYK; - MetricField* m_pC; - MetricField* m_pY; - MetricField* m_pM; - MetricField* m_pK; + VclPtr m_pCMYK; + VclPtr m_pC; + VclPtr m_pY; + VclPtr m_pM; + VclPtr m_pK; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnWorkOn; - PushButton* m_pBtnDelete; + VclPtr m_pBtnAdd; + VclPtr m_pBtnModify; + VclPtr m_pBtnWorkOn; + VclPtr m_pBtnDelete; const SfxItemSet& rOutAttrs; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index ca9f7b718d1a..6f19fb7eed04 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -91,34 +91,34 @@ class SvxLineTabPage : public SvxTabPage using TabPage::DeactivatePage; static const sal_uInt16 pLineRanges[]; private: - VclBox* m_pBoxColor; - LineLB* m_pLbLineStyle; - ColorLB* m_pLbColor; - VclBox* m_pBoxWidth; - MetricField* m_pMtrLineWidth; - VclBox* m_pBoxTransparency; - MetricField* m_pMtrTransparent; - - VclFrame* m_pFlLineEnds; - VclBox* m_pBoxArrowStyles; - LineEndLB* m_pLbStartStyle; - VclBox* m_pBoxStart; - MetricField* m_pMtrStartWidth; - TriStateBox* m_pTsbCenterStart; - VclBox* m_pBoxEnd; - LineEndLB* m_pLbEndStyle; - MetricField* m_pMtrEndWidth; - TriStateBox* m_pTsbCenterEnd; - CheckBox* m_pCbxSynchronize; - SvxXLinePreview* m_pCtlPreview; + VclPtr m_pBoxColor; + VclPtr m_pLbLineStyle; + VclPtr m_pLbColor; + VclPtr m_pBoxWidth; + VclPtr m_pMtrLineWidth; + VclPtr m_pBoxTransparency; + VclPtr m_pMtrTransparent; + + VclPtr m_pFlLineEnds; + VclPtr m_pBoxArrowStyles; + VclPtr m_pLbStartStyle; + VclPtr m_pBoxStart; + VclPtr m_pMtrStartWidth; + VclPtr m_pTsbCenterStart; + VclPtr m_pBoxEnd; + VclPtr m_pLbEndStyle; + VclPtr m_pMtrEndWidth; + VclPtr m_pTsbCenterEnd; + VclPtr m_pCbxSynchronize; + VclPtr m_pCtlPreview; // #116827# - VclFrame* m_pFLEdgeStyle; - VclGrid* m_pGridEdgeCaps; - ListBox* m_pLBEdgeStyle; + VclPtr m_pFLEdgeStyle; + VclPtr m_pGridEdgeCaps; + VclPtr m_pLBEdgeStyle; // LineCaps - ListBox* m_pLBCapStyle; + VclPtr m_pLBCapStyle; //#58425# symbols on a line (e. g. StarChart) -> /** a list of symbols to be shown in menu. Symbol at position SID_ATTR_SYMBOLTYPE is to be shown in preview. @@ -131,12 +131,12 @@ private: long nSymbolType; /// attributes for the shown symbols; only necessary if not equal to line properties SfxItemSet* pSymbolAttr; - VclFrame* m_pFlSymbol; - VclGrid* m_pGridIconSize; - MenuButton* m_pSymbolMB; - MetricField* m_pSymbolWidthMF; - MetricField* m_pSymbolHeightMF; - CheckBox* m_pSymbolRatioCB; + VclPtr m_pFlSymbol; + VclPtr m_pGridIconSize; + VclPtr m_pSymbolMB; + VclPtr m_pSymbolWidthMF; + VclPtr m_pSymbolHeightMF; + VclPtr m_pSymbolRatioCB; std::vector aGrfNames; SvxBmpItemInfoList aGrfBrushItems; bool bLastWidthModified; @@ -246,21 +246,21 @@ class SvxLineDefTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; private: - LineLB* m_pLbLineStyles; - ListBox* m_pLbType1; - ListBox* m_pLbType2; - NumericField* m_pNumFldNumber1; - NumericField* m_pNumFldNumber2; - MetricField* m_pMtrLength1; - MetricField* m_pMtrLength2; - MetricField* m_pMtrDistance; - CheckBox* m_pCbxSynchronize; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; - SvxXLinePreview* m_pCtlPreview; + VclPtr m_pLbLineStyles; + VclPtr m_pLbType1; + VclPtr m_pLbType2; + VclPtr m_pNumFldNumber1; + VclPtr m_pNumFldNumber2; + VclPtr m_pMtrLength1; + VclPtr m_pMtrLength2; + VclPtr m_pMtrDistance; + VclPtr m_pCbxSynchronize; + VclPtr m_pBtnAdd; + VclPtr m_pBtnModify; + VclPtr m_pBtnDelete; + VclPtr m_pBtnLoad; + VclPtr m_pBtnSave; + VclPtr m_pCtlPreview; const SfxItemSet& rOutAttrs; XDash aDash; @@ -303,6 +303,8 @@ private: public: SvxLineDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxLineDefTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); @@ -333,14 +335,14 @@ class SvxLineEndDefTabPage : public SfxTabPage using TabPage::DeactivatePage; private: - Edit* m_pEdtName; - LineEndLB* m_pLbLineEnds; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; - SvxXLinePreview* m_pCtlPreview; + VclPtr m_pEdtName; + VclPtr m_pLbLineEnds; + VclPtr m_pBtnAdd; + VclPtr m_pBtnModify; + VclPtr m_pBtnDelete; + VclPtr m_pBtnLoad; + VclPtr m_pBtnSave; + VclPtr m_pCtlPreview; const SfxItemSet& rOutAttrs; const SdrObject* pPolyObj; @@ -372,6 +374,8 @@ private: public: SvxLineEndDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxLineEndDefTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 1f2b34d616db..4ee17070a5f5 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -29,10 +29,12 @@ class FmInputRecordNoDialog : public ModalDialog { public: - NumericField* m_pRecordNo; + VclPtr m_pRecordNo; public: FmInputRecordNoDialog(vcl::Window * pParent); + virtual ~FmInputRecordNoDialog(); + virtual void dispose() SAL_OVERRIDE; void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); } long GetValue() const { return static_cast(m_pRecordNo->GetValue()); } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index a665aabbf636..fa714753bd14 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -46,12 +46,12 @@ namespace svx OUString aTypeText; OUString aPathText; - SvSimpleTableContainer* m_pPathCtrl; - PushButton* m_pNew; - PushButton* m_pEdit; - PushButton* m_pDelete; + VclPtr m_pPathCtrl; + VclPtr m_pNew; + VclPtr m_pEdit; + VclPtr m_pDelete; - ::svx::OptHeaderTabListBox* pPathBox; + VclPtr<::svx::OptHeaderTabListBox> pPathBox; SvTreeListEntry* m_pCurEntry; sal_uLong m_nOldCount; bool m_bModified; diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 46c971499c67..8615477f6618 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -30,9 +30,9 @@ class SvxNameDialog : public ModalDialog { private: - FixedText* pFtDescription; - Edit* pEdtName; - OKButton* pBtnOK; + VclPtr pFtDescription; + VclPtr pEdtName; + VclPtr pBtnOK; Link aCheckNameHdl; @@ -40,6 +40,8 @@ private: public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); + virtual ~SvxNameDialog(); + virtual void dispose() SAL_OVERRIDE; void GetName( OUString& rName ){rName = pEdtName->GetText();} @@ -75,10 +77,10 @@ class SvxObjectNameDialog : public ModalDialog { private: // name - Edit* pEdtName; + VclPtr pEdtName; // buttons - OKButton* pBtnOK; + VclPtr pBtnOK; // callback link for name uniqueness Link aCheckNameHdl; @@ -88,6 +90,8 @@ private: public: // constructor SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName); + virtual ~SvxObjectNameDialog(); + virtual void dispose() SAL_OVERRIDE; // data access void GetName(OUString& rName) {rName = pEdtName->GetText(); } @@ -110,15 +114,16 @@ class SvxObjectTitleDescDialog : public ModalDialog { private: // title - Edit* pEdtTitle; + VclPtr pEdtTitle; // description - VclMultiLineEdit* pEdtDescription; + VclPtr pEdtDescription; public: // constructor SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc); - + virtual ~SvxObjectTitleDescDialog(); + virtual void dispose() SAL_OVERRIDE; // data access void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); } void GetDescription(OUString& rDescription) {rDescription = pEdtDescription->GetText(); } @@ -128,10 +133,10 @@ public: class SvxMessDialog : public ModalDialog { private: - FixedText* pFtDescription; - PushButton* pBtn1; - PushButton* pBtn2; - FixedImage* pFtImage; + VclPtr pFtDescription; + VclPtr pBtn1; + VclPtr pBtn2; + VclPtr pFtImage; Image* pImage; DECL_LINK(Button1Hdl, void *); diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index e0be5f3dd87e..0d07317c98ec 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -29,21 +29,23 @@ class SvxDistributePage : public SvxTabPage SvxDistributeHorizontal m_eDistributeHor; SvxDistributeVertical m_eDistributeVer; - RadioButton* m_pBtnHorNone; - RadioButton* m_pBtnHorLeft; - RadioButton* m_pBtnHorCenter; - RadioButton* m_pBtnHorDistance; - RadioButton* m_pBtnHorRight; - RadioButton* m_pBtnVerNone; - RadioButton* m_pBtnVerTop; - RadioButton* m_pBtnVerCenter; - RadioButton* m_pBtnVerDistance; - RadioButton* m_pBtnVerBottom; + VclPtr m_pBtnHorNone; + VclPtr m_pBtnHorLeft; + VclPtr m_pBtnHorCenter; + VclPtr m_pBtnHorDistance; + VclPtr m_pBtnHorRight; + VclPtr m_pBtnVerNone; + VclPtr m_pBtnVerTop; + VclPtr m_pBtnVerCenter; + VclPtr m_pBtnVerDistance; + VclPtr m_pBtnVerBottom; public: SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); + virtual ~SvxDistributePage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); @@ -57,12 +59,14 @@ public: class SvxDistributeDialog : public SfxSingleTabDialog { - SvxDistributePage* mpPage; + VclPtr mpPage; public: SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); + virtual ~SvxDistributeDialog(); + virtual void dispose() SAL_OVERRIDE; SvxDistributeHorizontal GetDistributeHor() const { return mpPage->GetDistributeHor(); } SvxDistributeVertical GetDistributeVer() const { return mpPage->GetDistributeVer(); } diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 39cd21b26538..e52d39c92a01 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -56,28 +56,28 @@ class SvxGrfCropPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - VclContainer* m_pCropFrame; - RadioButton* m_pZoomConstRB; - RadioButton* m_pSizeConstRB; - MetricField* m_pLeftMF; - MetricField* m_pRightMF; - MetricField* m_pTopMF; - MetricField* m_pBottomMF; - - VclContainer* m_pScaleFrame; - MetricField* m_pWidthZoomMF; - MetricField* m_pHeightZoomMF; - - VclContainer* m_pSizeFrame; - MetricField* m_pWidthMF; - MetricField* m_pHeightMF; - - VclContainer* m_pOrigSizeGrid; - FixedText* m_pOrigSizeFT; - PushButton* m_pOrigSizePB; + VclPtr m_pCropFrame; + VclPtr m_pZoomConstRB; + VclPtr m_pSizeConstRB; + VclPtr m_pLeftMF; + VclPtr m_pRightMF; + VclPtr m_pTopMF; + VclPtr m_pBottomMF; + + VclPtr m_pScaleFrame; + VclPtr m_pWidthZoomMF; + VclPtr m_pHeightZoomMF; + + VclPtr m_pSizeFrame; + VclPtr m_pWidthMF; + VclPtr m_pHeightMF; + + VclPtr m_pOrigSizeGrid; + VclPtr m_pOrigSizeFT; + VclPtr m_pOrigSizePB; // Example - SvxCropExample* m_pExampleWN; + VclPtr m_pExampleWN; Timer aTimer; @@ -85,7 +85,7 @@ class SvxGrfCropPage : public SfxTabPage Size aOrigSize; Size aOrigPixelSize; Size aPageSize; - const MetricField* pLastCropField; + VclPtr pLastCropField; long nOldWidth; long nOldHeight; bool bReset; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 2cfd24d24b60..6018b0fa161a 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -104,27 +104,27 @@ namespace svx { private: - PushButton* m_pFind; - PushButton* m_pIgnore; - PushButton* m_pIgnoreAll; - PushButton* m_pReplace; - PushButton* m_pReplaceAll; - PushButton* m_pOptions; - SuggestionDisplay* m_pSuggestions; - RadioButton* m_pSimpleConversion; - RadioButton* m_pHangulBracketed; - RadioButton* m_pHanjaBracketed; - Edit* m_pWordInput; - FixedText* m_pOriginalWord; - RubyRadioButton* m_pHanjaAbove; - RubyRadioButton* m_pHanjaBelow; - RubyRadioButton* m_pHangulAbove; - RubyRadioButton* m_pHangulBelow; - CheckBox* m_pHangulOnly; - CheckBox* m_pHanjaOnly; - CheckBox* m_pReplaceByChar; - - CheckBox* m_pIgnoreNonPrimary; + VclPtr m_pFind; + VclPtr m_pIgnore; + VclPtr m_pIgnoreAll; + VclPtr m_pReplace; + VclPtr m_pReplaceAll; + VclPtr m_pOptions; + VclPtr m_pSuggestions; + VclPtr m_pSimpleConversion; + VclPtr m_pHangulBracketed; + VclPtr m_pHanjaBracketed; + VclPtr m_pWordInput; + VclPtr m_pOriginalWord; + VclPtr m_pHanjaAbove; + VclPtr m_pHanjaBelow; + VclPtr m_pHangulAbove; + VclPtr m_pHangulBelow; + VclPtr m_pHangulOnly; + VclPtr m_pHanjaOnly; + VclPtr m_pReplaceByChar; + + VclPtr m_pIgnoreNonPrimary; /** are we working for a document? This is normally true, but in case the user uses the "find" functionality, we switch to working with what the user entered, which then does not have any relation to @@ -138,6 +138,8 @@ namespace svx HangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + virtual ~HangulHanjaConversionDialog(); + virtual void dispose() SAL_OVERRIDE; public: void SetOptionsChangedHdl( const Link& _rHdl ); @@ -196,14 +198,14 @@ namespace svx class HangulHanjaOptionsDialog : public ModalDialog { private: - SvxCheckListBox* m_pDictsLB; - CheckBox* m_pIgnorepostCB; - CheckBox* m_pShowrecentlyfirstCB; - CheckBox* m_pAutoreplaceuniqueCB; - PushButton* m_pNewPB; - PushButton* m_pEditPB; - PushButton* m_pDeletePB; - OKButton* m_pOkPB; + VclPtr m_pDictsLB; + VclPtr m_pIgnorepostCB; + VclPtr m_pShowrecentlyfirstCB; + VclPtr m_pAutoreplaceuniqueCB; + VclPtr m_pNewPB; + VclPtr m_pEditPB; + VclPtr m_pDeletePB; + VclPtr m_pOkPB; SvLBoxButtonData* m_pCheckButtonData; @@ -232,8 +234,8 @@ namespace svx class HangulHanjaNewDictDialog : public ModalDialog { private: - Edit* m_pDictNameED; - OKButton* m_pOkBtn; + VclPtr m_pDictNameED; + VclPtr m_pOkBtn; bool m_bEntered; @@ -241,6 +243,8 @@ namespace svx DECL_LINK( ModifyHdl, void* ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); + virtual ~HangulHanjaNewDictDialog(); + virtual void dispose() SAL_OVERRIDE; bool GetName( OUString& _rRetName ) const; }; @@ -251,14 +255,16 @@ namespace svx class SuggestionEdit : public Edit { private: - SuggestionEdit* m_pPrev; - SuggestionEdit* m_pNext; - ScrollBar* m_pScrollBar; + VclPtr m_pPrev; + VclPtr m_pNext; + VclPtr m_pScrollBar; bool ShouldScroll( bool _bUp ) const; void DoJump( bool _bUp ); public: SuggestionEdit( vcl::Window* pParent, WinBits nBits ); + virtual ~SuggestionEdit(); + virtual void dispose() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext); }; @@ -274,15 +280,15 @@ namespace svx OUString m_aOriginal; SuggestionList* m_pSuggestions; - ListBox* m_aBookLB; - ComboBox* m_aOriginalLB; - SuggestionEdit* m_aEdit1; - SuggestionEdit* m_aEdit2; - SuggestionEdit* m_aEdit3; - SuggestionEdit* m_aEdit4; - ScrollBar* m_aScrollSB; - PushButton* m_aNewPB; - PushButton* m_aDeletePB; + VclPtr m_aBookLB; + VclPtr m_aOriginalLB; + VclPtr m_aEdit1; + VclPtr m_aEdit2; + VclPtr m_aEdit3; + VclPtr m_aEdit4; + VclPtr m_aScrollSB; + VclPtr m_aNewPB; + VclPtr m_aDeletePB; sal_uInt16 m_nTopPos; bool m_bModifiedSuggestions; diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 186ce6a6fe9a..494b7a28d33a 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -30,11 +30,11 @@ class SvxHyperlinkNewDocTp : public SvxHyperlinkTabPageBase { private: - RadioButton *m_pRbtEditNow; - RadioButton *m_pRbtEditLater; - SvxHyperURLBox *m_pCbbPath; - PushButton *m_pBtCreate; - ListBox *m_pLbDocTypes; + VclPtr m_pRbtEditNow; + VclPtr m_pRbtEditLater; + VclPtr m_pCbbPath; + VclPtr m_pBtCreate; + VclPtr m_pLbDocTypes; bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 108df078dfa6..76dda781969a 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -30,12 +30,12 @@ class SvxHyperlinkDocTp : public SvxHyperlinkTabPageBase { private: - SvxHyperURLBox *m_pCbbPath; - PushButton *m_pBtFileopen; + VclPtr m_pCbbPath; + VclPtr m_pBtFileopen; - Edit *m_pEdTarget; - FixedText *m_pFtFullURL; - PushButton *m_pBtBrowse; + VclPtr m_pEdTarget; + VclPtr m_pFtFullURL; + VclPtr m_pBtBrowse; OUString maStrURL; @@ -67,6 +67,8 @@ protected: public: SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + virtual ~SvxHyperlinkDocTp(); + virtual void dispose() SAL_OVERRIDE; static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index bc76625641e4..03b0132c1263 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -32,15 +32,15 @@ class SvxHyperlinkInternetTp : public SvxHyperlinkTabPageBase { private: - RadioButton *m_pRbtLinktypInternet; - RadioButton *m_pRbtLinktypFTP; - SvxHyperURLBox *m_pCbbTarget; - PushButton *m_pBtBrowse; - FixedText *m_pFtLogin; - Edit *m_pEdLogin; - FixedText *m_pFtPassword; - Edit *m_pEdPassword; - CheckBox *m_pCbAnonymous; + VclPtr m_pRbtLinktypInternet; + VclPtr m_pRbtLinktypFTP; + VclPtr m_pCbbTarget; + VclPtr m_pBtBrowse; + VclPtr m_pFtLogin; + VclPtr m_pEdLogin; + VclPtr m_pFtPassword; + VclPtr m_pEdPassword; + VclPtr m_pCbAnonymous; OUString maStrOldUser; OUString maStrOldPassword; @@ -78,6 +78,8 @@ protected: public: SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + virtual ~SvxHyperlinkInternetTp(); + virtual void dispose() SAL_OVERRIDE; static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 1687e848156c..5eae01b5851a 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -30,10 +30,10 @@ class SvxHyperlinkMailTp : public SvxHyperlinkTabPageBase { private: - SvxHyperURLBox *m_pCbbReceiver; - PushButton *m_pBtAdrBook; - FixedText *m_pFtSubject; - Edit *m_pEdSubject; + VclPtr m_pCbbReceiver; + VclPtr m_pBtAdrBook; + VclPtr m_pFtSubject; + VclPtr m_pEdSubject; DECL_LINK (ClickAdrBookHdl_Impl , void * ); ///< Button : Address book DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified @@ -51,6 +51,8 @@ protected: public: SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + virtual ~SvxHyperlinkMailTp(); + virtual void dispose() SAL_OVERRIDE; static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index e9d8c32dac9c..9591a2a0f640 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -39,10 +39,12 @@ class SvxHlinkDlgMarkWnd; class SvxHlmarkTreeLBox : public SvTreeListBox { private: - SvxHlinkDlgMarkWnd* mpParentWnd; + VclPtr mpParentWnd; public: SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle); + virtual ~SvxHlmarkTreeLBox(); + virtual void dispose() SAL_OVERRIDE; void SetParentWnd(SvxHlinkDlgMarkWnd* pParent) { @@ -62,13 +64,13 @@ class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow private: friend class SvxHlmarkTreeLBox; - PushButton* mpBtApply; - PushButton* mpBtClose; - SvxHlmarkTreeLBox* mpLbTree; + VclPtr mpBtApply; + VclPtr mpBtClose; + VclPtr mpLbTree; bool mbUserMoved; - SvxHyperlinkTabPageBase* mpParent; + VclPtr mpParent; OUString maStrLastURL; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 275d28b7afed..d155d6e42de7 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -67,11 +67,11 @@ public: class SvxHyperlinkTabPageBase : public IconChoicePage { private: - ComboBox *mpCbbFrame; - ListBox *mpLbForm; - Edit *mpEdIndication; - Edit *mpEdText; - PushButton *mpBtScript; + VclPtr mpCbbFrame; + VclPtr mpLbForm; + VclPtr mpEdIndication; + VclPtr mpEdText; + VclPtr mpBtScript; bool mbIsCloseDisabled; @@ -79,7 +79,7 @@ private: mxDocumentFrame; protected: - vcl::Window* mpDialog; + VclPtr mpDialog; bool mbStdControlsInit; @@ -87,7 +87,7 @@ protected: Timer maTimer; - SvxHlinkDlgMarkWnd* mpMarkWnd; + VclPtr mpMarkWnd; void InitStdControls (); void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem ); diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 16821011e500..3bf97672b99b 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -42,14 +42,14 @@ protected: class SvxHyphenWordDialog : public SfxModalDialog { - HyphenEdit* m_pWordEdit; - PushButton* m_pLeftBtn; - PushButton* m_pRightBtn; - PushButton* m_pOkBtn; - PushButton* m_pContBtn; - PushButton* m_pDelBtn; - PushButton* m_pHyphAll; - CloseButton* m_pCloseBtn; + VclPtr m_pWordEdit; + VclPtr m_pLeftBtn; + VclPtr m_pRightBtn; + VclPtr m_pOkBtn; + VclPtr m_pContBtn; + VclPtr m_pDelBtn; + VclPtr m_pHyphAll; + VclPtr m_pCloseBtn; OUString aLabel; SvxSpellWrapper* pHyphWrapper; css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator; @@ -85,6 +85,8 @@ public: vcl::Window* pParent, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); + virtual ~SvxHyphenWordDialog(); + virtual void dispose() SAL_OVERRIDE; void SetWindowTitle( LanguageType nLang ); void SelLeft(); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 21a8d5b1025a..62260e2e9dd2 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -49,7 +49,7 @@ struct IconChoicePageData sal_uInt16 nId; CreatePage fnCreatePage; ///< pointer to the factory GetPageRanges fnGetRanges; ///< pointer to the ranges-function - IconChoicePage* pPage; ///< the TabPage itself + VclPtr pPage; ///< the TabPage itself bool bOnDemand; ///< Flag: ItemSet onDemand bool bRefresh; ///< Flag: page has to be newly initialized @@ -73,7 +73,7 @@ private : const SfxItemSet* pSet; OUString aUserString; bool bHasExchangeSupport; - IconChoiceDialog* pDialog; + VclPtr pDialog; void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } IconChoiceDialog* GetDialog() const { return pDialog; } @@ -85,10 +85,12 @@ private : protected : IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); - sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } - sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } + sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } + sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } public : + virtual ~IconChoicePage(); + virtual void dispose() SAL_OVERRIDE; const SfxItemSet& GetItemSet() const { return *pSet; } @@ -124,18 +126,18 @@ private : ::std::vector< IconChoicePageData* > maPageList; - SvtIconChoiceCtrl *m_pIconCtrl; + VclPtr m_pIconCtrl; sal_uInt16 mnCurrentPageId; // Buttons - OKButton *m_pOKBtn; - PushButton *m_pApplyBtn; - CancelButton *m_pCancelBtn; - HelpButton *m_pHelpBtn; - PushButton *m_pResetBtn; + VclPtr m_pOKBtn; + VclPtr m_pApplyBtn; + VclPtr m_pCancelBtn; + VclPtr m_pHelpBtn; + VclPtr m_pResetBtn; - VclVBox *m_pTabContainer; + VclPtr m_pTabContainer; const SfxItemSet* pSet; SfxItemSet* pOutSet; SfxItemSet* pExampleSet; @@ -166,7 +168,7 @@ protected : SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); inline SfxItemSet* GetInputSetImpl() { return const_cast(pSet); } inline IconChoicePage* GetTabPage( sal_uInt16 nPageId ) - { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); } + { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage.get():NULL); } void RefreshInputSet(); void ActivatePageImpl (); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 009174bbffcc..eda64bad3349 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -56,14 +56,14 @@ public: class SvInsertOleDlg : public InsertObjectDialog_Impl { - RadioButton* m_pRbNewObject; - RadioButton* m_pRbObjectFromfile; - VclFrame* m_pObjectTypeFrame; - ListBox* m_pLbObjecttype; - VclFrame* m_pFileFrame; - Edit* m_pEdFilepath; - PushButton* m_pBtnFilepath; - CheckBox* m_pCbFilelink; + VclPtr m_pRbNewObject; + VclPtr m_pRbObjectFromfile; + VclPtr m_pObjectTypeFrame; + VclPtr m_pLbObjecttype; + VclPtr m_pFileFrame; + VclPtr m_pEdFilepath; + VclPtr m_pBtnFilepath; + VclPtr m_pCbFilelink; const SvObjectServerList* m_pServers; ::com::sun::star::uno::Sequence< sal_Int8 > m_aIconMetaFile; @@ -86,6 +86,8 @@ public: SvInsertOleDlg( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); + virtual ~SvInsertOleDlg(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; /// get replacement for the iconified embedded object and the mediatype of the replacement @@ -95,9 +97,9 @@ public: class SvInsertPlugInDialog : public InsertObjectDialog_Impl { private: - Edit* m_pEdFileurl; - PushButton* m_pBtnFileurl; - VclMultiLineEdit* m_pEdPluginsOptions; + VclPtr m_pEdFileurl; + VclPtr m_pBtnFileurl; + VclPtr m_pEdPluginsOptions; INetURLObject* m_pURL; OUString m_aCommands; @@ -116,23 +118,23 @@ public: class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl { private: - Edit* m_pEDName; - Edit* m_pEDURL; - PushButton* m_pBTOpen; + VclPtr m_pEDName; + VclPtr m_pEDURL; + VclPtr m_pBTOpen; - RadioButton* m_pRBScrollingOn; - RadioButton* m_pRBScrollingOff; - RadioButton* m_pRBScrollingAuto; + VclPtr m_pRBScrollingOn; + VclPtr m_pRBScrollingOff; + VclPtr m_pRBScrollingAuto; - RadioButton* m_pRBFrameBorderOn; - RadioButton* m_pRBFrameBorderOff; + VclPtr m_pRBFrameBorderOn; + VclPtr m_pRBFrameBorderOff; - FixedText* m_pFTMarginWidth; - NumericField* m_pNMMarginWidth; - CheckBox* m_pCBMarginWidthDefault; - FixedText* m_pFTMarginHeight; - NumericField* m_pNMMarginHeight; - CheckBox* m_pCBMarginHeightDefault; + VclPtr m_pFTMarginWidth; + VclPtr m_pNMMarginWidth; + VclPtr m_pCBMarginWidthDefault; + VclPtr m_pFTMarginHeight; + VclPtr m_pNMMarginHeight; + VclPtr m_pCBMarginHeightDefault; DECL_STATIC_LINK(SfxInsertFloatingFrameDialog, OpenHdl, PushButton* ); DECL_STATIC_LINK(SfxInsertFloatingFrameDialog, CheckHdl, CheckBox* ); @@ -144,6 +146,8 @@ public: const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); SfxInsertFloatingFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); + virtual ~SfxInsertFloatingFrameDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; }; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 012916b89423..f24467db07cd 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -31,10 +31,10 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog { - NumericField* m_pCountEdit; + VclPtr m_pCountEdit; - RadioButton* m_pBeforeBtn; - RadioButton* m_pAfterBtn; + VclPtr m_pBeforeBtn; + VclPtr m_pAfterBtn; OUString aRow; OUString aCol; @@ -43,6 +43,8 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog public: SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); + virtual ~SvxInsRowColDlg(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute(void) SAL_OVERRIDE; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 446499f28887..7b20283f2ebc 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -34,16 +34,16 @@ class SvxCaptionTabPage : public SfxTabPage { private: static const sal_uInt16 pCaptionRanges[]; - ValueSet* m_pCT_CAPTTYPE; - MetricField* m_pMF_ABSTAND; - ListBox* m_pLB_ANSATZ; - FixedText* m_pFT_UM; - MetricField* m_pMF_ANSATZ; - FixedText* m_pFT_ANSATZ_REL; - ListBox* m_pLB_ANSATZ_REL; - FixedText* m_pFT_LAENGE; - MetricField* m_pMF_LAENGE; - CheckBox* m_pCB_LAENGE; + VclPtr m_pCT_CAPTTYPE; + VclPtr m_pMF_ABSTAND; + VclPtr m_pLB_ANSATZ; + VclPtr m_pFT_UM; + VclPtr m_pMF_ANSATZ; + VclPtr m_pFT_ANSATZ_REL; + VclPtr m_pLB_ANSATZ_REL; + VclPtr m_pFT_LAENGE; + VclPtr m_pMF_LAENGE; + VclPtr m_pCB_LAENGE; Image m_aBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; @@ -75,6 +75,8 @@ private: public: SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxCaptionTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pCaptionRanges; } diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 62afb0c54b80..7e953fcd747e 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -44,16 +44,16 @@ class SvBaseLinksDlg : public ModalDialog { using Window::SetType; - SvTabListBox *m_pTbLinks; - FixedText *m_pFtFullFileName; - FixedText *m_pFtFullSourceName; - FixedText *m_pFtFullTypeName; - RadioButton *m_pRbAutomatic; - RadioButton *m_pRbManual; - PushButton *m_pPbUpdateNow; - PushButton *m_pPbOpenSource; - PushButton *m_pPbChangeSource; - PushButton *m_pPbBreakLink; + VclPtr m_pTbLinks; + VclPtr m_pFtFullFileName; + VclPtr m_pFtFullSourceName; + VclPtr m_pFtFullTypeName; + VclPtr m_pRbAutomatic; + VclPtr m_pRbManual; + VclPtr m_pPbUpdateNow; + VclPtr m_pPbOpenSource; + VclPtr m_pPbChangeSource; + VclPtr m_pPbBreakLink; OUString aStrAutolink; OUString aStrManuallink; OUString aStrBrokenlink; @@ -95,6 +95,8 @@ class SvBaseLinksDlg : public ModalDialog public: SvBaseLinksDlg( vcl::Window * pParent, sfx2::LinkManager*, bool bHtml = false ); + virtual ~SvBaseLinksDlg(); + virtual void dispose() SAL_OVERRIDE; void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 7e7bc034cbbe..18b0fc6ce20d 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -33,23 +33,23 @@ class SvxMeasurePage : public SvxTabPage private: static const sal_uInt16 pRanges[]; - MetricField* m_pMtrFldLineDist; - MetricField* m_pMtrFldHelplineOverhang; - MetricField* m_pMtrFldHelplineDist; - MetricField* m_pMtrFldHelpline1Len; - MetricField* m_pMtrFldHelpline2Len; - TriStateBox* m_pTsbBelowRefEdge; - MetricField* m_pMtrFldDecimalPlaces; - - SvxRectCtl* m_pCtlPosition; - TriStateBox* m_pTsbAutoPosV; - TriStateBox* m_pTsbAutoPosH; - TriStateBox* m_pTsbShowUnit; - ListBox* m_pLbUnit; - TriStateBox* m_pTsbParallel; - FixedText* m_pFtAutomatic; - - SvxXMeasurePreview* m_pCtlPreview; + VclPtr m_pMtrFldLineDist; + VclPtr m_pMtrFldHelplineOverhang; + VclPtr m_pMtrFldHelplineDist; + VclPtr m_pMtrFldHelpline1Len; + VclPtr m_pMtrFldHelpline2Len; + VclPtr m_pTsbBelowRefEdge; + VclPtr m_pMtrFldDecimalPlaces; + + VclPtr m_pCtlPosition; + VclPtr m_pTsbAutoPosV; + VclPtr m_pTsbAutoPosH; + VclPtr m_pTsbShowUnit; + VclPtr m_pLbUnit; + VclPtr m_pTsbParallel; + VclPtr m_pFtAutomatic; + + VclPtr m_pCtlPreview; const SfxItemSet& rOutAttrs; SfxItemSet aAttrSet; @@ -66,6 +66,8 @@ private: public: SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxMeasurePage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 685bbc32d96d..ecc1395f6cad 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -39,9 +39,9 @@ class SvxMultiPathDialog : public ModalDialog { private: - svx::SvxRadioButtonListBox* m_pRadioLB; - PushButton* m_pAddBtn; - PushButton* m_pDelBtn; + VclPtr m_pRadioLB; + VclPtr m_pAddBtn; + VclPtr m_pDelBtn; DECL_LINK(AddHdl_Impl, void *); DECL_LINK(DelHdl_Impl, void *); @@ -60,9 +60,9 @@ public: class SvxPathSelectDialog : public ModalDialog { private: - ListBox* m_pPathLB; - PushButton* m_pAddBtn; - PushButton* m_pDelBtn; + VclPtr m_pPathLB; + VclPtr m_pAddBtn; + VclPtr m_pDelBtn; DECL_LINK(AddHdl_Impl, void *); DECL_LINK(DelHdl_Impl, void *); diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 778457aec69e..f6be298f88d2 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -29,11 +29,13 @@ class SvxNewTableDialog : public SvxAbstractNewTableDialog, public ModalDialog { private: - NumericField* mpNumColumns; - NumericField* mpNumRows; + VclPtr mpNumColumns; + VclPtr mpNumRows; public: SvxNewTableDialog( vcl::Window* pWindow ); + virtual ~SvxNewTableDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute(void) SAL_OVERRIDE; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 7a633e325872..552f59249a3e 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -92,31 +92,31 @@ public: private: SvxNumberFormatTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); - FixedText* m_pFtCategory; - ListBox* m_pLbCategory; - FixedText* m_pFtFormat; - ListBox* m_pLbCurrency; - SvxFontListBox* m_pLbFormat; - FixedText* m_pFtLanguage; - SvxLanguageBox* m_pLbLanguage; - CheckBox* m_pCbSourceFormat; - SvxNumberPreview* m_pWndPreview; - FixedText* m_pFtOptions; - FixedText* m_pFtDecimals; - NumericField* m_pEdDecimals; - CheckBox* m_pBtnNegRed; - FixedText* m_pFtLeadZeroes; - NumericField* m_pEdLeadZeroes; - CheckBox* m_pBtnThousand; - - VclContainer* m_pFormatCodeFrame; - Edit* m_pEdFormat; - PushButton* m_pIbAdd; - PushButton* m_pIbInfo; - PushButton* m_pIbRemove; - - FixedText* m_pFtComment; - Edit* m_pEdComment; + VclPtr m_pFtCategory; + VclPtr m_pLbCategory; + VclPtr m_pFtFormat; + VclPtr m_pLbCurrency; + VclPtr m_pLbFormat; + VclPtr m_pFtLanguage; + VclPtr m_pLbLanguage; + VclPtr m_pCbSourceFormat; + VclPtr m_pWndPreview; + VclPtr m_pFtOptions; + VclPtr m_pFtDecimals; + VclPtr m_pEdDecimals; + VclPtr m_pBtnNegRed; + VclPtr m_pFtLeadZeroes; + VclPtr m_pEdLeadZeroes; + VclPtr m_pBtnThousand; + + VclPtr m_pFormatCodeFrame; + VclPtr m_pEdFormat; + VclPtr m_pIbAdd; + VclPtr m_pIbInfo; + VclPtr m_pIbRemove; + + VclPtr m_pFtComment; + VclPtr m_pEdComment; Timer aResetWinTimer; @@ -131,7 +131,7 @@ private: OUString sAutomaticEntry; - vcl::Window* pLastActivWindow; + VclPtr pLastActivWindow; void Init_Impl(); void FillCurrencyBox(); @@ -146,11 +146,11 @@ private: void ChangePreviewText( sal_uInt16 nPos ); void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); // Handler - DECL_LINK( LostFocusHdl_Impl, Edit* pEd ); - DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb ); + DECL_LINK( LostFocusHdl_Impl, Edit* ); + DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* ); DECL_LINK( SelFormatHdl_Impl, void * ); - DECL_LINK( ClickHdl_Impl, PushButton* pIB ); - DECL_LINK( EditHdl_Impl, Edit* pEdFormat ); + DECL_LINK( ClickHdl_Impl, PushButton* ); + DECL_LINK( EditHdl_Impl, Edit* ); DECL_LINK( OptHdl_Impl, void * ); DECL_LINK(TimeHdl_Impl, void *); }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 9f9cca7bd9df..f2cb95c9c112 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -90,7 +90,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - SvxNumValueSet* m_pExamplesVS; + VclPtr m_pExamplesVS; SvxNumSettingsArr_Impl aNumSettingsArr; SvxNumRule* pActNum; SvxNumRule* pSaveNum; @@ -130,7 +130,7 @@ class SvxBulletPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - SvxNumValueSet* m_pExamplesVS; + VclPtr m_pExamplesVS; SvxNumRule* pActNum; SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; @@ -168,7 +168,7 @@ class SvxNumPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - SvxNumValueSet* m_pExamplesVS; + VclPtr m_pExamplesVS; OUString sNumCharFmtName; OUString sBulletCharFmtName; @@ -213,8 +213,8 @@ class SvxBitmapPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - FixedText* m_pErrorText; - SvxBmpNumValueSet* m_pExamplesVS; + VclPtr m_pErrorText; + VclPtr m_pExamplesVS; std::vector aGrfNames; OUString sNumCharFmtName; @@ -255,44 +255,44 @@ class SvxNumOptionsTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - ListBox* m_pLevelLB; - - ListBox* m_pFmtLB; - - FixedText* m_pSeparatorFT; - FixedText* m_pPrefixFT; - Edit* m_pPrefixED; - FixedText* m_pSuffixFT; - Edit* m_pSuffixED; - FixedText* m_pCharFmtFT; - ListBox* m_pCharFmtLB; - FixedText* m_pBulColorFT; - ColorListBox* m_pBulColLB; - FixedText* m_pBulRelSizeFT; - MetricField* m_pBulRelSizeMF; - FixedText* m_pAllLevelFT; - NumericField* m_pAllLevelNF; - FixedText* m_pStartFT; - NumericField* m_pStartED; - FixedText* m_pBulletFT; - PushButton* m_pBulletPB; - FixedText* m_pAlignFT; - ListBox* m_pAlignLB; - FixedText* m_pBitmapFT; - MenuButton* m_pBitmapMB; + VclPtr m_pLevelLB; + + VclPtr m_pFmtLB; + + VclPtr m_pSeparatorFT; + VclPtr m_pPrefixFT; + VclPtr m_pPrefixED; + VclPtr m_pSuffixFT; + VclPtr m_pSuffixED; + VclPtr m_pCharFmtFT; + VclPtr m_pCharFmtLB; + VclPtr m_pBulColorFT; + VclPtr m_pBulColLB; + VclPtr m_pBulRelSizeFT; + VclPtr m_pBulRelSizeMF; + VclPtr m_pAllLevelFT; + VclPtr m_pAllLevelNF; + VclPtr m_pStartFT; + VclPtr m_pStartED; + VclPtr m_pBulletFT; + VclPtr m_pBulletPB; + VclPtr m_pAlignFT; + VclPtr m_pAlignLB; + VclPtr m_pBitmapFT; + VclPtr m_pBitmapMB; sal_uInt16 m_nGalleryId; - FixedText* m_pWidthFT; - MetricField* m_pWidthMF; - FixedText* m_pHeightFT; - MetricField* m_pHeightMF; - CheckBox* m_pRatioCB; - FixedText* m_pOrientFT; - ListBox* m_pOrientLB; + VclPtr m_pWidthFT; + VclPtr m_pWidthMF; + VclPtr m_pHeightFT; + VclPtr m_pHeightMF; + VclPtr m_pRatioCB; + VclPtr m_pOrientFT; + VclPtr m_pOrientLB; - VclContainer* m_pAllLevelsFrame; - CheckBox* m_pSameLevelCB; + VclPtr m_pAllLevelsFrame; + VclPtr m_pSameLevelCB; - SvxNumberingPreview* m_pPreviewWIN; + VclPtr m_pPreviewWIN; OUString m_sNumCharFmtName; OUString m_sBulletCharFmtName; @@ -390,36 +390,36 @@ class SvxNumPositionTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - ListBox* m_pLevelLB; + VclPtr m_pLevelLB; // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION - FixedText* m_pDistBorderFT; - MetricField* m_pDistBorderMF; - CheckBox* m_pRelativeCB; - FixedText* m_pIndentFT; - MetricField* m_pIndentMF; - FixedText* m_pDistNumFT; - MetricField* m_pDistNumMF; - FixedText* m_pAlignFT; - ListBox* m_pAlignLB; + VclPtr m_pDistBorderFT; + VclPtr m_pDistBorderMF; + VclPtr m_pRelativeCB; + VclPtr m_pIndentFT; + VclPtr m_pIndentMF; + VclPtr m_pDistNumFT; + VclPtr m_pDistNumMF; + VclPtr m_pAlignFT; + VclPtr m_pAlignLB; // new set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT - FixedText* m_pLabelFollowedByFT; - ListBox* m_pLabelFollowedByLB; - FixedText* m_pListtabFT; - MetricField* m_pListtabMF; - FixedText* m_pAlign2FT; - ListBox* m_pAlign2LB; - FixedText* m_pAlignedAtFT; - MetricField* m_pAlignedAtMF; - FixedText* m_pIndentAtFT; - MetricField* m_pIndentAtMF; - - PushButton* m_pStandardPB; - - SvxNumberingPreview* m_pPreviewWIN; + VclPtr m_pLabelFollowedByFT; + VclPtr m_pLabelFollowedByLB; + VclPtr m_pListtabFT; + VclPtr m_pListtabMF; + VclPtr m_pAlign2FT; + VclPtr m_pAlign2LB; + VclPtr m_pAlignedAtFT; + VclPtr m_pAlignedAtMF; + VclPtr m_pIndentAtFT; + VclPtr m_pIndentAtMF; + + VclPtr m_pStandardPB; + + VclPtr m_pPreviewWIN; SvxNumRule* pActNum; SvxNumRule* pSaveNum; diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 5dc19787d471..5be6d8034a51 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -29,22 +29,22 @@ struct SvxAsianLayoutPage_Impl; class SvxAsianLayoutPage : public SfxTabPage { - RadioButton* m_pCharKerningRB; - RadioButton* m_pCharPunctKerningRB; + VclPtr m_pCharKerningRB; + VclPtr m_pCharPunctKerningRB; - RadioButton* m_pNoCompressionRB; - RadioButton* m_pPunctCompressionRB; - RadioButton* m_pPunctKanaCompressionRB; + VclPtr m_pNoCompressionRB; + VclPtr m_pPunctCompressionRB; + VclPtr m_pPunctKanaCompressionRB; - FixedText* m_pLanguageFT; - SvxLanguageBox* m_pLanguageLB; - CheckBox* m_pStandardCB; + VclPtr m_pLanguageFT; + VclPtr m_pLanguageLB; + VclPtr m_pStandardCB; - FixedText* m_pStartFT; - Edit* m_pStartED; - FixedText* m_pEndFT; - Edit* m_pEndED; - FixedText* m_pHintFT; + VclPtr m_pStartFT; + VclPtr m_pStartED; + VclPtr m_pEndFT; + VclPtr m_pEndED; + VclPtr m_pHintFT; SvxAsianLayoutPage_Impl* pImpl; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 9ed48ed6f1f8..3bdffc3f0edd 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -50,10 +50,10 @@ namespace linguistic2{ class SvxNewDictionaryDialog : public ModalDialog { private: - Edit* pNameEdit; - SvxLanguageBox* pLanguageLB; - CheckBox* pExceptBtn; - OKButton* pOKBtn; + VclPtr pNameEdit; + VclPtr pLanguageLB; + VclPtr pExceptBtn; + VclPtr pOKBtn; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; ::com::sun::star::uno::Reference< @@ -66,6 +66,8 @@ public: SvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); + virtual ~SvxNewDictionaryDialog(); + virtual void dispose() SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > @@ -100,16 +102,16 @@ class SvxEditDictionaryDialog : public ModalDialog { private: - ListBox* pAllDictsLB; - FixedText* pLangFT; - SvxLanguageBox* pLangLB; + VclPtr pAllDictsLB; + VclPtr pLangFT; + VclPtr pLangLB; - SvxDictEdit* pWordED; - FixedText* pReplaceFT; - SvxDictEdit* pReplaceED; - SvTabListBox* pWordsLB; - PushButton* pNewReplacePB; - PushButton* pDeletePB; + VclPtr pWordED; + VclPtr pReplaceFT; + VclPtr pReplaceED; + VclPtr pWordsLB; + VclPtr pNewReplacePB; + VclPtr pDeletePB; OUString sModify; OUString sNew; @@ -152,6 +154,8 @@ public: const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl ); + virtual ~SvxEditDictionaryDialog(); + virtual void dispose() SAL_OVERRIDE; sal_uInt16 GetSelectedDict() {return pAllDictsLB->GetSelectEntryPos();} }; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index cb49363bafe6..0dea8bc01149 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -52,15 +52,15 @@ class SvxLinguData_Impl; class SvxEditModulesDlg : public ModalDialog { - SvxLanguageBox* m_pLanguageLB; + VclPtr m_pLanguageLB; - SvxCheckListBox* m_pModulesCLB; - PushButton* m_pPrioUpPB; - PushButton* m_pPrioDownPB; - PushButton* m_pBackPB; - FixedHyperlink* m_pMoreDictsLink; + VclPtr m_pModulesCLB; + VclPtr m_pPrioUpPB; + VclPtr m_pPrioDownPB; + VclPtr m_pBackPB; + VclPtr m_pMoreDictsLink; - CloseButton* m_pClosePB; + VclPtr m_pClosePB; OUString sSpell; OUString sHyph; @@ -94,17 +94,17 @@ public: class SvxLinguTabPage : public SfxTabPage { private: - FixedText* m_pLinguModulesFT; - SvxCheckListBox* m_pLinguModulesCLB; - PushButton* m_pLinguModulesEditPB; - FixedText* m_pLinguDicsFT; - SvxCheckListBox* m_pLinguDicsCLB; - PushButton* m_pLinguDicsNewPB; - PushButton* m_pLinguDicsEditPB; - PushButton* m_pLinguDicsDelPB; - SvxCheckListBox* m_pLinguOptionsCLB; - PushButton* m_pLinguOptionsEditPB; - FixedHyperlink* m_pMoreDictsLink; + VclPtr m_pLinguModulesFT; + VclPtr m_pLinguModulesCLB; + VclPtr m_pLinguModulesEditPB; + VclPtr m_pLinguDicsFT; + VclPtr m_pLinguDicsCLB; + VclPtr m_pLinguDicsNewPB; + VclPtr m_pLinguDicsEditPB; + VclPtr m_pLinguDicsDelPB; + VclPtr m_pLinguOptionsCLB; + VclPtr m_pLinguOptionsEditPB; + VclPtr m_pMoreDictsLink; OUString sCapitalWords; OUString sWordsWithDigits; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 89cf4857371a..3e0ff7e7dc71 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -42,11 +42,11 @@ class SvxPathTabPage; class SvxPathTabPage : public SfxTabPage { private: - SvSimpleTableContainer* m_pPathCtrl; - PushButton* m_pStandardBtn; - PushButton* m_pPathBtn; + VclPtr m_pPathCtrl; + VclPtr m_pStandardBtn; + VclPtr m_pPathBtn; - ::svx::OptHeaderTabListBox* pPathBox; + VclPtr<::svx::OptHeaderTabListBox> pPathBox; OptPath_Impl* pImpl; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index fae515c87d41..f34239c850f2 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -75,53 +75,53 @@ class SvxPageDescPage : public SfxTabPage static const sal_uInt16 pRanges[]; private: // paper format - ListBox* m_pPaperSizeBox; + VclPtr m_pPaperSizeBox; - MetricField* m_pPaperWidthEdit; - MetricField* m_pPaperHeightEdit; + VclPtr m_pPaperWidthEdit; + VclPtr m_pPaperHeightEdit; - FixedText* m_pOrientationFT; - RadioButton* m_pPortraitBtn; - RadioButton* m_pLandscapeBtn; + VclPtr m_pOrientationFT; + VclPtr m_pPortraitBtn; + VclPtr m_pLandscapeBtn; - SvxPageWindow* m_pBspWin; + VclPtr m_pBspWin; - FixedText* m_pTextFlowLbl; - svx::FrameDirectionListBox* m_pTextFlowBox; + VclPtr m_pTextFlowLbl; + VclPtr m_pTextFlowBox; - ListBox* m_pPaperTrayBox; + VclPtr m_pPaperTrayBox; // Margins - FixedText* m_pLeftMarginLbl; - MetricField* m_pLeftMarginEdit; - FixedText* m_pRightMarginLbl; - MetricField* m_pRightMarginEdit; - MetricField* m_pTopMarginEdit; - MetricField* m_pBottomMarginEdit; + VclPtr m_pLeftMarginLbl; + VclPtr m_pLeftMarginEdit; + VclPtr m_pRightMarginLbl; + VclPtr m_pRightMarginEdit; + VclPtr m_pTopMarginEdit; + VclPtr m_pBottomMarginEdit; // layout settings - FixedText* m_pPageText; - ListBox* m_pLayoutBox; - ListBox* m_pNumberFormatBox; + VclPtr m_pPageText; + VclPtr m_pLayoutBox; + VclPtr m_pNumberFormatBox; //Extras Calc - FixedText* m_pTblAlignFT; - CheckBox* m_pHorzBox; - CheckBox* m_pVertBox; + VclPtr m_pTblAlignFT; + VclPtr m_pHorzBox; + VclPtr m_pVertBox; // Impress and Draw - CheckBox* m_pAdaptBox; + VclPtr m_pAdaptBox; //Register Writer - CheckBox* m_pRegisterCB; - FixedText* m_pRegisterFT; - ListBox* m_pRegisterLB; + VclPtr m_pRegisterCB; + VclPtr m_pRegisterFT; + VclPtr m_pRegisterLB; OUString sStandardRegister; - FixedText* m_pInsideLbl; - FixedText* m_pOutsideLbl; - FixedText* m_pPrintRangeQueryText; + VclPtr m_pInsideLbl; + VclPtr m_pOutsideLbl; + VclPtr m_pPrintRangeQueryText; long nFirstLeftMargin; long nFirstRightMargin; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 26a9bc78d9cf..401158ead1da 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -52,32 +52,32 @@ private: SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // indention - SvxRelativeField* m_pLeftIndent; + VclPtr m_pLeftIndent; - FixedText* m_pRightLabel; - SvxRelativeField* m_pRightIndent; + VclPtr m_pRightLabel; + VclPtr m_pRightIndent; - FixedText* m_pFLineLabel; - SvxRelativeField* m_pFLineIndent; - CheckBox* m_pAutoCB; + VclPtr m_pFLineLabel; + VclPtr m_pFLineIndent; + VclPtr m_pAutoCB; // distance - SvxRelativeField* m_pTopDist; - SvxRelativeField* m_pBottomDist; - CheckBox* m_pContextualCB; + VclPtr m_pTopDist; + VclPtr m_pBottomDist; + VclPtr m_pContextualCB; // line spacing - ListBox* m_pLineDist; - FixedText* m_pLineDistAtLabel; - MetricField* m_pLineDistAtPercentBox; - MetricField* m_pLineDistAtMetricBox; - FixedText* m_pAbsDist; + VclPtr m_pLineDist; + VclPtr m_pLineDistAtLabel; + VclPtr m_pLineDistAtPercentBox; + VclPtr m_pLineDistAtMetricBox; + VclPtr m_pAbsDist; OUString sAbsDist; - SvxParaPrevWindow* m_pExampleWin; + VclPtr m_pExampleWin; // only writer - VclFrame* m_pRegisterFL; - CheckBox* m_pRegisterCB; + VclPtr m_pRegisterFL; + VclPtr m_pRegisterCB; long nAbst; long nWidth; @@ -98,6 +98,9 @@ protected: public: + virtual ~SvxStdParagraphTabPage(); + virtual void dispose() SAL_OVERRIDE; + DECL_LINK(ELRLoseFocusHdl, void *); static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -125,27 +128,27 @@ class SvxParaAlignTabPage : public SfxTabPage static const sal_uInt16 pAlignRanges[]; // alignment - RadioButton* m_pLeft; - RadioButton* m_pRight; - RadioButton* m_pCenter; - RadioButton* m_pJustify; - FixedText* m_pLeftBottom; - FixedText* m_pRightTop; + VclPtr m_pLeft; + VclPtr m_pRight; + VclPtr m_pCenter; + VclPtr m_pJustify; + VclPtr m_pLeftBottom; + VclPtr m_pRightTop; - FixedText* m_pLastLineFT; - ListBox* m_pLastLineLB; - CheckBox* m_pExpandCB; + VclPtr m_pLastLineFT; + VclPtr m_pLastLineLB; + VclPtr m_pExpandCB; - CheckBox* m_pSnapToGridCB; + VclPtr m_pSnapToGridCB; //preview - SvxParaPrevWindow* m_pExampleWin; + VclPtr m_pExampleWin; //vertical alignment - VclFrame* m_pVertAlignFL; - ListBox* m_pVertAlignLB; + VclPtr m_pVertAlignFL; + VclPtr m_pVertAlignLB; - VclFrame* m_pPropertiesFL; - svx::FrameDirectionListBox* m_pTextDirectionLB; + VclPtr m_pPropertiesFL; + VclPtr m_pTextDirectionLB; DECL_LINK(AlignHdl_Impl, void *); DECL_LINK(LastLineHdl_Impl, void *); @@ -159,6 +162,9 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: + virtual ~SvxParaAlignTabPage(); + virtual void dispose() SAL_OVERRIDE; + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pAlignRanges; } @@ -189,6 +195,9 @@ class SvxExtParagraphTabPage: public SfxTabPage static const sal_uInt16 pExtRanges[]; public: + virtual ~SvxExtParagraphTabPage(); + virtual void dispose() SAL_OVERRIDE; + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pExtRanges; } @@ -205,37 +214,37 @@ private: SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // hyphenation - TriStateBox* m_pHyphenBox; - FixedText* m_pBeforeText; - NumericField* m_pExtHyphenBeforeBox; - FixedText* m_pAfterText; - NumericField* m_pExtHyphenAfterBox; - FixedText* m_pMaxHyphenLabel; - NumericField* m_pMaxHyphenEdit; + VclPtr m_pHyphenBox; + VclPtr m_pBeforeText; + VclPtr m_pExtHyphenBeforeBox; + VclPtr m_pAfterText; + VclPtr m_pExtHyphenAfterBox; + VclPtr m_pMaxHyphenLabel; + VclPtr m_pMaxHyphenEdit; // pagebreak - TriStateBox* m_pPageBreakBox; - FixedText* m_pBreakTypeFT; - ListBox* m_pBreakTypeLB; - FixedText* m_pBreakPositionFT; - ListBox* m_pBreakPositionLB; - TriStateBox* m_pApplyCollBtn; - ListBox* m_pApplyCollBox; - FixedText* m_pPagenumText; - NumericField* m_pPagenumEdit; + VclPtr m_pPageBreakBox; + VclPtr m_pBreakTypeFT; + VclPtr m_pBreakTypeLB; + VclPtr m_pBreakPositionFT; + VclPtr m_pBreakPositionLB; + VclPtr m_pApplyCollBtn; + VclPtr m_pApplyCollBox; + VclPtr m_pPagenumText; + VclPtr m_pPagenumEdit; // paragraph division - TriStateBox* m_pKeepTogetherBox; - TriStateBox* m_pKeepParaBox; + VclPtr m_pKeepTogetherBox; + VclPtr m_pKeepParaBox; // orphan/widow - TriStateBox* m_pOrphanBox; - NumericField* m_pOrphanRowNo; - FixedText* m_pOrphanRowLabel; + VclPtr m_pOrphanBox; + VclPtr m_pOrphanRowNo; + VclPtr m_pOrphanRowLabel; - TriStateBox* m_pWidowBox; - NumericField* m_pWidowRowNo; - FixedText* m_pWidowRowLabel; + VclPtr m_pWidowBox; + VclPtr m_pWidowRowNo; + VclPtr m_pWidowRowLabel; bool bPageBreak; bool bHtmlMode; @@ -257,15 +266,18 @@ private: class SvxAsianTabPage : public SfxTabPage { - CheckBox* m_pForbiddenRulesCB; - CheckBox* m_pHangingPunctCB; - CheckBox* m_pScriptSpaceCB; + VclPtr m_pForbiddenRulesCB; + VclPtr m_pHangingPunctCB; + VclPtr m_pScriptSpaceCB; SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); DECL_LINK( ClickHdl_Impl, CheckBox* ); public: + virtual ~SvxAsianTabPage(); + virtual void dispose() SAL_OVERRIDE; + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index a4ac2415f9f5..ef4779dddd72 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -39,10 +39,10 @@ class TransferableDataHelper; class SvPasteObjectDialog : public ModalDialog { - FixedText* m_pFtObjectSource; - ListBox* m_pLbInsertList; - OKButton* m_pOKButton; - ::std::map< SotClipboardFormatId, OUString > aSupplementMap; + VclPtr m_pFtObjectSource; + VclPtr m_pLbInsertList; + VclPtr m_pOKButton; + ::std::map< SotFormatStringId, OUString > aSupplementMap; SvGlobalName aObjClassName; OUString aObjName; @@ -55,6 +55,8 @@ class SvPasteObjectDialog : public ModalDialog public: SvPasteObjectDialog( vcl::Window* pParent ); + virtual ~SvPasteObjectDialog(); + virtual void dispose() SAL_OVERRIDE; void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ); void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index fa3124359e7c..170e00692379 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -88,17 +88,17 @@ public: } private: - FixedText* m_pLastEditFT; + VclPtr m_pLastEditFT; - VclMultiLineEdit* m_pEditED; + VclPtr m_pEditED; - VclContainer* m_pInsertAuthor; - PushButton* m_pAuthorBtn; + VclPtr m_pInsertAuthor; + VclPtr m_pAuthorBtn; - OKButton* m_pOKBtn; + VclPtr m_pOKBtn; - PushButton* m_pPrevBtn; - PushButton* m_pNextBtn; + VclPtr m_pPrevBtn; + VclPtr m_pNextBtn; const SfxItemSet& rSet; SfxItemSet* pOutSet; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 0936ff2faabe..d3847dc6de62 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -95,9 +95,11 @@ public: class CuiInputDialog : public ModalDialog { private: - Edit* m_pEdit; + VclPtr m_pEdit; public: CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode); + virtual ~CuiInputDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName(const OUString& rName) @@ -132,14 +134,14 @@ public: class SvxScriptOrgDialog : public SfxModalDialog { protected: - SFTreeListBox* m_pScriptsBox; - - PushButton* m_pRunButton; - CloseButton* m_pCloseButton; - PushButton* m_pCreateButton; - PushButton* m_pEditButton; - PushButton* m_pRenameButton; - PushButton* m_pDelButton; + VclPtr m_pScriptsBox; + + VclPtr m_pRunButton; + VclPtr m_pCloseButton; + VclPtr m_pCreateButton; + VclPtr m_pEditButton; + VclPtr m_pRenameButton; + VclPtr m_pDelButton; OUString m_sLanguage; static Selection_hash m_lastSelection; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index de029f891868..c1ac1e3f6b62 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -123,7 +123,7 @@ class SvxConfigGroupListBox : public SvTreeListBox SvxGroupInfoArr_Impl aArr; bool m_bShowSlots; - SvxConfigFunctionListBox* pFunctionListBox; + VclPtr pFunctionListBox; ImageProvider* m_pImageProvider; ::com::sun::star::uno::Reference @@ -181,12 +181,12 @@ public: class SvxScriptSelectorDialog : public ModelessDialog { - FixedText* m_pDialogDescription; - SvxConfigGroupListBox* m_pCategories; - SvxConfigFunctionListBox* m_pCommands; - PushButton* m_pOKButton; - PushButton* m_pCancelButton; - VclMultiLineEdit* m_pDescriptionText; + VclPtr m_pDialogDescription; + VclPtr m_pCategories; + VclPtr m_pCommands; + VclPtr m_pOKButton; + VclPtr m_pCancelButton; + VclPtr m_pDescriptionText; OUString m_sDefaultDesc; bool m_bShowSlots; Link m_aAddHdl; @@ -205,6 +205,8 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame = 0 ); + virtual ~SvxScriptSelectorDialog(); + virtual void dispose() SAL_OVERRIDE; void SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; } const Link& GetAddHdl() const { return m_aAddHdl; } diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index dceddb7e3a00..d7494d72896b 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -35,13 +35,15 @@ class FmShowColsDialog : public ModalDialog { - ListBox* m_pList; - OKButton* m_pOK; + VclPtr m_pList; + VclPtr m_pOK; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; public: FmShowColsDialog(vcl::Window* pParent); + virtual ~FmShowColsDialog(); + virtual void dispose() SAL_OVERRIDE; void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index bc5fc701e449..e9142e24005f 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -28,10 +28,10 @@ class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog { - NumericField* m_pCountEdit; - RadioButton* m_pHorzBox; - RadioButton* m_pVertBox; - CheckBox* m_pPropCB; + VclPtr m_pCountEdit; + VclPtr m_pHorzBox; + VclPtr m_pVertBox; + VclPtr m_pPropCB; long mnMaxVertical; long mnMaxHorizontal; @@ -40,6 +40,8 @@ protected: public: SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); + virtual ~SvxSplitTableDlg(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( ClickHdl, Button * ); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 705c4d2a96fc..f1c6aefde1a9 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -51,10 +51,12 @@ class SvxSearchAttributeDialog : public ModalDialog public: SvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ); + virtual ~SvxSearchAttributeDialog(); + virtual void dispose() SAL_OVERRIDE; private: - SvxCheckListBox* m_pAttrLB; - OKButton* m_pOKBtn; + VclPtr m_pAttrLB; + VclPtr m_pOKBtn; SearchAttrItemList& rList; @@ -66,10 +68,10 @@ private: class SvxSearchSimilarityDialog : public ModalDialog { private: - NumericField* m_pOtherFld; - NumericField* m_pLongerFld; - NumericField* m_pShorterFld; - CheckBox* m_pRelaxBox; + VclPtr m_pOtherFld; + VclPtr m_pLongerFld; + VclPtr m_pShorterFld; + VclPtr m_pRelaxBox; public: SvxSearchSimilarityDialog( vcl::Window* pParent, @@ -77,6 +79,8 @@ public: sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger ); + virtual ~SvxSearchSimilarityDialog(); + virtual void dispose() SAL_OVERRIDE; sal_uInt16 GetOther() { return (sal_uInt16)m_pOtherFld->GetValue(); } sal_uInt16 GetShorter() { return (sal_uInt16)m_pShorterFld->GetValue(); } diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 3c3d3e622f41..5ed3ad77df18 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -34,39 +34,39 @@ class SvxSwPosSizeTabPage : public SfxTabPage { using TabPage::DeactivatePage; - MetricField* m_pWidthMF; - MetricField* m_pHeightMF; - CheckBox* m_pKeepRatioCB; + VclPtr m_pWidthMF; + VclPtr m_pHeightMF; + VclPtr m_pKeepRatioCB; - RadioButton* m_pToPageRB; - RadioButton* m_pToParaRB; - RadioButton* m_pToCharRB; - RadioButton* m_pAsCharRB; - RadioButton* m_pToFrameRB; + VclPtr m_pToPageRB; + VclPtr m_pToParaRB; + VclPtr m_pToCharRB; + VclPtr m_pAsCharRB; + VclPtr m_pToFrameRB; - TriStateBox* m_pPositionCB; - TriStateBox* m_pSizeCB; + VclPtr m_pPositionCB; + VclPtr m_pSizeCB; - VclContainer* m_pPosFrame; - FixedText* m_pHoriFT; - ListBox* m_pHoriLB; - FixedText* m_pHoriByFT; - MetricField* m_pHoriByMF; - FixedText* m_pHoriToFT; - ListBox* m_pHoriToLB; + VclPtr m_pPosFrame; + VclPtr m_pHoriFT; + VclPtr m_pHoriLB; + VclPtr m_pHoriByFT; + VclPtr m_pHoriByMF; + VclPtr m_pHoriToFT; + VclPtr m_pHoriToLB; - CheckBox* m_pHoriMirrorCB; + VclPtr m_pHoriMirrorCB; - FixedText* m_pVertFT; - ListBox* m_pVertLB; - FixedText* m_pVertByFT; - MetricField* m_pVertByMF; - FixedText* m_pVertToFT; - ListBox* m_pVertToLB; + VclPtr m_pVertFT; + VclPtr m_pVertLB; + VclPtr m_pVertByFT; + VclPtr m_pVertByMF; + VclPtr m_pVertToFT; + VclPtr m_pVertToLB; - CheckBox* m_pFollowCB; + VclPtr m_pFollowCB; - SvxSwFrameExample* m_pExampleWN; + VclPtr m_pExampleWN; Link m_aValidateLink; @@ -123,6 +123,8 @@ class SvxSwPosSizeTabPage : public SfxTabPage public: SvxSwPosSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxSwPosSizeTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 2fd0d3aa8f18..4a67cd9cd008 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -49,6 +49,8 @@ class SvxTabulatorTabPage : public SfxTabPage static const sal_uInt16 pRanges[]; public: + virtual ~SvxTabulatorTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pRanges; } @@ -64,34 +66,34 @@ private: SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // tabulators and positions - MetricBox* m_pTabBox; + VclPtr m_pTabBox; // TabType - RadioButton* m_pLeftTab; - RadioButton* m_pRightTab; - RadioButton* m_pCenterTab; - RadioButton* m_pDezTab; - - TabWin_Impl* m_pLeftWin; - TabWin_Impl* m_pRightWin; - TabWin_Impl* m_pCenterWin; - TabWin_Impl* m_pDezWin; - - FixedText* m_pDezCharLabel; - Edit* m_pDezChar; - - RadioButton* m_pNoFillChar; - RadioButton* m_pFillPoints; - RadioButton* m_pFillDashLine ; - RadioButton* m_pFillSolidLine; - RadioButton* m_pFillSpecial; - Edit* m_pFillChar; - - PushButton* m_pNewBtn; - PushButton* m_pDelAllBtn; - PushButton* m_pDelBtn; - - VclContainer* m_pTypeFrame; - VclContainer* m_pFillFrame; + VclPtr m_pLeftTab; + VclPtr m_pRightTab; + VclPtr m_pCenterTab; + VclPtr m_pDezTab; + + VclPtr m_pLeftWin; + VclPtr m_pRightWin; + VclPtr m_pCenterWin; + VclPtr m_pDezWin; + + VclPtr m_pDezCharLabel; + VclPtr m_pDezChar; + + VclPtr m_pNoFillChar; + VclPtr m_pFillPoints; + VclPtr m_pFillDashLine ; + VclPtr m_pFillSolidLine; + VclPtr m_pFillSpecial; + VclPtr m_pFillChar; + + VclPtr m_pNewBtn; + VclPtr m_pDelAllBtn; + VclPtr m_pDelBtn; + + VclPtr m_pTypeFrame; + VclPtr m_pFillFrame; // local variables, internal functions SvxTabStop aAktTab; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 31a705d488b3..8ba2ad2ff956 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -37,27 +37,28 @@ class SdrView; class SvxTextAnimationPage : public SfxTabPage { private: - static const sal_uInt16 pRanges[]; - ListBox* m_pLbEffect; - VclBox* m_pBoxDirection; - PushButton* m_pBtnUp; - PushButton* m_pBtnLeft; - PushButton* m_pBtnRight; - PushButton* m_pBtnDown; + static const sal_uInt16 pRanges[]; - VclFrame* m_pFlProperties; - TriStateBox* m_pTsbStartInside; - TriStateBox* m_pTsbStopInside; + VclPtr m_pLbEffect; + VclPtr m_pBoxDirection; + VclPtr m_pBtnUp; + VclPtr m_pBtnLeft; + VclPtr m_pBtnRight; + VclPtr m_pBtnDown; - VclBox* m_pBoxCount; - TriStateBox* m_pTsbEndless; - NumericField* m_pNumFldCount; + VclPtr m_pFlProperties; + VclPtr m_pTsbStartInside; + VclPtr m_pTsbStopInside; - TriStateBox* m_pTsbPixel; - MetricField* m_pMtrFldAmount; + VclPtr m_pBoxCount; + VclPtr m_pTsbEndless; + VclPtr m_pNumFldCount; - TriStateBox* m_pTsbAuto; - MetricField* m_pMtrFldDelay; + VclPtr m_pTsbPixel; + VclPtr m_pMtrFldAmount; + + VclPtr m_pTsbAuto; + VclPtr m_pMtrFldDelay; const SfxItemSet& rOutAttrs; SdrTextAniKind eAniKind; @@ -75,6 +76,8 @@ private: public: SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxTextAnimationPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 439eb82ba2d3..eacc8265d4ab 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -38,22 +38,23 @@ class SvxTextAttrPage : public SvxTabPage { private: static const sal_uInt16 pRanges[]; - TriStateBox* m_pTsbAutoGrowWidth; - TriStateBox* m_pTsbAutoGrowHeight; - TriStateBox* m_pTsbFitToSize; - TriStateBox* m_pTsbContour; - TriStateBox* m_pTsbWordWrapText; - TriStateBox* m_pTsbAutoGrowSize; - - VclFrame* m_pFlDistance; - MetricField* m_pMtrFldLeft; - MetricField* m_pMtrFldRight; - MetricField* m_pMtrFldTop; - MetricField* m_pMtrFldBottom; - - VclFrame* m_pFlPosition; - SvxRectCtl* m_pCtlPosition; - TriStateBox* m_pTsbFullWidth; + + VclPtr m_pTsbAutoGrowWidth; + VclPtr m_pTsbAutoGrowHeight; + VclPtr m_pTsbFitToSize; + VclPtr m_pTsbContour; + VclPtr m_pTsbWordWrapText; + VclPtr m_pTsbAutoGrowSize; + + VclPtr m_pFlDistance; + VclPtr m_pMtrFldLeft; + VclPtr m_pMtrFldRight; + VclPtr m_pMtrFldTop; + VclPtr m_pMtrFldBottom; + + VclPtr m_pFlPosition; + VclPtr m_pCtlPosition; + VclPtr m_pTsbFullWidth; const SfxItemSet& rOutAttrs; const SdrView* pView; @@ -76,6 +77,8 @@ private: public: SvxTextAttrPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxTextAttrPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 9b035f14d03f..661788124c3f 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -35,13 +35,15 @@ class SvxThesaurusDialog; class LookUpComboBox : public ComboBox { Idle m_aModifyIdle; - SvxThesaurusDialog* m_pDialog; + VclPtr m_pDialog; LookUpComboBox( const LookUpComboBox & ) SAL_DELETED_FUNCTION; LookUpComboBox& operator = ( const LookUpComboBox & ) SAL_DELETED_FUNCTION; public: LookUpComboBox(vcl::Window *pParent); + virtual ~LookUpComboBox(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( ModifyTimer_Hdl, Timer * ); @@ -71,7 +73,7 @@ public: class ThesaurusAlternativesCtrl : public SvxCheckListBox { - SvxThesaurusDialog* m_pDialog; + VclPtr m_pDialog; typedef std::map< const SvTreeListEntry *, AlternativesExtraData > UserDataMap_t; UserDataMap_t m_aUserData; @@ -98,13 +100,15 @@ public: class ReplaceEdit : public Edit { - Button * m_pBtn; + VclPtr