[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-7' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/filter/html/htmlfldw.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1afbfadd86e9e60238d7ab15621282637328fc6
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Apr 19 09:17:21 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed May 3 12:18:37 2023 +0200

    sw: fix crash in OutHTML_SwFormatField()
    
    Crashreport signature:
    
    program/libswlo.so
            SwDocShell::GetView()
                    sw/inc/docsh.hxx:222
    program/libswlo.so
            OutHTML_SwFormatField(Writer&, SfxPoolItem const&)
                    sw/source/filter/html/htmlfldw.cxx:549
    ...
    program/libswlo.so
            SwTransferable::WriteObject(tools::SvRef<SotTempStream>&, void*, 
unsigned int, com::sun::star::datatransfer::DataFlavor const&)
                    sw/source/uibase/dochdl/swdtflvr.cxx:?
    
    I.e. clipboard documents don't have a doc shell, handle that.
    
    Change-Id: I48b22087f759a11b4aa46b83b310f4a661e1fbc4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150897
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    (cherry picked from commit 5951e37eb24e09d3c24cb4cab4b0f3da41e3dfff)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150914
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit 69d843df91fb02812f2c76e4951f61915706a44c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150917
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Tested-by: Michael Stahl <michael.st...@allotropia.de>
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/filter/html/htmlfldw.cxx 
b/sw/source/filter/html/htmlfldw.cxx
index 222ac3e96589..beb309e5121f 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -537,7 +537,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const 
SfxPoolItem& rHt )
     {
         const SwTextField *pTextField = rField.GetTextField();
         OSL_ENSURE( pTextField, "Where is the txt fld?" );
-        if( pTextField )
+        if( pTextField && rWrt.m_pDoc->GetDocShell() )
         {
             // ReqIF-XHTML doesn't allow specifying a background color.
             bool bFieldShadings = SwViewOption::IsFieldShadings() && 
!rHTMLWrt.mbReqIF;