[Libreoffice-commits] core.git: 4 commits - sw/source writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Sun May 25 11:29:19 PDT 2014
sw/source/core/doc/docbm.cxx | 6 ++-
writerfilter/source/ooxml/effort.xsl | 63 -----------------------------------
writerfilter/source/ooxml/rngtocxx | 50 ---------------------------
3 files changed, 4 insertions(+), 115 deletions(-)
New commits:
commit 309a2dabab52dc1498ddbf69b19232e3ad9e88c4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 25 20:11:36 2014 +0200
coverity#1158083 Unchecked dynamic_cast
Change-Id: I8213e0c8e6228320c6efcba5e42e58e87e0379b9
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index e396bc2..dc54734 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1736,8 +1736,8 @@ void _RestoreCntntIdx(SwDoc* pDoc,
switch( aSave.GetType() )
{
case 0x8000:
+ if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aSave.GetCount()].get()))
{
- MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aSave.GetCount()].get());
SwPosition aNewPos(pMark->GetMarkPos());
aNewPos.nNode = *pCNd;
aNewPos.nContent.Assign(pCNd, aSave.GetContent() + nOffset);
@@ -1745,8 +1745,8 @@ void _RestoreCntntIdx(SwDoc* pDoc,
}
break;
case 0x8001:
+ if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aSave.GetCount()].get()))
{
- MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aSave.GetCount()].get());
SwPosition aNewPos(pMark->GetOtherMarkPos());
aNewPos.nNode = *pCNd;
aNewPos.nContent.Assign(pCNd, aSave.GetContent() + nOffset);
commit eedae0444722923e85766d4b2843ac4e2171c3de
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 25 20:05:01 2014 +0200
coverity#1158082 Unchecked dynamic_cast
Change-Id: Ia70d73d64af020c546a0218b996334959ca6b624
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 21de483..e396bc2 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -616,6 +616,8 @@ namespace sw { namespace mark
// is on position ??
bool bChangedPos = false, bChangedOPos = false;
::sw::mark::MarkBase* const pMark = dynamic_cast< ::sw::mark::MarkBase* >(ppMark->get());
+ if (!pMark)
+ continue;
if(&pMark->GetMarkPos().nNode.GetNode() == pOldNode)
{
SwPosition aNewPosRel(aNewPos);
commit 8282656f851ceec7b50d4a8352bb76d7e7219ff0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 25 19:58:18 2014 +0200
writerfilter: remove unused rngtocxx
Change-Id: I780aff48f55bdc4f903404472f22f3fb4bb6968c
diff --git a/writerfilter/source/ooxml/rngtocxx b/writerfilter/source/ooxml/rngtocxx
deleted file mode 100755
index bb91c2a..0000000
--- a/writerfilter/source/ooxml/rngtocxx
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# 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 .
-#
-
-xalan -xsl modelpreprocess.xsl -in model.xml > model_processed.xml
-xalan -xsl resourcestokens.xsl -in model_processed.xml > OOXMLtokens.hxx
-xalan -xsl resources.xsl -in model_processed.xml > OOXMLresources.hxx
-xalan -xsl resourcesimpl.xsl -in model_processed.xml > OOXMLresources.cxx
-xalan -xsl resourcesimpl_dml-baseStylesheet.xsl -in model_processed.xml > OOXMLresources_dml-baseStylesheet.cxx
-xalan -xsl resourcesimpl_dml-baseTypes.xsl -in model_processed.xml > OOXMLresources_dml-baseTypes.cxx
-xalan -xsl resourcesimpl_dml-chartDrawing.xsl -in model_processed.xml > OOXMLresources_dml-chartDrawing.cxx
-xalan -xsl resourcesimpl_dml-documentProperties.xsl -in model_processed.xml > OOXMLresources_dml-documentProperties.cxx
-xalan -xsl resourcesimpl_dml-graphicalObject.xsl -in model_processed.xml > OOXMLresources_dml-graphicalObject.cxx
-xalan -xsl resourcesimpl_dml-shape3DCamera.xsl -in model_processed.xml > OOXMLresources_dml-shape3DCamera.cxx
-xalan -xsl resourcesimpl_dml-shape3DLighting.xsl -in model_processed.xml > OOXMLresources_dml-shape3DLighting.cxx
-xalan -xsl resourcesimpl_dml-shape3DScene.xsl -in model_processed.xml > OOXMLresources_dml-shape3DScene.cxx
-xalan -xsl resourcesimpl_dml-shape3DStyles.xsl -in model_processed.xml > OOXMLresources_dml-shape3DStyles.cxx
-xalan -xsl resourcesimpl_dml-shapeEffects.xsl -in model_processed.xml > OOXMLresources_dml-shapeEffects.cxx
-xalan -xsl resourcesimpl_dml-shapeGeometry.xsl -in model_processed.xml > OOXMLresources_dml-shapeGeometry.cxx
-xalan -xsl resourcesimpl_dml-shapeLineProperties.xsl -in model_processed.xml > OOXMLresources_dml-shapeLineProperties.cxx
-xalan -xsl resourcesimpl_dml-shapeProperties.xsl -in model_processed.xml > OOXMLresources_dml-shapeProperties.cxx
-xalan -xsl resourcesimpl_dml-styleDefaults.xsl -in model_processed.xml > OOXMLresources_dml-styleDefaults.cxx
-xalan -xsl resourcesimpl_dml-stylesheet.xsl -in model_processed.xml > OOXMLresources_dml-stylesheet.cxx
-xalan -xsl resourcesimpl_dml-textCharacter.xsl -in model_processed.xml > OOXMLresources_dml-textCharacter.cxx
-xalan -xsl resourcesimpl_dml-wordprocessingDrawing.xsl -in model_processed.xml > OOXMLresources_dml-wordprocessingDrawing.cxx
-xalan -xsl resourcesimpl_shared-math.xsl -in model_processed.xml > OOXMLresources_shared-math.cxx
-xalan -xsl resourcesimpl_shared-relationshipReference.xsl -in model_processed.xml > OOXMLresources_shared-relationshipReference.cxx
-xalan -xsl resourcesimpl_sml-customXmlMappings.xsl -in model_processed.xml > OOXMLresources_sml-customXmlMappings.cxx
-xalan -xsl resourcesimpl_wml.xsl -in model_processed.xml > OOXMLresources_wml.cxx
-xalan -xsl tokenmapinit.xsl -in model_processed.xml > TokenMapInit.cxx
-xalan -xsl valuesimpl.xsl -in model_processed.xml > OOXMLvalues.cxx
-xalan -xsl qnametostr.xsl -in model_processed.xml > qnametostr.tmp
-xalan -xsl resourceids.xsl -in model_processed.xml > ../../inc/ooxml/resourceids.hxx
-xalan -xsl gperfattributes.xsl -in model_processed.xml | $GPERF -t -E -S1 -LC++ > gperfattributes.hxx
-xalan -xsl gperfelements.xsl -in model_processed.xml | $GPERF -t -E -S1 -LC++ > gperfelements.hxx
commit f65aa822eedce255eb3931c975b5111ff0f596cb
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun May 25 19:56:55 2014 +0200
writerfilter: remove unused effort.xsl
Change-Id: I8e05b2d8e62acaab651f8db4098a8877713e81e0
diff --git a/writerfilter/source/ooxml/effort.xsl b/writerfilter/source/ooxml/effort.xsl
deleted file mode 100644
index 9fe2edd..0000000
--- a/writerfilter/source/ooxml/effort.xsl
+++ /dev/null
@@ -1,63 +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">
-
-<xsl:output method="text"/>
-
-<xsl:template match="/">
- <xsl:text>Namespace,Define,Name,Tag,Done,Planned,qname-count
</xsl:text>
- <xsl:for-each select="/todo/attribute|/todo/element">
- <xsl:variable name="namespace" select="@namespace"/>
- <xsl:variable name="define" select="@define"/>
- <xsl:variable name="name" select="@name"/>
- <xsl:variable name="tag" select="@tag"/>
-
- <xsl:for-each select=".//status">
- <xsl:value-of select="$namespace"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="$define"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="$tag"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="@done"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="@planned"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="@qname-count"/>
- <xsl:text>
</xsl:text>
- </xsl:for-each>
- <xsl:if test="not(.//status)">
- <xsl:value-of select="$namespace"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="$define"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="$name"/>
- <xsl:text>,</xsl:text>
- <xsl:value-of select="$tag"/>
- <xsl:text>,0,0.5,1
</xsl:text>
- </xsl:if>
- </xsl:for-each>
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
More information about the Libreoffice-commits
mailing list