diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-16 20:40:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-16 20:57:38 +0000 |
| commit | cb3411386b57c27c3be4e4dbf63c8820429b2df1 (patch) | |
| tree | 38c0cedc1900f26d24d10198df36a2e0e4a78601 /framework/source | |
| parent | 5b2028f5d611425f8e4143d33ed19dc1cbfc3551 (diff) | |
reduce the amount of __cxa_atexit churn
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 6 | ||||
| -rw-r--r-- | framework/source/inc/accelerators/acceleratorconfiguration.hxx | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 8cf49ba0f422..cd99a2ddf2eb 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -86,6 +86,12 @@ namespace framework { + const ::rtl::OUString CFG_ENTRY_PRIMARY(RTL_CONSTASCII_USTRINGPARAM("PrimaryKeys")); + const ::rtl::OUString CFG_ENTRY_SECONDARY(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeys")); + const ::rtl::OUString CFG_ENTRY_GLOBAL(RTL_CONSTASCII_USTRINGPARAM("Global")); + const ::rtl::OUString CFG_ENTRY_MODULES(RTL_CONSTASCII_USTRINGPARAM("Modules")); + const ::rtl::OUString CFG_PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command")); + #ifdef fpc #error "Who exports this define? I use it as namespace alias ..." diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 3b0c3422a1db..277728e8ffb9 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -76,13 +76,13 @@ namespace framework //----------------------------------------------- // Accelerators.xcu -static const ::rtl::OUString CFG_ENTRY_PRIMARY(RTL_CONSTASCII_USTRINGPARAM("PrimaryKeys")); -static const ::rtl::OUString CFG_ENTRY_SECONDARY(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeys")); +extern const ::rtl::OUString CFG_ENTRY_PRIMARY; +extern const ::rtl::OUString CFG_ENTRY_SECONDARY; -static const ::rtl::OUString CFG_ENTRY_GLOBAL(RTL_CONSTASCII_USTRINGPARAM("Global")); -static const ::rtl::OUString CFG_ENTRY_MODULES(RTL_CONSTASCII_USTRINGPARAM("Modules")); +extern const ::rtl::OUString CFG_ENTRY_GLOBAL; +extern const ::rtl::OUString CFG_ENTRY_MODULES; -static const ::rtl::OUString CFG_PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command")); +extern const ::rtl::OUString CFG_PROP_COMMAND; /** "global" type to make accelerator presets unique, so they can be used in combination with the salhelper::SingletonRef mechanism! */ |