mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of $(share_subdir_name) again

Browse Source 
Quoting 56211a166a "fdo#72394 Don't endlessly
expand $(share_subdir_name) into itself":

* The compile-time variable LIBO_SHARE_FOLDER should not end up as a runtime
  framework path variable, esp. since accidentally re-substituting it for
  "share" segments in unrelated URLs like <file:///export/share/for-all> does
  not make sense.  ac4e19f908 "fdo#68552: Don't
  (attempt to) do run-time expansion of build-time parameters" had already
  attempted a fix for that, but it had to be reverted again with
  791a8b96f7 because it "Unfortunately does not
  work if BUILDDIR is different from SRCDIR."

So this time fix it not via configure-expanded *.in files, but via xsltproc
(for officecfg/registry/ files) and sed (for wizards/soruce/configshare files).

The changes to officecfg/util/alllang.xsl will replace @LIBO_SHARE_FOLDER@ only
in oor:name attribues (and in <value> text), not in any other attributes,
because I have no idea how to write that generically in XSLT and it happens to
be only needed in oor:name for now.

Change-Id: Iec78eb70dcbf1a5bbabf4e42f21c44dc65c3e438
This commit is contained in:
Stephan Bergmann
2013-12-10 12:29:11 +01:00
parent 6e89666b4e
commit 87dd1780a3
13 changed files with 174 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/inc/services/substitutepathvars.hxx
View File

@@ -177,7 +177,6 @@ enum PreDefVariable
PREDEFVAR_BASEINSTURL, PREDEFVAR_BASEINSTURL,
PREDEFVAR_USERDATAURL, PREDEFVAR_USERDATAURL,
PREDEFVAR_BRANDBASEURL, PREDEFVAR_BRANDBASEURL,
PREDEFVAR_SHARE_SUBDIR_NAME,
PREDEFVAR_COUNT PREDEFVAR_COUNT
}; };

9
framework/source/services/substitutepathvars.cxx
View File

