diff options
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Paths.xcu | 2 | ||||
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4 | ||||
-rw-r--r-- | officecfg/util/alllang.xsl | 52 | ||||
-rw-r--r-- | officecfg/util/schema_trim.xsl | 44 | ||||
-rw-r--r-- | solenv/gbuild/Configuration.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/HelpTarget.mk | 2 |
6 files changed, 95 insertions, 13 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index 7568f4d2fb23..6d739e67d72f 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -98,7 +98,7 @@ </node> <node oor:name="Help" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(instpath)/help" oor:op="fuse"/> + <node oor:name="$(instpath)/@LIBO_SHARE_HELP_FOLDER@" oor:op="fuse"/> </node> </node> <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true"> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 8ac7f693abec..09a9b1867e54 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1652,7 +1652,7 @@ <info> <desc>Specifies the path to the Office help files.</desc> </info> - <value>$(instpath)/help</value> + <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false"> <info> @@ -1847,7 +1847,7 @@ <desc>Specifies the default directory where Office help files are located.</desc> </info> - <value>$(instpath)/help</value> + <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false"> <info> diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl index 31b53bccd853..f5d9ae103fc5 100644 --- a/officecfg/util/alllang.xsl +++ b/officecfg/util/alllang.xsl @@ -35,6 +35,7 @@ <xsl:param name="fallback-locale">en-US</xsl:param> <xsl:param name="LIBO_SHARE_FOLDER"/> +<xsl:param name="LIBO_SHARE_HELP_FOLDER"/> <xsl:variable name="schemaRootURL"> <xsl:value-of select="$schemaRoot"/> @@ -341,19 +342,23 @@ <xsl:template match="@oor:name"> <xsl:attribute name="oor:name"> - <xsl:call-template name="replace"> + <xsl:call-template name="replacetwo"> <xsl:with-param name="input" select="current()"/> - <xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/> - <xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/> + <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/> + <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/> + <xsl:with-param name="pattern2" select="'@LIBO_SHARE_HELP_FOLDER@'"/> + <xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/> </xsl:call-template> </xsl:attribute> </xsl:template> <xsl:template match="text()"> - <xsl:call-template name="replace"> + <xsl:call-template name="replacetwo"> <xsl:with-param name="input" select="current()"/> - <xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/> - <xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/> + <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/> + <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/> + <xsl:with-param name="pattern2" select="'@LIBO_SHARE_HELP_FOLDER@'"/> + <xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/> </xsl:call-template> </xsl:template> @@ -378,4 +383,39 @@ </xsl:choose> </xsl:template> + <xsl:template name="replacetwo"> + <xsl:param name="input"/> + <xsl:param name="pattern1"/> + <xsl:param name="replace1"/> + <xsl:param name="pattern2"/> + <xsl:param name="replace2"/> + <xsl:choose> + <xsl:when test="contains($input, $pattern1)"> + <xsl:call-template name="replace"> + <xsl:with-param + name="input" select="substring-before($input, $pattern1)"/> + <xsl:with-param name="pattern" select="$pattern2"/> + <xsl:with-param name="replace" select="$replace2"/> + </xsl:call-template> + <xsl:value-of select="$replace1"/> + <xsl:call-template name="replacetwo"> + <xsl:with-param + name="input" select="substring-after($input, $pattern1)"/> + <xsl:with-param name="pattern1" select="$pattern1"/> + <xsl:with-param name="replace1" select="$replace1"/> + <xsl:with-param name="pattern2" select="$pattern2"/> + <xsl:with-param name="replace2" select="$replace2"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="replace"> + <xsl:with-param + name="input" select="$input"/> + <xsl:with-param name="pattern" select="$pattern2"/> + <xsl:with-param name="replace" select="$replace2"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + </xsl:transform> diff --git a/officecfg/util/schema_trim.xsl b/officecfg/util/schema_trim.xsl index 79b3c5c8cb4f..4ebac1c5b733 100644 --- a/officecfg/util/schema_trim.xsl +++ b/officecfg/util/schema_trim.xsl @@ -24,6 +24,7 @@ version="1.0"> <xsl:param name="LIBO_SHARE_FOLDER"/> + <xsl:param name="LIBO_SHARE_HELP_FOLDER"/> <!-- Get the correct format --> <xsl:output method="xml" indent="yes"/> @@ -81,10 +82,12 @@ </xsl:template> <xsl:template match="text()"> - <xsl:call-template name="replace"> + <xsl:call-template name="replacetwo"> <xsl:with-param name="input" select="current()"/> - <xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/> - <xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/> + <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/> + <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/> + <xsl:with-param name="pattern2" select="'@LIBO_SHARE_HELP_FOLDER@'"/> + <xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/> </xsl:call-template> </xsl:template> @@ -109,4 +112,39 @@ </xsl:choose> </xsl:template> + <xsl:template name="replacetwo"> + <xsl:param name="input"/> + <xsl:param name="pattern1"/> + <xsl:param name="replace1"/> + <xsl:param name="pattern2"/> + <xsl:param name="replace2"/> + <xsl:choose> + <xsl:when test="contains($input, $pattern1)"> + <xsl:call-template name="replace"> + <xsl:with-param + name="input" select="substring-before($input, $pattern1)"/> + <xsl:with-param name="pattern" select="$pattern2"/> + <xsl:with-param name="replace" select="$replace2"/> + </xsl:call-template> + <xsl:value-of select="$replace1"/> + <xsl:call-template name="replacetwo"> + <xsl:with-param + name="input" select="substring-after($input, $pattern1)"/> + <xsl:with-param name="pattern1" select="$pattern1"/> + <xsl:with-param name="replace1" select="$replace1"/> + <xsl:with-param name="pattern2" select="$pattern2"/> + <xsl:with-param name="replace2" select="$replace2"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="replace"> + <xsl:with-param + name="input" select="$input"/> + <xsl:with-param name="pattern" select="$pattern2"/> + <xsl:with-param name="replace" select="$replace2"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + </xsl:transform> diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 06aa8a174816..e5b8a9a4e812 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -85,6 +85,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(gb_Configuration_XSLTCOMMAND) --nonet \ -o $(1) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ + --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \ $(gb_XcsTarget_XSLT_SchemaTrim) \ $(3)) endef @@ -122,6 +123,7 @@ $(call gb_Helper_abbreviate_dirs,\ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ $(gb_Configuration__stringparam_schemaRoot) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ + --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \ --path $(SRCDIR)/officecfg/registry \ $(gb_XcuTarget_XSLT_AllLang) \ $(3)) @@ -158,6 +160,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(gb_Configuration__stringparam_schemaRoot) \ --stringparam module $(notdir $(subst -,/,$(basename $(notdir $(2))))) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ + --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \ $(gb_XcuTarget_XSLT_AllLang) \ $(3)) endef @@ -255,6 +258,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(gb_Configuration__stringparam_schemaRoot) \ --stringparam locale $(word 2,$(subst /, ,$(2))) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ + --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \ --path $(SRCDIR)/officecfg/registry \ $(gb_XcuTarget_XSLT_AllLang) \ $(3)) diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 142f00e23593..a541a4776e80 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -656,7 +656,7 @@ endef # gb_HelpTarget__add_file target file define gb_HelpTarget__add_file -$(call gb_Package_add_file,$(call gb_HelpTarget_get_packagename,$(1)),help/$(call gb_HelpTarget__get_lang,$(1))/$(2),$(2)) +$(call gb_Package_add_file,$(call gb_HelpTarget_get_packagename,$(1)),$(LIBO_SHARE_HELP_FOLDER)/$(call gb_HelpTarget__get_lang,$(1))/$(2),$(2)) endef |