summaryrefslogtreecommitdiff
path: root/framework/source/inc/accelerators/acceleratorconfiguration.hxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-09-09 03:41:07 +0000
committerOliver Bolte <obo@openoffice.org>2009-09-09 03:41:07 +0000
commit7cd75414afa95d9738c58e3ac862a151d71eca3d (patch)
tree927d20c49029da9559d02194ce54dd7f49c373ff /framework/source/inc/accelerators/acceleratorconfiguration.hxx
parentc08eabf905d58dea0b056ac190f1108214332b78 (diff)
CWS-TOOLING: integrate CWS acceleratorsfix01
2009-08-31 06:45:23 +0200 wuy r275582 : i104644 - make the XCUBasedAcceleratorConfiguration::KeyMapping singleton; i104645 - interface storeToStorage of XCUBasedAcceleratorConfiguration is unimplemented 2009-08-31 06:41:51 +0200 wuy r275581 : i104644 - make the XCUBasedAcceleratorConfiguration::KeyMapping singleton 2009-08-14 03:44:15 +0200 wuy r274967 : CWS-TOOLING: rebase CWS acceleratorsfix01 to trunk@274622 (milestone: DEV300:m54) 2009-05-18 11:39:26 +0200 wuy r272007 : CWS-TOOLING: rebase CWS acceleratorsfix01 to trunk@271830 (milestone: DEV300:m48)
Diffstat (limited to 'framework/source/inc/accelerators/acceleratorconfiguration.hxx')
-rw-r--r--framework/source/inc/accelerators/acceleratorconfiguration.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 2eb566d6b4c8..d6547105a347 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -37,6 +37,7 @@
#include <accelerators/istoragelistener.hxx>
#include <accelerators/presethandler.hxx>
#include <accelerators/acceleratorcache.hxx>
+#include <accelerators/keymapping.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <threadhelp/threadhelpbase.hxx>
@@ -67,6 +68,7 @@
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/weak.hxx>
#include <comphelper/locale.hxx>
+#include <salhelper/singletonref.hxx>
//__________________________________________
// definition
@@ -338,6 +340,8 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
::rtl::OUString m_sGlobalOrModules;
::rtl::OUString m_sModuleCFG;
+ ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
+
//______________________________________
// native interface!