summaryrefslogtreecommitdiff
path: root/sd/source/filter/ppt/propread.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-03-12 20:06:58 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-03-12 20:06:58 +0100
commitc61cd1a5a26de1d1f62389988b00229c04e36693 (patch)
tree9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/filter/ppt/propread.hxx
parent064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff)
parentf2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/filter/ppt/propread.hxx')
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/propread.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index b268fb3d019d..9adbd89aeb3e 100644..100755
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -129,13 +129,13 @@ class Dictionary : protected List
{
friend class Section;
- void AddProperty( UINT32 nId, const String& rString );
+ void AddProperty( sal_uInt32 nId, const String& rString );
public :
Dictionary(){};
~Dictionary();
Dictionary& operator=( Dictionary& rDictionary );
- UINT32 GetProperty( const String& rPropName );
+ sal_uInt32 GetProperty( const String& rPropName );
};
// ------------------------------------------------------------------------
@@ -146,7 +146,7 @@ class Section : private List
protected:
- BYTE aFMTID[ 16 ];
+ sal_uInt8 aFMTID[ 16 ];
void AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize );
@@ -167,7 +167,7 @@ class Section : private List
class PropRead : private List
{
sal_Bool mbStatus;
- SvStorageStream* mpSvStream;
+ SvStorageStreamRef mpSvStream;
sal_uInt16 mnByteOrder;
sal_uInt16 mnFormat;
@@ -182,7 +182,7 @@ class PropRead : private List
~PropRead();
PropRead& operator=( PropRead& rPropRead );
- const Section* GetSection( const BYTE* pFMTID );
+ const Section* GetSection( const sal_uInt8* pFMTID );
sal_Bool IsValid() const { return mbStatus; };
void Read();
};