summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmltabw.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-03-01 17:50:52 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-03-02 08:08:11 +0100
commit12c3ab8c341ff6482ce380ca4010bb7b97e35bf7 (patch)
treebd055e3283aa5df58d55c05b44e7354555719070 /sw/source/filter/html/htmltabw.cxx
parent4bb67227c142b7a549d3aa2024e398049e8e3222 (diff)
sw HTML export: XHTML ns alias for table markup
This was forgotten from the previous mass-conversion of adding namespace aliases to written elements. Change-Id: Id9b7e961c941ec3b3614e3694963c3f9ef9e46eb Reviewed-on: https://gerrit.libreoffice.org/50595 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source/filter/html/htmltabw.cxx')
-rw-r--r--sw/source/filter/html/htmltabw.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 0f644f0f4855..f856af17eac4 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -300,7 +300,8 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
rWrt.OutNewLine(); // <TH>/<TD> in new line
OStringBuffer sOut;
sOut.append('<');
- sOut.append(bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata);
+ OString aTag(bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata);
+ sOut.append(rWrt.GetNamespace() + aTag);
// output ROW- and COLSPAN
if( nRowSpan>1 )
@@ -483,7 +484,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
if( rWrt.m_bLFPossible )
rWrt.OutNewLine();
- OString aTag = bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata;
+ aTag = bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata;
HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(), rWrt.GetNamespace() + aTag, false);
rWrt.m_bLFPossible = true;
}
@@ -514,7 +515,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
}
rWrt.OutNewLine(); // <TR> in new line
- rWrt.Strm().WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tablerow );
+ rWrt.Strm().WriteChar( '<' ).WriteOString( rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_tablerow );
if( pBrushItem )
{
rWrt.OutBackground( pBrushItem, false );
@@ -598,7 +599,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
if( rWrt.m_bLFPossible )
rWrt.OutNewLine(); // <TABLE> in new line
OStringBuffer sOut;
- sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_table);
+ sOut.append('<').append(rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_table);
const SvxFrameDirection nOldDirection = rWrt.m_nDirection;
if( pFrameFormat )
@@ -732,7 +733,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
const SwWriteTableCol *pColumn = m_aCols[nCol];
OStringBuffer sOutStr;
- sOutStr.append('<').append(OOO_STRING_SVTOOLS_HTML_col);
+ sOutStr.append('<').append(rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_col);
sal_uInt32 nWidth;
bool bRel;