diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-05-24 09:39:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-24 09:39:52 +0100 |
| commit | e49865e7020ca7e5cb024df51f1d3c0dc7994b35 (patch) | |
| tree | ddd7dff6743184890ab3c25274523da3879ac101 /automation | |
| parent | 779b389116e7112c7ca29cb08e56cfcb043ecc4d (diff) | |
git rid of comm_WORD and comm_DWORD
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/inc/automation/commdefines.hxx | 16 | ||||
| -rw-r--r-- | automation/inc/automation/commtypes.hxx | 5 |
2 files changed, 8 insertions, 13 deletions
diff --git a/automation/inc/automation/commdefines.hxx b/automation/inc/automation/commdefines.hxx index 15e38a8ff897..433cdeca9e45 100644 --- a/automation/inc/automation/commdefines.hxx +++ b/automation/inc/automation/commdefines.hxx @@ -38,22 +38,22 @@ #include <osl/endian.h> #ifndef MAKEDWORD -#define MAKEDWORD(wl, wh) ((comm_DWORD)((wl) & 0xFFFF) | (((comm_DWORD)(wh) & 0xFFFF) << 16)) +#define MAKEDWORD(wl, wh) ((sal_uInt32)((wl) & 0xFFFF) | (((sal_uInt32)(wh) & 0xFFFF) << 16)) #endif #ifndef LOWORD -#define LOWORD(d) ((comm_WORD)((comm_DWORD)(d) & 0xFFFF)) +#define LOWORD(d) ((sal_uInt16)((sal_uInt32)(d) & 0xFFFF)) #endif #ifndef HIWORD -#define HIWORD(d) ((comm_WORD)(((comm_DWORD)(d) >> 16) & 0xFFFF)) +#define HIWORD(d) ((sal_uInt16)(((sal_uInt32)(d) >> 16) & 0xFFFF)) #endif #ifndef MAKEWORD -#define MAKEWORD(bl, bh) ((comm_WORD)((bl) & 0xFF) | (((comm_WORD)(bh) & 0xFF) << 8)) +#define MAKEWORD(bl, bh) ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8)) #endif #ifndef LOBYTE -#define LOBYTE(w) ((comm_BYTE)((comm_WORD)(w) & 0xFF)) +#define LOBYTE(w) ((comm_BYTE)((sal_uInt16)(w) & 0xFF)) #endif #ifndef HIBYTE -#define HIBYTE(w) ((comm_BYTE)(((comm_WORD)(w) >> 8) & 0xFF)) +#define HIBYTE(w) ((comm_BYTE)(((sal_uInt16)(w) >> 8) & 0xFF)) #endif #ifndef MAKEBYTE #define MAKEBYTE(nl, nh) ((comm_BYTE)(((nl) & 0x0F) | (((nh) & 0x0F) << 4))) @@ -74,10 +74,10 @@ #ifdef OSL_BIGENDIAN #ifndef NETWORD -#define NETWORD(w) (comm_WORD)(w) +#define NETWORD(w) (sal_uInt16)(w) #endif #ifndef NETDWORD -#define NETDWORD(d) (comm_DWORD)(d) +#define NETDWORD(d) (sal_uInt32)(d) #endif #endif // OSL_BIGENDIAN diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index 8d7c976fb125..c2b8619c2eef 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -38,8 +38,6 @@ /** defines al least types comm_BYTE - comm_WORD; - comm_DWORD; comm_BOOL comm_ULONG comm_USHORT @@ -65,9 +63,6 @@ typedef sal_uInt16 comm_USHORT; typedef sal_uInt16 comm_UINT16; typedef sal_uInt32 comm_UINT32; -typedef sal_uInt16 comm_WORD; -typedef sal_uInt32 comm_DWORD; - class String; #define comm_String String |