diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:19:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:19:44 +0000 |
| commit | ec40b58359059748ec8873fc67b77ead9789f8d6 (patch) | |
| tree | 91a0f5c191c27c94e8cb97f3cc0b9e6d9e8f71ff /configmgr | |
| parent | 66913840f37d6347dfc851d1a24f6f46e324a7eb (diff) | |
INTEGRATION: CWS warnings01 (1.22.26); FILE MERGED
2006/05/23 22:58:14 sb 1.22.26.5: RESYNC: (1.23-1.24); FILE MERGED
2006/02/14 10:17:29 cd 1.22.26.4: #i55991# Fix warnings for ms c++ compiler
2005/10/25 10:38:45 cd 1.22.26.3: #i53898# Make code warning free for gcc and non-pro build
2005/09/22 16:36:50 sb 1.22.26.2: RESYNC: (1.22-1.23); FILE MERGED
2005/09/06 12:27:38 cd 1.22.26.1: #i53898# Make code warning free
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/backend/layermerge.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configmgr/source/backend/layermerge.cxx b/configmgr/source/backend/layermerge.cxx index 1ff8aef7b4..073477fc23 100644 --- a/configmgr/source/backend/layermerge.cxx +++ b/configmgr/source/backend/layermerge.cxx @@ -4,9 +4,9 @@ * * $RCSfile: layermerge.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: hr $ $Date: 2006-04-19 14:00:16 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:19:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -72,6 +72,9 @@ namespace configmgr // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- +//#if OSL_DEBUG_LEVEL > 0 +// currently not used in debug builds +#if 0 static void check_if_complete(uno::Reference< uno::XComponentContext > const & _xContext) { MergedComponentData aData; @@ -79,6 +82,7 @@ namespace configmgr uno::Reference< backenduno::XLayerHandler > test(new LayerMergeHandler(_xContext, aData)); } +#endif // ----------------------------------------------------------------------------- @@ -99,7 +103,8 @@ struct LayerMergeHandler::Converter // ----------------------------------------------------------------------------- LayerMergeHandler::LayerMergeHandler(Context const & xContext, MergedComponentData & _rData, ITemplateDataProvider* aTemplateProvider ) : m_rData(_rData) -, m_aContext(xContext,static_cast<backenduno::XLayerHandler*>(this),aTemplateProvider ) +//, m_aContext(xContext,static_cast<backenduno::XLayerHandler*>(this),aTemplateProvider ) +, m_aContext(xContext) , m_aFactory() , m_aLocale() , m_pProperty(NULL) @@ -107,6 +112,7 @@ LayerMergeHandler::LayerMergeHandler(Context const & xContext, MergedComponentDa , m_nSkipping(0) , m_bSublayer(false) { + m_aContext = DataBuilderContext(xContext,static_cast<backenduno::XLayerHandler*>(this),aTemplateProvider ); OSL_ENSURE( m_rData.hasSchema(), "Creating layer merger without default data" ); } // ----------------------------------------------------------------------------- |