From 01b3628d420ed30b5c61376f4f5fcb491a5aa0a1 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Wed, 3 Nov 2010 15:49:08 +0100 Subject: removetooltypes01: #i112600# remove tooltypes from idl, and other small changes --- idl/inc/database.hxx | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'idl/inc/database.hxx') diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index 0f207b64aef8..1d5ead23c907 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -44,15 +44,15 @@ class SvIdlError { ByteString aText; public: - UINT32 nLine, nColumn; + sal_uInt32 nLine, nColumn; SvIdlError() : nLine(0), nColumn(0) {} - SvIdlError( UINT32 nL, UINT32 nC ) + SvIdlError( sal_uInt32 nL, sal_uInt32 nC ) : nLine(nL), nColumn(nC) {} const ByteString & GetText() const { return aText; } void SetText( const ByteString & rT ) { aText = rT; } - BOOL IsError() const { return nLine != 0; } + sal_Bool IsError() const { return nLine != 0; } void Clear() { nLine = nColumn = 0; } SvIdlError & operator = ( const SvIdlError & rRef ) { aText = rRef.aText; @@ -66,13 +66,13 @@ public: /******************** class SvIdlDataBase ********************************/ class SvIdlDataBase { - BOOL bExport; + sal_Bool bExport; String aExportFile; sal_uInt32 nUniqueId; sal_uInt32 nVerbosity; String aDataBaseFile; SvFileStream * pStm; - BOOL bIsModified; + sal_Bool bIsModified; SvPersistStream aPersStream; StringList aIdFileList; SvStringHashTable * pIdTable; @@ -98,10 +98,10 @@ protected: public: explicit SvIdlDataBase( const SvCommand& rCmd ); ~SvIdlDataBase(); - static BOOL IsBinaryFormat( SvStream & rInStm ); + static sal_Bool IsBinaryFormat( SvStream & rInStm ); void Load( SvStream & rInStm ); - void Save( SvStream & rInStm, UINT32 nContextFlags ); + void Save( SvStream & rInStm, sal_uInt32 nContextFlags ); SvMetaAttributeMemberList& GetAttrList() { return aAttrList; } SvStringHashTable * GetIdTable() { return pIdTable; } @@ -132,11 +132,11 @@ public: void WriteError( const ByteString & rErrWrn, const ByteString & rFileName, const ByteString & rErrorText, - ULONG nRow = 0, ULONG nColumn = 0 ) const; + sal_uIntPtr nRow = 0, sal_uIntPtr nColumn = 0 ) const; void WriteError( SvTokenStream & rInStm ); void SetError( const ByteString & rError, SvToken * pTok ); void Push( SvMetaObject * pObj ); - BOOL Pop( BOOL bOk, SvTokenStream & rInStm, UINT32 nTokPos ) + sal_Bool Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos ) { GetStack().Pop(); if( bOk ) @@ -146,9 +146,9 @@ public: return bOk; } sal_uInt32 GetUniqueId() { return ++nUniqueId; } - BOOL FindId( const ByteString & rIdName, ULONG * pVal ); - BOOL InsertId( const ByteString & rIdName, ULONG nVal ); - BOOL ReadIdFile( const String & rFileName ); + sal_Bool FindId( const ByteString & rIdName, sal_uIntPtr * pVal ); + sal_Bool InsertId( const ByteString & rIdName, sal_uIntPtr nVal ); + sal_Bool ReadIdFile( const String & rFileName ); SvMetaType * FindType( const ByteString & rName ); static SvMetaType * FindType( const SvMetaType *, SvMetaTypeMemberList & ); @@ -167,14 +167,14 @@ class SvIdlWorkingBase : public SvIdlDataBase public: explicit SvIdlWorkingBase( const SvCommand& rCmd ); - BOOL ReadSvIdl( SvTokenStream &, BOOL bImported, const String & rPath ); - BOOL WriteSvIdl( SvStream & ); + sal_Bool ReadSvIdl( SvTokenStream &, sal_Bool bImported, const String & rPath ); + sal_Bool WriteSvIdl( SvStream & ); - BOOL WriteSfx( SvStream & ); - BOOL WriteHelpIds( SvStream & ); - BOOL WriteSfxItem( SvStream & ); - BOOL WriteCSV( SvStream& ); - BOOL WriteDocumentation( SvStream& ); + sal_Bool WriteSfx( SvStream & ); + sal_Bool WriteHelpIds( SvStream & ); + sal_Bool WriteSfxItem( SvStream & ); + sal_Bool WriteCSV( SvStream& ); + sal_Bool WriteDocumentation( SvStream& ); }; #endif -- cgit From d0097a3f35e5e2c68d293d604a2f6f51b2d822a5 Mon Sep 17 00:00:00 2001 From: Xiaofei Zhang Date: Mon, 8 Nov 2010 15:11:38 +0800 Subject: removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and framework --- idl/inc/database.hxx | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 idl/inc/database.hxx (limited to 'idl/inc/database.hxx') diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx old mode 100644 new mode 100755 -- cgit From d1b478f18dee26565d638054f54fabd5ac87c346 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Thu, 13 Jan 2011 09:32:03 +0100 Subject: removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in idl --- idl/inc/database.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'idl/inc/database.hxx') diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index 1d5ead23c907..b3f9ca5b154f 100755 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -132,7 +132,7 @@ public: void WriteError( const ByteString & rErrWrn, const ByteString & rFileName, const ByteString & rErrorText, - sal_uIntPtr nRow = 0, sal_uIntPtr nColumn = 0 ) const; + sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const; void WriteError( SvTokenStream & rInStm ); void SetError( const ByteString & rError, SvToken * pTok ); void Push( SvMetaObject * pObj ); @@ -146,8 +146,8 @@ public: return bOk; } sal_uInt32 GetUniqueId() { return ++nUniqueId; } - sal_Bool FindId( const ByteString & rIdName, sal_uIntPtr * pVal ); - sal_Bool InsertId( const ByteString & rIdName, sal_uIntPtr nVal ); + sal_Bool FindId( const ByteString & rIdName, sal_uLong * pVal ); + sal_Bool InsertId( const ByteString & rIdName, sal_uLong nVal ); sal_Bool ReadIdFile( const String & rFileName ); SvMetaType * FindType( const ByteString & rName ); -- cgit