diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/inc/sdiocmpt.hxx | |
parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/inc/sdiocmpt.hxx')
-rwxr-xr-x[-rw-r--r--] | sd/inc/sdiocmpt.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx index 36fd3eb8e39b..7c25924ff009 100644..100755 --- a/sd/inc/sdiocmpt.hxx +++ b/sd/inc/sdiocmpt.hxx @@ -38,17 +38,17 @@ class old_SdrDownCompat { protected: SvStream& rStream; - UINT32 nSubRecSiz; - UINT32 nSubRecPos; - UINT16 nMode; - BOOL bOpen; + sal_uInt32 nSubRecSiz; + sal_uInt32 nSubRecPos; + sal_uInt16 nMode; + sal_Bool bOpen; protected: void Read(); void Write(); public: - old_SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode); + old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode); ~old_SdrDownCompat(); void OpenSubRecord(); void CloseSubRecord(); @@ -56,20 +56,20 @@ public: ////////////////////////////////////////////////////////////////////////////// #include "sddllapi.h" -#define SDIOCOMPAT_VERSIONDONTKNOW (UINT16)0xffff +#define SDIOCOMPAT_VERSIONDONTKNOW (sal_uInt16)0xffff class SD_DLLPUBLIC SdIOCompat : public old_SdrDownCompat { private: - UINT16 nVersion; + sal_uInt16 nVersion; public: // nNewMode: STREAM_READ oder STREAM_WRITE // nVer: nur beim Schreiben angeben - SdIOCompat(SvStream& rNewStream, USHORT nNewMode, - UINT16 nVer = SDIOCOMPAT_VERSIONDONTKNOW); + SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode, + sal_uInt16 nVer = SDIOCOMPAT_VERSIONDONTKNOW); ~SdIOCompat(); - UINT16 GetVersion() const { return nVersion; } + sal_uInt16 GetVersion() const { return nVersion; } }; #endif // _SD_SDIOCMPT_HXX |