summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--forms/source/component/imgprod.cxx6
-rw-r--r--include/tools/stream.hxx4
-rw-r--r--svl/source/items/lckbitem.cxx2
-rw-r--r--sw/source/uibase/app/docsh2.cxx4
-rw-r--r--tools/source/stream/stream.cxx4
-rw-r--r--unotools/source/streaming/streamhelper.cxx2
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx4
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.hxx2
8 files changed, 13 insertions, 15 deletions
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index dc51b5ef47e2..c4ae8ee9e008 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -48,7 +48,7 @@ public:
virtual ErrCode WriteAt( sal_uInt64 nPos, const void* pBuffer, std::size_t nCount, std::size_t * pWritten ) override;
virtual ErrCode Flush() const override;
virtual ErrCode SetSize( sal_uInt64 nSize ) override;
- virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const override;
+ virtual ErrCode Stat( SvLockBytesStat* ) const override;
};
@@ -144,10 +144,10 @@ ErrCode ImgProdLockBytes::SetSize(sal_uInt64 const nSize)
}
-ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFlag ) const
+ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat ) const
{
if( GetStream() )
- return SvLockBytes::Stat( pStat, eFlag );
+ return SvLockBytes::Stat( pStat );
else
{
DBG_ASSERT( xStmRef.is(), "ImgProdLockBytes::Stat: xInputStream has no reference..." );
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 42f4231addd7..ea3e53d21ff9 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -94,8 +94,6 @@ struct SvLockBytesStat
SvLockBytesStat() : nSize(0) {}
};
-enum SvLockBytesStatFlag { SVSTATFLAG_DEFAULT };
-
class TOOLS_DLLPUBLIC SvLockBytes: public virtual SvRefBase
{
SvStream * m_pStream;
@@ -128,7 +126,7 @@ public:
virtual ErrCode SetSize(sal_uInt64 nSize);
- virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const;
+ virtual ErrCode Stat(SvLockBytesStat * pStat) const;
};
typedef tools::SvRef<SvLockBytes> SvLockBytesRef;
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 737db2750da4..5c2efba1e9b1 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -130,7 +130,7 @@ bool SfxLockBytesItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
sal_uInt32 nLen;
SvLockBytesStat aStat;
- if ( _xVal->Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE )
+ if ( _xVal->Stat( &aStat ) == ERRCODE_NONE )
nLen = aStat.nSize;
else
return false;
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index a13930dba1b3..ef501c1d0e56 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -801,7 +801,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
// Transfer ownership of stream to a lockbytes object
SvLockBytes aLockBytes( pStrm, true );
SvLockBytesStat aStat;
- if ( aLockBytes.Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE )
+ if ( aLockBytes.Stat( &aStat ) == ERRCODE_NONE )
{
sal_uInt32 nLen = aStat.nSize;
std::size_t nRead = 0;
@@ -866,7 +866,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
// Transfer ownership of stream to a lockbytes object
SvLockBytes aLockBytes( pStrm, true );
SvLockBytesStat aStat;
- if ( aLockBytes.Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE )
+ if ( aLockBytes.Stat( &aStat ) == ERRCODE_NONE )
{
sal_uInt32 nLen = aStat.nSize;
std::size_t nRead = 0;
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 4fd9890a865b..7eaef59e5883 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -241,7 +241,7 @@ ErrCode SvLockBytes::SetSize(sal_uInt64 const nSize)
return m_pStream->GetErrorCode();
}
-ErrCode SvLockBytes::Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const
+ErrCode SvLockBytes::Stat(SvLockBytesStat * pStat) const
{
if (!m_pStream)
{
@@ -294,7 +294,7 @@ sal_uInt64 SvStream::SeekPos(sal_uInt64 const nPos)
{
DBG_ASSERT( m_xLockBytes.is(), "pure virtual function" );
SvLockBytesStat aStat;
- m_xLockBytes->Stat( &aStat, SVSTATFLAG_DEFAULT );
+ m_xLockBytes->Stat( &aStat );
m_nActPos = aStat.nSize;
}
else
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index 893384ff7525..1b639fb04825 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -71,7 +71,7 @@ sal_Int64 SAL_CALL OInputStreamHelper::getLength( )
::osl::MutexGuard aGuard( m_aMutex );
SvLockBytesStat aStat;
- m_xLockBytes->Stat( &aStat, SVSTATFLAG_DEFAULT );
+ m_xLockBytes->Stat( &aStat );
return aStat.nSize;
}
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index c2dcf90f3a8c..c851a408b736 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1220,7 +1220,7 @@ ErrCode UcbLockBytes::Flush() const
ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize)
{
SvLockBytesStat aStat;
- Stat( &aStat, SvLockBytesStatFlag(0) );
+ Stat( &aStat );
std::size_t nSize = aStat.nSize;
if ( nSize > nNewSize )
@@ -1249,7 +1249,7 @@ ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize)
return ERRCODE_NONE;
}
-ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const
+ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat ) const
{
if ( IsSynchronMode() )
{
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 164c551d8dbf..5f0783f73338 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -106,7 +106,7 @@ public:
virtual ErrCode WriteAt(sal_uInt64, const void*, std::size_t, std::size_t *pWritten) override;
virtual ErrCode Flush() const override;
virtual ErrCode SetSize(sal_uInt64) override;
- virtual ErrCode Stat ( SvLockBytesStat *pStat, SvLockBytesStatFlag) const override;
+ virtual ErrCode Stat ( SvLockBytesStat *pStat ) const override;
void SetError( ErrCode nError )
{ m_nError = nError; }