diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-23 09:46:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-24 08:21:39 +0200 |
| commit | 447d4e1366cf176c6ff2c6eebf3cf8a65745a7dc (patch) | |
| tree | e55491440114dd1e63b3f772931891404966095e | |
| parent | 070980765bc5b2fc3b59e000cdc0611ac1fb622e (diff) | |
loplugin:useuniqueptr in PrintDialog
Change-Id: Ia40e48b2e57624bb59bc0dcc0927bf673581081d
Reviewed-on: https://gerrit.libreoffice.org/53346
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | vcl/inc/printdlg.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index f8c799e7ff97..b16d91cad1f6 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -168,7 +168,7 @@ namespace vcl void storeToSettings(); }; - VclBuilder* mpCustomOptionsUIBuilder; + std::unique_ptr<VclBuilder> mpCustomOptionsUIBuilder; std::shared_ptr<PrinterController> maPController; VclPtr<TabControl> mpTabCtrl; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index a7ef48c01e83..084763fa934b 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -798,7 +798,7 @@ PrintDialog::~PrintDialog() void PrintDialog::dispose() { - delete mpCustomOptionsUIBuilder; + mpCustomOptionsUIBuilder.reset(); mpTabCtrl.clear(); mpPreviewWindow.clear(); mpPageEdit.clear(); @@ -908,8 +908,7 @@ void PrintDialog::setupOptionalUI() vcl::Window *pCustom = get<vcl::Window>("customcontents"); - delete mpCustomOptionsUIBuilder; - mpCustomOptionsUIBuilder = new VclBuilder(pCustom, getUIRootDir(), sOptionsUIFile); + mpCustomOptionsUIBuilder.reset(new VclBuilder(pCustom, getUIRootDir(), sOptionsUIFile)); vcl::Window *pWindow = mpCustomOptionsUIBuilder->get_widget_root(); pWindow->Show(); continue; |