1 files changed, 9 insertions, 5 deletions
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 79bcc29c871d..a0fba532d142 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -55,7 +55,13 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) :
 
 OTableWindowTitle::~OTableWindowTitle()
 {
-    m_pTabWin = NULL;
+    disposeOnce();
+}
+
+void OTableWindowTitle::dispose()
+{
+    m_pTabWin.clear();
+    FixedText::dispose();
 }
 
 void OTableWindowTitle::GetFocus()
@@ -130,10 +136,8 @@ void OTableWindowTitle::MouseButtonDown( const MouseEvent& rEvt )
 
                 OJoinTableView* pView = static_cast<OJoinTableView*>(m_pTabWin->getTableView());
                 OSL_ENSURE(pView,"No OJoinTableView!");
-                const ::std::vector<OTableConnection*>& rConns = pView->getTableConnections();
-                ::std::for_each(rConns.begin(),
-                                rConns.end(),
-                                ::std::mem_fun(&OTableConnection::RecalcLines));
+                for (auto conn : pView->getTableConnections())
+                    conn->RecalcLines();
 
                 pView->InvalidateConnections();
                 pView->getDesignView()->getController().setModified(sal_True);