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 /sw/source/core/inc/bookmrk.hxx | |
| 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 'sw/source/core/inc/bookmrk.hxx')
| -rw-r--r-- | sw/source/core/inc/bookmrk.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 5b5e6e62f610..b5eef562e59a 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -22,6 +22,7 @@ #include <cppuhelper/weakref.hxx> #include <sfx2/Metadatable.hxx> +#include <vcl/keycod.hxx> #include <boost/scoped_ptr.hpp> #include <boost/noncopyable.hpp> #include <map> @@ -165,18 +166,18 @@ namespace sw { { public: Bookmark(const SwPaM& rPaM, - const KeyCode& rCode, + const vcl::KeyCode& rCode, const OUString& rName, const OUString& rShortName); virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE; virtual const OUString& GetShortName() const SAL_OVERRIDE { return m_sShortName; } - virtual const KeyCode& GetKeyCode() const SAL_OVERRIDE + virtual const vcl::KeyCode& GetKeyCode() const SAL_OVERRIDE { return m_aCode; } virtual void SetShortName(const OUString& rShortName) SAL_OVERRIDE { m_sShortName = rShortName; } - virtual void SetKeyCode(const KeyCode& rCode) SAL_OVERRIDE + virtual void SetKeyCode(const vcl::KeyCode& rCode) SAL_OVERRIDE { m_aCode = rCode; } // ::sfx2::Metadatable @@ -188,7 +189,7 @@ namespace sw { ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE; private: - KeyCode m_aCode; + vcl::KeyCode m_aCode; OUString m_sShortName; }; |