diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-03 13:35:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-03 13:35:35 +0000 |
| commit | 72f9d26cad277963d87a385bf883514d2d0f3636 (patch) | |
| tree | 0301bd70d662c5afddc5848e2de1d98ebc26b86c /configmgr | |
| parent | be214487747fce59e078a0c0f78db84bd3c8e513 (diff) | |
INTEGRATION: CWS scmtoapoc (1.18.12); FILE MERGED
2004/06/17 16:36:46 ssmith 1.18.12.1: #117123# configmgr cleanup
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/backend/layermerge.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configmgr/source/backend/layermerge.cxx b/configmgr/source/backend/layermerge.cxx index 8559c27dbdfe..4f4eaf5249ea 100644 --- a/configmgr/source/backend/layermerge.cxx +++ b/configmgr/source/backend/layermerge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layermerge.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2004-02-25 17:31:50 $ + * last change: $Author: hr $ $Date: 2004-08-03 14:35:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -430,7 +430,7 @@ void LayerMergeHandler::applyPropertyValue(uno::Any const & _aValue, OUString co else if (ValueNode * pValue = m_pProperty->asValueNode()) { - OSL_ENSURE(false, "Layer merging: Got locale-dependent value for non localized node"); + //OSL_ENSURE(false, "Layer merging: Got locale-dependent value for non localized node"); setValueAndCheck(*pValue,_aValue); } |