Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2151

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/2151/1

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

Change-Id: I5d4cb579c042f03137188f3e0293015bea723dce
---
M sw/source/filter/ww8/docxattributeoutput.cxx
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a2ed719..f54186f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3059,7 +3059,7 @@
     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 @@
     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,

-- 
To view, visit https://gerrit.libreoffice.org/2151
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d4cb579c042f03137188f3e0293015bea723dce
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luboš Luňák <l.lunak@suse.cz>

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.