summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-18 12:28:06 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-18 12:28:06 +0000
commit2ce18f56f6db310f4f14bd5c72ee0290739f6dcf (patch)
tree584696f0eb17017791247784c6c030cb94f39401 /configmgr
parentf5f373c791b5a4b757421a0d940e4191ffe816e2 (diff)
INTEGRATION: CWS cfgsmartcache (1.10.22); FILE MERGED
2005/01/12 15:32:38 jb 1.10.22.1: #i29624# Multilocale support for the binary cache
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/backend/backendaccess.hxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/configmgr/source/backend/backendaccess.hxx b/configmgr/source/backend/backendaccess.hxx
index ecb8a9b78217..77110b72317a 100644
--- a/configmgr/source/backend/backendaccess.hxx
+++ b/configmgr/source/backend/backendaccess.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: backendaccess.hxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: kz $ $Date: 2004-08-31 15:23:27 $
+ * last change: $Author: kz $ $Date: 2005-01-18 13:28:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,6 +74,10 @@
#include "mergedcomponentdata.hxx"
#endif // CONFIGMGR_BACKEND_MERGEDCOMPONENTDATA_HXX
+#ifndef CONFIGMGR_MATCHLOCALE_HXX
+#include "matchlocale.hxx"
+#endif
+
#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYER_HPP_
#include <com/sun/star/configuration/backend/XLayer.hpp>
#endif // _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYER_HPP_
@@ -175,7 +179,8 @@ class BackendAccess : public IMergedDataProvider
MergedComponentData& aData,
const uno::Reference<backenduno::XLayer> * pLayers,
sal_Int32 aNumLayers,
- RequestOptions const & aOptions,
+ localehelper::Locale const & aRequestedLocale,
+ localehelper::LocaleSequence & inoutMergedLocales,
ITemplateDataProvider *aTemplateProvider,
sal_Int32 * pLayersMerged = 0)
CFG_UNO_THROW_ALL();