[Libreoffice-commits] core.git: 3 commits - writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Oct 16 12:06:31 PDT 2013
writerfilter/source/doctok/WW8LFOTable.cxx | 11 ----
writerfilter/source/doctok/WW8ListTable.cxx | 69 ---------------------------
writerfilter/source/doctok/resources.xmi | 15 -----
writerfilter/source/doctok/resourcesimpl.xsl | 38 --------------
4 files changed, 3 insertions(+), 130 deletions(-)
New commits:
commit 31d3ab5ea19268cb51a5efdd6ac0065dfce25f28
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Oct 16 21:01:46 2013 +0200
writerfilter: remove unused WW8ListTable class in doctok
Change-Id: If13c1ce4847e5711cbb60196a77a669411496306
diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx
index 5d71a39..45d0f1e 100644
--- a/writerfilter/source/doctok/WW8ListTable.cxx
+++ b/writerfilter/source/doctok/WW8ListTable.cxx
@@ -23,22 +23,6 @@
namespace writerfilter {
namespace doctok {
-sal_uInt32 WW8ListTable::getEntryCount()
-{
- return getU16(0);
-}
-
-writerfilter::Reference<Properties>::Pointer_t
-WW8ListTable::getEntry(sal_uInt32 nIndex)
-{
- WW8List * pList = new WW8List(this, entryOffsets[nIndex]);
-
- pList->setIndex(nIndex);
-
- return writerfilter::Reference<Properties>::Pointer_t
- (pList);
-}
-
sal_uInt32 WW8List::get_listlevel_count()
{
if (get_fSimpleList())
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index d04e3aa..8dca3a7 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -2325,15 +2325,6 @@
<!--Class List-->
<!--Class ListTable-->
<UML:Class xmi.id="ListTable" name="ListTable">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8resource"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="plcf"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8nopayloadoffset"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>rtf:LISTTABLE</UML:TaggedValue.dataValue>
commit ee1187452ba0312cbef6406ea95c7ae39486076d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Oct 16 20:59:21 2013 +0200
writerfilter: remove unused WW8ListLevel class
Change-Id: Ib1058fcc10100938a34fae18e94fa9fd21ebfb36
diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx b/writerfilter/source/doctok/WW8LFOTable.cxx
index 5c41219..aef1639 100644
--- a/writerfilter/source/doctok/WW8LFOTable.cxx
+++ b/writerfilter/source/doctok/WW8LFOTable.cxx
@@ -57,17 +57,6 @@ sal_uInt32 WW8LFOLevel::calcSize()
{
sal_uInt32 nResult = WW8LFOLevel::getSize();
- if (get_fFormatting())
- {
- WW8ListLevel aLevel(mpParent, mnOffsetInParent + nResult);
-
- nResult += aLevel.calcSize();
-
- sal_uInt32 nXstSize = mpParent->getU16(mnOffsetInParent + nResult);
-
- nResult += (nXstSize + 1) * 2;
- }
-
return nResult;
}
diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx
index 380c19d..5d71a39 100644
--- a/writerfilter/source/doctok/WW8ListTable.cxx
+++ b/writerfilter/source/doctok/WW8ListTable.cxx
@@ -48,60 +48,11 @@ sal_uInt32 WW8List::get_listlevel_count()
}
writerfilter::Reference<Properties>::Pointer_t
-WW8List::get_listlevel(sal_uInt32 nIndex)
+WW8List::get_listlevel(sal_uInt32 /*nIndex*/)
{
- WW8ListTable * pListTable = dynamic_cast<WW8ListTable *>(mpParent);
- sal_uInt32 nPayloadIndex = pListTable->getPayloadIndex(mnIndex) + nIndex;
- sal_uInt32 nPayloadOffset = pListTable->getPayloadOffset(nPayloadIndex);
- sal_uInt32 nPayloadSize = pListTable->getPayloadSize(nPayloadIndex);
-
- return writerfilter::Reference<Properties>::Pointer_t
- (new WW8ListLevel(mpParent, nPayloadOffset, nPayloadSize));
-}
-
-OUString WW8ListLevel::get_xst()
-{
- sal_uInt32 nOffset = WW8ListLevel::getSize();
-
- nOffset += get_cbGrpprlPapx();
- nOffset += get_cbGrpprlChpx();
-
- return getString(nOffset);
+ return writerfilter::Reference<Properties>::Pointer_t();
}
-void WW8ListLevel::resolveNoAuto(Properties & rHandler)
-{
- sal_uInt32 nOffset = getSize();
-
- {
- WW8PropertySet::Pointer_t pSet
- (new WW8PropertySetImpl(*this, nOffset, get_cbGrpprlPapx()));
-
- WW8PropertiesReference aRef(pSet);
- aRef.resolve(rHandler);
- }
-
- nOffset += get_cbGrpprlPapx();
-
- {
- WW8PropertySet::Pointer_t pSet
- (new WW8PropertySetImpl(*this, nOffset, get_cbGrpprlChpx()));
-
- WW8PropertiesReference aRef(pSet);
- aRef.resolve(rHandler);
- }
-}
-
-sal_uInt32 WW8ListLevel::calcSize()
-{
- sal_uInt32 nResult = WW8ListLevel::getSize();
-
- nResult += get_cbGrpprlPapx();
- nResult += get_cbGrpprlChpx();
- nResult += 2 + getU16(nResult) * 2;
-
- return nResult;
-}
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 74f6c1e..d04e3aa 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -595,12 +595,6 @@
<!--WW8 resources-->
<!--Class ListLevel-->
<UML:Class xmi.id="ListLevel" name="ListLevel">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8resource"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="resolvenoauto"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>28</UML:TaggedValue.dataValue>
commit e9bcc4f814ba4a13942732dcabb3ae992af13735
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Oct 16 20:46:15 2013 +0200
writerfilter: remove various no longer needed resolve* methods in doctok
Change-Id: Iae638fbc5142e7c6d3f62bd6916b25fa4ecf040e
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl
index f541f69..f54f3be 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -161,52 +161,16 @@ using namespace ::std;
<xsl:choose>
<xsl:when test=".//UML:Stereotype[@xmi.idref='ww8resource']">
<xsl:text>::resolve(Properties & </xsl:text>
- <xsl:value-of select="$rHandler"/>
<xsl:text>)</xsl:text>
</xsl:when>
<xsl:when test=".//UML:Stereotype[@xmi.idref='dffrecord']">
<xsl:text>::resolveLocal(Properties & </xsl:text>
- <xsl:value-of select="$rHandler"/>
<xsl:text>)</xsl:text>
</xsl:when>
</xsl:choose>
<xsl:text>
- {</xsl:text>
- <xsl:if test='.//UML:Stereotype[@xmi.idref="debug"]'>
- <xsl:text>
- dump(output);</xsl:text>
- </xsl:if>
- <xsl:text>
- try
- {</xsl:text>
- <xsl:for-each select='.//UML:Attribute[@name!="reserved"]'>
- <xsl:choose>
- <xsl:when test='.//UML:Stereotype[@xmi.idref="noresolve"]'>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select='.' mode='resolveAttribute'/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <xsl:for-each select='.//UML:Operation[@name!="reserved"]'>
- <xsl:choose>
- <xsl:when test='.//UML:Stereotype[@xmi.idref="noresolve"]'>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select='.' mode='resolveOperation'/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
-
- <xsl:if test='.//UML:Stereotype[@xmi.idref = "resolvenoauto"]'>
- resolveNoAuto(rHandler);
- </xsl:if>
- <xsl:text>
- } catch (const Exception & e) {
- clog << e.getText() << endl;
- }
+ {
}
-
</xsl:text>
</xsl:template>
More information about the Libreoffice-commits
mailing list