officecfg/registry/cppheader.xsl | 216 +++++++++++++++++++--------------------
1 file changed, 110 insertions(+), 106 deletions(-)
New commits:
commit 10f91e94c2880c10c546eef094630f5b5699f2b0
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Jul 19 20:29:21 2023 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Jul 25 21:33:27 2023 +0200
Do not emit C++ officecfg struct from deprecated property
This would prevent mistakes like what was fixed in commit
514cc22875a90c8faa3d946ad47ebb68bd710ac7.
Change-Id: Icc67d485461e23d25f2003303a243c830d48b8c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154623
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index 78e3bb05a10e..9fc13f39113e 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/officecfg/registry/cppheader.xsl
@@ -122,7 +122,7 @@
<xsl:template match="group">
<xsl:param name="path"/>
- <xsl:if test=".//prop or .//set">
+ <xsl:if test="not(info/deprecated) and (.//prop or .//set)">
<xsl:variable name="name" select="translate(@oor:name, '-.', '__')"/>
<xsl:text>struct </xsl:text>
<xsl:value-of select="$name"/>
@@ -157,115 +157,119 @@
<xsl:template match="set">
<xsl:param name="path"/>
- <xsl:variable name="name" select="translate(@oor:name, '-.', '__')"/>
- <xsl:text>struct </xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>: public comphelper::ConfigurationSet< </xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>> {
</xsl:text>
- <xsl:text> static OUString path() { static constexpr OUStringLiteral
PATH(<!--
- -->u"</xsl:text>
- <xsl:value-of select="$path"/>
- <xsl:text>/</xsl:text>
- <xsl:value-of select="@oor:name"/>
- <xsl:text>"); return PATH; }
</xsl:text>
- <xsl:text>private:
</xsl:text>
- <xsl:text> </xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>(); // not defined
</xsl:text>
- <xsl:text> ~</xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>(); // not defined
</xsl:text>
- <xsl:text>};
</xsl:text>
- <xsl:text>
</xsl:text>
+ <xsl:if test="not(info/deprecated)">
+ <xsl:variable name="name" select="translate(@oor:name, '-.', '__')"/>
+ <xsl:text>struct </xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>: public comphelper::ConfigurationSet< </xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>> {
</xsl:text>
+ <xsl:text> static OUString path() { static constexpr OUStringLiteral
PATH(<!--
+ -->u"</xsl:text>
+ <xsl:value-of select="$path"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="@oor:name"/>
+ <xsl:text>"); return PATH; }
</xsl:text>
+ <xsl:text>private:
</xsl:text>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>(); // not defined
</xsl:text>
+ <xsl:text> ~</xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>(); // not defined
</xsl:text>
+ <xsl:text>};
</xsl:text>
+ <xsl:text>
</xsl:text>
+ </xsl:if>
</xsl:template>
<xsl:template match="prop">
<xsl:param name="path"/>
- <xsl:variable name="name" select="translate(@oor:name, '-.', '__')"/>
- <xsl:text>struct </xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>: public comphelper::</xsl:text>
- <xsl:choose>
- <xsl:when test="@oor:localized = 'true'">
- <xsl:text>ConfigurationLocalizedProperty</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>ConfigurationProperty</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text><</xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>, </xsl:text>
- <xsl:if test="not(@oor:nillable = 'false')">
- <xsl:text>std::optional<</xsl:text>
- </xsl:if>
- <xsl:choose>
- <xsl:when test="@oor:type='oor:any'">
- <xsl:text>com::sun::star::uno::Any</xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='xs:boolean'">
- <xsl:text>bool</xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='xs:short'">
- <xsl:text>sal_Int16</xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='xs:int'">
- <xsl:text>sal_Int32</xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='xs:long'">
- <xsl:text>sal_Int64</xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='xs:double'">
- <xsl:text>double</xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='xs:string'">
- <xsl:text>OUString</xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='xs:hexBinary'">
- <xsl:text>com::sun::star::uno::Sequence<sal_Int8> </xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='oor:boolean-list'">
- <xsl:text>com::sun::star::uno::Sequence<bool> </xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='oor:short-list'">
- <xsl:text>com::sun::star::uno::Sequence<sal_Int16> </xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='oor:int-list'">
- <xsl:text>com::sun::star::uno::Sequence<sal_Int32> </xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='oor:long-list'">
- <xsl:text>com::sun::star::uno::Sequence<sal_Int64> </xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='oor:double-list'">
- <xsl:text>com::sun::star::uno::Sequence<double> </xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='oor:string-list'">
- <xsl:text>com::sun::star::uno::Sequence<OUString> </xsl:text>
- </xsl:when>
- <xsl:when test="@oor:type='oor:hexBinary-list'">
- <xsl:text>com::sun::star::uno::Sequence<<!--
- -->com::sun::star::uno::Sequence<sal_Int8> > </xsl:text>
- </xsl:when>
- </xsl:choose>
- <xsl:if test="not(@oor:nillable = 'false')">
- <xsl:text>> </xsl:text>
+ <xsl:if test="not(info/deprecated)">
+ <xsl:variable name="name" select="translate(@oor:name, '-.', '__')"/>
+ <xsl:text>struct </xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>: public comphelper::</xsl:text>
+ <xsl:choose>
+ <xsl:when test="@oor:localized = 'true'">
+ <xsl:text>ConfigurationLocalizedProperty</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>ConfigurationProperty</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text><</xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>, </xsl:text>
+ <xsl:if test="not(@oor:nillable = 'false')">
+ <xsl:text>std::optional<</xsl:text>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="@oor:type='oor:any'">
+ <xsl:text>com::sun::star::uno::Any</xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='xs:boolean'">
+ <xsl:text>bool</xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='xs:short'">
+ <xsl:text>sal_Int16</xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='xs:int'">
+ <xsl:text>sal_Int32</xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='xs:long'">
+ <xsl:text>sal_Int64</xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='xs:double'">
+ <xsl:text>double</xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='xs:string'">
+ <xsl:text>OUString</xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='xs:hexBinary'">
+ <xsl:text>com::sun::star::uno::Sequence<sal_Int8> </xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='oor:boolean-list'">
+ <xsl:text>com::sun::star::uno::Sequence<bool> </xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='oor:short-list'">
+ <xsl:text>com::sun::star::uno::Sequence<sal_Int16> </xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='oor:int-list'">
+ <xsl:text>com::sun::star::uno::Sequence<sal_Int32> </xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='oor:long-list'">
+ <xsl:text>com::sun::star::uno::Sequence<sal_Int64> </xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='oor:double-list'">
+ <xsl:text>com::sun::star::uno::Sequence<double> </xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='oor:string-list'">
+ <xsl:text>com::sun::star::uno::Sequence<OUString> </xsl:text>
+ </xsl:when>
+ <xsl:when test="@oor:type='oor:hexBinary-list'">
+ <xsl:text>com::sun::star::uno::Sequence<<!--
+ -->com::sun::star::uno::Sequence<sal_Int8> > </xsl:text>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:if test="not(@oor:nillable = 'false')">
+ <xsl:text>> </xsl:text>
+ </xsl:if>
+ <xsl:text>> {
</xsl:text>
+ <xsl:text> static OUString path() { static constexpr OUStringLiteral
PATH(<!--
+ -->u"</xsl:text>
+ <xsl:value-of select="$path"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="@oor:name"/>
+ <xsl:text>"); return PATH; }
</xsl:text>
+ <xsl:text>private:
</xsl:text>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>(); // not defined
</xsl:text>
+ <xsl:text> ~</xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>(); // not defined
</xsl:text>
+ <xsl:text>};
</xsl:text>
+ <xsl:text>
</xsl:text>
</xsl:if>
- <xsl:text>> {
</xsl:text>
- <xsl:text> static OUString path() { static constexpr OUStringLiteral
PATH(<!--
- -->u"</xsl:text>
- <xsl:value-of select="$path"/>
- <xsl:text>/</xsl:text>
- <xsl:value-of select="@oor:name"/>
- <xsl:text>"); return PATH; }
</xsl:text>
- <xsl:text>private:
</xsl:text>
- <xsl:text> </xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>(); // not defined
</xsl:text>
- <xsl:text> ~</xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>(); // not defined
</xsl:text>
- <xsl:text>};
</xsl:text>
- <xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
