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

tagezi lera.goncharuk at gmail.com
Mon Nov 20 14:42:28 UTC 2017


 basctl/source/basicide/scriptdocument.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9abd653129986d5aa8a07b8f8bb92b2d4254126e
Author: tagezi <lera.goncharuk at gmail.com>
Date:   Mon Nov 20 10:02:30 2017 +0200

    tdf#108872 Also remove VBA module info on module removal
    
    If this information is left, then css.container.ElementExistException
    is thrown on following creation of a module with the same name in
    XVBAModuleInfo::insertModuleInfo called from
    ScriptDocument::Impl::createModule
    (see commit 2be139d76bdb66e77719613d802dc0047c284456)
    
    Change-Id: I6750819ce36c112c146d7800a6bab4cc207e0062
    Reviewed-on: https://gerrit.libreoffice.org/44940
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 733cebdbb679..a7b16505d1a5 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -527,6 +527,9 @@ namespace basctl
                 if ( xLib.is() )
                 {
                     xLib->removeByName( _rModuleName );
+                    Reference< XVBAModuleInfo > xVBAModuleInfo(xLib, UNO_QUERY);
+                    if(xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo(_rModuleName))
+                        xVBAModuleInfo->removeModuleInfo(_rModuleName);
                     return true;
                 }
             }


More information about the Libreoffice-commits mailing list