summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/comphelper/seqstream.hxx18
-rw-r--r--sax/source/tools/fastserializer.cxx11
-rw-r--r--sax/source/tools/fastserializer.hxx6
-rw-r--r--sc/source/filter/excel/excdoc.cxx2
-rw-r--r--sc/source/filter/excel/xestream.cxx7
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx2
6 files changed, 31 insertions, 15 deletions
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index d5729955000c..d4f301cdd1d8 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -74,27 +74,23 @@ public:
private:
inline sal_Int32 avail();
};
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XOutputStream > OSequenceOutputStream_Base;
-class OSequenceOutputStream : public OSequenceOutputStream_Base
+class COMPHELPER_DLLPUBLIC OSequenceOutputStream :
+ public ::cppu::WeakImplHelper1< ::com::sun::star::io::XOutputStream >
{
protected:
::com::sun::star::uno::Sequence< sal_Int8 >& m_rSequence;
double m_nResizeFactor;
sal_Int32 m_nMinimumResize;
sal_Int32 m_nMaximumResize;
+ /** the size of the virtual stream. This is not the size of the sequence,
+ but the number of bytes written into the stream at a given moment.
+ */
sal_Int32 m_nSize;
- // the size of the virtual stream. This is not the size of the sequence, but the number of bytes written
- // into the stream at a given moment.
-
- bool m_bConnected;
- // closeOutput has been called ?
+ bool m_bConnected; ///< closeOutput has been called ?
::osl::Mutex m_aMutex;
-protected:
- virtual ~OSequenceOutputStream() { if (m_bConnected) closeOutput(); }
-
public:
/** constructs the object. Everything written into the stream through the XOutputStream methods will be forwarded
to the sequence, reallocating it if necessary. Writing will start at offset 0 within the sequence.
@@ -118,6 +114,8 @@ public:
sal_Int32 _nMaximumResize = -1
);
+ virtual ~OSequenceOutputStream() { if (m_bConnected) closeOutput(); }
+
/// same as XOutputStream::writeBytes (as expected :)
virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// this is a dummy in this implementation, no buffering is used
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index fbce18aa9ab0..a9520e4907ea 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -53,7 +53,9 @@ using ::com::sun::star::io::BufferSizeExceededException;
namespace sax_fastparser {
FastSaxSerializer::FastSaxSerializer( )
- : mxOutputStream()
+ : maOutputData()
+ , maOutputStream(maOutputData)
+ , mxOutputStream()
, mxFastTokenHandler()
, maMarkStack()
, maClosingBracket((const sal_Int8 *)">", 1)
@@ -112,6 +114,9 @@ namespace sax_fastparser {
{
if (!mxOutputStream.is())
return;
+
+ maOutputStream.flush();
+ mxOutputStream->writeBytes(maOutputData);
}
void SAL_CALL FastSaxSerializer::writeId( ::sal_Int32 nElement )
@@ -293,7 +298,7 @@ namespace sax_fastparser {
if ( maMarkStack.size() == 1 && eMergeType != MERGE_MARKS_IGNORE)
{
- mxOutputStream->writeBytes( maMarkStack.top()->getData() );
+ maOutputStream.writeBytes( maMarkStack.top()->getData() );
maMarkStack.pop();
return;
}
@@ -314,7 +319,7 @@ namespace sax_fastparser {
void FastSaxSerializer::writeBytes( const Sequence< ::sal_Int8 >& aData ) throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException )
{
if ( maMarkStack.empty() )
- mxOutputStream->writeBytes( aData );
+ maOutputStream.writeBytes( aData );
else
maMarkStack.top()->append( aData );
}
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index a88e3ca0e166..147d7671d160 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -29,6 +29,7 @@
#include <boost/shared_ptr.hpp>
+#include <comphelper/seqstream.hxx>
#include "sax/fshelper.hxx"
namespace sax_fastparser {
@@ -148,6 +149,11 @@ public:
void mergeTopMarks( sax_fastparser::MergeMarksEnum eMergeType = sax_fastparser::MERGE_MARKS_APPEND );
private:
+ /// Buffer written to mxOutputStream at the end, called from FSHelper destructor.
+ css::uno::Sequence< sal_Int8 > maOutputData;
+ /// Helper class to dynamically allocate memory when needed for maOutputData.
+ comphelper::OSequenceOutputStream maOutputStream;
+ /// Output stream, usually writing data into files.
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > mxOutputStream;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > mxFastTokenHandler;
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index e84b474dabe2..0297da6b401b 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -879,8 +879,6 @@ void ExcDocument::WriteXml( XclExpXmlStream& rStrm )
rWorkbook->endElement( XML_workbook );
rWorkbook.reset();
-
- rStrm.commitStorage();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 6f364409b7e8..31e39c7d3e47 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -939,6 +939,7 @@ XclExpXmlStream::XclExpXmlStream( const Reference< XComponentContext >& rCC )
XclExpXmlStream::~XclExpXmlStream()
{
+ assert(maStreams.empty() && "Forgotten PopStream()?");
}
sax_fastparser::FSHelperPtr& XclExpXmlStream::GetCurrentStream()
@@ -1103,6 +1104,12 @@ bool XclExpXmlStream::exportDocument()
aDocRoot.WriteXml( *this );
}
+ PopStream();
+ // Free all FSHelperPtr, to flush data before commiting storage
+ maOpenedStreamMap.clear();
+
+ commitStorage();
+
if (xStatusIndicator.is())
xStatusIndicator->end();
mpRoot = NULL;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index caf46c66ba4b..9fb836bf875f 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -384,6 +384,8 @@ bool PowerPointExport::exportDocument() throw (css::uno::RuntimeException, std::
mPresentationFS->endElementNS( XML_p, XML_presentation );
mPresentationFS.reset();
+ // Free all FSHelperPtr, to flush data before commiting storage
+ mpSlidesFSArray.clear();
commitStorage();
generated by cgit (git 2.34.1) at 2024-08-13 15:42:44 +0000