diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-18 20:41:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-18 20:44:51 +0200 |
| commit | ee5403b98bf0e89693a14f7a1ae5658d9e5eb730 (patch) | |
| tree | 970ef68163338b47335e54ca7e95b81a641acd2c /officecfg | |
| parent | 0d38f7fe957a7dd60e793ced3d60cb7d40b58ef1 (diff) | |
officecfg: generate header for Impress-sdremote, handle "-" in xcs name
Change-Id: I3f965a293cb6cbd5cafe42e1a05565282f2e10c7
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/cppheader.xsl | 18 | ||||
| -rw-r--r-- | officecfg/registry/files.mk | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl index 372876ec3adc..ac7dce79ee00 100644 --- a/officecfg/registry/cppheader.xsl +++ b/officecfg/registry/cppheader.xsl @@ -65,29 +65,29 @@ <xsl:param name="path"/> <xsl:text>#ifndef INCLUDED_OFFICECFG_</xsl:text> <xsl:value-of - select="translate($ns1, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/> + select="translate($ns1, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/> <xsl:if test="$ns2"> <xsl:text>_</xsl:text> <xsl:value-of - select="translate($ns2, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/> + select="translate($ns2, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/> <xsl:if test="$ns3"> <xsl:text>_</xsl:text> <xsl:value-of - select="translate($ns3, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/> + select="translate($ns3, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/> </xsl:if> </xsl:if> <xsl:text>_HXX
</xsl:text> <xsl:text>#define INCLUDED_OFFICECFG_</xsl:text> <xsl:value-of - select="translate($ns1, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/> + select="translate($ns1, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/> <xsl:if test="$ns2"> <xsl:text>_</xsl:text> <xsl:value-of - select="translate($ns2, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/> + select="translate($ns2, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/> <xsl:if test="$ns3"> <xsl:text>_</xsl:text> <xsl:value-of - select="translate($ns3, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/> + select="translate($ns3, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/> </xsl:if> </xsl:if> <xsl:text>_HXX
</xsl:text> @@ -113,13 +113,13 @@ <xsl:text>#include "comphelper/configuration.hxx"
</xsl:text> <xsl:text>
</xsl:text> <xsl:text>namespace officecfg { namespace </xsl:text> - <xsl:value-of select="$ns1"/> + <xsl:value-of select="translate($ns1, '-', '_')"/> <xsl:if test="$ns2"> <xsl:text> { namespace </xsl:text> - <xsl:value-of select="$ns2"/> + <xsl:value-of select="translate($ns2, '-', '_')"/> <xsl:if test="$ns3"> <xsl:text> { namespace </xsl:text> - <xsl:value-of select="$ns3"/> + <xsl:value-of select="translate($ns3, '-', '_')"/> </xsl:if> </xsl:if> <xsl:text> {
</xsl:text> diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk index 21a4a15c1f03..5e93fb486efa 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -1,4 +1,4 @@ -officecfg_FILES = \ +officecfg_FILES := \ FirstStartWizard \ Inet \ Interaction \ @@ -22,6 +22,7 @@ officecfg_FILES = \ Office/FormWizard \ Office/Histories \ Office/Impress \ + $(if $(filter YES,$(ENABLE_SDREMOTE)),Office/Impress-sdremote) \ Office/Java \ Office/Jobs \ Office/Labels \ |