sot/inc/sot/storage.hxx | 4 ++--
writerperfect/source/stream/WPXSvStream.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 90f3840e4c767154266c6be1c532f5e748e8c3f7
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Fri May 25 16:11:39 2012 +0200
Make SotStorage and SotStorageStream dtors public
Change-Id: I3ca0d308199bc4acf66a4c473d8b48561560d631
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 925ae42..7f4a563 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -71,13 +71,13 @@ protected:
virtual sal_uLong PutData( const void* pData, sal_uLong nSize );
virtual sal_uLong SeekPos( sal_uLong nPos );
virtual void FlushData();
- ~SotStorageStream();
public:
SotStorageStream( const String &,
StreamMode = STREAM_STD_READWRITE,
StorageMode = 0 );
SotStorageStream( BaseStorageStream *pStm );
SotStorageStream();
+ ~SotStorageStream();
SO2_DECL_BASIC_CLASS_DLL(SotStorageStream,SOTDATA())
using SvStream::SyncSvStream;
@@ -128,9 +128,9 @@ friend class ::binfilter::SvStorage;
long m_nVersion;
protected:
- ~SotStorage();
void CreateStorage( sal_Bool bUCBStorage, StreamMode,
StorageMode );
public:
+ ~SotStorage();
SotStorage( const String &,
StreamMode = STREAM_STD_READWRITE,
StorageMode = 0 );
commit 090068a41f083d0960c3717724ab539cf0515c3e
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Fri May 25 16:10:07 2012 +0200
Revert "Blind Hail Mary trying to solve tinderbox breakages"
This reverts commit 70d473c07d79dc59a69f6cc725c026eacdc12c2a.
diff --git a/writerperfect/source/stream/WPXSvStream.cxx
b/writerperfect/source/stream/WPXSvStream.cxx
index 7039b42..d71e155 100644
--- a/writerperfect/source/stream/WPXSvStream.cxx
+++ b/writerperfect/source/stream/WPXSvStream.cxx
@@ -173,7 +173,7 @@ WPXInputStream
*WPXSvInputStream::getDocumentOLEStream(const char *name)
else if (mxChildrenStorages.back()->IsStorage(aElems[i]))
{
SotStorageRef &tmpParent(mxChildrenStorages.back());
-
mxChildrenStorages.push_back(static_cast<SotStorageRef>(tmpParent->OpenSotStorage(aElems[i++],
STREAM_STD_READ)));
+
mxChildrenStorages.push_back(tmpParent->OpenSotStorage(aElems[i++],
STREAM_STD_READ));
}
else
// should not happen
@@ -186,8 +186,8 @@ WPXInputStream
*WPXSvInputStream::getDocumentOLEStream(const char *name)
if (i >= aElems.size())
return 0;
- mxChildrenStreams.push_back(
static_cast<SotStorageStreamRef>(mxChildrenStorages.back()->OpenSotStream(
- aElems[i], STREAM_STD_READ )));
+ mxChildrenStreams.push_back( mxChildrenStorages.back()->OpenSotStream(
+ aElems[i], STREAM_STD_READ ));
mxSeekable->seek(tmpPosition);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
