dbaccess/source/ui/browser/dbtreeview.cxx | 2 +- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2 +- dbaccess/source/ui/querydesign/QueryTextView.cxx | 2 +- dbaccess/source/ui/querydesign/TableWindow.cxx | 2 +- dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 2 +- dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 3 +-- dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 2 +- dbaccess/source/ui/tabledesign/TableDesignView.cxx | 6 +++--- dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 6 +++--- extensions/source/propctrlr/standardcontrol.cxx | 4 ++-- sw/source/ui/dbui/customizeaddresslistdialog.cxx | 6 +++--- sw/source/uibase/docvw/edtwin.cxx | 3 ++- vcl/source/window/window.cxx | 1 - 13 files changed, 20 insertions(+), 21 deletions(-)
New commits: commit 89ec9424b27e602fe668b1d5e77a5d3a6a909f82 Author: Michael Meeks <[email protected]> Date: Wed Apr 22 21:05:44 2015 +0100 Fix a number of boost::unique_ptr errors. Audit for this problem in: "vclwidget: change all vcl::window fields to be wrapped in VclPtr" Change-Id: I6e57f078364a7fd3fd4e61c748d7af843458758e diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 4a63fe7..f87ba85 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -59,7 +59,7 @@ void DBTreeView::dispose() m_pTreeListBox->DisconnectFromModel(); } } - m_pTreeListBox.clear(); + m_pTreeListBox.disposeAndClear(); vcl::Window::dispose(); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 998e147..448e6a4 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2524,7 +2524,7 @@ void OQueryDesignView::dispose() { if ( m_pTableView ) ::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - m_pSelectionBox.clear(); + m_pSelectionBox.disposeAndClear(); m_aSplitter.disposeAndClear(); OQueryView::dispose(); } diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 775408b..a73e3d4 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -57,7 +57,7 @@ OQueryTextView::~OQueryTextView() void OQueryTextView::dispose() { - m_pEdit.clear(); + m_pEdit.disposeAndClear(); vcl::Window::dispose(); } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index ee5d721..e0c1e5b 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -108,7 +108,7 @@ void OTableWindow::dispose() { OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!"); } - m_pListBox.clear(); + m_pListBox.disposeAndClear(); if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 2fcfe15..9aa8ba3 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -75,7 +75,7 @@ namespace dbaui xCloseable->close(sal_False); // false - holds the ownership of this frame } - m_pSplitter.clear(); + m_pSplitter.disposeAndClear(); ODataView::dispose(); } bool OQueryContainerWindow::switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo ) diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index f6af18e..3252a5d 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -43,7 +43,7 @@ OFieldDescGenWin::~OFieldDescGenWin() void OFieldDescGenWin::dispose() { - m_pFieldControl.clear(); + m_pFieldControl.disposeAndClear(); TabPage::dispose(); } @@ -79,7 +79,6 @@ void OFieldDescGenWin::SetControlText( sal_uInt16 nControlId, const OUString& rT void OFieldDescGenWin::DisplayData( OFieldDescription* pFieldDescr ) { - m_pFieldControl->DisplayData(pFieldDescr); } diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 8c84a1b..5c1fcc1 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -43,7 +43,7 @@ OTableDesignHelpBar::~OTableDesignHelpBar() void OTableDesignHelpBar::dispose() { - m_pTextWin.clear(); + m_pTextWin.disposeAndClear(); TabPage::dispose(); } diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 3f8aafb..9b5598f 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -71,8 +71,8 @@ void OTableBorderWindow::dispose() // ::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); m_pEditorCtrl->Hide(); m_pFieldDescWin->Hide(); - m_pEditorCtrl.clear(); - m_pFieldDescWin.clear(); + m_pEditorCtrl.disposeAndClear(); + m_pFieldDescWin.disposeAndClear(); m_aHorzSplitter.disposeAndClear(); vcl::Window::dispose(); } @@ -195,7 +195,7 @@ OTableDesignView::~OTableDesignView() void OTableDesignView::dispose() { m_pWin->Hide(); - m_pWin.clear(); + m_pWin.disposeAndClear(); ODataView::dispose(); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 616e667..e0b89db 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -76,9 +76,9 @@ void OTableFieldDescWin::dispose() getGenPage()->Hide(); m_pHeader->Hide(); - m_pGenPage.clear(); - m_pHeader.clear(); - m_pHelpBar.clear(); + m_pGenPage.disposeAndClear(); + m_pHeader.disposeAndClear(); + m_pHelpBar.disposeAndClear(); TabPage::dispose(); } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index fe0313d..240b3f5 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -1079,8 +1079,8 @@ namespace pcr { SetSubEdit(nullptr); m_pImplEdit.disposeAndClear(); - m_pFloatingEdit.clear(); - m_pDropdownButton.clear(); + m_pFloatingEdit.disposeAndClear(); + m_pDropdownButton.disposeAndClear(); DropDownEditControl_Base::dispose(); } diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index aba225a..7ade018 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -88,11 +88,11 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton) if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; - VclPtr<SwAddRenameEntryDialog> pDlg; + ScopedVclPtr<SwAddRenameEntryDialog> pDlg; if (bRename) - pDlg = VclPtr<SwRenameEntryDialog>::Create(pButton, m_pNewData->aDBColumnHeaders); + pDlg.reset(VclPtr<SwRenameEntryDialog>::Create(pButton, m_pNewData->aDBColumnHeaders)); else - pDlg = VclPtr<SwAddEntryDialog>::Create(pButton, m_pNewData->aDBColumnHeaders); + pDlg.reset(VclPtr<SwAddEntryDialog>::Create(pButton, m_pNewData->aDBColumnHeaders)); if(bRename) { OUString aTemp = m_pFieldsLB->GetEntry(nPos); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index cc10c20..8429fac 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5080,7 +5080,8 @@ void SwEditWin::GetFocus() void SwEditWin::LoseFocus() { - m_rView.GetWrtShell().InvalidateAccessibleFocus(); + if (m_rView.GetWrtShellPtr()) + m_rView.GetWrtShell().InvalidateAccessibleFocus(); Window::LoseFocus(); if( m_pQuickHlpData && m_pQuickHlpData->m_bIsDisplayed ) m_pQuickHlpData->Stop( m_rView.GetWrtShell() ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index b596026..cb457e4 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3135,7 +3135,6 @@ void Window::SetUpdateMode( bool bUpdate ) void Window::GrabFocus() { - ImplGrabFocus( 0 ); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
