diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-15 12:35:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-16 09:19:20 +0000 |
| commit | d9bdc157b43ce412ad4689ee78b81068b1224d30 (patch) | |
| tree | 6ca4917524e9e160345e887b88a6fcfc6d9540d5 /include | |
| parent | a05281b30edc0cf9efecf90a7b6240b90f9c8267 (diff) | |
remove ACCELITEM stuff from rsc
Change-Id: I97dade0324edfb2d67ee33ef07498166b499c13c
Reviewed-on: https://gerrit.libreoffice.org/25003
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/rc.h | 4 | ||||
| -rw-r--r-- | include/tools/rcid.h | 1 | ||||
| -rw-r--r-- | include/vcl/accel.hxx | 5 |
3 files changed, 0 insertions, 10 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index 1aed99554c59..97e17fb524d9 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -88,10 +88,6 @@ namespace o3tl { template<> struct typed_flags<RscMenuItem> : is_typed_flags<RscMenuItem, 0xd7f> {}; } -// "AccelKey" resource options: -#define ACCELITEM_ACCEL 0x01 -#define ACCELITEM_KEY 0x02 - // For "Field" resources: enum class RscNumFormatterFlags { diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 122c48efb022..492e078b7a52 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -37,7 +37,6 @@ #define RSC_STRING (RSC_NOTYPE + 0x11) #define RSC_BITMAP (RSC_NOTYPE + 0x13) #define RSC_ACCEL (RSC_NOTYPE + 0x1a) -#define RSC_ACCELITEM (RSC_NOTYPE + 0x1b) // only used internally #define RSC_MENU (RSC_NOTYPE + 0x1c) #define RSC_MENUITEM (RSC_NOTYPE + 0x1d) // only used internally #define RSC_KEYCODE (RSC_NOTYPE + 0x1f) diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index 7e965809277c..f34b44372fc9 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -58,20 +58,15 @@ private: SAL_DLLPRIVATE ImplAccelEntry* ImplGetAccelData( const vcl::KeyCode& rKeyCode ) const; -protected: - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - public: Accelerator(); Accelerator( const Accelerator& rAccel ); - Accelerator( const ResId& rResId ); virtual ~Accelerator(); void Activate(); void Select(); void InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode ); - void InsertItem( const ResId& rResId ); sal_uInt16 GetCurItemId() const { return mnCurId; } const vcl::KeyCode& GetCurKeyCode() const { return maCurKeyCode; } |