[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0-10.0' - sw/source

[Luboš Luňák (via logerrit)]

 sw/source/filter/html/htmlflywriter.cxx |    6 ++++--
 sw/source/filter/html/htmltabw.cxx      |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b1b6bd1d46950c4d3c51aa006434dd90ca5baeb5
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 18:21:53 2022 +0200

    do not write vspace/hspace attributes to reqif
    
    These are not valid for the ReqIF-XHTML subset.
    
    Change-Id: Ie68560c49ba43b0f728c6e51eeb33b4829bded93

diff --git a/sw/source/filter/html/htmlflywriter.cxx 
b/sw/source/filter/html/htmlflywriter.cxx
index e5a3b482bd61..e2e8c7bc7424 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -621,7 +621,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,
@@ -888,7 +889,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 dea6d9d01b62..81a7daf570a0 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -672,7 +672,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),