@@ -104,7 +104,6 @@
#define VARIABLE_BASEINSTURL "$(baseinsturl)" #define VARIABLE_BASEINSTURL "$(baseinsturl)"
#define VARIABLE_USERDATAURL "$(userdataurl)" #define VARIABLE_USERDATAURL "$(userdataurl)"
#define VARIABLE_BRANDBASEURL "$(brandbaseurl)" #define VARIABLE_BRANDBASEURL "$(brandbaseurl)"
#define VARIABLE_SHARE_SUBDIR_NAME "$(share_subdir_name)"
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::beans; using namespace com::sun::star::beans;
@@ -194,8 +193,7 @@ static const FixedVariable aFixedVarTable[] =
// New variable of hierachy service (#i32656#) // New variable of hierachy service (#i32656#)
{ VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL,true }, { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL,true },
{ VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL, REPLACELENGTH_USERDATAURL,true }, { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL, REPLACELENGTH_USERDATAURL,true },
{ VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true }, { VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true }
{ VARIABLE_SHARE_SUBDIR_NAME,PREDEFVAR_SHARE_SUBDIR_NAME, RTL_CONSTASCII_LENGTH(VARIABLE_SHARE_SUBDIR_NAME), false }
}; };
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
@@ -992,8 +990,7 @@ throw ( RuntimeException )
bool bMatch = true; bool bMatch = true;
if ( pIterFixed->eVariable == PREDEFVAR_LANG || if ( pIterFixed->eVariable == PREDEFVAR_LANG ||
pIterFixed->eVariable == PREDEFVAR_LANGID || pIterFixed->eVariable == PREDEFVAR_LANGID ||
pIterFixed->eVariable == PREDEFVAR_VLANG || pIterFixed->eVariable == PREDEFVAR_VLANG )
pIterFixed->eVariable == PREDEFVAR_SHARE_SUBDIR_NAME )
{ {
// Special path variables as they can occur in the middle of a path. Only match if they // Special path variables as they can occur in the middle of a path. Only match if they
// describe a whole directory and not only a substring of a directory! // describe a whole directory and not only a substring of a directory!
@@ -1111,8 +1108,6 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
rtl::Bootstrap::expandMacros( rtl::Bootstrap::expandMacros(
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]); aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
aPreDefPathVariables.m_FixedVar[PREDEFVAR_SHARE_SUBDIR_NAME] = rtl::OUString(LIBO_SHARE_FOLDER);
// Get inspath and userpath from bootstrap mechanism in every case as file URL // Get inspath and userpath from bootstrap mechanism in every case as file URL
::utl::Bootstrap::PathStatus aState; ::utl::Bootstrap::PathStatus aState;
OUString sVal ; OUString sVal ;

24
officecfg/registry/data/org/openoffice/Office/Paths.xcu
View File

@@ -26,7 +26,7 @@
</node> </node>
<node oor:name="AutoCorrect" oor:op="fuse" oor:mandatory="true"> <node oor:name="AutoCorrect" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/autocorr" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autocorr" oor:op="fuse"/>
</node> </node>
<prop oor:name="WritePath"> <prop oor:name="WritePath">
<value>$(userurl)/autocorr</value> <value>$(userurl)/autocorr</value>
@@ -34,7 +34,7 @@
</node> </node>
<node oor:name="AutoText" oor:op="fuse" oor:mandatory="true"> <node oor:name="AutoText" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/autotext/$(vlang)" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)" oor:op="fuse"/>
</node> </node>
<prop oor:name="WritePath"> <prop oor:name="WritePath">
<value>$(userurl)/autotext</value> <value>$(userurl)/autotext</value>
@@ -52,7 +52,7 @@
</node> </node>
<node oor:name="Basic" oor:op="fuse" oor:mandatory="true"> <node oor:name="Basic" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/basic" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/basic" oor:op="fuse"/>
</node> </node>
<prop oor:name="WritePath"> <prop oor:name="WritePath">
<value>$(userurl)/basic</value> <value>$(userurl)/basic</value>
@@ -60,12 +60,12 @@
</node> </node>
<node oor:name="Bitmap" oor:op="fuse" oor:mandatory="true"> <node oor:name="Bitmap" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/config/symbol" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol" oor:op="fuse"/>
</node> </node>
</node> </node>
<node oor:name="Config" oor:op="fuse" oor:mandatory="true"> <node oor:name="Config" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config" oor:op="fuse"/>
</node> </node>
</node> </node>
<node oor:name="Favorite" oor:op="fuse" oor:mandatory="true"> <node oor:name="Favorite" oor:op="fuse" oor:mandatory="true">
@@ -80,7 +80,7 @@
</node> </node>
<node oor:name="Gallery" oor:op="fuse" oor:mandatory="true"> <node oor:name="Gallery" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/gallery" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/gallery" oor:op="fuse"/>
</node> </node>
<prop oor:name="WritePath"> <prop oor:name="WritePath">
<value>$(userurl)/gallery</value> <value>$(userurl)/gallery</value>
@@ -103,8 +103,8 @@
</node> </node>
<node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true"> <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/dict" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/dict" oor:op="fuse"/>
<node oor:name="$(insturl)/$(share_subdir_name)/dict/ooo" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/dict/ooo" oor:op="fuse"/>
</node> </node>
<prop oor:name="UserPaths"> <prop oor:name="UserPaths">
<value>$(userurl)/wordbook</value> <value>$(userurl)/wordbook</value>
@@ -112,7 +112,7 @@
</node> </node>
<node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true"> <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/wordbook" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/wordbook" oor:op="fuse"/>
</node> </node>
<prop oor:name="WritePath"> <prop oor:name="WritePath">
<value>$(userurl)/wordbook</value> <value>$(userurl)/wordbook</value>
@@ -135,7 +135,7 @@
</node> </node>
<node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true"> <node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node install:module="internallibexttextcatdata" oor:name="$(insturl)/$(share_subdir_name)/fingerprint" oor:op="fuse"/> <node install:module="internallibexttextcatdata" oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/fingerprint" oor:op="fuse"/>
<node install:module="externallibexttextcatdata" oor:name="${SYSTEM_LIBEXTTEXTCAT_DATA}" oor:op="fuse"/> <node install:module="externallibexttextcatdata" oor:name="${SYSTEM_LIBEXTTEXTCAT_DATA}" oor:op="fuse"/>
</node> </node>
</node> </node>
@@ -158,7 +158,7 @@
</node> </node>
<node oor:name="Template" oor:op="fuse" oor:mandatory="true"> <node oor:name="Template" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/template/$(vlang)" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)" oor:op="fuse"/>
</node> </node>
<prop oor:name="WritePath"> <prop oor:name="WritePath">
<value>$(userurl)/template</value> <value>$(userurl)/template</value>
@@ -166,7 +166,7 @@
</node> </node>
<node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true"> <node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/> <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config" oor:op="fuse"/>
</node> </node>
</node> </node>
<node oor:name="UserConfig" oor:op="fuse" oor:mandatory="true"> <node oor:name="UserConfig" oor:op="fuse" oor:mandatory="true">

4
officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
View File

@@ -1241,12 +1241,12 @@
<node oor:name="BackgroundImages"> <node oor:name="BackgroundImages">
<node oor:name="1" oor:op="replace"> <node oor:name="1" oor:op="replace">
<prop oor:name="Href"> <prop oor:name="Href">
<value>$(inst)/$(share_subdir_name)/gallery/www-back/</value> <value>$(inst)/@LIBO_SHARE_FOLDER@/gallery/www-back/</value>
</prop> </prop>
</node> </node>
<node oor:name="2" oor:op="replace"> <node oor:name="2" oor:op="replace">
<prop oor:name="Href"> <prop oor:name="Href">
<value>$(inst)/$(share_subdir_name)/gallery/surface</value> <value>$(inst)/@LIBO_SHARE_FOLDER@/gallery/surface</value>
</prop> </prop>
</node> </node>
<node oor:name="3" oor:op="replace"> <node oor:name="3" oor:op="replace">

42
officecfg/registry/schema/org/openoffice/Office/Common.xcs
View File

@@ -1529,7 +1529,7 @@
<desc>Specifies the settings of the AutoCorrect dialog.</desc> <desc>Specifies the settings of the AutoCorrect dialog.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/autocorr</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/autocorr</it>
<it>$(userurl)/autocorr</it> <it>$(userurl)/autocorr</it>
</value> </value>
</prop> </prop>
@@ -1539,7 +1539,7 @@
modules.</desc> modules.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
<it>$(userurl)/autotext</it> <it>$(userurl)/autotext</it>
</value> </value>
</prop> </prop>
@@ -1555,7 +1555,7 @@
AutoPilots.</desc> AutoPilots.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/basic</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/basic</it>
<it>$(userurl)/basic</it> <it>$(userurl)/basic</it>
</value> </value>
</prop> </prop>
@@ -1564,20 +1564,20 @@
<desc>Contains the bitmap files which can be used for menu and <desc>Contains the bitmap files which can be used for menu and
toolbar icons.</desc> toolbar icons.</desc>
</info> </info>
<value>$(insturl)/$(share_subdir_name)/config/symbol</value> <value>$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol</value>
</prop> </prop>
<prop oor:name="Config" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Config" oor:type="xs:string" oor:nillable="false">
<info> <info>
<desc>Contains the configuration files. This value cannot be changed <desc>Contains the configuration files. This value cannot be changed
through the user interface.</desc> through the user interface.</desc>
</info> </info>
<value>$(insturl)/$(share_subdir_name)/config</value> <value>$(insturl)/@LIBO_SHARE_FOLDER@/config</value>
</prop> </prop>
<prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false">
<info> <info>
<desc>Contains the provided dictionaries.</desc> <desc>Contains the provided dictionaries.</desc>
</info> </info>
<value>$(insturl)/$(share_subdir_name)/wordbook</value> <value>$(insturl)/@LIBO_SHARE_FOLDER@/wordbook</value>
</prop> </prop>
<prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false">
<info> <info>
@@ -1598,7 +1598,7 @@
and multimedia files.</desc> and multimedia files.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/gallery</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/gallery</it>
<it>$(userurl)/gallery</it> <it>$(userurl)/gallery</it>
</value> </value>
</prop> </prop>
@@ -1620,7 +1620,7 @@
<desc>Contains the files that are necessary for the <desc>Contains the files that are necessary for the
spellcheck.</desc> spellcheck.</desc>
</info> </info>
<value>$(insturl)/$(share_subdir_name)/dict</value> <value>$(insturl)/@LIBO_SHARE_FOLDER@/dict</value>
</prop> </prop>
<prop oor:name="Module" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Module" oor:type="xs:string" oor:nillable="false">
<info> <info>
@@ -1665,8 +1665,8 @@
sub-folders.</desc> sub-folders.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
<it>$(insturl)/$(share_subdir_name)/template/common</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
<it>$(userurl)/template</it> <it>$(userurl)/template</it>
</value> </value>
</prop> </prop>
@@ -1677,7 +1677,7 @@
merged from UserConfig and from these folders.</desc> merged from UserConfig and from these folders.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/config</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/config</it>
</value> </value>
</prop> </prop>
<prop oor:name="UserConfig" oor:type="xs:string" oor:nillable="false"> <prop oor:name="UserConfig" oor:type="xs:string" oor:nillable="false">
@@ -1720,7 +1720,7 @@
AutoCorrect dialog.</desc> AutoCorrect dialog.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/autocorr</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/autocorr</it>
<it>$(userurl)/autocorr</it> <it>$(userurl)/autocorr</it>
</value> </value>
</prop> </prop>
@@ -1730,7 +1730,7 @@
located.</desc> located.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
<it>$(userurl)/autotext</it> <it>$(userurl)/autotext</it>
</value> </value>
</prop> </prop>
@@ -1747,7 +1747,7 @@
the AutoPilots, are located.</desc> the AutoPilots, are located.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/basic</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/basic</it>
<it>$(userurl)/basic</it> <it>$(userurl)/basic</it>
</value> </value>
</prop> </prop>
@@ -1756,21 +1756,21 @@
<desc>Specifies the default directory where the bitmap files, which <desc>Specifies the default directory where the bitmap files, which
can be used for the menu and toolbar icons, are located.</desc> can be used for the menu and toolbar icons, are located.</desc>
</info> </info>
<value>$(insturl)/$(share_subdir_name)/config/symbol</value> <value>$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol</value>
</prop> </prop>
<prop oor:name="Config" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Config" oor:type="xs:string" oor:nillable="false">
<info> <info>
<desc>Specifies the default directory where the configuration files <desc>Specifies the default directory where the configuration files
are stored.</desc> are stored.</desc>
</info> </info>
<value>$(insturl)/$(share_subdir_name)/config</value> <value>$(insturl)/@LIBO_SHARE_FOLDER@/config</value>
</prop> </prop>
<prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false">
<info> <info>
<desc>Specifies the default directory where the provided <desc>Specifies the default directory where the provided
dictionaries are located.</desc> dictionaries are located.</desc>
</info> </info>
<value>$(insturl)/$(share_subdir_name)/wordbook/$(vlang)</value> <value>$(insturl)/@LIBO_SHARE_FOLDER@/wordbook/$(vlang)</value>
</prop> </prop>
<prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false">
<info> <info>
@@ -1792,7 +1792,7 @@
multimedia files are located.</desc> multimedia files are located.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/gallery</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/gallery</it>
<it>$(userurl)/gallery</it> <it>$(userurl)/gallery</it>
</value> </value>
</prop> </prop>
@@ -1815,7 +1815,7 @@
<desc>Specifies the default directory where the files that are <desc>Specifies the default directory where the files that are
necessary for the spellcheck are saved.</desc> necessary for the spellcheck are saved.</desc>
</info> </info>
<value>$(insturl)/$(share_subdir_name)/dict</value> <value>$(insturl)/@LIBO_SHARE_FOLDER@/dict</value>
</prop> </prop>
<prop oor:name="Module" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Module" oor:type="xs:string" oor:nillable="false">
<info> <info>
@@ -1853,8 +1853,8 @@
are located in folders and sub-folders.</desc> are located in folders and sub-folders.</desc>
</info> </info>
<value> <value>
<it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
<it>$(insturl)/$(share_subdir_name)/template/common</it> <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
<it>$(userurl)/template</it> <it>$(userurl)/template</it>
</value> </value>
</prop> </prop>

55
officecfg/util/alllang.xsl
View File

@@ -34,6 +34,8 @@
<xsl:param name="schemaRoot">.</xsl:param> <xsl:param name="schemaRoot">.</xsl:param>
<xsl:param name="fallback-locale">en-US</xsl:param> <xsl:param name="fallback-locale">en-US</xsl:param>
<xsl:param name="LIBO_SHARE_FOLDER"/>
<xsl:variable name="schemaRootURL"> <xsl:variable name="schemaRootURL">
<xsl:value-of select="$schemaRoot"/> <xsl:value-of select="$schemaRoot"/>
</xsl:variable> </xsl:variable>
@@ -91,7 +93,7 @@
<xsl:if test="@xml:lang=$locale and not(@install:module)"> <xsl:if test="@xml:lang=$locale and not(@install:module)">
<xsl:copy> <xsl:copy>
<xsl:apply-templates select = "@*" mode="locale"/> <xsl:apply-templates select = "@*" mode="locale"/>
<xsl:copy-of select="node()"/> <xsl:apply-templates select="node()"/>
</xsl:copy> </xsl:copy>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
@@ -265,8 +267,7 @@
<xsl:when test="not($module) and ancestor-or-self::*/@install:module"/> <xsl:when test="not($module) and ancestor-or-self::*/@install:module"/>
<xsl:otherwise> <xsl:otherwise>
<xsl:copy> <xsl:copy>
<xsl:apply-templates select = "@*"/> <xsl:apply-templates select = "@*|node()"/>
<xsl:copy-of select="node()"/>
</xsl:copy> </xsl:copy>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
@@ -275,12 +276,17 @@
<xsl:template match="value" mode="fallback-locale"> <xsl:template match="value" mode="fallback-locale">
<xsl:if test="@xml:lang=$fallback-locale and not(@install:module)"> <xsl:if test="@xml:lang=$fallback-locale and not(@install:module)">
<xsl:copy> <xsl:copy>
<xsl:apply-templates select = "@*"/> <xsl:apply-templates select = "@*|node()"/>
<xsl:copy-of select="node()"/>
</xsl:copy> </xsl:copy>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
<xsl:template match ="it|unicode">
<xsl:copy>
<xsl:apply-templates select = "@*|node()"/>
</xsl:copy>
</xsl:template>
<xsl:template match = "@*"> <xsl:template match = "@*">
<xsl:copy/> <xsl:copy/>
</xsl:template> </xsl:template>
@@ -333,4 +339,43 @@
<xsl:value-of select="$fileURL"/> <xsl:value-of select="$fileURL"/>
</xsl:template> </xsl:template>
<xsl:template match="@oor:name">
<xsl:attribute name="oor:name">
<xsl:call-template name="replace">
<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:call-template>
</xsl:attribute>
</xsl:template>
<xsl:template match="text()">
<xsl:call-template name="replace">
<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:call-template>
</xsl:template>
<xsl:template name="replace">
<xsl:param name="input"/>
<xsl:param name="pattern"/>
<xsl:param name="replace"/>
<xsl:choose>
<xsl:when test="contains($input, $pattern)">
<xsl:value-of select="substring-before($input, $pattern)"/>
<xsl:value-of select="$replace"/>
<xsl:call-template name="replace">
<xsl:with-param
name="input" select="substring-after($input, $pattern)"/>
<xsl:with-param name="pattern" select="$pattern"/>
<xsl:with-param name="replace" select="$replace"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$input"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:transform> </xsl:transform>

40
officecfg/util/schema_trim.xsl
View File

@@ -23,6 +23,8 @@
xmlns:oor="http://openoffice.org/2001/registry" xmlns:oor="http://openoffice.org/2001/registry"
version="1.0"> version="1.0">
<xsl:param name="LIBO_SHARE_FOLDER"/>
<!-- Get the correct format --> <!-- Get the correct format -->
<xsl:output method="xml" indent="yes"/> <xsl:output method="xml" indent="yes"/>
<xsl:namespace-alias stylesheet-prefix="xs" result-prefix="xs"></xsl:namespace-alias> <xsl:namespace-alias stylesheet-prefix="xs" result-prefix="xs"></xsl:namespace-alias>
@@ -68,9 +70,43 @@
<!-- copy all other values with content --> <!-- copy all other values with content -->
<xsl:template match="value"> <xsl:template match="value">
<xsl:copy> <xsl:copy>
<xsl:apply-templates select="@*"/> <xsl:apply-templates select="@*|node()"/>
<xsl:copy-of select="node()"/>
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>
<xsl:template match ="it|unicode">
<xsl:copy>
<xsl:apply-templates select = "@*|node()"/>
</xsl:copy>
</xsl:template>
<xsl:template match="text()">
<xsl:call-template name="replace">
<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:call-template>
</xsl:template>
<xsl:template name="replace">
<xsl:param name="input"/>
<xsl:param name="pattern"/>
<xsl:param name="replace"/>
<xsl:choose>
<xsl:when test="contains($input, $pattern)">
<xsl:value-of select="substring-before($input, $pattern)"/>
<xsl:value-of select="$replace"/>
<xsl:call-template name="replace">
<xsl:with-param
name="input" select="substring-after($input, $pattern)"/>
<xsl:with-param name="pattern" select="$pattern"/>
<xsl:with-param name="replace" select="$replace"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$input"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:transform> </xsl:transform>

4
solenv/gbuild/Configuration.mk
View File

@@ -84,6 +84,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(3) && \ $(3) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \ $(gb_Configuration_XSLTCOMMAND) --nonet \
-o $(1) \ -o $(1) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
$(gb_XcsTarget_XSLT_SchemaTrim) \ $(gb_XcsTarget_XSLT_SchemaTrim) \
$(3)) $(3))
endef endef
@@ -120,6 +121,7 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1) \ -o $(1) \
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
--path $(SRCDIR)/officecfg/registry \ --path $(SRCDIR)/officecfg/registry \
$(gb_XcuTarget_XSLT_AllLang) \ $(gb_XcuTarget_XSLT_AllLang) \
$(3)) $(3))
@@ -155,6 +157,7 @@ $(call gb_Helper_abbreviate_dirs,\
--stringparam xcs $(4) \ --stringparam xcs $(4) \
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--stringparam module $(notdir $(subst -,/,$(basename $(notdir $(2))))) \ --stringparam module $(notdir $(subst -,/,$(basename $(notdir $(2))))) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
$(gb_XcuTarget_XSLT_AllLang) \ $(gb_XcuTarget_XSLT_AllLang) \
$(3)) $(3))
endef endef
@@ -251,6 +254,7 @@ $(call gb_Helper_abbreviate_dirs,\
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--stringparam locale $(word 2,$(subst /, ,$(2))) \ --stringparam locale $(word 2,$(subst /, ,$(2))) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
--path $(SRCDIR)/officecfg/registry \ --path $(SRCDIR)/officecfg/registry \
$(gb_XcuTarget_XSLT_AllLang) \ $(gb_XcuTarget_XSLT_AllLang) \
$(3)) $(3))

