diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:22:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:33:30 +0300 |
| commit | 30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch) | |
| tree | ab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /cui/source/inc | |
| parent | 02f6c270e79879188b2be670c6db4feb56bb064e (diff) | |
fdo#82577: Handle KeyCode
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.
Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
Diffstat (limited to 'cui/source/inc')
| -rw-r--r-- | cui/source/inc/acccfg.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 9a3a1a30c128..7ece823d5b88 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -83,7 +83,7 @@ struct TAccInfo public: TAccInfo( sal_Int32 nKeyPos , sal_Int32 nListPos, - const KeyCode& aKey ) + const vcl::KeyCode& aKey ) : m_nKeyPos (nKeyPos ) , m_nListPos (nListPos ) , m_bIsConfigurable(true ) /**< its important to set sal_True as default - @@ -101,7 +101,7 @@ struct TAccInfo sal_Int32 m_nListPos; bool m_bIsConfigurable; OUString m_sCommand; - KeyCode m_aKey; + vcl::KeyCode m_aKey; }; namespace sfx2 @@ -160,7 +160,7 @@ private: OUString GetLabel4Command(const OUString& rCommand); void InitAccCfg(); - sal_uLong MapKeyCodeToPos( const KeyCode &rCode ) const; + sal_uLong MapKeyCodeToPos( const vcl::KeyCode &rCode ) const; css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const OUString& sName); void StartFileDialog( WinBits nBits, const OUString& rTitle ); |