summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-12-07 10:20:22 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-12-07 10:45:32 +0100
commite04bfc030f778439a5b0eadc495ab4e530451976 (patch)
tree623e32ea33d07e4258df9c70d730a49f254cd43d
parent62174f6a8d4c191d67b7952d851a06b84a2b02be (diff)
writerfilter: remove unused WW8PropertySetImpl in doctok
Change-Id: I42e7fbc62d455d909f50864371a321058d4ac2ad
-rw-r--r--writerfilter/Library_writerfilter.mk1
-rw-r--r--writerfilter/source/doctok/WW8PropertySetImpl.cxx386
-rw-r--r--writerfilter/source/doctok/WW8PropertySetImpl.hxx138
-rw-r--r--writerfilter/source/doctok/WW8ResourceModelImpl.cxx13
-rw-r--r--writerfilter/source/doctok/resources.xsl1
-rw-r--r--writerfilter/source/doctok/resourcesimpl.xsl14
6 files changed, 0 insertions, 553 deletions
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 7413ce454b4a..d9556aa70d36 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -123,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/ThemeTable \
writerfilter/source/dmapper/WrapPolygonHandler \
writerfilter/source/doctok/WW8CpAndFc \
- writerfilter/source/doctok/WW8PropertySetImpl \
writerfilter/source/doctok/WW8ResourceModelImpl \
writerfilter/source/doctok/WW8StructBase \
writerfilter/source/filter/ImportFilter \
diff --git a/writerfilter/source/doctok/WW8PropertySetImpl.cxx b/writerfilter/source/doctok/WW8PropertySetImpl.cxx
deleted file mode 100644
index 66e0d8f09e93..000000000000
--- a/writerfilter/source/doctok/WW8PropertySetImpl.cxx
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#include "WW8ResourceModelImpl.hxx"
-#include <doctok/resourceids.hxx>
-#include <resourcemodel/QNameToString.hxx>
-#include "WW8PropertySetImpl.hxx"
-
-namespace writerfilter {
-namespace doctok
-{
-
-
-bool operator != (const WW8PropertySetIterator & rA,
- const WW8PropertySetIterator & rB)
-{
- return ! (rA.equal(rB));
-}
-
-WW8Property::~WW8Property()
-{
-}
-
-WW8PropertySet::~WW8PropertySet()
-{
-}
-
-WW8PropertySetIterator::~WW8PropertySetIterator()
-{
-}
-
-WW8PropertyImpl::WW8PropertyImpl(const WW8StructBase & rBase,
- sal_uInt32 nOffset,
- sal_uInt32 nCount)
-: WW8StructBase(rBase, nOffset, nCount)
-{
-}
-
-WW8PropertyImpl::~WW8PropertyImpl()
-{
-}
-
-sal_uInt32 WW8PropertyImpl::getParam() const
-{
- sal_uInt32 nResult = 0;
-
- switch (get_spra())
- {
- case 0:
- case 1:
- nResult = getU8(2);
-
- break;
-
- case 2:
- case 4:
- case 5:
- nResult = getU16(2);
-
- break;
-
- case 3:
- nResult = getU32(2);
-
- break;
-
- case 7:
- nResult = getU16(2) + (getU8(4) << 16);
-
- break;
-
- default:
- break;
- }
-
- return nResult;
-}
-
-WW8Stream::Sequence WW8PropertyImpl::getParams() const
-{
- return WW8Stream::Sequence(mSequence, 2, getCount() - 2);
-}
-
-sal_uInt32 WW8PropertyImpl::getByteLength() const
-{
- sal_uInt32 nParamSize = 0;
-
- switch (get_spra())
- {
- case 0:
- case 1:
- nParamSize = 1;
-
- break;
-
- case 2:
- case 4:
- case 5:
- nParamSize = 2;
-
- break;
-
- case 3:
- nParamSize = 4;
-
- break;
-
- case 7:
- nParamSize = 3;
-
- break;
- default:
- switch (getId())
- {
- case 0xd608:
- nParamSize = getU16(2) + 1;
- break;
- default:
- nParamSize = getU8(2) + 1;
- break;
- }
-
- break;
- }
-
- return nParamSize + 2;
-}
-
-void WW8PropertyImpl::dump(OutputWithDepth<string> & o) const
-{
- o.addItem(toString());
-}
-
-string WW8PropertyImpl::toString() const
-{
- string aResult;
-
- aResult += "<sprmcommon";
-
- char sBuffer[256];
- snprintf(sBuffer, sizeof(sBuffer), " id=\"%" SAL_PRIuUINT32 "\"", getId());
- aResult += sBuffer;
- aResult += " name=\"";
- aResult += (*SprmIdToString::Instance())(getId());
- aResult += "\"";
- snprintf(sBuffer, sizeof(sBuffer), " sgc=\"%x\"", get_sgc());
- aResult += sBuffer;
- snprintf(sBuffer, sizeof(sBuffer), " spra=\"%x\"", get_spra());
- aResult += sBuffer;
- snprintf(sBuffer, sizeof(sBuffer), " size=\"%" SAL_PRIxUINT32 "\"", getByteLength());
- aResult += sBuffer;
- snprintf(sBuffer, sizeof(sBuffer), " param=\"%" SAL_PRIxUINT32 "\"", getParam());
- aResult += sBuffer;
- aResult += ">\n";
-
- aResult += mSequence.toString();
-
- aResult += "</sprmcommon>";
-
- return aResult;
-}
-
-WW8PropertySetImpl::WW8PropertySetImpl(WW8Stream & rStream,
- sal_uInt32 nOffset,
- sal_uInt32 nCount,
- bool bPap)
-: WW8StructBase(rStream, nOffset, nCount), mbPap(bPap)
-{
-}
-
-WW8PropertySetImpl::WW8PropertySetImpl(const WW8StructBase & rBase,
- sal_uInt32 nOffset,
- sal_uInt32 nCount,
- bool bPap)
-: WW8StructBase(rBase, nOffset, nCount), mbPap(bPap)
-{
-}
-
-WW8PropertySetImpl::~WW8PropertySetImpl()
-{
-}
-
-bool WW8PropertySetImpl::isPap() const
-{
- return mbPap;
-}
-
-sal_uInt32 WW8PropertySetImpl::get_istd() const
-{
- sal_uInt32 nResult = 0;
-
- if (mbPap)
- nResult = getU16(0);
-
- return nResult;
-}
-
-WW8PropertySetIterator::Pointer_t WW8PropertySetImpl::begin()
-{
- return WW8PropertySetIterator::Pointer_t
- (new WW8PropertySetIteratorImpl(this, mbPap ? 2 : 0));
-}
-
-WW8PropertySetIterator::Pointer_t WW8PropertySetImpl::end()
-{
- return WW8PropertySetIterator::Pointer_t
- (new WW8PropertySetIteratorImpl(this, getCount()));
-}
-
-WW8PropertySetIteratorImpl::~WW8PropertySetIteratorImpl()
-{
-}
-
-WW8Property::Pointer_t
-WW8PropertySetImpl::getAttribute(sal_uInt32 nOffset) const
-{
- WW8PropertyImpl aTmpAttr(*this, nOffset, 3);
-
- sal_uInt32 nLength = aTmpAttr.getByteLength();
-
- if (nOffset + nLength > getCount())
- nLength = getCount() - nOffset;
-
- return WW8Property::Pointer_t
- (new WW8PropertyImpl(*this, nOffset, nLength));
-}
-
-void WW8PropertySetImpl::dump(OutputWithDepth<string> & o) const
-{
- WW8StructBase::dump(o);
-
- WW8PropertySetIterator::Pointer_t pIt =
- const_cast<WW8PropertySetImpl *>(this)->begin();
- WW8PropertySetIterator::Pointer_t pItEnd =
- const_cast<WW8PropertySetImpl *>(this)->end();
-
- while((*pIt) != (*pItEnd))
- {
- WW8Property::Pointer_t pAttr = pIt->get();
-
- pAttr->dump(o);
- ++(*pIt);
- }
-}
-
-void WW8PropertySetImpl::dots(ostream & o)
-{
- WW8PropertySetIterator::Pointer_t pIt = begin();
- WW8PropertySetIterator::Pointer_t pItEnd = end();
-
- while((*pIt) != (*pItEnd))
- {
- WW8Property::Pointer_t pAttr = pIt->get();
-
- o << "." << endl;
-
- ++(*pIt);
- }
-}
-
-string WW8PropertySetImpl::getType() const
-{
- return "WW8PropertySetImpl";
-}
-
-void WW8PropertySetImpl::resolveLocal(Sprm & sprm, Properties & rHandler)
-{
- switch (sprm.getId())
- {
- case 0x6a03:
- {
- Value::Pointer_t pValue = sprm.getValue();
- }
- break;
- case 0x806:
- break;
- case 0x6646:
- {
- WW8Stream::Pointer_t pStream;
-
- if (pStream.get() != NULL)
- {
- Value::Pointer_t pValue = sprm.getValue();
- sal_uInt32 nOffset = pValue->getInt();
- WW8StructBase aStruct(*pStream, nOffset, 2);
- sal_uInt16 nCount = aStruct.getU16(0);
-
- {
- WW8PropertySetImpl * pPropSet =
- new WW8PropertySetImpl(*pStream, nOffset + 2, nCount);
-
- pPropSet->resolve(rHandler);
- }
- }
- }
- break;
- default:
- break;
- }
-}
-
-void WW8PropertySetImpl::resolve(Properties & rHandler)
-{
- if (getCount() >= (isPap() ? 5U : 3U))
- {
- WW8PropertySetIterator::Pointer_t pIt = begin();
- WW8PropertySetIterator::Pointer_t pItEnd = end();
-
- if (isPap())
- {
- WW8Value::Pointer_t pValue = createValue(getU16(0));
- rHandler.attribute(NS_rtf::LN_ISTD, *pValue);
- }
-
- while((*pIt) != (*pItEnd))
- {
- WW8Sprm aSprm(pIt->get());
-
- rHandler.sprm(aSprm);
-
- resolveLocal(aSprm, rHandler);
-
- ++(*pIt);
- }
- }
-}
-
-WW8PropertySetIterator & WW8PropertySetIteratorImpl::operator++ ()
-{
- WW8Property::Pointer_t pTmpAttr = mpAttrSet->getAttribute(mnOffset);
-
- mnOffset += dynamic_cast<WW8PropertyImpl *>(pTmpAttr.get())->
- getByteLength();
-
- if (mnOffset > mpAttrSet->getCount() ||
- mpAttrSet->getCount() - mnOffset < 3)
- mnOffset = mpAttrSet->getCount();
-
- return *this;
-}
-
-WW8Property::Pointer_t WW8PropertySetIteratorImpl::get() const
-{
- return mpAttrSet->getAttribute(mnOffset);
-}
-
-bool WW8PropertySetIteratorImpl::equal
-(const WW8PropertySetIterator & rIt) const
-{
- const WW8PropertySetIteratorImpl & rMyIt =
- dynamic_cast<const WW8PropertySetIteratorImpl &>(rIt);
-
- return mpAttrSet == rMyIt.mpAttrSet && mnOffset == rMyIt.mnOffset;
-}
-
-string WW8PropertySetIteratorImpl::toString() const
-{
- string sResult = "";
-
- char sBuffer[256];
-
- snprintf(sBuffer, sizeof(sBuffer), "(%" SAL_PRIuUINT32 ")", mnOffset);
- sResult += sBuffer;
-
- return sResult;
-}
-
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/WW8PropertySetImpl.hxx b/writerfilter/source/doctok/WW8PropertySetImpl.hxx
deleted file mode 100644
index 928b518b0b38..000000000000
--- a/writerfilter/source/doctok/WW8PropertySetImpl.hxx
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#ifndef INCLUDED_WW8_PROPERTY_SET_IMPL_HXX
-#define INCLUDED_WW8_PROPERTY_SET_IMPL_HXX
-
-#include <resourcemodel/WW8ResourceModel.hxx>
-#include <doctok/WW8Document.hxx>
-#include "WW8StructBase.hxx"
-
-#include <map>
-
-namespace writerfilter {
-namespace doctok
-{
-
-class WW8PropertyImpl : public WW8Property, public WW8StructBase
-{
- sal_uInt8 get_ispmd() const
- { return sal::static_int_cast<sal_uInt8>(getId() & 0xff); }
- bool get_fSpec() const { return (getId() & 0x100) != 0; }
- sal_uInt8 get_sgc() const
- { return sal::static_int_cast<sal_uInt8>((getId() >> 10) & 0x7); }
- sal_uInt8 get_spra() const
- { return sal::static_int_cast<sal_uInt8>((getId() >> 13) & 0x7); }
-
-public:
- WW8PropertyImpl(WW8Stream & rStream, sal_uInt32 nOffset, sal_uInt32 nCount);
- WW8PropertyImpl(const WW8StructBase & rBase, sal_uInt32 nOffset,
- sal_uInt32 nCount);
-
- WW8PropertyImpl(WW8StructBase * pBase, sal_uInt32 nOffset,
- sal_uInt32 nCount);
-
- virtual ~WW8PropertyImpl();
-
- sal_uInt32 getId() const { return getU16(0); }
- sal_uInt32 getParam() const;
- WW8Stream::Sequence getParams() const;
-
- sal_uInt32 getByteLength() const;
- sal_uInt32 getParamOffset() const;
-
- virtual void dump(OutputWithDepth<string> & o) const;
- string toString() const;
-};
-
-class WW8PropertySetImpl : public WW8PropertySet, public WW8StructBase,
- public ::writerfilter::Reference<Properties>
-{
- bool mbPap;
-
-public:
- typedef boost::shared_ptr<WW8PropertySet> Pointer_t;
-
- WW8PropertySetImpl(WW8Stream & rStream, sal_uInt32 nOffset,
- sal_uInt32 nCount, bool bPap = false);
-
- WW8PropertySetImpl(const WW8StructBase & rBase, sal_uInt32 nOffset,
- sal_uInt32 nCount, bool bPap = false);
-
- virtual ~WW8PropertySetImpl();
-
- virtual WW8PropertySetIterator::Pointer_t begin();
- virtual WW8PropertySetIterator::Pointer_t end();
-
- virtual void dump(OutputWithDepth<string> & o) const;
- virtual void dots(ostream & o);
-
- virtual string getType() const;
-
- virtual WW8Property::Pointer_t getAttribute(sal_uInt32 nOffset) const;
-
- virtual bool isPap() const;
- virtual sal_uInt32 get_istd() const;
-
- virtual void insert(const WW8PropertySet::Pointer_t /*pSet*/) {}
-
- virtual void resolve(Properties & rHandler);
-
- /**
- Get and distribute information from sprm that is used
- internally by the document.
-
- @param rSprm sprm to process
- @param rHandler property handler to resolve huge papx (sprm 0x6646) to
- */
- virtual void resolveLocal(Sprm & rSprm, Properties & rHandler);
-};
-
-class WW8PropertySetIteratorImpl : public WW8PropertySetIterator
-{
- WW8PropertySetImpl * mpAttrSet;
- sal_uInt32 mnOffset;
-
-public:
- WW8PropertySetIteratorImpl(WW8PropertySetImpl * pAttrSet,
- sal_uInt32 nOffset)
- : mpAttrSet(pAttrSet), mnOffset(nOffset)
- {
- }
-
- virtual ~WW8PropertySetIteratorImpl();
-
- virtual WW8PropertySetIterator & operator++();
-
- virtual WW8Property::Pointer_t get() const;
-
- virtual bool equal(const WW8PropertySetIterator & rIt) const;
-
- virtual string toString() const;
-};
-
-::writerfilter::Reference<Properties>::Pointer_t createSprmProps
-(WW8PropertyImpl & rProp);
-::writerfilter::Reference<BinaryObj>::Pointer_t createSprmBinary
-(WW8PropertyImpl & rProp);
-}}
-
-#endif // INCLUDED_WW8_PROPERTY_SET_IMPL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
index ca707ecfe101..e16b1e84ad52 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
@@ -193,13 +193,6 @@ writerfilter::Reference<BinaryObj>::Pointer_t WW8Sprm::getBinary()
{
writerfilter::Reference<BinaryObj>::Pointer_t pResult;
- if (mpBinary.get() != NULL)
- pResult = writerfilter::Reference<BinaryObj>::Pointer_t
- (mpBinary->clone());
- else if (mpProperty.get() != NULL)
- pResult = createSprmBinary
- (dynamic_cast<WW8PropertyImpl &>(*(mpProperty.get())));
-
return pResult;
}
@@ -212,12 +205,6 @@ writerfilter::Reference<Properties>::Pointer_t WW8Sprm::getProps()
{
writerfilter::Reference<Properties>::Pointer_t pResult;
- if (mpProperty.get() != NULL)
- {
- pResult = createSprmProps
- (dynamic_cast<WW8PropertyImpl &>(*(mpProperty.get())));
- }
-
return pResult;
}
diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl
index f23db05f63b1..5903e5cc9297 100644
--- a/writerfilter/source/doctok/resources.xsl
+++ b/writerfilter/source/doctok/resources.xsl
@@ -53,7 +53,6 @@
#include &lt;doctok/resourceids.hxx&gt;
#include &lt;doctok/WW8StructBase.hxx&gt;
#include &lt;doctok/WW8ResourceModelImpl.hxx&gt;
-#include &lt;doctok/WW8PropertySetImpl.hxx&gt;
namespace writerfilter {
namespace doctok {
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl
index 5c80b74b1a06..faa79a914bd4 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -288,23 +288,9 @@ using namespace ::std;
</xsl:template>
<xsl:template match='UML:Model' mode='createsprmprops'>
-writerfilter::Reference &lt; Properties &gt; ::Pointer_t createSprmProps
-(WW8PropertyImpl &amp;)
-{
- writerfilter::Reference &lt; Properties &gt; ::Pointer_t pResult;
- return pResult;
-}
</xsl:template>
<xsl:template match='UML:Model' mode='createsprmbinary'>
-<xsl:text>
-writerfilter::Reference &lt; BinaryObj &gt; ::Pointer_t createSprmBinary
-(WW8PropertyImpl &amp;)
-{
- writerfilter::Reference &lt; BinaryObj &gt; ::Pointer_t pResult;
- return pResult;
-}
-</xsl:text>
</xsl:template>
<!-- returns optname of UML:Class -->