diff options
| author | sb <sb@openoffice.org> | 2010-03-04 23:05:27 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-03-04 23:05:27 +0100 |
| commit | c79b576a3dbbbce2a67c6215a4180ac060131790 (patch) | |
| tree | 32e1b51bf16b501fd7eea6d23f0610eee339fa5f /officecfg/util | |
| parent | ff783db420cdb801613ca46ffec6dc6812d9ad0d (diff) | |
| parent | 0d0b4e1cdd842808707e570b1dea125f312f2a50 (diff) | |
merged in re/DEV300_next towards DEV300_m74
Diffstat (limited to 'officecfg/util')
| -rw-r--r-- | officecfg/util/alllang.xsl | 3 | ||||
| -rw-r--r-- | officecfg/util/data_val.xsl | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl index 998a9a55e2d2..339c6685fa0e 100644 --- a/officecfg/util/alllang.xsl +++ b/officecfg/util/alllang.xsl @@ -312,6 +312,9 @@ <xsl:when test="not ($dataval)"> <xsl:value-of select="true()"/> </xsl:when> + <xsl:when test="$dataval/@oor:external"> + <xsl:value-of select="false()"/> + </xsl:when> <xsl:when test="not ($schemaval)"> <xsl:choose> <xsl:when test="$dataval/@xsi:nil='true'"> diff --git a/officecfg/util/data_val.xsl b/officecfg/util/data_val.xsl index 883bffc1976c..d918431c7566 100644 --- a/officecfg/util/data_val.xsl +++ b/officecfg/util/data_val.xsl @@ -202,9 +202,6 @@ <xsl:if test="following-sibling::value[@install:module=$module and @xml:lang=$lang]"> <xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has multiple values for module <xsl:value-of select="$module"/> and locale <xsl:value-of select="$lang"/>!</xsl:message> </xsl:if> - <xsl:if test="../value[not(@install:module)]"> - <xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has values both with and without module. This is currently not supported. Please contact jb@openoffice.org, if you need this!</xsl:message> - </xsl:if> <xsl:if test="not(preceding-sibling::value/@install:module)"> <xsl:message>ATTENTION: Property '<xsl:value-of select="$path"/>' has different values for different modules. Make sure the modules are mutually exclusive!</xsl:message> </xsl:if> |