[Libreoffice-commits] core.git: 2 commits - cui/source writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Sat Mar 29 11:34:48 PDT 2014


 cui/source/tabpages/tparea.cxx           |   15 
 writerfilter/source/dmapper/genclass.xsl |  710 -------------------------------
 2 files changed, 725 deletions(-)

New commits:
commit 0353a71eb008d9731bfe369244e8691934c323fe
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 29 19:27:23 2014 +0100

    writerfilter: remove unused genclass.xsl
    
    Change-Id: I4a76c13fb01e728613211ae3e4959f75a151ff33

diff --git a/writerfilter/source/dmapper/genclass.xsl b/writerfilter/source/dmapper/genclass.xsl
deleted file mode 100644
index 994b35d..0000000
--- a/writerfilter/source/dmapper/genclass.xsl
+++ /dev/null
@@ -1,710 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    xmlns:xalan="http://xml.apache.org/xalan"
-    exclude-result-prefixes = "xalan"
-    xml:indent="true">
-  <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="no"/>
-
-  <xsl:template match="/">
-    <xsl:for-each select="/model/class">
-      <xsl:choose>
-	<xsl:when test="$filetype='inc'">
-	  <xsl:call-template name="incfile"/>
-	</xsl:when>
-	<xsl:when test="$filetype='impl'">
-	  <xsl:call-template name="implfile"/>
-	</xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="license">
-    <xsl:text>/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */&#xa;</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="memberid">
-    <xsl:variable name="member">
-      <xsl:choose>
-	<xsl:when test="@member">
-	  <xsl:value-of select="@member"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="@name"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:for-each select="ancestor::class/member[@name=$member]">
-      <xsl:choose>
-	<xsl:when test="@type='bool'">
-	  <xsl:text>m_b</xsl:text>
-	</xsl:when>
-	<xsl:when test="@type='OUString'">
-	  <xsl:text>m_s</xsl:text>
-	</xsl:when>
-	<xsl:when test="@type='sal_uInt32'">
-	  <xsl:text>m_n</xsl:text>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:text>m_</xsl:text>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:call-template name="capfirst">
-      <xsl:with-param name="string" select="$member"/>
-    </xsl:call-template>
-  </xsl:template>
-  
-  <xsl:template name="incfile">
-    <xsl:call-template name="license"/>
-    <xsl:for-each select="//class">
-      <xsl:variable name="includeguard">
-	<xsl:text>INCLUDED_</xsl:text>
-	<xsl:value-of select="@name"/>
-	<xsl:text>_HXX</xsl:text>
-	</xsl:variable>
-	<xsl:text>#ifndef </xsl:text>
-	<xsl:value-of select="$includeguard"/>
-	<xsl:text>&#xa;#define </xsl:text>
-	<xsl:value-of select="$includeguard"/>
-	<xsl:text>&#xa;#include <resourcemodel/WW8ResourceModel.hxx></xsl:text>
-	<xsl:text>&#xa;#include <rtl/ustring.hxx></xsl:text>
-	<xsl:text>&#xa;namespace writerfilter {</xsl:text>
-	<xsl:text>&#xa;namespace dmapper {</xsl:text>
-	<xsl:call-template name="classdecl"/>
-	<xsl:text>&#xa;}}</xsl:text>
-	<xsl:text>&#xa;#endif //</xsl:text>
-	<xsl:value-of select="$includeguard"/>
-	<xsl:text>&#xa;</xsl:text>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="implfile">
-    <xsl:call-template name="license"/>
-    <xsl:for-each select="//class">
-      <xsl:text>#include "</xsl:text>
-      <xsl:value-of select="@name"/>
-      <xsl:text>.hxx"&#xa;</xsl:text>
-      <xsl:text>&#xa;#include <ooxml/resourceids.hxx></xsl:text>
-      <xsl:text>&#xa;#ifdef DEBUG_DOMAINMAPPER</xsl:text>
-      <xsl:text>&#xa;#include <resourcemodel/QNameToString.hxx></xsl:text>
-      <xsl:text>&#xa;#include "dmapperLoggers.hxx"</xsl:text>
-      <xsl:text>&#xa;#endif</xsl:text>
-      <xsl:text>&#xa;namespace writerfilter {</xsl:text>
-      <xsl:text>&#xa;namespace dmapper {&#xa;</xsl:text>
-      <xsl:call-template name="classimpl"/>
-      <xsl:text>}}&#xa;</xsl:text>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="classdecl">
-    <xsl:text>&#xa;class </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:if test="parent">
-      <xsl:text> : public </xsl:text>
-    </xsl:if>
-    <xsl:for-each select="parent">
-      <xsl:if test="position() > 1">
-	<xsl:text>, </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="@name"/>
-    </xsl:for-each>
-    <xsl:text>&#xa;{</xsl:text>
-    <xsl:text>&#xa;public:</xsl:text>
-    <xsl:call-template name="typedefs"/>
-    <xsl:text>&#xa;    // constructor</xsl:text>
-    <xsl:text>&#xa;    </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>();</xsl:text>
-    <xsl:text>&#xa;    // destructor</xsl:text>
-    <xsl:text>&#xa;    virtual ~</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>();&#xa;</xsl:text>
-    <xsl:call-template name="memberfuncdecls"/>
-    <xsl:for-each select="sprm">
-      <xsl:text>&#xa;    // sprm</xsl:text>
-      <xsl:text>&#xa;    void sprm(Sprm & r_sprm);</xsl:text>
-      <xsl:text>&#xa;    void resolveSprm(Sprm & r_sprm);&#xa;</xsl:text>
-    </xsl:for-each>
-    <xsl:for-each select="attribute">
-      <xsl:text>&#xa;    // attribute</xsl:text>
-      <xsl:text>&#xa;    void attribute(Id name, Value & val);&#xa;</xsl:text>
-    </xsl:for-each>
-    <xsl:text>&#xa;private:</xsl:text>
-    <xsl:call-template name="memberdecls"/>
-    <xsl:text>&#xa;};&#xa;&#xa;</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="type">
-    <xsl:param name="name"/>
-    <xsl:choose>
-      <xsl:when test="$name='OUString'">
-	<xsl:text>OUString</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="typedefs">
-    <xsl:text>&#xa;    // typedefs</xsl:text>
-    <xsl:for-each select="typedef">
-      <xsl:text>&#xa;    typedef </xsl:text>
-      <xsl:choose>
-	<xsl:when test="@type = 'shared_ptr'">
-	  <xsl:text>::boost::shared_ptr<</xsl:text>
-	  <xsl:value-of select="ancestor::class/@name"/>
-	  <xsl:text>></xsl:text>
-	</xsl:when>
-	<xsl:otherwise>
-	</xsl:otherwise>
-      </xsl:choose>
-      <xsl:for-each select="vector">
-	<xsl:text>::std::vector<</xsl:text>
-	<xsl:call-template name="cctype"/>
-	<xsl:text>></xsl:text>
-      </xsl:for-each>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="@name"/>
-      <xsl:text>;</xsl:text>
-    </xsl:for-each>
-    <xsl:text>&#xa;</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="settername">
-    <xsl:text>set</xsl:text>
-    <xsl:call-template name="capfirst">
-      <xsl:with-param name="string" select="@name"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="gettername">
-    <xsl:text>get</xsl:text>
-    <xsl:call-template name="capfirst">
-      <xsl:with-param name="string" select="@name"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="pushbackname">
-    <xsl:value-of select="@name"/>
-    <xsl:text>PushBack</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="settersig">    
-    <xsl:param name="classname"/>
-    <xsl:variable name="impl">
-      <xsl:if test="string-length($classname) > 0">
-	<xsl:text>true</xsl:text>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:text>void </xsl:text>
-    <xsl:if test="string-length($classname) > 0">
-      <xsl:value-of select="$classname"/>
-      <xsl:text>::</xsl:text>
-    </xsl:if>
-    <xsl:call-template name="settername"/>
-    <xsl:text>(</xsl:text>
-    <xsl:call-template name="constcctyperef">
-      <xsl:with-param name="impl" select="$impl"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="paramname"/>
-    <xsl:text>)</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="gettersig">
-    <xsl:param name="classname"/>    
-    <xsl:variable name="impl">
-      <xsl:if test="string-length($classname) > 0">
-	<xsl:text>true</xsl:text>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="type" select="@type"/>
-    <xsl:call-template name="constcctyperef">
-      <xsl:with-param name="impl" select="$impl"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:if test="string-length($classname) > 0">
-      <xsl:value-of select="$classname"/>
-      <xsl:text>::</xsl:text>
-    </xsl:if>    
-    <xsl:call-template name="gettername"/>
-    <xsl:text>() const</xsl:text>
-  </xsl:template>
-  
-  <xsl:template name="pushbacksig">
-    <xsl:param name="classname"/>    
-    <xsl:variable name="pushback">
-      <xsl:call-template name="pushbackname"/>
-    </xsl:variable>
-    <xsl:variable name="type" select="@type"/>
-    <xsl:for-each select="ancestor::class/typedef[@name=$type]">
-      <xsl:for-each select="vector">
-	<xsl:text>void </xsl:text>
-	<xsl:if test="string-length($classname) > 0">
-	  <xsl:value-of select="$classname"/>
-	  <xsl:text>::</xsl:text>
-	</xsl:if>    
-	<xsl:value-of select="$pushback"/>
-	<xsl:text>(</xsl:text>
-	<xsl:call-template name="constcctyperef">
-	  <xsl:with-param name="deep">true</xsl:with-param>
-	</xsl:call-template>
-	<xsl:text> r_Element</xsl:text>
-	<xsl:text>)</xsl:text>
-      </xsl:for-each>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="memberfuncdecls">
-    <xsl:for-each select="member">
-      <xsl:text>&#xa;    // member: </xsl:text>
-      <xsl:value-of select="@name"/>
-      <xsl:text>&#xa;    </xsl:text>
-      <xsl:call-template name="settersig"/>
-      <xsl:text>;</xsl:text>
-      <xsl:text>&#xa;    </xsl:text>
-      <xsl:call-template name="gettersig"/>
-      <xsl:text>;&#xa;    </xsl:text>
-      <xsl:variable name="pushback">
-	<xsl:call-template name="pushbacksig"/>
-      </xsl:variable>
-      <xsl:if test="string-length($pushback) > 0">
-	<xsl:value-of select="$pushback"/>
-	<xsl:text>;&#xa;</xsl:text>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="memberdecls">
-    <xsl:for-each select="member">
-      <xsl:text>&#xa;    </xsl:text>
-      <xsl:call-template name="cctype"/>
-      <xsl:text> </xsl:text>
-      <xsl:call-template name="memberid"/>
-      <xsl:text>;</xsl:text>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="cctype">
-    <xsl:param name="deep"/>
-    <xsl:param name="impl"/>
-    <xsl:variable name="type" select="@type"/>
-    <xsl:variable name="try1">
-      <xsl:if test="$deep='true'">
-	<xsl:for-each select="ancestor::class/typedef[@name=$type]">
-	  <xsl:for-each select="vector">
-	    <xsl:call-template name="cctype">
-	      <xsl:with-param name="impl" select="$impl"/>
-	      <xsl:with-param name="deep" select="$deep"/>
-	    </xsl:call-template>
-	  </xsl:for-each>
-	</xsl:for-each>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="string-length($try1) > 0">
-	<xsl:value-of select="$try1"/>
-      </xsl:when>
-      <xsl:when test="@type='OUString'">
-	<xsl:text>OUString</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:if test="$impl='true'">
-	  <xsl:for-each select="ancestor::class">
-	    <xsl:variable name="classname" select="@name"/>
-	    <xsl:for-each select="typedef[@name=$type]">
-	      <xsl:value-of select="$classname"/>
-	      <xsl:text>::</xsl:text>
-	    </xsl:for-each>
-	  </xsl:for-each>
-	</xsl:if>
-	<xsl:value-of select="@type"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="constcctype">
-    <xsl:param name="impl"/>
-    <xsl:choose>
-      <xsl:when test="@type='bool' or @type='sal_uInt32'">
-	<xsl:value-of select="@type"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:text>const </xsl:text>
-	<xsl:call-template name="cctype">
-	  <xsl:with-param name="impl" select="$impl"/>
-	</xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="constcctyperef">
-    <xsl:param name="impl"/>
-    <xsl:choose>
-      <xsl:when test="@type='bool' or @type='sal_uInt32'">
-	<xsl:value-of select="@type"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:call-template name="constcctype">
-	  <xsl:with-param name="impl" select="$impl"/>
-	</xsl:call-template>
-	<xsl:text> &</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="capfirst">
-    <xsl:param name="string"/>
-    <xsl:variable name="first" select="translate(substring($string, 1,1), 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
-    <xsl:value-of select="concat($first, substring($string, 2))"/>
-  </xsl:template>
-
-  <xsl:template name="paramname">
-    <xsl:choose>
-      <xsl:when test="@type='OUString'">
-	<xsl:text>r_s</xsl:text>
-	<xsl:call-template name="capfirst">
-	  <xsl:with-param name="string" select="@name"/>
-	</xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:text>r_</xsl:text>
-	<xsl:value-of select="@name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="setterimpl">
-    <xsl:call-template name="settersig">
-      <xsl:with-param name="classname" select="ancestor::class/@name"/>
-    </xsl:call-template>
-    <xsl:text>&#xa;{</xsl:text>
-    <xsl:text>&#xa;    </xsl:text>
-    <xsl:call-template name="memberid"/>
-    <xsl:text> = </xsl:text>
-    <xsl:call-template name="paramname"/>
-    <xsl:text>;</xsl:text>
-    <xsl:text>&#xa;}&#xa;&#xa;</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="getterimpl">
-    <xsl:call-template name="gettersig">
-      <xsl:with-param name="classname" select="ancestor::class/@name"/>
-    </xsl:call-template>
-    <xsl:text>&#xa;{</xsl:text>
-    <xsl:text>&#xa;    return </xsl:text>
-    <xsl:call-template name="memberid"/>
-    <xsl:text>;</xsl:text>
-    <xsl:text>&#xa;}&#xa;&#xa;</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="pushbackimpl">
-    <xsl:variable name="sig">
-      <xsl:call-template name="pushbacksig">
-	<xsl:with-param name="classname" select="ancestor::class/@name"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="string-length($sig) > 0">
-      <xsl:value-of select="$sig"/>
-      <xsl:text>&#xa;{</xsl:text>
-      <xsl:text>&#xa;    </xsl:text>
-      <xsl:call-template name="memberid"/>
-      <xsl:text>.push_back(r_Element);</xsl:text>
-      <xsl:text>&#xa;}&#xa;&#xa;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="getvalue">
-    <xsl:param name="valuePrefix"/>
-    <xsl:choose>
-      <xsl:when test="@type='OUString'">
-	<xsl:value-of select="$valuePrefix"/>
-	<xsl:text>getString()</xsl:text>
-      </xsl:when>
-      <xsl:when test="@type='bool' or @type='sal_uInt32'">
-	<xsl:value-of select="$valuePrefix"/>
-	<xsl:text>getInt()</xsl:text>
-      </xsl:when>
-      <xsl:when test="@type">
-	<xsl:variable name="type" select="@type"/>
-	<xsl:for-each select="ancestor::class/typedef[@name=$type]">
-	  <xsl:call-template name="getvalue">
-	    <xsl:with-param name="valuePrefix" select="$valuePrefix"/>
-	  </xsl:call-template>
-	</xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:variable name="member">
-	  <xsl:choose>
-	    <xsl:when test="@member">
-	      <xsl:value-of select="@member"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:value-of select="@name"/>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:variable>
-	<xsl:for-each select="ancestor::class/member[@name=$member]">
-	  <xsl:call-template name="getvalue">
-	    <xsl:with-param name="valuePrefix" select="$valuePrefix"/>
-	  </xsl:call-template>
-	</xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:for-each select="vector">
-      <xsl:call-template name="getvalue">
-	<xsl:with-param name="valuePrefix" select="$valuePrefix"/>
-      </xsl:call-template>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="sprmactionset">
-    <xsl:param name="valuePrefix"/>
-    <xsl:text>&#xa;        {</xsl:text>
-    <xsl:text>&#xa;            </xsl:text>
-    <xsl:call-template name="memberid"/>
-    <xsl:text> = </xsl:text>
-    <xsl:call-template name="getvalue">
-      <xsl:with-param name="valuePrefix" select="$valuePrefix"/>
-    </xsl:call-template>
-    <xsl:text>;&#xa;        }</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="sprmactionpushback">
-    <xsl:param name="valuePrefix"/>
-    <xsl:text>&#xa;        {</xsl:text>
-    <xsl:text>&#xa;            </xsl:text>
-    <xsl:call-template name="memberid"/>
-    <xsl:text>.push_back(</xsl:text>
-    <xsl:call-template name="getvalue">
-      <xsl:with-param name="valuePrefix" select="$valuePrefix"/>
-    </xsl:call-template>
-    <xsl:text>);</xsl:text>
-    <xsl:text>;&#xa;        }</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="sprmactionresolve">
-    <xsl:text>&#xa;        {</xsl:text>
-    <xsl:text>&#xa;            resolveSprm(r_Sprm);</xsl:text>
-    <xsl:text>&#xa;        }</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="sprmaction">
-    <xsl:param name="valuePrefix"/>
-    <xsl:choose>
-      <xsl:when test="@action='set'">
-	<xsl:call-template name="sprmactionset">
-	  <xsl:with-param name="valuePrefix" select="$valuePrefix"/>
-	</xsl:call-template>
-      </xsl:when>
-      <xsl:when test="@action='pushback'">
-	<xsl:call-template name="sprmactionpushback">
-	  <xsl:with-param name="valuePrefix" select="$valuePrefix"/>
-	</xsl:call-template>
-      </xsl:when>
-      <xsl:when test="@action='resolve'">
-	<xsl:call-template name="sprmactionresolve"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="sprmimpl">
-    <xsl:for-each select="sprm">
-      <xsl:text>&#xa;void </xsl:text>
-      <xsl:variable name="classname" select="ancestor::class/@name"/>
-      <xsl:value-of select="$classname"/>
-      <xsl:text>::sprm(Sprm & r_Sprm)</xsl:text>
-      <xsl:text>&#xa;{</xsl:text>
-      <xsl:text>&#xa;#ifdef DEBUG_DOMAINMAPPER</xsl:text>
-      <xsl:text>&#xa;    dmapper_logger->startElement("</xsl:text>
-      <xsl:value-of select="$classname"/>
-      <xsl:text>.sprm");</xsl:text>
-      <xsl:text>&#xa;    dmapper_logger->chars(r_Sprm.toString());</xsl:text>
-      <xsl:text>&#xa;#endif</xsl:text>
-      <xsl:text>&#xa;    switch(r_Sprm.getId())</xsl:text>
-      <xsl:text>&#xa;    {</xsl:text>
-      <xsl:for-each select="element">
-	<xsl:text>&#xa;    case </xsl:text>
-	<xsl:value-of select="@id"/>
-	<xsl:text>:</xsl:text>
-	<xsl:call-template name="sprmaction">
-	  <xsl:with-param name="valuePrefix">r_Sprm.getValue()-></xsl:with-param>
-	</xsl:call-template>
-	<xsl:text>&#xa;        break;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#xa;    default:</xsl:text>
-      <xsl:text>&#xa;#ifdef DEBUG_DOMAINMAPPER</xsl:text>
-      <xsl:text>&#xa;        dmapper_logger->element("unhandled");</xsl:text>
-      <xsl:text>&#xa;#endif DEBUG_DOMAINMAPPER</xsl:text>
-      <xsl:text>&#xa;        break;</xsl:text>
-      <xsl:text>&#xa;    }</xsl:text>
-      <xsl:text>&#xa;#ifdef DEBUG_DOMAINMAPPER</xsl:text>
-      <xsl:text>&#xa;    dmapper_logger->endElement("</xsl:text>
-      <xsl:value-of select="$classname"/>
-      <xsl:text>.sprm");</xsl:text>
-      <xsl:text>&#xa;#endif</xsl:text>
-      <xsl:text>&#xa;}&#xa;</xsl:text>
-      <xsl:text>&#xa;void </xsl:text>
-      <xsl:value-of select="ancestor::class/@name"/>
-      <xsl:text>::resolveSprm(Sprm & r_Sprm)</xsl:text>
-      <xsl:text>&#xa;{</xsl:text>
-      <xsl:text>&#xa;    writerfilter::Reference<Properties>::Pointer_t pProperties = r_Sprm.getProps();</xsl:text>
-      <xsl:text>&#xa;    if( pProperties.get())</xsl:text>
-      <xsl:text>&#xa;        pProperties->resolve(*this);</xsl:text>
-      <xsl:text>&#xa;}&#xa;</xsl:text>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="attrimpl">
-    <xsl:for-each select="attribute">
-      <xsl:text>&#xa;void </xsl:text>
-      <xsl:variable name="classname" select="ancestor::class/@name"/>
-      <xsl:value-of select="$classname"/>
-      <xsl:text>::</xsl:text>
-      <xsl:text>attribute(Id name, Value & val)</xsl:text>
-      <xsl:text>&#xa;{</xsl:text>
-      <xsl:text>&#xa;#ifdef DEBUG_DOMAINMAPPER</xsl:text>
-      <xsl:text>&#xa;    dmapper_logger->startElement("</xsl:text>
-      <xsl:value-of select="$classname"/>
-      <xsl:text>.attribute");</xsl:text>
-      <xsl:text>&#xa;    dmapper_logger->attribute("name", (*QNameToString::Instance())(name));</xsl:text>
-      <xsl:text>&#xa;    dmapper_logger->attribute("value", val.toString());</xsl:text>
-      <xsl:text>&#xa;    dmapper_logger->endElement("</xsl:text>
-      <xsl:value-of select="$classname"/>
-      <xsl:text>.attribute");</xsl:text>
-      <xsl:text>&#xa;#endif</xsl:text>
-      <xsl:text>&#xa;    switch (name)</xsl:text>
-      <xsl:text>&#xa;    {</xsl:text>
-      <xsl:for-each select="attribute">
-	<xsl:text>&#xa;    case </xsl:text>
-	<xsl:value-of select="@id"/>
-	<xsl:text>:</xsl:text>
-	<xsl:call-template name="sprmactionset">
-	  <xsl:with-param name="valuePrefix">val.</xsl:with-param>
-	</xsl:call-template>
-	<xsl:text>&#xa;        break;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#xa;    default:</xsl:text>
-      <xsl:text>&#xa;#ifdef DEBUG_DOMAINMAPPER</xsl:text>
-      <xsl:text>&#xa;        dmapper_logger->element("unhandled");</xsl:text>
-      <xsl:text>&#xa;#endif DEBUG_DOMAINMAPPER</xsl:text>
-      <xsl:text>&#xa;        break;</xsl:text>
-      <xsl:text>&#xa;    }</xsl:text>
-      <xsl:text>&#xa;}&#xa;&#xa;</xsl:text>
-    </xsl:for-each>
-  </xsl:template>
-  
-  <xsl:template name="constructorimpl">
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>::</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>()</xsl:text>
-    <xsl:variable name="memberinits">
-      <xsl:for-each select="member[@type='sal_uInt32' or @type='bool']">
-	<xsl:if test="position() > 1">
-	  <xsl:text>,</xsl:text>
-	  <xsl:text>&#xa;  </xsl:text>
-	</xsl:if>
-	<xsl:call-template name="memberid"/>	
-	<xsl:choose>
-	  <xsl:when test="@type='sal_uInt32'">
-	    <xsl:text>(0)</xsl:text>
-	  </xsl:when>
-	  <xsl:when test="@type='bool'">
-	    <xsl:text>(false)</xsl:text>
-	  </xsl:when>
-	</xsl:choose>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:if test="string-length($memberinits) > 0">
-      <xsl:text>&#xa;: </xsl:text>
-      <xsl:value-of select="$memberinits"/>
-    </xsl:if>
-    <xsl:text>&#xa;{</xsl:text>
-    <xsl:text>&#xa;}&#xa;&#xa;</xsl:text>
-  </xsl:template>
-  
-  <xsl:template name="destructorimpl">
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>::~</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>()</xsl:text>
-    <xsl:text>&#xa;{</xsl:text>
-    <xsl:text>&#xa;}&#xa;&#xa;</xsl:text>
-  </xsl:template>
-  
-  <xsl:template name="classimpl">
-    <xsl:variable name="classname" select="@name"/>
-    <xsl:variable name="comment">
-      <xsl:text>class: </xsl:text>
-      <xsl:value-of select="$classname"/>
-    </xsl:variable>
-    <xsl:variable name="commentfill">
-      <xsl:value-of select="translate($comment, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ: ', 
-			                        '******************************************************')"/>
-    </xsl:variable>
-    <xsl:text>&#xa;/***</xsl:text>
-    <xsl:value-of select="$commentfill"/>
-    <xsl:text>*</xsl:text>
-    <xsl:text>&#xa; * </xsl:text>
-    <xsl:value-of select="$comment"/>
-    <xsl:text> *</xsl:text>
-    <xsl:text>&#xa; **</xsl:text>
-    <xsl:value-of select="$commentfill"/>
-    <xsl:text>**/&#xa;</xsl:text>
-    <xsl:call-template name="constructorimpl"/>
-    <xsl:call-template name="destructorimpl"/>
-    <xsl:for-each select="member">
-      <xsl:text>// member: </xsl:text>
-      <xsl:value-of select="$classname"/>
-      <xsl:text>::</xsl:text>
-      <xsl:value-of select="@name"/>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="setterimpl"/>
-      <xsl:call-template name="getterimpl"/>
-      <xsl:call-template name="pushbackimpl"/>
-    </xsl:for-each>
-    <xsl:call-template name="sprmimpl"/>
-    <xsl:call-template name="attrimpl"/>
-  </xsl:template>
-</xsl:stylesheet>
commit e9c9f3f793a91525ac4fb74f8791ba74222515e4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 29 19:21:24 2014 +0100

    cui: unused code in SvxAreaTabPage::ClickHatchingHdl_Impl()
    
    Turns out this is unused since commit
    5627d0bdaf1385df9d90dcec3a319c82c089c2ca (Fix #86988#: Redesign of
    dialogs, 2001-05-15), and just getting rid of it avoids a crash on
    Insert -> Frame -> Area -> Hatching in Writer.
    
    Change-Id: Ic26cc592c0792f966c52dd2ac6de8657ff635cd3

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 4b8c2cc..408988c 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1965,21 +1965,6 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl()
     m_pCbxHatchBckgrd->Enable();
     m_pLbHatchBckgrdColor->Enable();
 
-    // set table text
-    OUString        aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString += ": ";
-    INetURLObject   aURL( pHatchingList->GetPath() );
-
-    aURL.Append( pHatchingList->GetName() );
-    DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-
-    if( aURL.getBase().getLength() > 18 )
-    {
-        aString += aURL.getBase().copy( 0, 15 );
-        aString += "...";
-    }
-    else
-        aString += aURL.getBase();
-
     ModifyHatchingHdl_Impl( this );
     ModifyHatchBckgrdColorHdl_Impl( this );
     ToggleHatchBckgrdColorHdl_Impl( this );


More information about the Libreoffice-commits mailing list