diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-07-07 17:35:56 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2022-07-07 18:21:53 +0200 |
| commit | b1b6bd1d46950c4d3c51aa006434dd90ca5baeb5 (patch) | |
| tree | 38cb29e083af7468b185ecaca86a81e18a76379e /sw/source/filter/html | |
| parent | 02516860272521f1bb83f4744d9ad5e2f6435f24 (diff) | |
do not write vspace/hspace attributes to reqif
These are not valid for the ReqIF-XHTML subset.
Change-Id: Ie68560c49ba43b0f728c6e51eeb33b4829bded93
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/htmlflywriter.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltabw.cxx | 2 |
2 files changed, 5 insertions, 3 deletions
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), |