core.git: Branch 'libreoffice-24-2' - sw/source

[Mike Kaganski (via logerrit)]

 sw/source/filter/html/htmlforw.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4b2ff14d32771174b14811d6834fc73638fdd575
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Jul 26 20:11:57 2024 +0500
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Aug 2 11:17:46 2024 +0200

    HTML/ReqIF export: make sure to close input tags
    
    Change-Id: If550cb3765f6f3eb6fbf7425061c1cec90f5470f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171082
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit bb48e26c9256fcf33938c66447e91987135a4ea7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171040
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit 5440af89aa0541049b04db65513e4864211810e0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171043
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/filter/html/htmlforw.cxx 
b/sw/source/filter/html/htmlforw.cxx
index 98423fc96a3e..fad89527f8e8 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -597,7 +597,7 @@ void SwHTMLWriter::OutHiddenControls(
                     sOut = "\""_ostr;
                 }
             }
-            sOut += ">";
+            sOut += "/>";
             Strm().WriteOString( sOut );
 
             m_nFormCntrlCnt++;
@@ -918,7 +918,8 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( 
SwHTMLWriter& rWrt,
     if( eTag == TAG_NONE )
         return rWrt;
 
-    OString sOut = OString::Concat("<") + TagNames[eTag];
+    const OString tag = rWrt.GetNamespace() + TagNames[eTag];
+    OString sOut = OString::Concat("<") + tag;
     if( eType != TYPE_NONE )
     {
         sOut += OString::Concat(" " OOO_STRING_SVTOOLS_HTML_O_type "=\"") +
@@ -1200,7 +1201,6 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( 
SwHTMLWriter& rWrt,
             rWrt.DecIndentLevel();
             rWrt.OutNewLine();// the </SELECT> gets its own line
         }
-        HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), 
Concat2View(rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_select), false );
     }
     else if( TAG_TEXTAREA == eTag )
     {
@@ -1226,7 +1226,6 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( 
SwHTMLWriter& rWrt,
                 HTMLOutFuncs::Out_String( rWrt.Strm(), aLine );
             }
         }
-        HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), 
Concat2View(rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_textarea), false );
     }
     else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType )
     {
@@ -1239,6 +1238,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( 
SwHTMLWriter& rWrt,
             }
         }
     }
+    HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(), tag, false);
 
     if( !aEndTags.isEmpty() )
         rWrt.Strm().WriteOString( aEndTags );