diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-16 10:30:35 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-16 10:30:35 +0100 |
| commit | 9fdc2716aada42ccb8f60e14555dab10de2c67eb (patch) | |
| tree | 38fd489d7d0e4aaf5ef8dcf39ff013969fd7adf7 /framework/inc/framework/menuconfiguration.hxx | |
| parent | c696055fbc116a65aac158fe6747079a3af44be4 (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
fwk165: Rebase to DEV300m100
Diffstat (limited to 'framework/inc/framework/menuconfiguration.hxx')
| -rw-r--r-- | framework/inc/framework/menuconfiguration.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx index dee6c23a8f8e..be3437c5e45c 100644 --- a/framework/inc/framework/menuconfiguration.hxx +++ b/framework/inc/framework/menuconfiguration.hxx @@ -60,13 +60,13 @@ #define FWK_SID_ADDONS (FWK_SID_SFX_START+1678) #define FWK_SID_ADDONHELP (FWK_SID_SFX_START+1684) -const USHORT START_ITEMID_PICKLIST = 4500; -const USHORT END_ITEMID_PICKLIST = 4599; -const USHORT MAX_ITEMCOUNT_PICKLIST = 99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed! -const USHORT START_ITEMID_WINDOWLIST = 4600; -const USHORT END_ITEMID_WINDOWLIST = 4699; -const USHORT ITEMID_ADDONLIST = FWK_SID_ADDONS; -const USHORT ITEMID_ADDONHELP = FWK_SID_ADDONHELP; +const sal_uInt16 START_ITEMID_PICKLIST = 4500; +const sal_uInt16 END_ITEMID_PICKLIST = 4599; +const sal_uInt16 MAX_ITEMCOUNT_PICKLIST = 99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed! +const sal_uInt16 START_ITEMID_WINDOWLIST = 4600; +const sal_uInt16 END_ITEMID_WINDOWLIST = 4699; +const sal_uInt16 ITEMID_ADDONLIST = FWK_SID_ADDONS; +const sal_uInt16 ITEMID_ADDONHELP = FWK_SID_ADDONHELP; namespace framework { @@ -113,8 +113,8 @@ class FWE_DLLPUBLIC MenuConfiguration ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream ) throw ( ::com::sun::star::lang::WrappedTargetException ); - static BOOL IsPickListItemId( USHORT nId ); - static BOOL IsWindowListItemId( USHORT nId ); + static sal_Bool IsPickListItemId( sal_uInt16 nId ); + static sal_Bool IsWindowListItemId( sal_uInt16 nId ); private: // #110897#-1 do not hold the uno reference by reference |