diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-12-09 08:32:23 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-12-09 08:32:23 +0000 |
| commit | 27d905094bbb0b1117bba4fe9efcd34c1bee3ebf (patch) | |
| tree | 5eecc247d5269b3d7805e6db3f76c70499e2d604 | |
| parent | f6017bd72c829c6b9b8f7be6bd5cdfadb2786f62 (diff) | |
CWS-TOOLING: integrate CWS fwk129
2009-12-07 14:19:39 +0100 mba r277741 : #i106367#: typo again
2009-12-02 10:32:30 +0100 jsk r277700 : fwk129: #i105719 - Fixed file size, wording and timing
2009-11-25 13:25:48 +0100 mav r277632 : #i107047# let the temporary stream be flushed in time
2009-11-25 13:17:36 +0100 mav r277631 : #i105719# switch to temporary file ealier to allow storing to the same location
2009-11-23 14:47:02 +0100 mav r277596 : #i105343# no outdated info in the buffer
2009-11-23 14:09:49 +0100 os r277595 : #i107064# copy styles in SwDoc::CreateCopy()
2009-11-23 10:38:29 +0100 mba r277592 : #i104338#: fix build without Java
2009-11-20 10:22:11 +0100 cd r277572 : #i107003# Make toolbar invisible before calling doLazyDelete. This prevents possible crashes in scenarios where a modal dialog is visible.
2009-11-19 18:30:33 +0100 mav r277569 : #i107035# let the temporary file be removed after the stream has been closed
2009-11-19 18:06:21 +0100 mba r277565 : #i106390#: crash caused by optimization
2009-11-19 17:58:34 +0100 mba r277564 : #i106367#: typo prevents correct asian language fallback
2009-11-19 17:57:16 +0100 mba r277563 : #i106390#: crash caused by optimization
2009-11-19 16:35:41 +0100 nn r277561 : #i106854# get source stream directly from document's storage instead of a temporary SfxMedium
2009-11-19 12:36:38 +0100 mav r277558 : #i106854# check the date of the original file
| -rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 0784df1ee..14461532b 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -737,12 +737,8 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic { // old stream is still in this file's storage - open read-only - SfxMedium* pSrcMed = rDoc.GetDocumentShell()->GetMedium(); - String aSrcURL = pSrcMed->GetOrigURL(); - - // SfxMedium must not be read-only, or it will create a temp file in GetStorage - SfxMedium aTmpMedium( aSrcURL, STREAM_READWRITE, FALSE, NULL, NULL ); - uno::Reference<embed::XStorage> xTmpStorage = aTmpMedium.GetStorage(); + // #i106854# use the document's storage directly, without a temporary SfxMedium + uno::Reference<embed::XStorage> xTmpStorage = rDoc.GetDocumentShell()->GetStorage(); uno::Reference<io::XStream> xSrcStream; uno::Reference<io::XInputStream> xSrcInput; try |