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/sdresid.hxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/inc/sdresid.hxx')
| -rwxr-xr-x[-rw-r--r--] | sd/inc/sdresid.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx index 617957b6b9e2..b764fc289c71 100644..100755 --- a/sd/inc/sdresid.hxx +++ b/sd/inc/sdresid.hxx @@ -35,7 +35,7 @@ class SD_DLLPUBLIC SdResId : public ResId { public: - SdResId(USHORT nId); + SdResId(sal_uInt16 nId); }; #endif /* _SD_SDRESID_HXX */ |