diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-12-15 11:58:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-12-15 11:59:03 +0100 |
| commit | d24bd093602da47349e4b48a7e5082592dcded48 (patch) | |
| tree | 05af5f98e4eed99f9a0ac2f2ab4e67960bed940f | |
| parent | d11f2ccdcecca78bc654ca0b787ea112c1dfe10c (diff) | |
Correctly handle <set> directly within <component>.
| -rw-r--r-- | officecfg/registry/cppheader.xsl | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl index 5071fba7ee7e..df891c29e6e2 100644 --- a/officecfg/registry/cppheader.xsl +++ b/officecfg/registry/cppheader.xsl @@ -94,49 +94,47 @@ <xsl:text>
</xsl:text> <xsl:text>#include "sal/config.h"
</xsl:text> <xsl:text>
</xsl:text> - <xsl:if test=".//prop/@oor:nillable = 'true'"> - <xsl:text>#include "boost/optional.hpp"
</xsl:text> - </xsl:if> - <xsl:if test=".//prop/@oor:type = 'oor:any'"> - <xsl:text>#include "com/sun/star/uno/Any.hxx"
</xsl:text> - </xsl:if> - <xsl:if test=".//prop/@oor:type = 'xs:hexBinary' or .//prop/@oor:type = 'oor:boolean-list' or .//prop/@oor:type = 'oor:short-list' or .//prop/@oor:type = 'oor:int-list' or .//prop/@oor:type = 'oor:long-list' or .//prop/@oor:type = 'oor:double-list' or .//prop/@oor:type = 'oor:string-list'"> - <xsl:text>#include "com/sun/star/uno/Sequence.hxx"
</xsl:text> - </xsl:if> <xsl:if test=".//prop or .//set"> + <xsl:if test=".//prop/@oor:nillable = 'true'"> + <xsl:text>#include "boost/optional.hpp"
</xsl:text> + </xsl:if> + <xsl:if test=".//prop/@oor:type = 'oor:any'"> + <xsl:text>#include "com/sun/star/uno/Any.hxx"
</xsl:text> + </xsl:if> + <xsl:if test=".//prop/@oor:type = 'xs:hexBinary' or .//prop/@oor:type = 'oor:boolean-list' or .//prop/@oor:type = 'oor:short-list' or .//prop/@oor:type = 'oor:int-list' or .//prop/@oor:type = 'oor:long-list' or .//prop/@oor:type = 'oor:double-list' or .//prop/@oor:type = 'oor:string-list'"> + <xsl:text>#include "com/sun/star/uno/Sequence.hxx"
</xsl:text> + </xsl:if> <xsl:text>#include "rtl/ustring.h"
</xsl:text> <xsl:text>#include "rtl/ustring.hxx"
</xsl:text> - </xsl:if> - <xsl:if test=".//prop/@oor:type = 'xs:short' or .//prop/@oor:type = 'xs:int' or .//prop/@oor:type = 'xs:long' or .//prop/@oor:type = 'xs:hexBinary'"> - <xsl:text>#include "sal/types.h"
</xsl:text> - </xsl:if> - <xsl:if test=".//prop or .//set"> + <xsl:if test=".//prop/@oor:type = 'xs:short' or .//prop/@oor:type = 'xs:int' or .//prop/@oor:type = 'xs:long' or .//prop/@oor:type = 'xs:hexBinary'"> + <xsl:text>#include "sal/types.h"
</xsl:text> + </xsl:if> <xsl:text>#include "unotools/configuration.hxx"
</xsl:text> - </xsl:if> - <xsl:text>
</xsl:text> - <xsl:text>namespace officecfg { namespace </xsl:text> - <xsl:value-of select="$ns1"/> - <xsl:if test="$ns2"> - <xsl:text> { namespace </xsl:text> - <xsl:value-of select="$ns2"/> - <xsl:if test="$ns3"> + <xsl:text>
</xsl:text> + <xsl:text>namespace officecfg { namespace </xsl:text> + <xsl:value-of select="$ns1"/> + <xsl:if test="$ns2"> <xsl:text> { namespace </xsl:text> - <xsl:value-of select="$ns3"/> + <xsl:value-of select="$ns2"/> + <xsl:if test="$ns3"> + <xsl:text> { namespace </xsl:text> + <xsl:value-of select="$ns3"/> + </xsl:if> </xsl:if> - </xsl:if> - <xsl:text> {
</xsl:text> - <xsl:text>
</xsl:text> - <xsl:apply-templates select="group"> - <xsl:with-param name="path" select="$path"/> - </xsl:apply-templates> - <xsl:if test="$ns2"> - <xsl:text>} </xsl:text> - <xsl:if test="$ns3"> + <xsl:text> {
</xsl:text> + <xsl:text>
</xsl:text> + <xsl:apply-templates select="group|set|prop"> + <xsl:with-param name="path" select="$path"/> + </xsl:apply-templates> + <xsl:if test="$ns2"> <xsl:text>} </xsl:text> + <xsl:if test="$ns3"> + <xsl:text>} </xsl:text> + </xsl:if> </xsl:if> + <xsl:text>} }
</xsl:text> + <xsl:text>
</xsl:text> </xsl:if> - <xsl:text>} }
</xsl:text> - <xsl:text>
</xsl:text> <xsl:text>#endif
</xsl:text> </xsl:template> |