diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-10-21 14:48:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-10-21 14:48:59 +0000 |
| commit | e96e6eb12e92600c1b404cbb8fec1bbb5ff4f8db (patch) | |
| tree | da1f176a13a49daa9192f3a4659e65fdaaed7dab /package/inc | |
| parent | 350d5ca9803e7e58167b7b5942ebdf429ed9b0af (diff) | |
CWS-TOOLING: integrate CWS fwk123
2009-10-14 10:18:49 +0200 cd r276885 : #i99971# Use AttachThreadInput to force SetForegroundWindow
2009-10-14 08:56:20 +0200 mav r276881 : #i105476# let the allocated memory live long anough
2009-10-14 08:53:51 +0200 mav r276880 : #i105476# let ZipFile use mutex while creating the requested stream
2009-10-14 08:51:52 +0200 mav r276879 : #i105476# let buffered IO use mutex ( patch from MHU )
2009-10-09 12:20:22 +0200 cd r276803 : #i99971# Use configuration to control window to front/focus handling
2009-10-09 12:19:22 +0200 cd r276802 : #i99971# New configuration item to force set focus and window to front for new document windows
2009-10-09 12:18:23 +0200 cd r276801 : #i99971# Introduction of a new show flag to force window to front
2009-10-06 11:04:16 +0200 ab r276695 : #i105386# Call xmlInitParser() before registering input callbacks
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/ByteGrabber.hxx | 4 | ||||
| -rw-r--r-- | package/inc/ZipFile.hxx | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx index 725b2819f371..d4869845f066 100644 --- a/package/inc/ByteGrabber.hxx +++ b/package/inc/ByteGrabber.hxx @@ -38,12 +38,16 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <osl/mutex.hxx> + namespace com { namespace sun { namespace star { namespace io { class XSeekable; class XInputStream; } } } } class ByteGrabber { protected: + ::osl::Mutex m_aMutex; + com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream; com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xSeek; com::sun::star::uno::Sequence < sal_Int8 > aSequence; diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index a954a1691c4b..a4129f4fbbfe 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -65,6 +65,8 @@ class EncryptionData; class ZipFile { protected: + ::osl::Mutex m_aMutex; + ::rtl::OUString sComment; /* zip file comment */ EntryHash aEntries; ByteGrabber aGrabber; |