sw/source/filter/html/htmlflywriter.cxx | 6 ++++--
sw/source/filter/html/htmltabw.cxx | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 1f201d76d6e2fcc9d8af6504c38bd98c46e0798e
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Jul 7 17:35:56 2022 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Jul 7 21:42:43 2022 +0200
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.lu...@collabora.com>
diff --git a/sw/source/filter/html/htmlflywriter.cxx
b/sw/source/filter/html/htmlflywriter.cxx
index f8ff5c851024..0e27a89d8516 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,
diff --git a/sw/source/filter/html/htmltabw.cxx
b/sw/source/filter/html/htmltabw.cxx
index b8aac9aed9ba..6849cbb3244a 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),
