diff options
| author | Noel Grandin <noel@peralex.com> | 2015-02-11 14:42:23 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:17:00 +0100 |
| commit | 00f2787a4a68633206635743298926bf2e65a8fa (patch) | |
| tree | efc3a4f02b3d8acd69d25071499be5a475cb0338 /dbaccess/source/ui/dlg/ConnectionHelper.cxx | |
| parent | b3dcb2996b70caabda1939c9e85545c97d78404a (diff) | |
vclwidgets: wrap all vcl::Window subclasses allocated on stack in VclPtr
Change-Id: Ia8b0d84bbf69f9d8f85505d019acdded14e25133
Conflicts:
sw/qa/tiledrendering/tiledrendering.cxx
Diffstat (limited to 'dbaccess/source/ui/dlg/ConnectionHelper.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/ConnectionHelper.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 96e158fde04f..d0d0043b0cac 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -312,16 +312,16 @@ namespace dbaui aProfiles.insert(pArray[index]); // execute the select dialog - ODatasourceSelectDialog aSelector(GetParent(), aProfiles); + VclPtr<ODatasourceSelectDialog> aSelector(new ODatasourceSelectDialog(GetParent(), aProfiles)); OUString sOldProfile=getURLNoPrefix(); if (!sOldProfile.isEmpty()) - aSelector.Select(sOldProfile); + aSelector->Select(sOldProfile); else - aSelector.Select(xMozillaBootstrap->getDefaultProfile(profileType)); + aSelector->Select(xMozillaBootstrap->getDefaultProfile(profileType)); - if ( RET_OK == aSelector.Execute() ) - setURLNoPrefix(aSelector.GetSelected()); + if ( RET_OK == aSelector->Execute() ) + setURLNoPrefix(aSelector->GetSelected()); break; } case ::dbaccess::DST_FIREBIRD: @@ -482,8 +482,8 @@ namespace dbaui sQuery = sQuery.replaceFirst("$path$", aTransformer.get(OFileNotation::N_SYSTEM)); m_bUserGrabFocus = false; - QueryBox aQuery(GetParent(), WB_YES_NO | WB_DEF_YES, sQuery); - sal_Int32 nQueryResult = aQuery.Execute(); + VclPtr<QueryBox> aQuery(new QueryBox(GetParent(), WB_YES_NO | WB_DEF_YES, sQuery)); + sal_Int32 nQueryResult = aQuery->Execute(); m_bUserGrabFocus = true; switch (nQueryResult) @@ -499,8 +499,8 @@ namespace dbaui sQuery = sQuery.replaceFirst("$name$", aTransformer.get(OFileNotation::N_SYSTEM)); m_bUserGrabFocus = false; - QueryBox aWhatToDo(GetParent(), WB_RETRY_CANCEL | WB_DEF_RETRY, sQuery); - nQueryResult = aWhatToDo.Execute(); + VclPtr<QueryBox> aWhatToDo(new QueryBox(GetParent(), WB_RETRY_CANCEL | WB_DEF_RETRY, sQuery)); + nQueryResult = aWhatToDo->Execute(); m_bUserGrabFocus = true; if (RET_RETRY == nQueryResult) |