diff options
Diffstat (limited to 'dbaccess/source/ui')
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppIconControl.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/queryorder.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryTableView.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/TableConnectionData.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 3 |
7 files changed, 4 insertions, 16 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 2c6584f68f01..9a126059522d 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -560,7 +560,6 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon pTreeView->SetHelpId(HID_APP_TABLE_TREE); m_pLists[E_TABLE] = pTreeView; - ImageProvider aImageProvider( _xConnection ); createTree( pTreeView, ImageProvider::getDefaultImage( DatabaseObject::TABLE ) ); diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 831d20cf4a1f..569692f39326 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -71,7 +71,7 @@ void OApplicationIconControl::dispose() SvxIconChoiceCtrlEntry* pEntry = GetEntry( i ); if ( pEntry ) { - std::unique_ptr<ElementType> aType(static_cast<ElementType*>(pEntry->GetUserData())); + delete static_cast<ElementType*>(pEntry->GetUserData()); pEntry->SetUserData(nullptr); } } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index ff34dfa9282b..641dd537a861 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2164,8 +2164,8 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool) if (xWarnings.is()) { - SQLExceptionInfo aWarnings(xWarnings->getWarnings()); #if 0 + SQLExceptionInfo aWarnings(xWarnings->getWarnings()); // Obviously this if test is always false. So to avoid a Clang warning // "use of logical '&&' with constant operand" I put this in #if // 0. Yeah, I know it is fairly likely nobody will ever read this @@ -2962,14 +2962,6 @@ void SbaTableQueryBrowser::unloadAndCleanup( bool _bDisposeConnection ) try { // get the active connection. We need to dispose it. - Reference< XPropertySet > xRowSetProps(getRowSet(),UNO_QUERY); -#if OSL_DEBUG_LEVEL > 0 - { - Reference< XComponent > xComp( - xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION), - css::uno::UNO_QUERY); - } -#endif // unload the form Reference< XLoadable > xLoadable = getLoadable(); diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 1be97ad25ec9..292e90621863 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -196,8 +196,6 @@ OUString DlgOrderCrit::GetOrderList( ) const Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : OUString(); - Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY_THROW)->getColumns(); - OUStringBuffer sOrder; for( sal_uInt16 i=0 ; i<DOG_ROWS; i++ ) { diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index f2d0a17581cf..b90254ac7869 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -133,7 +133,6 @@ namespace OQueryTableConnectionData* pNewConnData = new OQueryTableConnectionData( _rSource.GetData(), _rDest.GetData() ); TTableConnectionData::value_type aNewConnData(pNewConnData); - Reference<XIndexAccess> xReferencedKeys( _rDest.GetData()->getKeys()); OUString sRelatedColumn; // iterate through all foreignkey columns to create the connections diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index 760e1e0aec3a..f8498f058e52 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -133,7 +133,6 @@ OConnectionLineDataVec::size_type OTableConnectionData::normalizeLines() { if(m_vConnLineData[i]->GetSourceFieldName().isEmpty() && m_vConnLineData[i]->GetDestFieldName().isEmpty()) { - OConnectionLineDataRef pData = m_vConnLineData[i]; m_vConnLineData.erase(m_vConnLineData.begin()+i); --nCount; if (i < nRet) diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 572d8354683a..7361421378a4 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -62,8 +62,9 @@ namespace dbaui void OQueryContainerWindow::dispose() { { - std::unique_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch); + OQueryViewSwitch* pTemp = m_pViewSwitch; m_pViewSwitch = nullptr; + delete pTemp; } if ( m_pBeamer ) ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); |