25
wizards/CustomTarget_share.mk Normal file
View File

@@ -0,0 +1,25 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_CustomTarget_CustomTarget,wizards/share))
$(call gb_CustomTarget_get_target,wizards/share): \
$(call gb_CustomTarget_get_workdir,wizards/share)/dialog.xlc \
$(call gb_CustomTarget_get_workdir,wizards/share)/script.xlc
$(call gb_CustomTarget_get_workdir,wizards/share)/%.xlc: \
$(SRCDIR)/wizards/source/configshare/%.xlc \
| $(call gb_CustomTarget_get_workdir,wizards/share)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e 's/@LIBO_SHARE_FOLDER@/$(LIBO_SHARE_FOLDER)/' $< > $@
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
# vim: set noet sw=4 ts=4:

1
wizards/Module_wizards.mk
View File

@@ -20,6 +20,7 @@
$(eval $(call gb_Module_Module,wizards)) $(eval $(call gb_Module_Module,wizards))
$(eval $(call gb_Module_add_targets,wizards,\ $(eval $(call gb_Module_add_targets,wizards,\
CustomTarget_share \
Package_access2base \ Package_access2base \
Package_depot \ Package_depot \
Package_euro \ Package_euro \

2
wizards/Package_share.mk
View File

@@ -17,7 +17,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
$(eval $(call gb_Package_Package,wizards_basicshare,$(SRCDIR)/wizards/source/configshare)) $(eval $(call gb_Package_Package,wizards_basicshare,$(call gb_CustomTarget_get_workdir,wizards/share)))
$(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\ $(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\
dialog.xlc \ dialog.xlc \

18
wizards/source/configshare/dialog.xlc
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd"> <!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink"> <library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
<library:library library:name="FormWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/FormWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="FormWizard" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/FormWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Template" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Template/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Template" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Template/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Tools" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Tools/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Tools" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Tools/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Gimmicks" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Gimmicks/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Gimmicks" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Gimmicks/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="ImportWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ImportWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="ImportWizard" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ImportWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Euro" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Euro/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Euro" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Euro/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Depot" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Depot" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Access2Base" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Access2Base/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Access2Base" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Access2Base/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
</library:libraries> </library:libraries>

18
wizards/source/configshare/script.xlc
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd"> <!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink"> <library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
<library:library library:name="FormWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/FormWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="FormWizard" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/FormWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Template" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Template/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Template" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Template/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Tools" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Tools/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Tools" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Tools/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Gimmicks" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Gimmicks/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Gimmicks" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Gimmicks/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="ImportWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ImportWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="ImportWizard" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ImportWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Euro" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Euro/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Euro" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Euro/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Depot" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Depot" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
<library:library library:name="Access2Base" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Access2Base/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> <library:library library:name="Access2Base" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Access2Base/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
</library:libraries> </library:libraries>