[Libreoffice-commits] core.git: Branch 'feature/vclref' - dbaccess/source sfx2/source vcl/source

[Michael Meeks]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |   11 ++++++-----
 sfx2/source/view/viewfrm.cxx                   |    1 +
 vcl/source/edit/vclmedit.cxx                   |   13 +++++++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit a22861ed0f81f214c4264317d229c9a6f7399bf9
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Mar 17 15:37:03 2015 +0000

    add missing disposeAndClear pieces for VclMEdit
    
    Also correct dispose ordering in dbaccess.
    
    Change-Id: Idda877c062ff8a1ead2202b80c77c10d7a926333

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 554d97f..48f31b1 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -252,13 +252,14 @@ void OAppDetailPageHelper::dispose()
             m_pLists[i].disposeAndClear();
         }
     }
-    m_aFL.disposeAndClear();
-    m_aTBPreview.disposeAndClear();
-    m_aPreview.disposeAndClear();
-    m_aDocumentInfo.disposeAndClear();
+    m_aMenu.reset();
     m_pTablePreview.disposeAndClear();
+    m_aDocumentInfo.disposeAndClear();
+    m_aPreview.disposeAndClear();
     m_aBorder.disposeAndClear();
-    m_aMenu.reset();
+    m_aTBPreview.disposeAndClear();
+    m_aFL.disposeAndClear();
+
     vcl::Window::dispose();
 }
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index d5929a6..abe011c 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1502,6 +1502,7 @@ SfxViewFrame::~SfxViewFrame()
         KillDispatcher_Impl();
 
     pImp->pWindow.disposeAndClear();
+    pImp->pFocusWin.clear();
 
     if ( GetFrame().GetCurrentViewFrame() == this )
         GetFrame().SetCurrentViewFrame_Impl( NULL );
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 1b4d82c..63ed22a 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -256,6 +256,11 @@ void ImpVclMEdit::InitFromStyle( WinBits nWinStyle )
 ImpVclMEdit::~ImpVclMEdit()
 {
     EndListening( *mpTextWindow->GetTextEngine() );
+    mpScrollBox.disposeAndClear();
+    mpVScrollBar.disposeAndClear();
+    mpHScrollBar.disposeAndClear();
+    mpTextWindow.disposeAndClear();
+    pVclMultiLineEdit.disposeAndClear();
 }
 
 void ImpVclMEdit::ImpSetScrollBarRanges()
@@ -1154,17 +1159,17 @@ void VclMultiLineEdit::SetText( const OUString& rStr )
 
 OUString VclMultiLineEdit::GetText() const
 {
-    return pImpVclMEdit->GetText();
+    return pImpVclMEdit ? pImpVclMEdit->GetText() : OUString("");
 }
 
 OUString VclMultiLineEdit::GetText( LineEnd aSeparator ) const
 {
-    return pImpVclMEdit->GetText( aSeparator );
+    return pImpVclMEdit ? pImpVclMEdit->GetText( aSeparator ) : OUString("");
 }
 
-OUString VclMultiLineEdit::GetTextLines(  LineEnd aSeparator ) const
+OUString VclMultiLineEdit::GetTextLines( LineEnd aSeparator ) const
 {
-    return pImpVclMEdit->GetTextLines( aSeparator );
+    return pImpVclMEdit ? pImpVclMEdit->GetTextLines( aSeparator ) : OUString("");
 }
 
 void VclMultiLineEdit::Resize()