diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-20 16:50:12 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-20 16:50:12 +0000 |
| commit | 7135fdcdcac71b3ca328d372a62e1f4e1c58b032 (patch) | |
| tree | 902829f6181dec65b27dde9cf38bd84dc4f1b8f7 /framework/source/inc/accelerators | |
| parent | b39339ae6139db83c4db0301c9ece902b154fc0d (diff) | |
INTEGRATION: CWS patch01as (1.7.244); FILE MERGED
2006/11/17 12:48:52 as 1.7.244.1: #i64717# share non localized accelerator config
Diffstat (limited to 'framework/source/inc/accelerators')
| -rw-r--r-- | framework/source/inc/accelerators/presethandler.hxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 30bf4896c7e1..d976c70909f8 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -4,9 +4,9 @@ * * $RCSfile: presethandler.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:30:19 $ + * last change: $Author: ihi $ $Date: 2006-12-20 17:50:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -226,6 +226,11 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas css::uno::Reference< css::embed::XStorage > m_xWorkingStorageShare; //--------------------------------------- + /** @short global language-independent storage + */ + css::uno::Reference< css::embed::XStorage > m_xWorkingStorageNoLang; + + //--------------------------------------- /** @short holds the folder storage of the user layer alive, where the current configuration set exists. @@ -259,6 +264,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas //--------------------------------------- /** @short knows the relative path from the root. */ ::rtl::OUString m_sRelPathShare; + ::rtl::OUString m_sRelPathNoLang; ::rtl::OUString m_sRelPathUser; //------------------------------------------- @@ -451,9 +457,13 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @param sPreset the ALIAS name of an existing preset. + @param bNoLangGlobal + access the global language-independent storage instead of the preset storage + @return The opened preset stream ... or NULL if the preset does not exists. */ - css::uno::Reference< css::io::XStream > openPreset(const ::rtl::OUString& sPreset); + css::uno::Reference< css::io::XStream > openPreset(const ::rtl::OUString& sPreset, + sal_Bool bUseNoLangGlobal = sal_False); //--------------------------------------- /** @short open the specified target as stream object |