Kaydet (Commit) fe8bfb20 authored tarafından Luboš Luňák's avatar Luboš Luňák

mso saves obfuscated fonts as .odttf in .docx, so use the extension as well

Change-Id: I5d4cb579c042f03137188f3e0293015bea723dce
üst 2301bf6f
......@@ -3059,7 +3059,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, const c
if( file.open( osl_File_OpenFlag_Read ) != osl::File::E_None )
return;
uno::Reference< com::sun::star::io::XOutputStream > xOutStream = m_rExport.GetFilter().openFragmentStream(
OUString( "word/fonts/font" ) + OUString::number(m_nextFontId) + ".ttf",
OUString( "word/fonts/font" ) + OUString::number(m_nextFontId) + ".odttf",
"application/vnd.openxmlformats-officedocument.obfuscatedFont" );
// Not much point in trying hard with the obfuscation key, whoever reads the spec can read the font anyway,
// so just alter the first and last part of the key.
......@@ -3110,7 +3110,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, const c
xOutStream->closeOutput();
OString relId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/font",
OUString( "fonts/font" ) + OUString::number(m_nextFontId) + ".ttf" ), RTL_TEXTENCODING_UTF8 );
OUString( "fonts/font" ) + OUString::number(m_nextFontId) + ".odttf" ), RTL_TEXTENCODING_UTF8 );
m_pSerializer->singleElementNS( XML_w, tag,
FSNS( XML_r, XML_id ), relId.getStr(),
FSNS( XML_w, XML_fontKey ), fontKeyStr,
......
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