summaryrefslogtreecommitdiff
path: root/sot/source
diff options
context:
space:
mode:
authorMatthias Huetsch [mhu] <matthias.huetsch@sun.com>2010-01-21 16:52:59 +0100
committerMatthias Huetsch [mhu] <matthias.huetsch@sun.com>2010-01-21 16:52:59 +0100
commitf8aaaf1051002c2542d757e53f48037923a756ad (patch)
tree19bc5f5fc896bb95c30d916096d40b2b751697f3 /sot/source
parent7d65553ad15e4cfd4444ae15250c7bd9d058ebe4 (diff)
parent7f5f6c30e89c27422a1576ccceb9b0d79c8e3f0d (diff)
Update from master repository (to m70).
Diffstat (limited to 'sot/source')
-rw-r--r--sot/source/sdstor/stgstrms.cxx2
-rw-r--r--sot/source/sdstor/stgstrms.hxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 46ae3529439c..0e20af6118af 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1104,7 +1104,7 @@ StgTmpStrm::~StgTmpStrm()
}
}
-ULONG StgTmpStrm::GetSize()
+ULONG StgTmpStrm::GetSize() const
{
ULONG n;
if( pStrm )
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index 806d562af6d0..fd7971da3aba 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.hxx
@@ -167,8 +167,7 @@ public:
~StgTmpStrm();
BOOL Copy( StgTmpStrm& );
void SetSize( ULONG );
- using SvMemoryStream::GetSize;
- ULONG GetSize();
+ ULONG GetSize() const;
};
#endif