commit 1f201d76d6e2fcc9d8af6504c38bd98c46e0798e
author Luboš Luňák <l.lunak@collabora.com> Thu Jul 07 17:35:56 2022 +0200
committer Luboš Luňák <l.lunak@collabora.com> Thu Jul 07 21:42:43 2022 +0200
tree 1655afa34ce9b82ce5479595976e0b3944ee527f
parent f6a4537e3de65d551e10212a1ebba5eedf798ac5

do not write vspace/hspace attributes to reqif

These are not valid for the ReqIF-XHTML subset.

Change-Id: Ie68560c49ba43b0f728c6e51eeb33b4829bded93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136887
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>

sw/source/filter/html/htmlflywriter.cxx

diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index f8ff5c8..0e27a89 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -613,7 +613,8 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,

    if( (nFrameOpts & HtmlFrmOpts::Space) &&
        (aTwipSpc.Width() || aTwipSpc.Height()) &&
        Application::GetDefaultDevice() )
        Application::GetDefaultDevice() &&
        !mbReqIF )
    {
        Size aPixelSpc =
            Application::GetDefaultDevice()->LogicToPixel( aTwipSpc,
@@ -877,7 +878,8 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma

    if( (nFrameOptions & HtmlFrmOpts::Space) &&
        (aTwipSpc.Width() || aTwipSpc.Height()) &&
        Application::GetDefaultDevice() )
        Application::GetDefaultDevice() &&
        !mbReqIF )
    {
        Size aPixelSpc =
            Application::GetDefaultDevice()->LogicToPixel( aTwipSpc,

sw/source/filter/html/htmltabw.cxx

diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index b8aac9a..6849cbb 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -664,7 +664,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
        sOut.append("\"");
    }

    if( (nHSpace || nVSpace) && Application::GetDefaultDevice())
    if( (nHSpace || nVSpace) && Application::GetDefaultDevice() && !rWrt.mbReqIF)
    {
        Size aPixelSpc =
            Application::GetDefaultDevice()->LogicToPixel( Size(nHSpace,nVSpace),