summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/control/ctrlbox.cxx4
-rw-r--r--svtools/source/graphic/descriptor.cxx2
-rw-r--r--svtools/source/graphic/grfattr.cxx4
-rw-r--r--svtools/source/graphic/grfmgr.cxx8
-rw-r--r--svtools/source/graphic/provider.cxx8
-rw-r--r--svtools/source/misc/imap.cxx8
-rw-r--r--svtools/source/misc/imap3.cxx8
-rw-r--r--svtools/source/misc/templatefoldercache.cxx2
-rw-r--r--svtools/source/misc/transfer.cxx4
9 files changed, 24 insertions, 24 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index c83db0b4a1d5..e1a26e7f5a6d 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -988,7 +988,7 @@ void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico
return;
SvFileStream aStream;
- aStream.Open( aFontMRUEntriesFile, STREAM_WRITE | STREAM_TRUNC );
+ aStream.Open( aFontMRUEntriesFile, StreamMode::WRITE | StreamMode::TRUNC );
if( ! (aStream.IsOpen() && aStream.IsWritable()) )
{
#if OSL_DEBUG_LEVEL > 1
@@ -1007,7 +1007,7 @@ void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico
if( aFontMRUEntriesFile.isEmpty() )
return;
- SvFileStream aStream( aFontMRUEntriesFile, STREAM_READ );
+ SvFileStream aStream( aFontMRUEntriesFile, StreamMode::READ );
if( ! aStream.IsOpen() )
{
#if OSL_DEBUG_LEVEL > 1
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 8b5fa7b490f2..75d30cafe0d1 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -75,7 +75,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic )
void GraphicDescriptor::init( const OUString& rURL )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, STREAM_READ ));
+ boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ ));
if( pIStm )
implCreate( *pIStm, &rURL );
diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx
index b44cafd86283..6a11cb266115 100644
--- a/svtools/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.cxx
@@ -75,7 +75,7 @@ bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const
SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr )
{
- VersionCompat aCompat( rIStm, STREAM_READ );
+ VersionCompat aCompat( rIStm, StreamMode::READ );
sal_uInt32 nTmp32;
sal_uInt16 nTmp16;
@@ -101,7 +101,7 @@ SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr )
SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr )
{
- VersionCompat aCompat( rOStm, STREAM_WRITE, 2 );
+ VersionCompat aCompat( rOStm, StreamMode::WRITE, 2 );
const sal_uInt32 nTmp32 = 0;
rOStm.WriteUInt32( nTmp32 ).WriteUInt32( nTmp32 );
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index f680b1146231..32ec70728463 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -232,7 +232,7 @@ void GraphicObject::ImplAutoSwapIn()
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( GetLink(), aURLStr ) )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, STREAM_READ ));
+ boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ ));
if( pIStm )
{
@@ -1103,7 +1103,7 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl)
SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj )
{
- VersionCompat aCompat( rIStm, STREAM_READ );
+ VersionCompat aCompat( rIStm, StreamMode::READ );
Graphic aGraphic;
GraphicAttr aAttr;
bool bLink;
@@ -1130,7 +1130,7 @@ SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj )
SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj )
{
- VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
+ VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
const bool bLink = rGraphicObj.HasLink();
WriteGraphic( rOStm, rGraphicObj.GetGraphic() );
@@ -1159,7 +1159,7 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL )
Graphic aGraphic;
if ( !aURL.isEmpty() )
{
- boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, STREAM_READ ));
+ boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ ));
if( pStream )
GraphicConverter::Import( *pStream, aGraphic );
}
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index f5a4292a3afd..5a224189b3ab 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -200,7 +200,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno
uno::Reference< ::graphic::XGraphic > xRet;
uno::Sequence< sal_Int8 > aBmpSeq( xBtm->getDIB() );
uno::Sequence< sal_Int8 > aMaskSeq( xBtm->getMaskDIB() );
- SvMemoryStream aBmpStream( aBmpSeq.getArray(), aBmpSeq.getLength(), STREAM_READ );
+ SvMemoryStream aBmpStream( aBmpSeq.getArray(), aBmpSeq.getLength(), StreamMode::READ );
Bitmap aBmp;
BitmapEx aBmpEx;
@@ -208,7 +208,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno
if( aMaskSeq.getLength() )
{
- SvMemoryStream aMaskStream( aMaskSeq.getArray(), aMaskSeq.getLength(), STREAM_READ );
+ SvMemoryStream aMaskStream( aMaskSeq.getArray(), aMaskSeq.getLength(), StreamMode::READ );
Bitmap aMask;
ReadDIB(aMask, aMaskStream, true);
@@ -462,7 +462,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co
xRet = implLoadStandardImage( aPath );
if( !xRet.is() )
- pIStm.reset(::utl::UcbStreamHelper::CreateStream( aPath, STREAM_READ ));
+ pIStm.reset(::utl::UcbStreamHelper::CreateStream( aPath, StreamMode::READ ));
}
else if( xBtm.is() )
{
@@ -741,7 +741,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
OUString aURL;
aValue >>= aURL;
- pOStm.reset(::utl::UcbStreamHelper::CreateStream( aURL, STREAM_WRITE | STREAM_TRUNC ));
+ pOStm.reset(::utl::UcbStreamHelper::CreateStream( aURL, StreamMode::WRITE | StreamMode::TRUNC ));
aPath = aURL;
}
else if (aName == "OutputStream")
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 6ff356b22ade..37f794cc0d3d 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -92,7 +92,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
rOStm.WriteUChar( bActive );
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding);
- boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, STREAM_WRITE ));
+ boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, StreamMode::WRITE ));
WriteIMapObject( rOStm );
aEventList.Write( rOStm ); // V4
@@ -121,7 +121,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
// make URL absolute
aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS );
- boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, STREAM_READ ));
+ boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ ));
ReadIMapObject( rIStm );
@@ -959,7 +959,7 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
rOStm.WriteUInt16( nCount );
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding);
- pCompat = new IMapCompat( rOStm, STREAM_WRITE );
+ pCompat = new IMapCompat( rOStm, StreamMode::WRITE );
// here one can insert in newer versions
@@ -1001,7 +1001,7 @@ void ImageMap::Read( SvStream& rIStm, const OUString& rBaseURL )
rIStm.ReadUInt16( nCount );
read_uInt16_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy
- pCompat = new IMapCompat( rIStm, STREAM_READ );
+ pCompat = new IMapCompat( rIStm, StreamMode::READ );
// here one can read in newer versions
diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx
index 90114cd4be05..b0a198a7fa53 100644
--- a/svtools/source/misc/imap3.cxx
+++ b/svtools/source/misc/imap3.cxx
@@ -28,17 +28,17 @@
|*
\******************************************************************************/
-IMapCompat::IMapCompat( SvStream& rStm, const sal_uInt16 nStreamMode )
+IMapCompat::IMapCompat( SvStream& rStm, const StreamMode nStreamMode )
: pRWStm(&rStm)
, nCompatPos(0)
, nTotalSize(0)
, nStmMode(nStreamMode)
{
- DBG_ASSERT( nStreamMode == STREAM_READ || nStreamMode == STREAM_WRITE, "Wrong Mode!" );
+ DBG_ASSERT( nStreamMode == StreamMode::READ || nStreamMode == StreamMode::WRITE, "Wrong Mode!" );
if ( !pRWStm->GetError() )
{
- if ( nStmMode == STREAM_WRITE )
+ if ( nStmMode == StreamMode::WRITE )
{
nCompatPos = pRWStm->Tell();
pRWStm->SeekRel( 4 );
@@ -65,7 +65,7 @@ IMapCompat::~IMapCompat()
{
if ( !pRWStm->GetError() )
{
- if ( nStmMode == STREAM_WRITE )
+ if ( nStmMode == StreamMode::WRITE )
{
const sal_uLong nEndPos = pRWStm->Tell();
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 8d2c992a5bbf..8c1e2a4eadf3 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -763,7 +763,7 @@ namespace svt
// open the stream
m_pCacheStream = UcbStreamHelper::CreateStream( aStorageURL.GetMainURL( INetURLObject::DECODE_TO_IURI ),
- _bForRead ? STREAM_READ | STREAM_NOCREATE : STREAM_WRITE | STREAM_TRUNC );
+ _bForRead ? StreamMode::READ | StreamMode::NOCREATE : StreamMode::WRITE | StreamMode::TRUNC );
DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::openCacheStream: could not open/create the cache stream!" );
if ( m_pCacheStream && m_pCacheStream->GetErrorCode() )
{
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 7bf8f637dfba..81defcc9f04f 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -350,7 +350,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
if( maAny >>= aSeq )
{
- boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ));
+ boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
GDIMetaFile aMtf;
ReadGDIMetaFile( *pSrcStm, aMtf );
@@ -380,7 +380,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
if( maAny >>= aSeq )
{
- boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ));
+ boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
GDIMetaFile aMtf;
ReadGDIMetaFile( *pSrcStm, aMtf );
generated by cgit (git 2.34.1) at 2025-01-16 10:43:42 +0000