Kaydet (Commit) c0fc7910 authored tarafından Justin Luth's avatar Justin Luth Kaydeden (comit) Caolán McNamara

tdf#104707 ooxmlexport: support RawText in textboxes

Thanks to Caolan, we got some more sample documents
from tdf#43431 and tdf#33596
to help flesh this out a bit better.

Change-Id: I47cf4b7e2af6854e0da1f8dbdc1e564494ee0e17
Reviewed-on: https://gerrit.libreoffice.org/48511Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJustin Luth <justin_luth@sil.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 1ede9f7f
......@@ -2492,9 +2492,8 @@ void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCh
void DocxAttributeOutput::RawText(const OUString& rText, rtl_TextEncoding /*eCharSet*/)
{
assert (m_pHyperlinkAttrList.is() && "jluth is at mail dot com and wants example documents that use RawText/EEField");
if ( m_pHyperlinkAttrList.is() )
m_sRawText = rText;
assert ( (m_pHyperlinkAttrList.is() || m_rExport.SdrExporter().IsDMLAndVMLDrawingOpen() /* || m_rExport.SdrExporter().IsDrawingOpen() */) && "jluth is at mail dot com-and wants example documents that use RawText/EEField");
m_sRawText = rText;
}
void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby )
......@@ -5547,6 +5546,13 @@ void DocxAttributeOutput::WriteOutliner(const OutlinerParaObject& rParaObj)
RunText(aOut);
}
if ( !m_sRawText.isEmpty() )
{
assert (bTextAtr && "jluth is at mail dot com-and is looking for sample documents");
RunText( m_sRawText );
m_sRawText.clear();
}
m_pSerializer->endElementNS( XML_w, XML_r );
nAktPos = nNextAttr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment