summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-09-25 21:47:16 +0200
committerMathias Bauer <mba@openoffice.org>2009-09-25 21:47:16 +0200
commit0a266bd33b8786869cdeab8325f8f1b1900533ad (patch)
tree137ba378aaae9e8f0765fabbbf5035131f250781 /configmgr
parent6a1e797fa4b432841708545272e13e8f6ab4bd39 (diff)
parentab33e14647ada2a32624fa39ec0ddbbbdc694df5 (diff)
merge commit
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/backendhelper/makefile.mk2
-rw-r--r--configmgr/source/platformbe/makefile.mk2
-rw-r--r--configmgr/source/tree/localizedtreeactions.cxx5
-rw-r--r--configmgr/util/makefile.mk2
4 files changed, 10 insertions, 1 deletions
diff --git a/configmgr/source/backendhelper/makefile.mk b/configmgr/source/backendhelper/makefile.mk
index 44b502b451b4..f9a27c8167b0 100644
--- a/configmgr/source/backendhelper/makefile.mk
+++ b/configmgr/source/backendhelper/makefile.mk
@@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings ---
.INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
.INCLUDE : $(PRJ)$/makefile.pmk
DLLPRE =
@@ -66,6 +67,7 @@ DEF1EXPORTFILE=exports.dxp
DEF1DES=Configuration: Backend Helper
# --- Targets ---
+.ENDIF # L10N_framework
.INCLUDE : target.mk
diff --git a/configmgr/source/platformbe/makefile.mk b/configmgr/source/platformbe/makefile.mk
index 19796b2442c2..9cbe53f5cf7d 100644
--- a/configmgr/source/platformbe/makefile.mk
+++ b/configmgr/source/platformbe/makefile.mk
@@ -42,6 +42,7 @@ SYSMGR_MAJOR=1
# --- Settings ---
.INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
.INCLUDE : $(PRJ)$/makefile.pmk
DLLPRE =
@@ -69,6 +70,7 @@ DEF1EXPORTFILE=exports.dxp
DEF1DES=Configuration: System Integration Manager
# --- Targets ---
+.ENDIF # L10N_framework
.INCLUDE : target.mk
diff --git a/configmgr/source/tree/localizedtreeactions.cxx b/configmgr/source/tree/localizedtreeactions.cxx
index 8cd40c4da79f..b2ed23a730b3 100644
--- a/configmgr/source/tree/localizedtreeactions.cxx
+++ b/configmgr/source/tree/localizedtreeactions.cxx
@@ -178,8 +178,11 @@ namespace
// -- -----------------------------
OSL_ENSURE( aValueType != uno::Type(), "VOID result type found");
- OSL_ENSURE( aValueType == parseTemplateName(_aSubtree.getElementTemplateName()),
+#if OSL_DEBUG_LEVEL > 0
+ uno::Type aTemplateType = parseTemplateName( _aSubtree.getElementTemplateName() );
+ OSL_ENSURE( ( aValueType == aTemplateType ) || ( aTemplateType.getTypeClass() == uno::TypeClass_ANY ),
"ERROR: Found Value Type doesn't match encoded value type in pseudo template name");
+#endif
OSL_POSTCOND( static_cast<ValueNode&>(*pResult).getValueType() == aValueType,
"ERROR: Resulting Value Type doesn't match original value type" );
diff --git a/configmgr/util/makefile.mk b/configmgr/util/makefile.mk
index 6fd7c63195a4..eaea5d343503 100644
--- a/configmgr/util/makefile.mk
+++ b/configmgr/util/makefile.mk
@@ -36,6 +36,7 @@ TARGET=configmgr
ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(L10N_framework)"==""
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
DLLPRE =
@@ -75,6 +76,7 @@ DEF1NAME= $(SHL1TARGET)
DEF1EXPORTFILE= exports.dxp
# --- Targets ----------------------------------
+.ENDIF # L10N_framework
.INCLUDE : target.mk