[Libreoffice-commits] core.git: Branch 'feature/vclptr' - 14 commits - avmedia/source basctl/source basic/source canvas/source chart2/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source forms/source fpicker/source framework/source include/svx include/vcl lotuswordpro/source reportdesign/source sc/inc sc/source sd/source sfx2/source slideshow/source starmath/inc starmath/qa starmath/source svtools/source svx/inc svx/source svx/workben sw/qa sw/source uui/source vcl/generic vcl/quartz vcl/README.lifecycle vcl/source vcl/unx vcl/win vcl/workben writerperfect/source xmlsecurity/source
Noel Grandin
noel at peralex.com
Fri Apr 10 04:32:30 PDT 2015
avmedia/source/viewer/mediawindow.cxx | 2
basctl/source/basicide/basdoc.cxx | 3
basctl/source/basicide/basdoc.hxx | 2
basctl/source/basicide/baside2.cxx | 4
basctl/source/basicide/baside2b.cxx | 4
basctl/source/basicide/baside3.cxx | 4
basctl/source/basicide/basides1.cxx | 4
basctl/source/basicide/basobj2.cxx | 4
basctl/source/basicide/basobj3.cxx | 4
basctl/source/basicide/bastypes.cxx | 6
basctl/source/basicide/moduldl2.cxx | 4
basctl/source/basicide/moduldlg.cxx | 4
basctl/source/dlged/managelang.cxx | 4
basic/source/runtime/iosys.cxx | 2
canvas/source/cairo/cairo_canvasfont.cxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 4
canvas/source/cairo/cairo_canvashelper.hxx | 4
canvas/source/cairo/cairo_canvashelper_text.cxx | 4
canvas/source/cairo/cairo_devicehelper.cxx | 2
canvas/source/cairo/cairo_devicehelper.hxx | 2
canvas/source/cairo/cairo_textlayout.cxx | 10
canvas/source/opengl/ogl_canvashelper.cxx | 12
canvas/source/vcl/canvasfont.cxx | 6
canvas/source/vcl/canvashelper_texturefill.cxx | 14
canvas/source/vcl/textlayout.cxx | 26 -
chart2/source/controller/dialogs/DataBrowser.cxx | 4
chart2/source/controller/dialogs/res_DataLabel.cxx | 2
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 6
chart2/source/controller/main/ChartController.cxx | 4
chart2/source/controller/main/ChartController_EditData.cxx | 2
chart2/source/controller/main/ChartController_Insert.cxx | 16
chart2/source/controller/main/ChartController_Properties.cxx | 4
chart2/source/view/main/3DChartObjects.cxx | 16
chart2/source/view/main/DummyXShape.cxx | 16
chart2/source/view/main/OpenGLRender.cxx | 16
cui/source/customize/cfg.cxx | 42 +-
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/about.cxx | 2
cui/source/dialogs/colorpicker.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/hangulhanjadlg.cxx | 6
cui/source/dialogs/hldocntp.cxx | 4
cui/source/dialogs/hltpbase.cxx | 2
cui/source/dialogs/linkdlg.cxx | 4
cui/source/dialogs/passwdomdlg.cxx | 4
cui/source/dialogs/scriptdlg.cxx | 8
cui/source/inc/page.hxx | 2
cui/source/options/dbregister.cxx | 4
cui/source/options/doclinkdialog.cxx | 6
cui/source/options/optchart.cxx | 2
cui/source/options/optcolor.cxx | 8
cui/source/options/optdict.cxx | 2
cui/source/options/optgdlg.cxx | 2
cui/source/options/optinet2.cxx | 6
cui/source/options/optjava.cxx | 10
cui/source/options/optlingu.cxx | 6
cui/source/options/optopencl.cxx | 2
cui/source/options/personalization.cxx | 2
cui/source/tabpages/autocdlg.cxx | 6
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/numpages.cxx | 2
cui/source/tabpages/page.cxx | 3
cui/source/tabpages/tpbitmap.cxx | 10
cui/source/tabpages/tpcolor.cxx | 8
cui/source/tabpages/tpgradnt.cxx | 8
cui/source/tabpages/tphatch.cxx | 8
cui/source/tabpages/tpline.cxx | 12
cui/source/tabpages/tplnedef.cxx | 8
cui/source/tabpages/tplneend.cxx | 8
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 2
dbaccess/source/ui/app/AppControllerDnD.cxx | 6
dbaccess/source/ui/app/AppControllerGen.cxx | 4
dbaccess/source/ui/browser/brwctrlr.cxx | 8
dbaccess/source/ui/browser/dataview.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 4
dbaccess/source/ui/dlg/CollectionView.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 6
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 4
dbaccess/source/ui/dlg/UserAdmin.cxx | 8
dbaccess/source/ui/dlg/adminpages.cxx | 6
dbaccess/source/ui/dlg/detailpages.cxx | 4
dbaccess/source/ui/dlg/directsql.cxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 10
dbaccess/source/ui/dlg/sqlmessage.cxx | 2
dbaccess/source/ui/dlg/tablespage.cxx | 2
dbaccess/source/ui/inc/ConnectionLine.hxx | 2
dbaccess/source/ui/misc/DExport.cxx | 4
dbaccess/source/ui/misc/RowSetDrop.cxx | 2
dbaccess/source/ui/misc/UITools.cxx | 8
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
dbaccess/source/ui/querydesign/QueryTableView.cxx | 6
dbaccess/source/ui/querydesign/querycontroller.cxx | 10
dbaccess/source/ui/relationdesign/RelationController.cxx | 4
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 11
dbaccess/source/ui/tabledesign/TableController.cxx | 26 -
dbaccess/source/ui/uno/dbinteraction.cxx | 6
desktop/source/app/app.cxx | 4
desktop/source/app/lockfile2.cxx | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 12
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 10
desktop/source/lib/init.cxx | 10
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2
desktop/source/splash/splash.cxx | 26 -
editeng/source/editeng/impedit3.cxx | 2
editeng/source/misc/splwrap.cxx | 2
extensions/source/abpilot/typeselectionpage.cxx | 2
extensions/source/bibliography/bibview.cxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 2
extensions/source/propctrlr/commoncontrol.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 12
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 4
extensions/source/scanner/sanedlg.cxx | 10
extensions/source/scanner/scanunx.cxx | 2
filter/source/flash/swfwriter.cxx | 2
filter/source/flash/swfwriter.hxx | 2
filter/source/graphic/GraphicExportDialog.cxx | 2
filter/source/graphicfilter/eos2met/eos2met.cxx | 39 +-
filter/source/graphicfilter/epict/epict.cxx | 29 -
filter/source/graphicfilter/eps/eps.cxx | 40 +-
filter/source/graphicfilter/icgm/cgm.cxx | 2
filter/source/graphicfilter/icgm/cgm.hxx | 3
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 2
filter/source/graphicfilter/idxf/dxf2mtf.hxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 36 -
filter/source/graphicfilter/ios2met/ios2met.cxx | 4
filter/source/graphicfilter/ipict/ipict.cxx | 4
filter/source/msfilter/escherex.cxx | 18
filter/source/msfilter/msdffimp.cxx | 6
filter/source/pdf/impdialog.cxx | 4
filter/source/pdf/pdfinteract.cxx | 2
filter/source/svg/svgfontexport.cxx | 24 -
filter/source/svg/svgwriter.cxx | 2
filter/source/svg/svgwriter.hxx | 4
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 12
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 2
forms/source/runtime/formoperations.cxx | 2
fpicker/source/office/PlacesListBox.cxx | 2
fpicker/source/office/iodlg.cxx | 10
framework/source/services/autorecovery.cxx | 2
include/svx/dialcontrol.hxx | 6
include/svx/dlgctrl.hxx | 4
include/svx/float3d.hxx | 2
include/svx/numvset.hxx | 2
include/vcl/cairo.hxx | 3
lotuswordpro/source/filter/lwppagelayout.cxx | 8
reportdesign/source/ui/inc/ColorChanger.hxx | 2
reportdesign/source/ui/misc/UITools.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 8
sc/inc/dociter.hxx | 2
sc/inc/editutil.hxx | 7
sc/inc/rowheightcontext.hxx | 6
sc/source/core/data/documen8.cxx | 5
sc/source/core/data/dpobject.cxx | 2
sc/source/core/data/global.cxx | 10
sc/source/core/data/validat.cxx | 6
sc/source/core/tool/editutil.cxx | 8
sc/source/filter/oox/workbookhelper.cxx | 2
sc/source/filter/rtf/eeimpars.cxx | 4
sc/source/ui/app/transobj.cxx | 20 -
sc/source/ui/condformat/colorformat.cxx | 2
sc/source/ui/dbgui/dbnamdlg.cxx | 2
sc/source/ui/docshell/arealink.cxx | 2
sc/source/ui/docshell/dbdocfun.cxx | 8
sc/source/ui/docshell/dbdocimp.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 5
sc/source/ui/docshell/docsh.cxx | 14
sc/source/ui/docshell/docsh3.cxx | 16
sc/source/ui/docshell/docsh4.cxx | 26 -
sc/source/ui/docshell/docsh5.cxx | 8
sc/source/ui/docshell/docsh6.cxx | 2
sc/source/ui/docshell/documentlinkmgr.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 2
sc/source/ui/docshell/impex.cxx | 4
sc/source/ui/drawfunc/fuins1.cxx | 2
sc/source/ui/drawfunc/graphsh.cxx | 2
sc/source/ui/inc/cbutton.hxx | 2
sc/source/ui/inc/csvruler.hxx | 4
sc/source/ui/inc/drawview.hxx | 2
sc/source/ui/inc/prevloc.hxx | 2
sc/source/ui/inc/printfun.hxx | 2
sc/source/ui/miscdlgs/optsolver.cxx | 8
sc/source/ui/miscdlgs/retypepassdlg.cxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 4
sc/source/ui/optdlg/tpformula.cxx | 2
sc/source/ui/undo/undobase.cxx | 8
sc/source/ui/undo/undoblk.cxx | 4
sc/source/ui/undo/undoblk3.cxx | 6
sc/source/ui/undo/undostyl.cxx | 6
sc/source/ui/unoobj/styleuno.cxx | 24 -
sc/source/ui/view/cellsh1.cxx | 6
sc/source/ui/view/cellsh2.cxx | 2
sc/source/ui/view/cellsh3.cxx | 2
sc/source/ui/view/dbfunc.cxx | 2
sc/source/ui/view/gridwin4.cxx | 2
sc/source/ui/view/spelleng.cxx | 2
sc/source/ui/view/tabview2.cxx | 2
sc/source/ui/view/viewfun2.cxx | 4
sc/source/ui/view/viewfun3.cxx | 4
sc/source/ui/view/viewfun4.cxx | 2
sc/source/ui/view/viewfunc.cxx | 12
sd/source/core/drawdoc3.cxx | 2
sd/source/filter/grf/sdgrffilter.cxx | 2
sd/source/filter/html/buttonset.cxx | 12
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/html/pubdlg.cxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationtag.cxx | 20 -
sd/source/ui/dlg/LayerTabBar.cxx | 2
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 4
sd/source/ui/dlg/animobjs.cxx | 20 -
sd/source/ui/dlg/brkdlg.cxx | 2
sd/source/ui/dlg/custsdlg.cxx | 4
sd/source/ui/dlg/docprev.cxx | 18
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/docshell/docshel2.cxx | 20 -
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 6
sd/source/ui/func/fulinend.cxx | 2
sd/source/ui/func/fupage.cxx | 2
sd/source/ui/slideshow/showwin.cxx | 16
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 2
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 16
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 2
sd/source/ui/view/Outliner.cxx | 8
sd/source/ui/view/ViewShellBase.cxx | 2
sd/source/ui/view/drviews2.cxx | 6
sd/source/ui/view/drviews6.cxx | 2
sd/source/ui/view/drviews9.cxx | 2
sd/source/ui/view/drviewsi.cxx | 2
sfx2/source/appl/appopen.cxx | 4
sfx2/source/appl/appserv.cxx | 6
sfx2/source/appl/impldde.cxx | 2
sfx2/source/appl/newhelp.cxx | 8
sfx2/source/appl/opengrf.cxx | 2
sfx2/source/appl/openuriexternally.cxx | 2
sfx2/source/appl/sfxhelp.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 2
sfx2/source/dialog/backingwindow.cxx | 10
sfx2/source/dialog/mailmodel.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 6
sfx2/source/dialog/passwd.cxx | 2
sfx2/source/dialog/recfloat.cxx | 2
sfx2/source/dialog/securitypage.cxx | 4
sfx2/source/dialog/templdlg.cxx | 6
sfx2/source/doc/QuerySaveDocument.cxx | 2
sfx2/source/doc/docinsert.cxx | 2
sfx2/source/doc/guisaveas.cxx | 4
sfx2/source/doc/objcont.cxx | 14
sfx2/source/doc/objserv.cxx | 16
sfx2/source/doc/objstor.cxx | 2
sfx2/source/doc/printhelper.cxx | 4
sfx2/source/doc/templatedlg.cxx | 22 -
sfx2/source/view/viewfrm.cxx | 6
sfx2/source/view/viewsh.cxx | 6
slideshow/source/engine/rehearsetimingsactivity.cxx | 40 +-
slideshow/source/engine/shapes/gdimtftools.cxx | 42 +-
starmath/inc/dialog.hxx | 4
starmath/inc/smmod.hxx | 2
starmath/inc/visitors.hxx | 2
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 32 -
starmath/source/smmod.cxx | 2
svtools/source/contnr/fileview.cxx | 2
svtools/source/java/javainteractionhandler.cxx | 12
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 4
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 30 -
svx/source/dialog/_bmpmask.cxx | 12
svx/source/dialog/_contdlg.cxx | 34 -
svx/source/dialog/dlgctrl.cxx | 42 +-
svx/source/dialog/docrecovery.cxx | 8
svx/source/dialog/fntctrl.cxx | 6
svx/source/dialog/frmsel.cxx | 31 -
svx/source/dialog/imapdlg.cxx | 4
svx/source/dialog/svxbmpnumvalueset.cxx | 2
svx/source/dialog/svxruler.cxx | 14
svx/source/engine3d/float3d.cxx | 2
svx/source/form/databaselocationinput.cxx | 2
svx/source/form/datanavi.cxx | 48 +-
svx/source/form/fmobj.cxx | 4
svx/source/form/fmshell.cxx | 2
svx/source/gallery2/galobj.cxx | 4
svx/source/gallery2/galtheme.cxx | 6
svx/source/inc/fmobj.hxx | 2
svx/source/inc/frmselimpl.hxx | 2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 6
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 94 ++---
svx/source/sidebar/line/LineWidthValueSet.cxx | 5
svx/source/sidebar/line/LineWidthValueSet.hxx | 2
svx/source/svdraw/svdfmtf.cxx | 54 +-
svx/source/svdraw/svdfmtf.hxx | 36 -
svx/source/svdraw/svdograf.cxx | 10
svx/source/svdraw/svdotext.cxx | 8
svx/source/svdraw/svdtrans.cxx | 16
svx/source/svdraw/svdxcgv.cxx | 22 -
svx/source/tbxctrls/colrctrl.cxx | 14
svx/source/tbxctrls/fontworkgallery.cxx | 14
svx/source/tbxctrls/grafctrl.cxx | 2
svx/source/tbxctrls/linectrl.cxx | 16
svx/source/toolbars/extrusionbar.cxx | 2
svx/source/toolbars/fontworkbar.cxx | 4
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/workben/pixelctl.cxx | 2
sw/qa/tiledrendering/tiledrendering.cxx | 8
sw/source/core/doc/DocumentRedlineManager.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/layout/paintfrm.cxx | 8
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 14
sw/source/ui/dialog/uiregionsw.cxx | 8
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/frmdlg/cption.cxx | 4
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/index/swuiidxmrk.cxx | 6
sw/source/ui/misc/glosbib.cxx | 2
sw/source/ui/misc/glossary.cxx | 8
sw/source/ui/misc/num.cxx | 2
sw/source/uibase/app/docsh2.cxx | 4
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/lingu/olmenu.cxx | 2
sw/source/uibase/shells/grfsh.cxx | 2
sw/source/uibase/shells/tabsh.cxx | 2
sw/source/uibase/shells/textsh1.cxx | 2
sw/source/uibase/uiview/view2.cxx | 16
sw/source/uibase/uiview/viewdraw.cxx | 2
sw/source/uibase/uiview/viewling.cxx | 2
sw/source/uibase/uiview/viewprt.cxx | 4
sw/source/uibase/utlui/gloslst.cxx | 2
uui/source/fltdlg.cxx | 4
uui/source/iahndl.cxx | 6
uui/source/masterpasscrtdlg.cxx | 2
uui/source/masterpassworddlg.cxx | 2
uui/source/nameclashdlg.cxx | 2
uui/source/passworddlg.cxx | 4
vcl/README.lifecycle | 181 ++++++++++
vcl/generic/print/genprnpsp.cxx | 2
vcl/generic/print/prtsetup.cxx | 2
vcl/quartz/cairo_quartz_cairo.cxx | 4
vcl/quartz/cairo_quartz_cairo.hxx | 2
vcl/source/app/dbggui.cxx | 6
vcl/source/app/stdtext.cxx | 2
vcl/source/app/svdata.cxx | 2
vcl/source/control/edit.cxx | 5
vcl/source/filter/wmf/emfwr.hxx | 3
vcl/source/gdi/print.cxx | 1
vcl/source/gdi/print3.cxx | 6
vcl/source/outdev/outdev.cxx | 4
vcl/source/window/dialog.cxx | 4
vcl/source/window/menubarwindow.cxx | 2
vcl/unx/generic/gdi/cairo_xlib_cairo.cxx | 4
vcl/unx/generic/gdi/cairo_xlib_cairo.hxx | 2
vcl/unx/generic/printer/cupsmgr.cxx | 2
vcl/unx/x11/x11sys.cxx | 2
vcl/win/source/gdi/cairo_win32_cairo.cxx | 4
vcl/win/source/gdi/cairo_win32_cairo.hxx | 2
vcl/workben/outdevgrind.cxx | 2
vcl/workben/svdem.cxx | 2
vcl/workben/svpclient.cxx | 2
vcl/workben/svptest.cxx | 2
vcl/workben/vcldemo.cxx | 32 -
writerperfect/source/writer/WordPerfectImportFilter.cxx | 4
xmlsecurity/source/component/documentdigitalsignatures.cxx | 10
xmlsecurity/source/dialogs/certificatechooser.cxx | 2
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 6
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
374 files changed, 1477 insertions(+), 1283 deletions(-)
New commits:
commit 11e83bc770af8a274ff08c7162677e7d6987bcd4
Author: Noel Grandin <noel at peralex.com>
Date: Fri Mar 20 13:49:00 2015 +0200
wrap some more OutputDevice in VclPtr
Change-Id: I6f4a74bf56543e4d31d3b84a0cd2830d4f4d669a
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index df53527..2670836 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2379,7 +2379,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
const Color aBackColor = rStyleSettings.GetFieldColor();
const Color aTextColor = rStyleSettings.GetFieldTextColor();
- boost::scoped_ptr<VirtualDevice> pVDev(new VirtualDevice(*this));
+ ScopedVclPtr<VirtualDevice> pVDev(new VirtualDevice(*this));
pVDev->EnableRTL( IsRTLEnabled() );
pVDev->SetMapMode(GetMapMode());
pVDev->SetOutputSize( aSize );
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 838c100..a170fd2 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -588,7 +588,7 @@ private:
private:
ScDocument& mrDoc;
- OutputDevice* mpOutDev;
+ VclPtr<OutputDevice> mpOutDev;
double mfPPTX;
double mfPPTY;
const ::std::vector<TabRanges>* mpTabRangesArray;
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 3b9b53a..86fd4ff 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -41,7 +41,7 @@ class ScEditUtil
SCROW nRow;
SCTAB nTab;
Point aScrPos;
- OutputDevice* pDev; // MapMode has to be set
+ VclPtr<OutputDevice> pDev; // MapMode has to be set
double nPPTX;
double nPPTY;
Fraction aZoomX;
@@ -80,10 +80,7 @@ public:
ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ,
const Point& rScrPosPixel,
OutputDevice* pDevice, double nScaleX, double nScaleY,
- const Fraction& rX, const Fraction& rY ) :
- pDoc(pDocument),nCol(nX),nRow(nY),nTab(nZ),
- aScrPos(rScrPosPixel),pDev(pDevice),
- nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {}
+ const Fraction& rX, const Fraction& rY );
Rectangle GetEditArea( const ScPatternAttr* pPattern, bool bForceToTop );
};
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index a077bd0..f801ee4 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -13,11 +13,11 @@
#include "scdllapi.h"
#include <tools/fract.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/outdev.hxx>
#include <vector>
-class OutputDevice;
-
namespace sc {
class SC_DLLPUBLIC RowHeightContext
@@ -28,7 +28,7 @@ class SC_DLLPUBLIC RowHeightContext
double mfPPTY;
Fraction maZoomX;
Fraction maZoomY;
- OutputDevice* mpOutDev;
+ VclPtr<OutputDevice> mpOutDev;
sal_uInt16 mnExtraHeight;
bool mbForceAutoSize; /// whether to set height to optimal even when the manual height flag is set.
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index dce8dd7..4d797cc 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -53,6 +53,14 @@ using namespace com::sun::star;
// STATIC DATA
// Delimiters zusaetzlich zu EditEngine-Default:
+ScEditUtil::ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ,
+ const Point& rScrPosPixel,
+ OutputDevice* pDevice, double nScaleX, double nScaleY,
+ const Fraction& rX, const Fraction& rY ) :
+ pDoc(pDocument),nCol(nX),nRow(nY),nTab(nZ),
+ aScrPos(rScrPosPixel),pDev(pDevice),
+ nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {}
+
OUString ScEditUtil::ModifyDelimiters( const OUString& rOld )
{
// underscore is used in function argument names
diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx
index f6b15a6..bb71b6c 100644
--- a/sc/source/ui/inc/cbutton.hxx
+++ b/sc/source/ui/inc/cbutton.hxx
@@ -60,7 +60,7 @@ private:
bool bState );
protected:
- OutputDevice* pOut;
+ VclPtr<OutputDevice> pOut;
Point aBtnPos;
Size aBtnSize;
};
diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index d789a38..9911115 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -32,8 +32,8 @@ class ScAccessibleCsvControl;
class SC_DLLPUBLIC ScCsvRuler : public ScCsvControl
{
private:
- VirtualDevice maBackgrDev; /// Ruler background, scaling.
- VirtualDevice maRulerDev; /// Ruler with splits and cursor.
+ ScopedVclPtr<VirtualDevice> maBackgrDev; /// Ruler background, scaling.
+ ScopedVclPtr<VirtualDevice> maRulerDev; /// Ruler with splits and cursor.
Color maBackColor; /// Background color.
Color maActiveColor; /// Color for active part of ruler.
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index baf0fa8..54f20bd 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -34,7 +34,7 @@ class SdrUndoManager;
class ScDrawView: public FmFormView
{
ScViewData* pViewData;
- OutputDevice* pDev; //! needed ?
+ VclPtr<OutputDevice> pDev; //! needed ?
ScDocument* pDoc;
SCTAB nTab;
Fraction aScaleX; // Factor for Drawing-MapMode
diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx
index 3a4b5bb..3f59e33 100644
--- a/sc/source/ui/inc/prevloc.hxx
+++ b/sc/source/ui/inc/prevloc.hxx
@@ -82,7 +82,7 @@ public:
class ScPreviewLocationData
{
- OutputDevice* pWindow;
+ VclPtr<OutputDevice> pWindow;
ScDocument* pDoc;
MapMode aCellMapMode;
MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES];
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index 2e8d51e..82864a3 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -131,7 +131,7 @@ private:
ScDocShell* pDocShell;
ScDocument* pDoc;
SfxPrinter* pPrinter;
- OutputDevice* pDev;
+ VclPtr<OutputDevice> pDev;
FmFormView* pDrawView;
MapMode aOldPrinterMode; // MapMode before the call
commit 61b224f392eb856bf4cfa0c04c68202a463cbdbf
Author: Noel Grandin <noel at peralex.com>
Date: Fri Mar 20 11:27:10 2015 +0200
vclwidget: fixup locally allocated vcl::Window objects
They need to be wrapped in ScopedVclPtr in order to be disposed properly.
Change-Id: Ib64dba353774f54711e4de7f5d15d859c6a4dc7e
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index fcaf4f3..be2f4cf 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -327,7 +327,7 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
{
- VclPtr<MessageDialog> aErrBox(new MessageDialog( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) ) );
+ ScopedVclPtr<MessageDialog> aErrBox(new MessageDialog( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) ) );
aErrBox->Execute();
aErrBox.disposeAndClear();
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 152fe61..25c3b5c 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -619,7 +619,7 @@ void ModulWindow::BasicToggleBreakPointEnabled()
void ModulWindow::ManageBreakPoints()
{
BreakPointWindow& rBrkWin = GetBreakPointWindow();
- VclPtr<BreakPointDialog> aBrkDlg(new BreakPointDialog( &rBrkWin, GetBreakPoints() ));
+ ScopedVclPtr<BreakPointDialog> aBrkDlg(new BreakPointDialog( &rBrkWin, GetBreakPoints() ));
aBrkDlg->Execute();
rBrkWin.Invalidate();
}
@@ -1043,7 +1043,7 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
break;
case SID_GOTOLINE:
{
- VclPtr<GotoLineDialog> aGotoDlg(new GotoLineDialog(this));
+ ScopedVclPtr<GotoLineDialog> aGotoDlg(new GotoLineDialog(this));
if (aGotoDlg->Execute())
if (sal_Int32 const nLine = aGotoDlg->GetLineNumber())
{
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 66f5349..3456cfd 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1520,7 +1520,7 @@ void BreakPointWindow::Command( const CommandEvent& rCEvt )
break;
case RID_BRKPROPS:
{
- VclPtr<BreakPointDialog> aBrkDlg(new BreakPointDialog( this, GetBreakPoints() ));
+ ScopedVclPtr<BreakPointDialog> aBrkDlg(new BreakPointDialog( this, GetBreakPoints() ));
aBrkDlg->SetCurrentBreakPoint( pBrk );
aBrkDlg->Execute();
Invalidate();
@@ -1535,7 +1535,7 @@ void BreakPointWindow::Command( const CommandEvent& rCEvt )
{
case RID_BRKDLG:
{
- VclPtr<BreakPointDialog> aBrkDlg(new BreakPointDialog( this, GetBreakPoints() ));
+ ScopedVclPtr<BreakPointDialog> aBrkDlg(new BreakPointDialog( this, GetBreakPoints() ));
aBrkDlg->Execute();
Invalidate();
}
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index c6957e3..52d173b 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1024,7 +1024,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script
OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT));
aQueryBoxText = aQueryBoxText.replaceAll("$(ARG1)", aXmlDlgName);
- VclPtr<NameClashQueryBox> aQueryBox(new NameClashQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ));
+ ScopedVclPtr<NameClashQueryBox> aQueryBox(new NameClashQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ));
sal_uInt16 nRet = aQueryBox->Execute();
if( RET_YES == nRet )
{
@@ -1086,7 +1086,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script
{
OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE));
OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT));
- VclPtr<LanguageMismatchQueryBox> aQueryBox(new LanguageMismatchQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ));
+ ScopedVclPtr<LanguageMismatchQueryBox> aQueryBox(new LanguageMismatchQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ));
sal_uInt16 nRet = aQueryBox->Execute();
if( RET_YES == nRet )
{
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index c9aaa23..139b1a3 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -136,7 +136,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
SfxViewFrame* pViewFrame = GetViewFrame();
SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow( SID_SEARCH_DLG ) : NULL;
vcl::Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL;
- VclPtr<QueryBox> aQuery(new QueryBox(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART)));
+ ScopedVclPtr<QueryBox> aQuery(new QueryBox(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART)));
if ( aQuery->Execute() == RET_YES )
{
it = aWindowTable.begin();
@@ -676,7 +676,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
case SID_BASICIDE_MANAGE_LANG:
{
- VclPtr<ManageLanguageDialog> aDlg(new ManageLanguageDialog(pCurWin, m_pCurLocalizationMgr));
+ ScopedVclPtr<ManageLanguageDialog> aDlg(new ManageLanguageDialog(pCurWin, m_pCurLocalizationMgr));
aDlg->Execute();
rReq.Done();
}
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index a746060..f816937 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -149,7 +149,7 @@ bool RenameModule (
if ( rDocument.hasModule( rLibName, rNewName ) )
{
- VclPtr<MessageDialog> aError(new MessageDialog(pErrorParent, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2)));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(pErrorParent, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2)));
aError->Execute();
return false;
}
@@ -157,7 +157,7 @@ bool RenameModule (
// #i74440
if ( rNewName.isEmpty() )
{
- VclPtr<MessageDialog> aError(new MessageDialog(pErrorParent, IDE_RESSTR(RID_STR_BADSBXNAME)));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(pErrorParent, IDE_RESSTR(RID_STR_BADSBXNAME)));
aError->Execute();
return false;
}
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index c280c3b..e7a7f05 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -155,7 +155,7 @@ bool RenameDialog (
if ( rDocument.hasDialog( rLibName, rNewName ) )
{
- VclPtr<MessageDialog> aError(new MessageDialog(pErrorParent, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2)));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(pErrorParent, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2)));
aError->Execute();
return false;
}
@@ -163,7 +163,7 @@ bool RenameDialog (
// #i74440
if ( rNewName.isEmpty() )
{
- VclPtr<MessageDialog> aError(new MessageDialog(pErrorParent, IDE_RESSTR(RID_STR_BADSBXNAME)));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(pErrorParent, IDE_RESSTR(RID_STR_BADSBXNAME)));
aError->Execute();
return false;
}
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index da7e393..67d4c54 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -803,7 +803,7 @@ bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent )
aNameBuf.append('\'');
aNameBuf.insert(0, '\'');
aQuery = aQuery.replaceAll("XX", aNameBuf.makeStringAndClear());
- VclPtr<MessageDialog> aQueryBox(new MessageDialog(pParent, aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
+ ScopedVclPtr<MessageDialog> aQueryBox(new MessageDialog(pParent, aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
return ( aQueryBox->Execute() == RET_YES );
}
@@ -840,7 +840,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer,
do
{
// password dialog
- VclPtr<SfxPasswordDialog> aDlg(new SfxPasswordDialog(Application::GetDefDialogParent()));
+ ScopedVclPtr<SfxPasswordDialog> aDlg(new SfxPasswordDialog(Application::GetDefDialogParent()));
aDlg->SetMinLen( 1 );
// set new title
@@ -868,7 +868,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer,
if ( !bOK )
{
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(Application::GetDefDialogParent(), IDE_RESSTR(RID_STR_WRONGPASSWORD)));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(Application::GetDefDialogParent(), IDE_RESSTR(RID_STR_WRONGPASSWORD)));
aErrorBox->Execute();
}
}
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index d231fe9..5735249 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1128,7 +1128,7 @@ void LibPage::Export( void )
return;
}
- VclPtr<ExportDialog> aNewDlg(new ExportDialog(this));
+ ScopedVclPtr<ExportDialog> aNewDlg(new ExportDialog(this));
if (aNewDlg->Execute() == RET_OK)
{
try
@@ -1504,7 +1504,7 @@ void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
i++;
}
- VclPtr<NewObjectDialog> aNewDlg(new NewObjectDialog(pWin, ObjectMode::Library));
+ ScopedVclPtr<NewObjectDialog> aNewDlg(new NewObjectDialog(pWin, ObjectMode::Library));
aNewDlg->SetObjectName(aLibName);
if (aNewDlg->Execute())
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 62d5dae..67e3915 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -825,7 +825,7 @@ void ObjectPage::NewDialog()
{
aDocument.getOrCreateLibrary( E_DIALOGS, aLibName );
- VclPtr<NewObjectDialog> aNewDlg(new NewObjectDialog(this, ObjectMode::Dialog, true));
+ ScopedVclPtr<NewObjectDialog> aNewDlg(new NewObjectDialog(this, ObjectMode::Dialog, true));
aNewDlg->SetObjectName( aDocument.createObjectName( E_DIALOGS, aLibName ) );
if (aNewDlg->Execute() != 0)
@@ -983,7 +983,7 @@ SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
if ( aModName.isEmpty() )
aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
- VclPtr<NewObjectDialog> aNewDlg(new NewObjectDialog(pWin, ObjectMode::Module, true));
+ ScopedVclPtr<NewObjectDialog> aNewDlg(new NewObjectDialog(pWin, ObjectMode::Module, true));
aNewDlg->SetObjectName( aModName );
if (aNewDlg->Execute() != 0)
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 27be747..a3ee649 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -146,7 +146,7 @@ void ManageLanguageDialog::ClearLanguageBox()
IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
{
- VclPtr<SetDefaultLanguageDialog> aDlg(new SetDefaultLanguageDialog( this, m_xLocalizationMgr ));
+ ScopedVclPtr<SetDefaultLanguageDialog> aDlg(new SetDefaultLanguageDialog( this, m_xLocalizationMgr ));
if ( RET_OK == aDlg->Execute() )
{
// add new locales
@@ -164,7 +164,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl)
{
- VclPtr<MessageDialog> aQBox(new MessageDialog(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelang.ui"));
+ ScopedVclPtr<MessageDialog> aQBox(new MessageDialog(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelang.ui"));
if ( aQBox->Execute() == RET_OK )
{
sal_uInt16 i, nCount = m_pLanguageLB->GetSelectEntryCount();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 297c970..5b4adda 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -966,7 +966,7 @@ void SbiIoSystem::CloseAll(void)
void SbiIoSystem::ReadCon(OString& rIn)
{
OUString aPromptStr(OStringToOUString(aPrompt, osl_getThreadTextEncoding()));
- VclPtr<SbiInputDialog> aDlg(new SbiInputDialog(NULL, aPromptStr) );
+ ScopedVclPtr<SbiInputDialog> aDlg(new SbiInputDialog(NULL, aPromptStr) );
if( aDlg->Execute() )
{
rIn = OUStringToOString(aDlg->GetInput(), osl_getThreadTextEncoding());
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 5bbe9f6..d3294590c 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -205,7 +205,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton )
aNumberSet.Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE, rnFormatKey ));
aNumberSet.Put( SfxBoolItem( SID_ATTR_NUMBERFORMAT_SOURCE, rUseSourceFormat ));
- VclPtr<NumberFormatDialog> aDlg(new NumberFormatDialog(m_pWindow, aNumberSet));
+ ScopedVclPtr<NumberFormatDialog> aDlg(new NumberFormatDialog(m_pWindow, aNumberSet));
if( bPercent )
aDlg->SetText( m_pFT_NumberFormatForPercent->GetText());
if( RET_OK == aDlg->Execute() )
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 6e6f3d1..935c13b 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1271,7 +1271,7 @@ void ChartController::executeDispatch_ChartType()
SolarMutexGuard aSolarGuard;
//prepare and open dialog
- VclPtr<ChartTypeDialog> aDlg(new ChartTypeDialog( m_pChartWindow, getModel(), m_xCC ));
+ ScopedVclPtr<ChartTypeDialog> aDlg(new ChartTypeDialog( m_pChartWindow, getModel(), m_xCC ));
if( aDlg->Execute() == RET_OK )
{
impl_adaptDataSeriesAutoResize();
@@ -1292,7 +1292,7 @@ void ChartController::executeDispatch_SourceData()
if( xChartDoc.is())
{
SolarMutexGuard aSolarGuard;
- VclPtr<::chart::DataSourceDialog> aDlg(new ::chart::DataSourceDialog( m_pChartWindow, xChartDoc, m_xCC ));
+ ScopedVclPtr<::chart::DataSourceDialog> aDlg(new ::chart::DataSourceDialog( m_pChartWindow, xChartDoc, m_xCC ));
if( aDlg->Execute() == RET_OK )
{
impl_adaptDataSeriesAutoResize();
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index 3f8079a..6f6b9c1 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -54,7 +54,7 @@ void ChartController::executeDispatch_EditData()
UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData(
SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ),
m_xUndoManager );
- VclPtr<DataEditor> aDataEditorDialog(new DataEditor( nullptr, xChartDoc, m_xCC ));
+ ScopedVclPtrInstance<DataEditor> aDataEditorDialog( nullptr, xChartDoc, m_xCC );
if (aDataEditorDialog->Execute() == RET_OK)
aDataEditorDialog->ApplyChangesToModel();
aUndoGuard.commit();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 57a5d9d..ac8ba5e 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -109,7 +109,7 @@ void ChartController::executeDispatch_InsertAxes()
AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, true );
SolarMutexGuard aGuard;
- VclPtr<SchAxisDlg> aDlg(new SchAxisDlg( m_pChartWindow, aDialogInput ));
+ ScopedVclPtr<SchAxisDlg> aDlg(new SchAxisDlg( m_pChartWindow, aDialogInput ));
if( aDlg->Execute() == RET_OK )
{
// lock controllers till end of block
@@ -147,7 +147,7 @@ void ChartController::executeDispatch_InsertGrid()
AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, false );
SolarMutexGuard aGuard;
- VclPtr<SchGridDlg> aDlg(new SchGridDlg( m_pChartWindow, aDialogInput ));//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY );
+ ScopedVclPtr<SchGridDlg> aDlg(new SchGridDlg( m_pChartWindow, aDialogInput ));//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY );
if( aDlg->Execute() == RET_OK )
{
// lock controllers till end of block
@@ -179,7 +179,7 @@ void ChartController::executeDispatch_InsertTitles()
aDialogInput.readFromModel( getModel() );
SolarMutexGuard aGuard;
- VclPtr<SchTitleDlg> aDlg(new SchTitleDlg( m_pChartWindow, aDialogInput ));
+ ScopedVclPtr<SchTitleDlg> aDlg(new SchTitleDlg( m_pChartWindow, aDialogInput ));
if( aDlg->Execute() == RET_OK )
{
// lock controllers till end of block
@@ -232,7 +232,7 @@ void ChartController::executeDispatch_OpenLegendDialog()
{
//prepare and open dialog
SolarMutexGuard aGuard;
- VclPtr<SchLegendDlg> aDlg(new SchLegendDlg( m_pChartWindow, m_xCC ));
+ ScopedVclPtr<SchLegendDlg> aDlg(new SchLegendDlg( m_pChartWindow, m_xCC ));
aDlg->init( getModel() );
if( aDlg->Execute() == RET_OK )
{
@@ -292,7 +292,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier );
SvNumberFormatter* pNumberFormatter = aNumberFormatterWrapper.getSvNumberFormatter();
- VclPtr<DataLabelsDialog> aDlg(new DataLabelsDialog( m_pChartWindow, aItemSet, pNumberFormatter));
+ ScopedVclPtr<DataLabelsDialog> aDlg(new DataLabelsDialog( m_pChartWindow, aItemSet, pNumberFormatter));
if( aDlg->Execute() == RET_OK )
{
@@ -397,7 +397,7 @@ void ChartController::executeDispatch_InsertTrendline()
aDialogParameter.init( getModel() );
ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get());
SolarMutexGuard aGuard;
- VclPtr<SchAttribTabDlg> aDialog(new SchAttribTabDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider,
+ ScopedVclPtr<SchAttribTabDlg> aDialog(new SchAttribTabDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider,
uno::Reference< util::XNumberFormatsSupplier >( getModel(), uno::UNO_QUERY )));
// note: when a user pressed "OK" but didn't change any settings in the
@@ -452,7 +452,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
aDialogParameter.init( getModel() );
ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get());
SolarMutexGuard aGuard;
- VclPtr<SchAttribTabDlg> aDlg(new SchAttribTabDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider,
+ ScopedVclPtr<SchAttribTabDlg> aDlg(new SchAttribTabDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider,
uno::Reference< util::XNumberFormatsSupplier >( getModel(), uno::UNO_QUERY )));
aDlg->SetAxisMinorStepWidthForErrorBarDecimals(
InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( getModel(),
@@ -489,7 +489,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
//prepare and open dialog
SolarMutexGuard aGuard;
- VclPtr<InsertErrorBarsDialog> aDlg(new InsertErrorBarsDialog(
+ ScopedVclPtr<InsertErrorBarsDialog> aDlg(new InsertErrorBarsDialog(
m_pChartWindow, aItemSet,
uno::Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY ),
bYError ? ErrorBarResources::ERROR_BAR_Y : ErrorBarResources::ERROR_BAR_X));
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index d0676cd..a1be8de 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -761,7 +761,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard(
ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get() );
SolarMutexGuard aGuard;
- VclPtr<SchAttribTabDlg> aDlg(new SchAttribTabDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider
+ ScopedVclPtr<SchAttribTabDlg> aDlg(new SchAttribTabDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider
, uno::Reference< util::XNumberFormatsSupplier >( getModel(), uno::UNO_QUERY ) ));
if(aDialogParameter.HasSymbolProperties())
@@ -822,7 +822,7 @@ void ChartController::executeDispatch_View3D()
//open dialog
SolarMutexGuard aSolarGuard;
- VclPtr<View3DDialog> aDlg(new View3DDialog( m_pChartWindow, getModel(), m_pDrawModelWrapper->GetColorList() ));
+ ScopedVclPtr<View3DDialog> aDlg(new View3DDialog( m_pChartWindow, getModel(), m_pDrawModelWrapper->GetColorList() ));
if( aDlg->Execute() == RET_OK )
aUndoGuard.commit();
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 6d2ff70..032cabb 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2393,7 +2393,7 @@ short SvxMenuConfigPage::QueryReset()
OUString label = replaceSaveInName( msg, saveInName );
- VclPtr<QueryBox> qbox(new QueryBox( this, WB_YES_NO, label ));
+ ScopedVclPtr<QueryBox> qbox(new QueryBox( this, WB_YES_NO, label ));
return qbox->Execute();
}
@@ -3045,7 +3045,7 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
if ( m_pContentsListBox->GetEntryCount() == 0 &&
GetTopLevelSelection()->IsDeletable() )
{
- VclPtr<MessageDialog> qbox(new MessageDialog(this,
+ ScopedVclPtr<MessageDialog> qbox(new MessageDialog(this,
CUI_RES(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
if ( qbox->Execute() == RET_YES )
@@ -3125,7 +3125,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
}
case ID_DEFAULT_STYLE:
{
- VclPtr<MessageDialog> qbox(new MessageDialog(this,
+ ScopedVclPtr<MessageDialog> qbox(new MessageDialog(this,
CUI_RES(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
if ( qbox->Execute() == RET_YES )
@@ -4356,7 +4356,7 @@ short SvxToolbarConfigPage::QueryReset()
OUString label = replaceSaveInName( msg, saveInName );
- VclPtr<QueryBox> qbox(new QueryBox( this, WB_YES_NO, label ));
+ ScopedVclPtr<QueryBox> qbox(new QueryBox( this, WB_YES_NO, label ));
return qbox->Execute();
}
@@ -5298,7 +5298,7 @@ void SvxIconSelectorDialog::ImportGraphics(
message += newLine;
}
- VclPtr<SvxIconChangeDialog> aDialog(new SvxIconChangeDialog(this, message));
+ ScopedVclPtr<SvxIconChangeDialog> aDialog(new SvxIconChangeDialog(this, message));
aDialog->Execute();
}
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index eba3a2a..0cee25d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -2055,7 +2055,7 @@ IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
uno::Any exc( ::cppu::getCaughtException() );
OUString msg( ::comphelper::anyToString( exc ) );
const SolarMutexGuard guard;
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(NULL, msg));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(NULL, msg));
aErrorBox->SetText(sTitle);
aErrorBox->Execute();
}
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index cfbdd3c..40239ca 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -143,7 +143,7 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
Any exc( ::cppu::getCaughtException() );
OUString msg( ::comphelper::anyToString( exc ) );
const SolarMutexGuard guard;
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(NULL, msg));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(NULL, msg));
aErrorBox->SetText( GetText() );
aErrorBox->Execute();
}
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 4cb968d..593db19 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1541,7 +1541,7 @@ void SAL_CALL ColorPicker::setTitle( const OUString& sTitle ) throw (RuntimeExce
sal_Int16 SAL_CALL ColorPicker::execute( ) throw (RuntimeException, std::exception)
{
- VclPtr<ColorPickerDialog> aDlg(new ColorPickerDialog( VCLUnoHelper::GetWindow( mxParent ), mnColor, mnMode ));
+ ScopedVclPtr<ColorPickerDialog> aDlg(new ColorPickerDialog( VCLUnoHelper::GetWindow( mxParent ), mnColor, mnMode ));
sal_Int16 ret = aDlg->Execute();
if( ret )
mnColor = aDlg->GetColor();
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 4b9763b..9811a85 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -611,7 +611,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
aStr += pInfo->GetThemeName();
aStr += ")";
- VclPtr<InfoBox> aBox(new InfoBox( this, aStr ));
+ ScopedVclPtr<InfoBox> aBox(new InfoBox( this, aStr ));
aBox->Execute();
m_pLbResName->GrabFocus();
bDifferentThemeExists = true;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 0652c8b..6d1a69a 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -761,7 +761,7 @@ namespace svx
IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnOption )
{
- VclPtr<HangulHanjaOptionsDialog> aOptDlg( new HangulHanjaOptionsDialog(this) );
+ ScopedVclPtr<HangulHanjaOptionsDialog> aOptDlg( new HangulHanjaOptionsDialog(this) );
aOptDlg->Execute();
m_aOptionsChangedLink.Call( this );
return 0L;
@@ -1041,7 +1041,7 @@ namespace svx
IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl)
{
OUString aName;
- VclPtr<HangulHanjaNewDictDialog> aNewDlg( new HangulHanjaNewDictDialog(this) );
+ ScopedVclPtr<HangulHanjaNewDictDialog> aNewDlg( new HangulHanjaNewDictDialog(this) );
aNewDlg->Execute();
if( aNewDlg->GetName( aName ) )
{
@@ -1077,7 +1077,7 @@ namespace svx
DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" );
if( pEntry )
{
- VclPtr<HangulHanjaEditDictDialog> aEdDlg( new HangulHanjaEditDictDialog(this, m_aDictList, m_pDictsLB->GetSelectEntryPos()) );
+ ScopedVclPtr<HangulHanjaEditDictDialog> aEdDlg( new HangulHanjaEditDictDialog(this, m_aDictList, m_pDictsLB->GetSelectEntryPos()) );
aEdDlg->Execute();
}
return 0L;
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index f08098b..85e7f27 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -271,7 +271,7 @@ bool SvxHyperlinkNewDocTp::AskApply()
bool bRet = ImplGetURLObject( m_pCbbPath->GetText(), m_pCbbPath->GetBaseURL(), aINetURLObject );
if ( !bRet )
{
- VclPtr<WarningBox> aWarning(new WarningBox( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) ) );
+ ScopedVclPtr<WarningBox> aWarning(new WarningBox( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) ) );
aWarning->Execute();
}
return bRet;
@@ -321,7 +321,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
if( bOk )
{
- VclPtr<WarningBox> aWarning(new WarningBox( this, WB_YES_NO, CUI_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) ));
+ ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CUI_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
bCreate = aWarning->Execute() == RET_YES;
}
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 072dedd..d341bc6 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -333,7 +333,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
bool bIsInputEnabled = GetParent()->IsInputEnabled();
if ( bIsInputEnabled )
GetParent()->EnableInput( false );
- VclPtr<SfxMacroAssignDlg> aDlg(new SfxMacroAssignDlg( this, mxDocumentFrame, *pItemSet ));
+ ScopedVclPtr<SfxMacroAssignDlg> aDlg(new SfxMacroAssignDlg( this, mxDocumentFrame, *pItemSet ));
// add events
SfxMacroTabPage *pMacroPage = static_cast<SfxMacroTabPage*>( aDlg->GetTabPage() );
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index e9811ab..5a83bbe 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -444,7 +444,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
if( !xLink.Is() )
return 0;
- VclPtr<QueryBox> aBox(new QueryBox( this, WB_YES_NO | WB_DEF_YES, Closelinkmsg() ));
+ ScopedVclPtr<QueryBox> aBox(new QueryBox( this, WB_YES_NO | WB_DEF_YES, Closelinkmsg() ));
if( RET_YES == aBox->Execute() )
{
@@ -475,7 +475,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
}
else
{
- VclPtr<QueryBox> aBox(new QueryBox( this, WB_YES_NO | WB_DEF_YES, CloselinkmsgMulti() ));
+ ScopedVclPtr<QueryBox> aBox(new QueryBox( this, WB_YES_NO | WB_DEF_YES, CloselinkmsgMulti() ));
if( RET_YES == aBox->Execute() )
{
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 5d161ae..e59e581 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -101,7 +101,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG
m_pPasswdToModifyED->GetText().isEmpty();
if (bInvalidState)
{
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(m_pParent,
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(m_pParent,
m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2));
aErrorBox->Execute();
}
@@ -112,7 +112,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG
const int nMismatch = (bToOpenMatch? 0 : 1) + (bToModifyMatch? 0 : 1);
if (nMismatch > 0)
{
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(m_pParent, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(m_pParent, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch));
aErrorBox->Execute();
Edit* pEdit = !bToOpenMatch ? m_pPasswdToOpenED : m_pPasswdToModifyED;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 5bf6d6d..c4c5b0d 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -922,7 +922,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
bValid = false;
OUString aError( m_createErrStr );
aError += m_createDupStr;
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(static_cast<vcl::Window*>(this), aError));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(static_cast<vcl::Window*>(this), aError));
aErrorBox->SetText( m_createErrTitleStr );
aErrorBox->Execute();
xNewDlg->SetObjectName( aNewName );
@@ -1004,7 +1004,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
{
//ISSUE L10N & message from exception?
OUString aError( m_createErrStr );
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(static_cast<vcl::Window*>(this), aError));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(static_cast<vcl::Window*>(this), aError));
aErrorBox->SetText( m_createErrTitleStr );
aErrorBox->Execute();
}
@@ -1080,7 +1080,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry )
{
//ISSUE L10N & message from exception?
OUString aError( m_renameErrStr );
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(static_cast<vcl::Window*>(this), aError));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(static_cast<vcl::Window*>(this), aError));
aErrorBox->SetText( m_renameErrTitleStr );
aErrorBox->Execute();
}
@@ -1126,7 +1126,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
else
{
//ISSUE L10N & message from exception?
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(static_cast<vcl::Window*>(this), m_delErrStr));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(static_cast<vcl::Window*>(this), m_delErrStr));
aErrorBox->SetText( m_delErrTitleStr );
aErrorBox->Execute();
}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index e719b47..2170afb 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -278,7 +278,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl)
SvTreeListEntry* pEntry = pPathBox->FirstSelected();
if ( pEntry )
{
- VclPtr<MessageDialog> aQuery(new MessageDialog(this, CUI_RES(RID_SVXSTR_QUERY_DELETE_CONFIRM), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
+ ScopedVclPtr<MessageDialog> aQuery(new MessageDialog(this, CUI_RES(RID_SVXSTR_QUERY_DELETE_CONFIRM), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
if ( aQuery->Execute() == RET_YES )
pPathBox->GetModel()->Remove(pEntry);
}
@@ -414,7 +414,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUS
void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const OUString& _sOldLocation,SvTreeListEntry* _pEntry)
{
- VclPtr<ODocumentLinkDialog> aDlg(new ODocumentLinkDialog(this,_pEntry == NULL));
+ ScopedVclPtr<ODocumentLinkDialog> aDlg(new ODocumentLinkDialog(this,_pEntry == NULL));
aDlg->setLink(_sOldName,_sOldLocation);
aDlg->setNameValidator(LINK( this, DbRegistrationOptionsPage, NameValidator ) );
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 7fbe477..3a5aa67 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -130,7 +130,7 @@ namespace svx
{
OUString sMsg = CUI_RES(STR_LINKEDDOC_DOESNOTEXIST);
sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
- VclPtr<MessageDialog> aError(new MessageDialog(this, sMsg));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, sMsg));
aError->Execute();
return 0L;
} // if (!bFileExists)
@@ -139,7 +139,7 @@ namespace svx
{
OUString sMsg = CUI_RES(STR_LINKEDDOC_NO_SYSTEM_FILE);
sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
- VclPtr<MessageDialog> aError(new MessageDialog(this, sMsg));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, sMsg));
aError->Execute();
return 0L;
}
@@ -151,7 +151,7 @@ namespace svx
{
OUString sMsg = CUI_RES(STR_NAME_CONFLICT);
sMsg = sMsg.replaceFirst("$file$", sCurrentText);
- VclPtr<MessageDialog> aError(new MessageDialog(this, sMsg, VCL_MESSAGE_INFO));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, sMsg, VCL_MESSAGE_INFO));
aError->Execute();
m_pName->SetSelection(Selection(0,sCurrentText.getLength()));
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 9ca96f9..87c5dd0 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -231,7 +231,7 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
{
OSL_ENSURE(pColorConfig->GetColorList().size() > 1, "don't delete the last chart color");
- VclPtr<MessageDialog> aQuery(new MessageDialog(pButton, "QueryDeleteChartColorDialog",
+ ScopedVclPtr<MessageDialog> aQuery(new MessageDialog(pButton, "QueryDeleteChartColorDialog",
"cui/ui/querydeletechartcolordialog.ui"));
if (RET_YES == aQuery->Execute())
{
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index bce0bfb..852d027 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -553,8 +553,8 @@ void ColorConfigWindow_Impl::CreateEntries()
long nCheckBoxLabelOffset = 0;
{
OUString sSampleText("X");
- VclPtr<CheckBox> aCheckBox(new CheckBox(this));
- VclPtr<FixedText> aFixedText(new FixedText(this));
+ ScopedVclPtr<CheckBox> aCheckBox(new CheckBox(this));
+ ScopedVclPtr<FixedText> aFixedText(new FixedText(this));
aCheckBox->SetText(sSampleText);
aFixedText->SetText(sSampleText);
Size aCheckSize(aCheckBox->CalcMinimumSize(0x7fffffff));
@@ -628,7 +628,7 @@ void ColorConfigWindow_Impl::SetAppearance ()
OSL_ENSURE( vEntries.size() >= sizeof vEntryInfo / sizeof vEntryInfo[0], "wrong number of helpIDs for color listboxes" );
// creating a sample color listbox with the color entries
- VclPtr<ColorListBox> aSampleColorList(new ColorListBox(this));
+ ScopedVclPtr<ColorListBox> aSampleColorList(new ColorListBox(this));
{
XColorListRef const xColorTable = XColorList::CreateStdColorList();
for (sal_Int32 i = 0; i != xColorTable->Count(); ++i)
@@ -1205,7 +1205,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
else
{
DBG_ASSERT(m_pColorSchemeLB->GetEntryCount() > 1, "don't delete the last scheme");
- VclPtr<MessageDialog> aQuery(new MessageDialog(pButton, CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
+ ScopedVclPtr<MessageDialog> aQuery(new MessageDialog(pButton, CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
aQuery->SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE));
if(RET_YES == aQuery->Execute())
{
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 0239009..10620f3 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -477,7 +477,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl)
if ( nLang != nOldLang )
{
- VclPtr<MessageDialog> aBox(new MessageDialog(this, CUI_RES( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
+ ScopedVclPtr<MessageDialog> aBox(new MessageDialog(this, CUI_RES( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
OUString sTxt(aBox->get_primary_text());
sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectEntry() );
aBox->set_primary_text(sTxt);
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ceb7c2f..24bfe05 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1356,7 +1356,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString));
Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
// display info
- VclPtr<MessageDialog> aBox(new MessageDialog(this, CUI_RES(RID_SVXSTR_LANGUAGE_RESTART), VCL_MESSAGE_INFO));
+ ScopedVclPtr<MessageDialog> aBox(new MessageDialog(this, CUI_RES(RID_SVXSTR_LANGUAGE_RESTART), VCL_MESSAGE_INFO));
aBox->Execute();
// tell quickstarter to stop being a veto listener
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index f92b13c..f7758fa 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -706,7 +706,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl)
}
else
{
- VclPtr<QueryBox> aQuery(new QueryBox( this, WB_YES_NO|WB_DEF_NO, m_sPasswordStoringDeactivateStr ));
+ ScopedVclPtr<QueryBox> aQuery(new QueryBox( this, WB_YES_NO|WB_DEF_NO, m_sPasswordStoringDeactivateStr ));
sal_uInt16 nRet = aQuery->Execute();
if( RET_YES == nRet )
@@ -803,7 +803,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl)
if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->authorizateWithMasterPassword( Reference< task::XInteractionHandler>() ) )
{
- VclPtr<svx::WebConnectionInfoDialog> aDlg( new svx::WebConnectionInfoDialog(this) );
+ ScopedVclPtr<svx::WebConnectionInfoDialog> aDlg( new svx::WebConnectionInfoDialog(this) );
aDlg->Execute();
}
}
@@ -822,7 +822,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl)
if (nRet == RET_OK && sOrig != mpCertPathDlg->getDirectory())
{
- VclPtr<MessageDialog> aWarnBox(new MessageDialog(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO));
+ ScopedVclPtr<MessageDialog> aWarnBox(new MessageDialog(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO));
aWarnBox->Execute();
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index fe3bd19..515b3c0 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -336,7 +336,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
(void)eErr;
if ( bRunning )
{
- VclPtr<MessageDialog> aWarnBox(new MessageDialog( this, CUI_RES( RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO ));
+ ScopedVclPtr<MessageDialog> aWarnBox(new MessageDialog( this, CUI_RES( RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO ));
aWarnBox->Execute();
}
}
@@ -381,7 +381,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
(void)eErr;
if ( bRunning )
{
- VclPtr<MessageDialog> aWarnBox(new MessageDialog( this, CUI_RES( RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO ));
+ ScopedVclPtr<MessageDialog> aWarnBox(new MessageDialog( this, CUI_RES( RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO ));
aWarnBox->Execute();
}
}
@@ -437,7 +437,7 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl )
{
- VclPtr<CuiAboutConfigTabPage> m_pExpertConfigDlg = new CuiAboutConfigTabPage(this);
+ ScopedVclPtr<CuiAboutConfigTabPage> m_pExpertConfigDlg = new CuiAboutConfigTabPage(this);
m_pExpertConfigDlg->Reset();//initialize and reset function
if( RET_OK == m_pExpertConfigDlg->Execute() )
@@ -630,12 +630,12 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
}
else if ( JFW_E_NOT_RECOGNIZED == eErr )
{
- VclPtr<MessageDialog> aErrBox(new MessageDialog( this, CUI_RES( RID_SVXSTR_JRE_NOT_RECOGNIZED ) ));
+ ScopedVclPtr<MessageDialog> aErrBox(new MessageDialog( this, CUI_RES( RID_SVXSTR_JRE_NOT_RECOGNIZED ) ));
aErrBox->Execute();
}
else if ( JFW_E_FAILED_VERSION == eErr )
{
- VclPtr<MessageDialog> aErrBox(new MessageDialog( this, CUI_RES( RID_SVXSTR_JRE_FAILED_VERSION ) ));
+ ScopedVclPtr<MessageDialog> aErrBox(new MessageDialog( this, CUI_RES( RID_SVXSTR_JRE_FAILED_VERSION ) ));
aErrBox->Execute();
}
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 53b3051..0182043 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1596,7 +1596,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
pLinguData = new SvxLinguData_Impl;
SvxLinguData_Impl aOldLinguData( *pLinguData );
- VclPtr<SvxEditModulesDlg> aDlg(new SvxEditModulesDlg( this, *pLinguData ));
+ ScopedVclPtr<SvxEditModulesDlg> aDlg(new SvxEditModulesDlg( this, *pLinguData ));
if (aDlg->Execute() != RET_OK)
*pLinguData = aOldLinguData;
@@ -1673,7 +1673,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
}
else if (m_pLinguDicsDelPB == pBtn)
{
- VclPtr<MessageDialog> aQuery(new MessageDialog(this, "QueryDeleteDictionaryDialog",
+ ScopedVclPtr<MessageDialog> aQuery(new MessageDialog(this, "QueryDeleteDictionaryDialog",
"cui/ui/querydeletedictionarydialog.ui"));
if (RET_NO == aQuery->Execute())
return 0;
@@ -1745,7 +1745,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
if(aData.HasNumericValue())
{
sal_uInt16 nRID = aData.GetEntryId();
- VclPtr<OptionsBreakSet> aDlg( new OptionsBreakSet(this, nRID) );
+ ScopedVclPtr<OptionsBreakSet> aDlg( new OptionsBreakSet(this, nRID) );
aDlg->GetNumericFld().SetValue( aData.GetNumericValue() );
if (RET_OK == aDlg->Execute() )
{
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 4454823..fd029b6 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -312,7 +312,7 @@ IMPL_LINK(ListEntryDialog, EditModifiedHdl, Edit*, pEdit)
void openListDialog(SvxOpenCLTabPage* pTabPage, OpenCLConfig::ImplMatcher& rEntry, const OString& rTag)
{
- VclPtr<ListEntryDialog> aDlg(new ListEntryDialog(pTabPage, rEntry, rTag));
+ ScopedVclPtr<ListEntryDialog> aDlg(new ListEntryDialog(pTabPage, rEntry, rTag));
if (aDlg->Execute() == RET_OK)
rEntry = aDlg->maEntry;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index a232cea..6b61f78 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -476,7 +476,7 @@ void SvxPersonalizationTabPage::LoadExtensionThemes()
IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ )
{
- VclPtr<SelectPersonaDialog> aDialog( new SelectPersonaDialog(NULL) );
+ ScopedVclPtr<SelectPersonaDialog> aDialog( new SelectPersonaDialog(NULL) );
if ( aDialog->Execute() == RET_OK )
{
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index afb5fe1..5e592b7 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -731,7 +731,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
if( nSelEntryPos == REPLACE_BULLETS ||
nSelEntryPos == APPLY_NUMBERING)
{
- VclPtr<SvxCharacterMap> pMapDlg(new SvxCharacterMap(this));
+ ScopedVclPtr<SvxCharacterMap> pMapDlg(new SvxCharacterMap(this));
ImpUserData* pUserData = (ImpUserData*)m_pCheckLB->FirstSelected()->GetUserData();
pMapDlg->SetCharFont(*pUserData->pFont);
pMapDlg->SetChar( (*pUserData->pString)[0] );
@@ -748,7 +748,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
else if( MERGE_SINGLE_LINE_PARA == nSelEntryPos )
{
// dialog for per cent settings
- VclPtr<OfaAutoFmtPrcntSet> aDlg(new OfaAutoFmtPrcntSet(this));
+ ScopedVclPtr<OfaAutoFmtPrcntSet> aDlg(new OfaAutoFmtPrcntSet(this));
aDlg->GetPrcntFld().SetValue(nPercent);
if(RET_OK == aDlg->Execute())
{
@@ -2061,7 +2061,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
else if (pBtn == m_pDblEndQuotePB)
nMode = DBL_END;
// start character selection dialog
- VclPtr<SvxCharacterMap> pMap(new SvxCharacterMap( this, true ));
+ ScopedVclPtr<SvxCharacterMap> pMap(new SvxCharacterMap( this, true ));
pMap->SetCharFont( OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT,
LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 ));
pMap->SetText(nMode < SGL_END ? m_sStartQuoteDlg : m_sEndQuoteDlg );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 4687eff..7fefce5 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -699,7 +699,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
// display original size
const FieldUnit eMetric = GetModuleFieldUnit( GetItemSet() );
- VclPtr<MetricField> aFld(new MetricField(this, WB_HIDE));
+ ScopedVclPtr<MetricField> aFld(new MetricField(this, WB_HIDE));
SetFieldUnit( *aFld.get(), eMetric );
aFld->SetDecimalDigits( m_pWidthMF->GetDecimalDigits() );
aFld->SetMax( LONG_MAX - 1 );
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 736b872..b3b183d 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -446,7 +446,7 @@ long SvxBitmapTabPage::CheckChanges_Impl()
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- VclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
+ ScopedVclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
SVX_RES( RID_SVXSTR_BITMAP ),
CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ),
&aWarningBoxImage ));
@@ -510,7 +510,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
DBG_ASSERT(pFact, "Dialog creation failed!");
boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
- VclPtr<MessageDialog> pWarnBox;
+ ScopedVclPtr<MessageDialog> pWarnBox;
sal_uInt16 nError(1);
while( pDlg->Execute() == RET_OK )
@@ -610,7 +610,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
if( !nError )
{
OUString aDesc( ResId(RID_SVXSTR_DESC_EXT_BITMAP, rMgr) );
- VclPtr<MessageDialog> pWarnBox;
+ ScopedVclPtr<MessageDialog> pWarnBox;
// convert file URL to UI name
OUString aName;
@@ -728,7 +728,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
}
else
{
- VclPtr<MessageDialog> aBox( new MessageDialog(GetParentDialog()
+ ScopedVclPtr<MessageDialog> aBox( new MessageDialog(GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui"));
aBox->Execute();
@@ -746,7 +746,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- VclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog(),"AskDelBitmapDialog","cui/ui/querydeletebitmapdialog.ui" ));
+ ScopedVclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog(),"AskDelBitmapDialog","cui/ui/querydeletebitmapdialog.ui" ));
if( aQueryBox->Execute() == RET_YES )
{
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index f0e6989..736f682 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -539,7 +539,7 @@ long SvxColorTabPage::CheckChanges_Impl()
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- VclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
+ ScopedVclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
SVX_RESSTR( RID_SVXSTR_COLOR ),
ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ),
&aWarningBoxImage ));
@@ -705,7 +705,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
// if yes, it is repeated and a new name is demanded
if ( !bDifferent )
{
- VclPtr<MessageDialog> aWarningBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aWarningBox(new MessageDialog( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui"));
aWarningBox->Execute();
@@ -776,7 +776,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
// if yes, it is repeated and a new name is demanded
if ( !bDifferent )
{
- VclPtr<MessageDialog> aWarningBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aWarningBox(new MessageDialog( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui"));
aWarningBox->Execute();
@@ -872,7 +872,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- VclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog(),"AskDelColorDialog","cui/ui/querydeletecolordialog.ui"));
+ ScopedVclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog(),"AskDelColorDialog","cui/ui/querydeletecolordialog.ui"));
if( aQueryBox->Execute() == RET_YES )
{
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 6181de3..7a38890 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -291,7 +291,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- VclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
+ ScopedVclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
SVX_RESSTR( RID_SVXSTR_GRADIENT ),
CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT ),
&aWarningBoxImage ));
@@ -457,7 +457,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
DBG_ASSERT(pFact, "Dialog creation failed!");
boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
- VclPtr<MessageDialog> pWarnBox;
+ ScopedVclPtr<MessageDialog> pWarnBox;
sal_uInt16 nError = 1;
while( pDlg->Execute() == RET_OK )
@@ -589,7 +589,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
}
else
{
- VclPtr<MessageDialog> aBox( new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aBox( new MessageDialog( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui") );
aBox->Execute();
@@ -608,7 +608,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- VclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog(),"AskDelGradientDialog","cui/ui/querydeletegradientdialog.ui"));
+ ScopedVclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog(),"AskDelGradientDialog","cui/ui/querydeletegradientdialog.ui"));
if ( aQueryBox->Execute() == RET_YES )
{
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index e98a0fa..d3f1aa3 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -261,7 +261,7 @@ long SvxHatchTabPage::CheckChanges_Impl()
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- VclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
+ ScopedVclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
SVX_RESSTR( RID_SVXSTR_HATCH ),
CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_HATCH ),
&aWarningBoxImage ));
@@ -500,7 +500,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
DBG_ASSERT(pFact, "Dialog creation failed!");
boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
- VclPtr<MessageDialog> pWarnBox;
+ ScopedVclPtr<MessageDialog> pWarnBox;
sal_uInt16 nError = 1;
while( pDlg->Execute() == RET_OK )
@@ -627,7 +627,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
}
else
{
- VclPtr<MessageDialog> aBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aBox(new MessageDialog( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui"));
aBox->Execute();
@@ -645,7 +645,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- VclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog(),"AskDelHatchDialog","cui/ui/querydeletehatchdialog.ui"));
+ ScopedVclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog(),"AskDelHatchDialog","cui/ui/querydeletehatchdialog.ui"));
if( aQueryBox->Execute() == RET_YES )
{
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 82cf99b..9f1b5eb 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -246,7 +246,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- VclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
+ ScopedVclPtr<SvxMessDialog> aMessDlg(new SvxMessDialog(GetParentDialog(),
SVX_RESSTR( RID_SVXSTR_LINESTYLE ),
OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
&aWarningBoxImage ));
@@ -619,7 +619,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
else
{
- VclPtr<MessageDialog> aBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aBox(new MessageDialog( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui"));
aBox->Execute();
@@ -697,7 +697,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
}
else
{
- VclPtr<MessageDialog> aBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aBox(new MessageDialog( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui") );
aBox->Execute();
@@ -715,7 +715,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- VclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog()
,"AskDelLineStyleDialog"
,"cui/ui/querydeletelinestyledialog.ui"));
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 6d36cfe..b1fa345 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -206,7 +206,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
if( aString != m_pLbLineEnds->GetSelectEntry() )
{
- VclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog()
,"AskChangeLineEndDialog"
,"cui/ui/querychangelineenddialog.ui"));
@@ -343,7 +343,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
// if yes, repeat and demand a new name
if ( !bDifferent )
{
- VclPtr<MessageDialog> aWarningBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aWarningBox(new MessageDialog( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui"));
aWarningBox->Execute();
@@ -497,7 +497,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
}
else
{
- VclPtr<MessageDialog> aBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aBox(new MessageDialog( GetParentDialog()
,"DuplicateNameDialog"
,"cui/ui/queryduplicatedialog.ui"));
aBox->Execute();
@@ -525,7 +525,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- VclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog()
+ ScopedVclPtr<MessageDialog> aQueryBox(new MessageDialog( GetParentDialog()
,"AskDelLineEndDialog"
,"cui/ui/querydeletelineenddialog.ui"));
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index dd1aa10..c6041a0 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -406,7 +406,7 @@ namespace dbmm
// check that the backup location isn't the same as the document itself
if ( lcl_equalURLs_nothrow( m_pData->aContext, sBackupLocation, m_pData->xDocumentModel->getURL() ) )
{
- VclPtr<MessageDialog> aErrorBox(new MessageDialog( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) ));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) ));
aErrorBox->Execute();
rBackupPage.grabLocationFocus();
return false;
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index ec583e1..a4dff8c 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -175,7 +175,7 @@ void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList
else
{
OUString sMessage(ModuleRes(STR_MISSING_TABLES_XDROP));
- VclPtr<MessageDialog> aError(new MessageDialog(getView(), sMessage));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(getView(), sMessage));
aError->Execute();
}
}
@@ -210,7 +210,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec
if ( eResult != svtools::QUERYDELETE_ALL )
{
- VclPtr<svtools::QueryDeleteDlg_Impl> aDlg( new svtools::QueryDeleteDlg_Impl(getView(), *aThisRound) );
+ ScopedVclPtr<svtools::QueryDeleteDlg_Impl> aDlg( new svtools::QueryDeleteDlg_Impl(getView(), *aThisRound) );
if ( !sDialogPosition.isEmpty() )
aDlg->SetWindowState( sDialogPosition );
@@ -686,7 +686,7 @@ bool OApplicationController::paste( ElementType _eType, const ::svx::ODataAccess
has a /table/ with that name) */
if ( bNeedAskForName )
{
- VclPtr<OSaveAsDlg> aAskForName(new OSaveAsDlg( getView(),
+ ScopedVclPtr<OSaveAsDlg> aAskForName(new OSaveAsDlg( getView(),
CommandType::QUERY,
getORB(),
getConnection(),
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index df90c32..237a31f 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -111,7 +111,7 @@ void OApplicationController::convertToView(const OUString& _sName)
OUString aDefaultName = ::dbaui::createDefaultName(xMeta,xTables,aName);
DynamicTableOrQueryNameCheck aNameChecker( xConnection, CommandType::TABLE );
- VclPtr<OSaveAsDlg> aDlg(new OSaveAsDlg( getView(), CommandType::TABLE, getORB(), xConnection, aDefaultName, aNameChecker ) );
+ ScopedVclPtr<OSaveAsDlg> aDlg(new OSaveAsDlg( getView(), CommandType::TABLE, getORB(), xConnection, aDefaultName, aNameChecker ) );
if ( aDlg->Execute() == RET_OK )
{
OUString sName = aDlg->getName();
@@ -534,7 +534,7 @@ void OApplicationController::askToReconnect()
bool bClear = true;
if ( !m_pSubComponentManager->empty() )
{
- VclPtr<MessageDialog> aQry(new MessageDialog(getView(), ModuleRes(STR_QUERY_CLOSEDOCUMENTS), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
+ ScopedVclPtr<MessageDialog> aQry(new MessageDialog(getView(), ModuleRes(STR_QUERY_CLOSEDOCUMENTS), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
switch (aQry->Execute())
{
case RET_YES:
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 32a261f..4c857cf 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1271,7 +1271,7 @@ IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotIntere
{
if ( m_aCurrentError.isValid() )
{
- VclPtr<OSQLMessageBox> aDlg(new OSQLMessageBox( getBrowserView(), m_aCurrentError ));
+ ScopedVclPtr<OSQLMessageBox> aDlg(new OSQLMessageBox( getBrowserView(), m_aCurrentError ));
aDlg->Execute();
}
return 0L;
@@ -1764,14 +1764,14 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(bool bFilter)
Reference< XConnection> xCon(xFormSet->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY);
if(bFilter)
{
- VclPtr<DlgFilterCrit> aDlg(new DlgFilterCrit( getBrowserView(), getORB(), xCon, xParser, xSup->getColumns() ) );
+ ScopedVclPtr<DlgFilterCrit> aDlg(new DlgFilterCrit( getBrowserView(), getORB(), xCon, xParser, xSup->getColumns() ) );
if ( !aDlg->Execute() )
return; // if so we don't need to update the grid
aDlg->BuildWherePart();
}
else
{
- VclPtr<DlgOrderCrit> aDlg(new DlgOrderCrit( getBrowserView(),xCon,xParser,xSup->getColumns() ) );
+ ScopedVclPtr<DlgOrderCrit> aDlg(new DlgOrderCrit( getBrowserView(),xCon,xParser,xSup->getColumns() ) );
if(!aDlg->Execute())
{
return; // if so we don't need to actualize the grid
@@ -2172,7 +2172,7 @@ bool SbaXDataBrowserController::SaveModified(bool bAskFor)
{
getBrowserView()->getVclControl()->GrabFocus();
- VclPtr<MessageDialog> aQry(new MessageDialog(getBrowserView()->getVclControl(),
+ ScopedVclPtr<MessageDialog> aQry(new MessageDialog(getBrowserView()->getVclControl(),
"SaveModifiedDialog",
"dbaccess/ui/savemodifieddialog.ui"));
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 030d38e..c581844 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -792,7 +792,7 @@ void SbaGridControl::SetColWidth(sal_uInt16 nColId)
Any aWidth = xAffectedCol->getPropertyValue(PROPERTY_WIDTH);
sal_Int32 nCurWidth = aWidth.hasValue() ? ::comphelper::getINT32(aWidth) : -1;
- VclPtr<DlgSize> aDlgColWidth(new DlgSize(this, nCurWidth, false));
+ ScopedVclPtr<DlgSize> aDlgColWidth(new DlgSize(this, nCurWidth, false));
if (aDlgColWidth->Execute())
{
sal_Int32 nValue = aDlgColWidth->GetValue();
@@ -821,7 +821,7 @@ void SbaGridControl::SetRowHeight()
Any aHeight = xCols->getPropertyValue(PROPERTY_ROW_HEIGHT);
sal_Int32 nCurHeight = aHeight.hasValue() ? ::comphelper::getINT32(aHeight) : -1;
- VclPtr<DlgSize> aDlgRowHeight(new DlgSize(this, nCurHeight, true));
+ ScopedVclPtr<DlgSize> aDlgRowHeight(new DlgSize(this, nCurHeight, true));
if (aDlgRowHeight->Execute())
{
sal_Int32 nValue = aDlgRowHeight->GetValue();
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index d174133..a7e9e8b 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -180,7 +180,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
Reference< XContent> xContent;
if ( xNameContainer->hasByName(sName) )
{
- VclPtr<QueryBox> aBox(new QueryBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) ) );
+ ScopedVclPtr<QueryBox> aBox(new QueryBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) ) );
if ( aBox->Execute() != RET_YES )
return 0;
}
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 4c65ae5..d07c04e 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -309,7 +309,7 @@ namespace dbaui
aProfiles.insert(pArray[index]);
// execute the select dialog
- VclPtr<ODatasourceSelectDialog> aSelector(new ODatasourceSelectDialog(GetParent(), aProfiles));
+ ScopedVclPtr<ODatasourceSelectDialog> aSelector(new ODatasourceSelectDialog(GetParent(), aProfiles));
OUString sOldProfile=getURLNoPrefix();
if (!sOldProfile.isEmpty())
@@ -479,7 +479,7 @@ namespace dbaui
sQuery = sQuery.replaceFirst("$path$", aTransformer.get(OFileNotation::N_SYSTEM));
m_bUserGrabFocus = false;
- VclPtr<QueryBox> aQuery(new QueryBox(GetParent(), WB_YES_NO | WB_DEF_YES, sQuery));
+ ScopedVclPtr<QueryBox> aQuery(new QueryBox(GetParent(), WB_YES_NO | WB_DEF_YES, sQuery));
sal_Int32 nQueryResult = aQuery->Execute();
m_bUserGrabFocus = true;
@@ -496,7 +496,7 @@ namespace dbaui
sQuery = sQuery.replaceFirst("$name$", aTransformer.get(OFileNotation::N_SYSTEM));
m_bUserGrabFocus = false;
- VclPtr<QueryBox> aWhatToDo(new QueryBox(GetParent(), WB_RETRY_CANCEL | WB_DEF_RETRY, sQuery));
+ ScopedVclPtr<QueryBox> aWhatToDo(new QueryBox(GetParent(), WB_RETRY_CANCEL | WB_DEF_RETRY, sQuery));
nQueryResult = aWhatToDo->Execute();
m_bUserGrabFocus = true;
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index d9aafa2..dde8917 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -308,7 +308,7 @@ namespace dbaui
const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
- VclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ) );
+ ScopedVclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ) );
aMsg->Execute();
return 0L;
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index ab31641..f202e90 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -563,7 +563,7 @@ using namespace ::com::sun::star;
#endif
const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
- VclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ) );
+ ScopedVclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ) );
aMsg->Execute();
return 0L;
}
@@ -685,7 +685,7 @@ using namespace ::com::sun::star;
}
#endif
sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
- VclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, OUString( ModuleRes( nMessage ) ), OUString() ) );
+ ScopedVclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, OUString( ModuleRes( nMessage ) ), OUString() ) );
aMsg->Execute();
return 0L;
}
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index bd282d7..032d337 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -102,7 +102,7 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl)
else
{
OUString aErrorMsg( ModuleRes( STR_ERROR_PASSWORDS_NOT_IDENTICAL));
- VclPtr<MessageDialog> aErrorBox(new MessageDialog(this, aErrorMsg));
+ ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(this, aErrorMsg));
aErrorBox->Execute();
m_pEDPassword->SetText( OUString() );
m_pEDPasswordRepeat->SetText( OUString() );
@@ -213,7 +213,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
{
if(pButton == m_pNEWUSER)
{
- VclPtr<SfxPasswordDialog> aPwdDlg(new SfxPasswordDialog(this));
+ ScopedVclPtr<SfxPasswordDialog> aPwdDlg(new SfxPasswordDialog(this));
aPwdDlg->ShowExtras(SHOWEXTRAS_ALL);
if(aPwdDlg->Execute())
{
@@ -240,7 +240,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
if(xUser.is())
{
OUString sNewPassword,sOldPassword;
- VclPtr<OPasswordDialog> aDlg(new OPasswordDialog(this,sName));
+ ScopedVclPtr<OPasswordDialog> aDlg(new OPasswordDialog(this,sName));
if(aDlg->Execute() == RET_OK)
{
sNewPassword = aDlg->GetNewPassword();
@@ -259,7 +259,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
Reference<XDrop> xDrop(m_xUsers,UNO_QUERY);
if(xDrop.is())
{
- VclPtr<MessageDialog> aQry(new MessageDialog(this, ModuleRes(STR_QUERY_USERADMIN_DELETE_USER), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
+ ScopedVclPtr<MessageDialog> aQry(new MessageDialog(this, ModuleRes(STR_QUERY_USERADMIN_DELETE_USER), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
if(aQry->Execute() == RET_YES)
xDrop->dropByName(GetUser());
}
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 61744a5..b837888 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -117,7 +117,7 @@ namespace dbaui
// show an error message
OUString sError( ModuleRes( STR_COULD_NOT_LOAD_ODBC_LIB ) );
sError = sError.replaceFirst("#lib#", aEnumeration.getLibraryName());
- VclPtr<MessageDialog> aDialog(new MessageDialog(this, sError));
+ ScopedVclPtr<MessageDialog> aDialog(new MessageDialog(this, sError));
aDialog->Execute();
return false;
}
@@ -125,7 +125,7 @@ namespace dbaui
{
aEnumeration.getDatasourceNames(aOdbcDatasources);
// execute the select dialog
- VclPtr<ODatasourceSelectDialog> aSelector(new ODatasourceSelectDialog(GetParent(), aOdbcDatasources));
+ ScopedVclPtr<ODatasourceSelectDialog> aSelector(new ODatasourceSelectDialog(GetParent(), aOdbcDatasources));
if (!_sCurr.isEmpty())
aSelector->Select(_sCurr);
if ( RET_OK == aSelector->Execute() )
@@ -242,7 +242,7 @@ namespace dbaui
eImage = OSQLMessageBox::Error;
aMessage = ModuleRes(STR_CONNECTION_NO_SUCCESS);
}
- VclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, sTitle, aMessage, WB_OK, eImage ) );
+ ScopedVclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, sTitle, aMessage, WB_OK, eImage ) );
aMsg->Execute();
}
if ( !bSuccess )
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 206a1cd..ecf9537 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -248,7 +248,7 @@ namespace dbaui
{
if (m_pIndexes == pButton)
{
- VclPtr<ODbaseIndexDialog> aIndexDialog(new ODbaseIndexDialog(this, m_sDsn));
+ ScopedVclPtr<ODbaseIndexDialog> aIndexDialog(new ODbaseIndexDialog(this, m_sDsn));
aIndexDialog->Execute();
}
else
@@ -541,7 +541,7 @@ namespace dbaui
#endif
const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
- VclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ) );
+ ScopedVclPtr<OSQLMessageBox> aMsg(new OSQLMessageBox( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ) );
aMsg->Execute();
return 0L;
}
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 32c9270e..c7d1634 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -106,7 +106,7 @@ namespace dbaui
{
OUString sMessage(ModuleRes(STR_DIRECTSQL_CONNECTIONLOST));
- VclPtr<MessageDialog> aError(new MessageDialog(this, sMessage));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, sMessage));
aError->Execute();
}
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 2451eac..5e58d86 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -738,7 +738,7 @@ namespace dbaui
if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() || !pFilter->GetWildcard().Matches(sPath) )
{
OUString sMessage(ModuleRes(STR_ERR_USE_CONNECT_TO));
- VclPtr<InfoBox> aError(new InfoBox(this, sMessage));
+ ScopedVclPtr<InfoBox> aError(new InfoBox(this, sMessage));
aError->Execute();
m_pRB_ConnectDatabase->Check();
OnSetupModeSelected( m_pRB_ConnectDatabase );
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index dc2c7dd..7b71e75 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -422,7 +422,7 @@ namespace dbaui
{
OUString sConfirm(ModuleRes(STR_CONFIRM_DROP_INDEX));
sConfirm = sConfirm.replaceFirst("$name$", m_pIndexList->GetEntryText(pSelected));
- VclPtr<MessageDialog> aConfirm(new MessageDialog(this, sConfirm, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
+ ScopedVclPtr<MessageDialog> aConfirm(new MessageDialog(this, sConfirm, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
if (RET_YES != aConfirm->Execute())
return;
}
@@ -586,7 +586,7 @@ namespace dbaui
if (aSelected->isModified() || aSelected->isNew())
{
- VclPtr<MessageDialog> aQuestion(new MessageDialog(this, "SaveIndexDialog",
+ ScopedVclPtr<MessageDialog> aQuestion(new MessageDialog(this, "SaveIndexDialog",
"dbaccess/ui/saveindexdialog.ui"));
nResponse = aQuestion->Execute();
}
@@ -630,7 +630,7 @@ namespace dbaui
{
OUString sError(ModuleRes(STR_INDEX_NAME_ALREADY_USED));
sError = sError.replaceFirst("$name$", sNewName);
- VclPtr<MessageDialog> aError(new MessageDialog(this, sError));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, sError));
aError->Execute();
updateToolbox();
@@ -691,7 +691,7 @@ namespace dbaui
// need at least one field
if (0 == _rPos->aFields.size())
{
- VclPtr<MessageDialog> aError(new MessageDialog(this, ModuleRes(STR_NEED_INDEX_FIELDS)));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, ModuleRes(STR_NEED_INDEX_FIELDS)));
aError->Execute();
m_pFields->GrabFocus();
return false;
@@ -709,7 +709,7 @@ namespace dbaui
// a column is specified twice ... won't work anyway, so prevent this here and now
OUString sMessage(ModuleRes(STR_INDEXDESIGN_DOUBLE_COLUMN_NAME));
sMessage = sMessage.replaceFirst("$name$", aFieldCheck->sFieldName);
- VclPtr<MessageDialog> aError(new MessageDialog(this, sMessage));
+ ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, sMessage));
aError->Execute();
m_pFields->GrabFocus();
return false;
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 49377e7..1c63cb0 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -712,7 +712,7 @@ void OSQLMessageBox::dispose()
IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ )
{
- VclPtr<OExceptionChainDialog> aDlg(new OExceptionChainDialog( this, m_pImpl->aDisplayInfo ) );
+ ScopedVclPtr<OExceptionChainDialog> aDlg(new OExceptionChainDialog( this, m_pImpl->aDisplayInfo ) );
aDlg->Execute();
return 0;
}
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 7ee4607..eb14533 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -327,7 +327,7 @@ namespace dbaui
if (aErrorInfo.isValid())
{
// establishing the connection failed. Show an error window and exit.
- VclPtr<OSQLMessageBox> aMessageBox(new OSQLMessageBox( GetParentDialog(), aErrorInfo ));
+ ScopedVclPtr<OSQLMessageBox> aMessageBox(new OSQLMessageBox( GetParentDialog(), aErrorInfo ));
aMessageBox->Execute();
m_pTables->Enable(false);
m_pTablesList->Clear();
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 088beb6..ba1352b 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -687,7 +687,7 @@ bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTe
{
bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty();
OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName );
- VclPtr<OCopyTableWizard> aWizard(new OCopyTableWizard(
+ ScopedVclPtr<OCopyTableWizard> aWizard(new OCopyTableWizard(
NULL,
sTableName,
bHaveDefaultTable ? CopyTableOperation::AppendData : CopyTableOperation::CopyDefinitionAndData,
@@ -754,7 +754,7 @@ void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException
OUString aMsg(e.Message);
aMsg += "\n";
aMsg += ModuleRes( STR_QRY_CONTINUE );
- VclPtr<OSQLWarningBox> aBox(new OSQLWarningBox( NULL, aMsg, WB_YES_NO | WB_DEF_NO ) );
+ ScopedVclPtr<OSQLWarningBox> aBox(new OSQLWarningBox( NULL, aMsg, WB_YES_NO | WB_DEF_NO ) );
if (aBox->Execute() == RET_YES)
m_bDontAskAgain = true;
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 8a74d80..a107c94 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -241,7 +241,7 @@ bool ORowSetImportExport::insertNewRow()
if(!m_bAlreadyAsked)
{
OUString sAskIfContinue = ModuleRes(STR_ERROR_OCCURRED_WHILE_COPYING);
- VclPtr<OSQLWarningBox> aDlg(new OSQLWarningBox( m_pParent, sAskIfContinue, WB_YES_NO | WB_DEF_YES ) );
+ ScopedVclPtr<OSQLWarningBox> aDlg(new OSQLWarningBox( m_pParent, sAskIfContinue, WB_YES_NO | WB_DEF_YES ) );
if(aDlg->Execute() == RET_YES)
m_bAlreadyAsked = true;
else
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index ef31134..ff9d94a 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -852,7 +852,7 @@ bool callColumnFormatDialog(vcl::Window* _pParent,
}
{ // want the dialog to be destroyed before our set
- VclPtr<SbaSbAttrDlg> aDlg(new SbaSbAttrDlg(_pParent, pFormatDescriptor, _pFormatter, _bHasFormat));
+ ScopedVclPtr<SbaSbAttrDlg> aDlg(new SbaSbAttrDlg(_pParent, pFormatDescriptor, _pFormatter, _bHasFormat));
if (RET_OK == aDlg->Execute())
{
// ItemSet->UNO
@@ -997,7 +997,7 @@ void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId
Size aDefaultMM = _pBox->PixelToLogic( Size( nDefaultWidth, 0 ), MapMode( MAP_MM ) );
- VclPtr<DlgSize> aColumnSizeDlg(new DlgSize( _pBox, nColSize, false, aDefaultMM.Width() * 10 ) );
+ ScopedVclPtr<DlgSize> aColumnSizeDlg(new DlgSize( _pBox, nColSize, false, aDefaultMM.Width() * 10 ) );
if ( aColumnSizeDlg->Execute() )
{
sal_Int32 nValue = aColumnSizeDlg->GetValue();
@@ -1286,7 +1286,7 @@ sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _
SolarMutexGuard aGuard;
OUString aMsg = ModuleRes(_nText);
aMsg = aMsg.replaceFirst("%1", _sName);
- VclPtr<OSQLMessageBox> aAsk(new OSQLMessageBox(_pParent, ModuleRes(_nTitle ), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query));
+ ScopedVclPtr<OSQLMessageBox> aAsk(new OSQLMessageBox(_pParent, ModuleRes(_nTitle ), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query));
if ( _bAll )
{
aAsk->AddButton(ModuleRes(STR_BUTTON_TEXT_ALL), RET_ALL, 0);
@@ -1431,7 +1431,7 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo
// here we have everything needed to create a new query object ...
HierarchicalNameCheck aNameChecker( _xNames.get(), sName );
// ... ehm, except a new name
- VclPtr<OSaveAsDlg> aAskForName(new OSaveAsDlg( _pParent,
+ ScopedVclPtr<OSaveAsDlg> aAskForName(new OSaveAsDlg( _pParent,
_rxContext,
sTargetName,
sLabel,
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index ce98528..e9fed42 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -308,7 +308,7 @@ namespace dbaui
bool bReConnect = true;
if ( _bUI )
{
- VclPtr<MessageDialog> aQuery(new MessageDialog(getView(), ModuleRes(STR_QUERY_CONNECTION_LOST), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
+ ScopedVclPtr<MessageDialog> aQuery(new MessageDialog(getView(), ModuleRes(STR_QUERY_CONNECTION_LOST), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO));
bReConnect = ( RET_YES == aQuery->Execute() );
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index eb00162..68cf1a7 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -158,7 +158,7 @@ namespace
}
}
- VclPtr<OQueryTableConnection> aInfo(new OQueryTableConnection(pTableView, aInfoData));
+ ScopedVclPtr<OQueryTableConnection> aInfo(new OQueryTableConnection(pTableView, aInfoData));
// Because OQueryTableConnection never takes ownership of the data passed to it, but only remembers the pointer,
// this pointer to a local variable is not critical, as aInfoData and aInfo have the same lifetime
pTableView->NotifyTabConnection( *aInfo.get() );
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 66c6e4d..23563fd 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -118,7 +118,7 @@ namespace
{
OQueryTableConnectionData* pData = static_cast< OQueryTableConnectionData*>(_pConnectionData.get());
- VclPtr<DlgQryJoin> aDlg(new DlgQryJoin(_pView,_pConnectionData,&_pView->GetTabWinMap(),_pView->getDesignView()->getController().getConnection(),_bSelectableTables));
+ ScopedVclPtr<DlgQryJoin> aDlg(new DlgQryJoin(_pView,_pConnectionData,&_pView->GetTabWinMap(),_pView->getDesignView()->getController().getConnection(),_bSelectableTables));
bool bOk = aDlg->Execute() == RET_OK;
if( bOk )
{
@@ -208,7 +208,7 @@ namespace
pNewConnData->AppendConnLine(*pIter,sRelatedColumn);
// now add the Conn itself
- VclPtr<OQueryTableConnection> aNewConn(new OQueryTableConnection(_pView, aNewConnData));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list