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

[Stephan Bergmann (via logerrit)]

 sw/source/filter/basflt/fltini.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit af791fb775e35c11ad01c42a7085dd121ab9c7a6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Dec 26 09:59:26 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Dec 26 12:15:31 2020 +0100

    Don't unload the msword library
    
    It caused issues on Windows with an upcoming change that introduces more static
    OUStringLiterals, and apparently one from msword ended up in the data structures
    of editeng's SvxForbiddenCharactersTable, which in turn is owned by theEditDLL
    singleton, which was destryoed at exit after the msword library had already been
    unloaded, so an OUString referenced the dangling OUStringLiteral data.
    
    Change-Id: I873f0b4e879a5820d1e8a1cda3b1b1fd49f809db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108321
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 7bdddbd40862..e8a64eda2d83 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -121,6 +121,7 @@ Filters::~Filters()
             rEntry.pReader = nullptr;
         }
     }
+    msword_.release();
 }
 
 #ifndef DISABLE_DYNLOADING