diff options
| author | Ravindra Vidhate <ravindra.vidhate@synerzip.com> | 2014-04-22 15:28:46 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-28 09:20:16 +0200 |
| commit | a3c00ee3c7b3b0fbcde32baeb7023c7e8526b908 (patch) | |
| tree | bf57790ba50049838065852b1981468a2ebb83ff /sw/source/filter/ww8/docxexport.cxx | |
| parent | df0dea0bf055fce59beedadbc8d20a2681c96bd6 (diff) | |
fdo#77759 : Embedded excel getting renamed to binary object.
The embedded excel (xlsx) when inserted on its own (unlike with chart) is getting converted to ".bin".
Note that only extension differs otherwise its an excel file only.
There is no loss of user experience in editing the file in MS Word.
The similar case is also exists when power point is inserted on it's own.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9126
Change-Id: Ie13c098a794179c3b27100a7b9e30884fb47f656
Diffstat (limited to 'sw/source/filter/ww8/docxexport.cxx')
| -rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index ff74f3a4800a..c3a6ddf93678 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -358,13 +358,13 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_In return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } -OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaType, const OUString& sRelationType ) +OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaType, const OUString& sRelationType, const OUString& sFileExtension ) { uno::Reference <embed::XEmbeddedObject> xObj( rObject.GetOleRef() ); comphelper::EmbeddedObjectContainer* aContainer = rObject.GetObject().GetContainer(); uno::Reference< io::XInputStream > xInStream = aContainer->GetObjectStream( xObj, NULL ); - OUString sFileName = "embeddings/oleObject" + OUString::number( ++m_nOLEObjects ) + ".bin"; + OUString sFileName = "embeddings/oleObject" + OUString::number( ++m_nOLEObjects ) + "." + sFileExtension; uno::Reference< io::XOutputStream > xOutStream = GetFilter().openFragmentStream( OUStringBuffer() .appendAscii( "word/" ) .append( sFileName ) |