From c48b54d421b693ec82c476fef7e848459a5db32a Mon Sep 17 00:00:00 2001
From: "Henning Brinkmann[hbrinkm]" <hbrinkm@openoffice.org>
Date: Tue, 24 Nov 2009 16:01:39 +0100
Subject: [PATCH] writerfilter07: handle stereotypes of <attributes> correctly,
 use @token in <attribute>

---
 writerfilter/source/doctok/xmigen.xsl | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/writerfilter/source/doctok/xmigen.xsl b/writerfilter/source/doctok/xmigen.xsl
index b1ca4f113770..9d00b6c2c5d5 100644
--- a/writerfilter/source/doctok/xmigen.xsl
+++ b/writerfilter/source/doctok/xmigen.xsl
@@ -96,7 +96,9 @@
       <xsl:for-each select="stereotype">
 	<UML:ModelElement.stereotype>
 	  <UML:Stereotype>
-	    <xsl:value-of select="@name"/>
+	    <xsl:attribute name="xmi.idref">
+	      <xsl:value-of select="@name"/>
+	    </xsl:attribute>
 	  </UML:Stereotype>
 	</UML:ModelElement.stereotype>
       </xsl:for-each>
@@ -185,10 +187,17 @@
 	  <xsl:with-param name="value"></xsl:with-param>
 	</xsl:call-template>
 	<xsl:call-template name="taggedvalue">
-	  <xsl:with-param name="type">attrid</xsl:with-param>
+	  <xsl:with-param name="type">attrid</xsl:with-param>	  
 	  <xsl:with-param name="value">
-	    <xsl:text>rtf:</xsl:text>
-	    <xsl:value-of select="@name"/>
+	    <xsl:choose>
+	      <xsl:when test="@token">
+		<xsl:value-of select="@token"/>
+	      </xsl:when>
+	      <xsl:otherwise>
+		<xsl:text>rtf:</xsl:text>
+		<xsl:value-of select="@name"/>
+	      </xsl:otherwise>
+	    </xsl:choose>
 	  </xsl:with-param>
 	</xsl:call-template>
 	<xsl:if test="@array-count">