diff options
author | Release Engineers <releng@openoffice.org> | 2009-04-12 04:24:43 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2009-04-12 04:24:43 +0000 |
commit | a3735ed51103b8eb46d80fc916739f3e7858c63f (patch) | |
tree | 90e673cf8007dfc7a03fb1a396463deccc99ec1f /officecfg/util | |
parent | #i10000# warning fix (diff) | |
download | core-a3735ed51103b8eb46d80fc916739f3e7858c63f.tar.gz core-a3735ed51103b8eb46d80fc916739f3e7858c63f.zip |
CWS-TOOLING: integrate CWS macshortcuts01
2009-04-02 18:13:38 +0200 pl r270430 : CWS-TOOLING: rebase CWS macshortcuts01 to trunk@270033 (milestone: DEV300:m45)
2009-03-04 13:02:01 +0100 pl r268816 : make compile with oldish gtk headers
2009-03-04 11:23:41 +0100 rvojta r268799 : Remove #ifndef MACOSX as Mac OS X X11 port is obsolote, no need to check for non Mac OS X
2009-03-03 16:33:34 +0100 rvojta r268764 : Meta/Super to MOD3 on all Unix platforms except Mac OS X
2009-03-03 16:08:46 +0100 rvojta r268744 : Map GDK_Meta_L/R and GDK_Super_L/R keys to KEY_MOD3 on Unix systems except Mac OS X
2009-03-03 16:04:23 +0100 rvojta r268742 : IsMod3(), IsLeftMod3(), IsRightMod3() added
2009-03-03 16:03:48 +0100 rvojta r268741 : MODKEY_LMOD3, MODKEY_RMOD3, MODKEY_MOD3 support
2009-02-28 00:09:26 +0100 rvojta r268620 : New KeyCode constructors support, by default MOD3 is not used here (probably temporary solution)
2009-02-25 22:53:02 +0100 rvojta r268469 : MOD3 support (META_DOWN_MASK)
2009-02-25 13:22:13 +0100 rvojta r268435 : Cmd-M to minimize window, Cmd-Option-M to minimize all windows
2009-02-25 11:09:20 +0100 rvojta r268417 : Add back F11 for non Mac OS X platforms (removed by accident in r268405)
2009-02-24 18:32:31 +0100 rvojta r268405 : F11 replaced by Cmd-T on Mac OS X
2009-02-23 15:21:53 +0100 sb r268358 : #i99296# support values with both xml:lang and install:module (which are moved into the spool tree, not the res tree)
2009-02-16 22:45:34 +0100 rvojta r267839 : Multiplatform shortcuts support
2009-02-16 22:41:03 +0100 rvojta r267838 : Use install:module instead of separate xcu file
2009-02-16 18:35:36 +0100 rvojta r267833 : Removed accelerators target
2009-02-16 09:27:42 +0100 rvojta r267776 : MOD3 added
2009-02-16 09:18:32 +0100 rvojta r267775 : MOD3 support
2009-02-16 09:17:11 +0100 rvojta r267774 : MOD3 support
2009-02-15 22:11:37 +0100 rvojta r267773 : Check for MOD3 too
2009-02-15 22:11:15 +0100 rvojta r267772 : Check for MOD3 too
2009-02-15 22:10:37 +0100 rvojta r267771 : Check for MOD3 too
2009-02-15 22:10:15 +0100 rvojta r267770 : Check for MOD3 during mouse event too
2009-02-15 22:09:54 +0100 rvojta r267769 : IsMod3() added
2009-02-15 19:34:59 +0100 rvojta r267768 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:33:43 +0100 rvojta r267767 : Cmd-M -> Ctrl-M for default format
2009-02-15 19:32:19 +0100 rvojta r267766 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:31:30 +0100 rvojta r267765 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:31:04 +0100 rvojta r267764 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:30:33 +0100 rvojta r267763 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:30:09 +0100 rvojta r267762 : MOD3 added (Ctrl on Mac OS X)
2009-02-13 22:11:22 +0100 rvojta r267751 : Cmd-Shift-Z for .uno:Redo
2009-02-13 22:04:19 +0100 rvojta r267748 : F11 -> Cmd-T for .uno:DesignerDialog
2009-02-13 21:09:11 +0100 rvojta r267743 : F11 -> Cmd-T (all occurences)
2009-02-13 19:47:21 +0100 rvojta r267741 : accelerators target added for Mac OS X shortcuts
2009-02-13 19:46:58 +0100 rvojta r267740 : Spreadsheet - replace F11 with Cmd-T
2009-02-13 19:24:19 +0100 rvojta r267739 : Remove Accelerators-Mac.xcs
2009-02-13 18:50:01 +0100 rvojta r267738 : Accelerators-Mac.xcs test
2009-02-13 18:48:10 +0100 rvojta r267737 : Accelerators-Mac.xcu added
2009-02-13 18:46:48 +0100 rvojta r267736 : F11 -> Cmd-T for stylist in Spreadsheet
Diffstat (limited to 'officecfg/util')
-rw-r--r-- | officecfg/util/alllang.xsl | 12 | ||||
-rw-r--r-- | officecfg/util/data_val.xsl | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl index 53f488066e2e..47ae08165928 100644 --- a/officecfg/util/alllang.xsl +++ b/officecfg/util/alllang.xsl @@ -101,7 +101,7 @@ </xsl:template> <xsl:template match="value" mode="locale"> - <xsl:if test="@xml:lang = $locale"> + <xsl:if test="@xml:lang=$locale and not(@install:module)"> <xsl:copy> <xsl:apply-templates select = "@*" mode="locale"/> <xsl:value-of select="."/> @@ -198,7 +198,7 @@ <xsl:param name = "context"/> <xsl:param name = "component-schema"/> - <xsl:variable name="applicable-values" select="descendant::value[not (@xml:lang) or (@xml:lang=$fallback-locale)]"/> + <xsl:variable name="applicable-values" select="descendant::value[not (@xml:lang) or (@xml:lang=$fallback-locale) or (@install:module=$module)]"/> <xsl:variable name="substantive-nodes" select="descendant-or-self::*[(@oor:finalized='true') or (@oor:mandatory='true') or (@oor:op!='modify')]"/> <xsl:choose> @@ -245,13 +245,13 @@ <xsl:apply-templates select = "value"/> </xsl:copy> </xsl:when> - <xsl:when test="value[not (@xml:lang)]"> + <xsl:when test="value[not (@xml:lang) or @install:module]"> <xsl:if test="value[not(@install:module) or @install:module=$module]"> <!-- copy locale independent values only, if the values differ --> <xsl:variable name="isRedundant"> <xsl:call-template name="isRedundant"> <xsl:with-param name="schemaval" select="$context/value"/> - <xsl:with-param name="dataval" select="value[not (@xml:lang) and (not(@install:module) or @install:module=$module)]"/> + <xsl:with-param name="dataval" select="value[(not(@xml:lang) or @install:module) and (not(@install:module) or @install:module=$module)]"/> </xsl:call-template> </xsl:variable> <xsl:if test="$isRedundant ='false'"> @@ -273,7 +273,7 @@ <xsl:template match="value"> <xsl:choose> - <xsl:when test="@xml:lang"/> + <xsl:when test="@xml:lang and not(@install:module)"/> <xsl:when test="$module and not(ancestor-or-self::*/@install:module=$module)"/> <xsl:when test="not($module) and ancestor-or-self::*/@install:module"/> <xsl:otherwise> @@ -286,7 +286,7 @@ </xsl:template> <xsl:template match="value" mode="fallback-locale"> - <xsl:if test="@xml:lang = $fallback-locale"> + <xsl:if test="@xml:lang=$fallback-locale and not(@install:module)"> <xsl:copy> <xsl:apply-templates select = "@*"/> <xsl:value-of select="."/> diff --git a/officecfg/util/data_val.xsl b/officecfg/util/data_val.xsl index 994664376325..bdf7c1ba2546 100644 --- a/officecfg/util/data_val.xsl +++ b/officecfg/util/data_val.xsl @@ -201,12 +201,10 @@ <xsl:call-template name="collectPath"/> </xsl:variable> <xsl:variable name = "module" select="@install:module"/> + <xsl:variable name = "lang" select="@xml:lang"/> - <xsl:if test="@oor:lang"> - <xsl:message terminate="yes">ERROR: Value in property '<xsl:value-of select="$path"/>' has module and locale!</xsl:message> - </xsl:if> - <xsl:if test="following-sibling::value[@install:module=$module]"> - <xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has multiple values for module <xsl:value-of select="$module"/>!</xsl:message> + <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> |