diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-02-12 19:06:54 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-02-14 17:24:12 +0100 |
| commit | fe8bfb201e79c31de1b692931a0e9ee6c7ff1d25 (patch) | |
| tree | e420df71404ba517014224bf4b613a24cd73bb43 | |
| parent | 2301bf6f5b88cb0230836a70e94854ee7d9a29eb (diff) | |
mso saves obfuscated fonts as .odttf in .docx, so use the extension as well
Change-Id: I5d4cb579c042f03137188f3e0293015bea723dce
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 0732979b3a68..9ff630a705c5 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -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, |