sw/source/uibase/dbui/dbmgr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1faebcc11311070d996a92b5ec4948f234219827
Author:     Ilmari Lauhakangas <[email protected]>
AuthorDate: Sat Jan 24 13:09:48 2026 +0200
Commit:     Ilmari Lauhakangas <[email protected]>
CommitDate: Sat Jan 24 16:17:36 2026 +0100

    sw: dispose Insert Database Columns dialog not only upon OK
    
    Pressing Cancel in the dialog caused an assert in debug builds:
    
    include/vcl/vclptr.hxx:123: VclPtr<reference_type>::~VclPtr()
    [with reference_type = AbstractSwInsertDBColAutoPilot]: Assertion
    `(!m_rInnerRef.get() || m_rInnerRef->isDisposed() || 
m_rInnerRef->getRefCount()
    > 1) && "someone forgot to call dispose()"' failed.
    
    After:
    commit 137df7cd67e5bb34cb75f716700d3c765a3efad2
    Author: Noel Grandin <[email protected]>
    Date:   Wed Jan 31 13:10:52 2024 +0200
    
        make insert-db-col-auto-pilot dialog async
    
    To reach the dialog:
    
    1. Open Writer
    2. View - Data Sources (Ctrl+Shift+F4)
    3. Expand Bibliography until you see biblio
    4. Click on a row indicator to the left of the data
    5. Now the "Data to Text" button is enabled, click it
    
    Change-Id: If2c4a1024afec666589b4b4c1932d5a661b964f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198036
    Tested-by: Jenkins
    Reviewed-by: Ilmari Lauhakangas <[email protected]>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 70f15c5821b1..2b9b122474da 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -3089,8 +3089,8 @@ void SwDBManager::InsertText(SwWrtShell& rSh,
                 {
                     TOOLS_WARN_EXCEPTION("sw.mailmerge", "");
                 }
-                pDlg->disposeOnce();
             }
+            pDlg->disposeOnce();
         }
     );
 

Reply via email to