[Libreoffice-commits] core.git: basctl/source

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/basobj3.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 9fd9da5739f5a99330af5601cd0a3a257f9dc529
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 12 15:47:24 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 13 09:47:54 2020 +0100

    tdf#130161 adding a document dialog or modules doesn't update catalog
    
    in basctl UI, seems to be since...
    
    commit 44861f2435a0c487d4fb5b196f7e4fe7f9569396
    Date:   Fri Aug 17 07:29:20 2012 +0200
    
        Object Catalog in Dialog Editor
    
    if it even really worked before that changed UpdateObjectCatalog
    to only get called for non-document changes
    
    Change-Id: I77a94bb4859cc399e86d75fdf2c9ca7c50288b35
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88543
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index ab8a36f85341..41c4f52052a4 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -250,20 +250,23 @@ BasicManager* FindBasicManager( StarBASIC const * pLib )
 
 void MarkDocumentModified( const ScriptDocument& rDocument )
 {
+    Shell* pShell = GetShell();
+
     // does not have to come from a document...
     if ( rDocument.isApplication() )
     {
-        if (Shell* pShell = GetShell())
-        {
+        if (pShell)
             pShell->SetAppBasicModified(true);
-            pShell->UpdateObjectCatalog();
-        }
     }
     else
     {
         rDocument.setDocumentModified();
     }
 
+    // tdf#130161 in all cases call UpdateObjectCatalog
+    if (pShell)
+        pShell->UpdateObjectCatalog();
+
     if (SfxBindings* pBindings = GetBindingsPtr())
     {
         pBindings->Invalidate( SID_SIGNATURE );