[Libreoffice-commits] .: unusedcode.easy writerfilter/Library_writerfilter.mk writerfilter/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Dec 1 02:11:06 PST 2012


 unusedcode.easy                                   |    1 
 writerfilter/Library_writerfilter.mk              |    1 
 writerfilter/source/resourcemodel/WW8Analyzer.cxx |  205 ----------------------
 writerfilter/source/resourcemodel/WW8Analyzer.hxx |   93 ---------
 4 files changed, 300 deletions(-)

New commits:
commit 794c1f97f57710846c22c21234e9adacedecd24a
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sat Dec 1 11:09:18 2012 +0100

    writerfilter: remove unused WW8Analyzer
    
    Change-Id: I711bc4d6b7100a1b089ed5bfeec7ff14f2727138

diff --git a/unusedcode.easy b/unusedcode.easy
index fa6e588..d3db1d4 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -67,7 +67,6 @@ unicode::isDigit(unsigned short)
 unicode::isLower(unsigned short)
 unicode::isPrint(unsigned short)
 unicode::isUpper(unsigned short)
-writerfilter::WW8Analyzer::WW8Analyzer()
 writerfilter::createStreamHandler()
 writerfilter::doctokidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
 writerfilter::ooxmlidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 870732f..98830a0 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -168,7 +168,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/resourcemodel/Protocol \
     writerfilter/source/resourcemodel/ResourceModelHelper \
     writerfilter/source/resourcemodel/TagLogger \
-    writerfilter/source/resourcemodel/WW8Analyzer \
     writerfilter/source/resourcemodel/XPathLogger \
     writerfilter/source/resourcemodel/qnametostrcore \
     writerfilter/source/resourcemodel/resourcemodel \
diff --git a/writerfilter/source/resourcemodel/WW8Analyzer.cxx b/writerfilter/source/resourcemodel/WW8Analyzer.cxx
deleted file mode 100644
index 0426a6b..0000000
--- a/writerfilter/source/resourcemodel/WW8Analyzer.cxx
+++ /dev/null
@@ -1,205 +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 <WW8Analyzer.hxx>
-#include <doctok/resourceids.hxx>
-#include <resourcemodel/QNameToString.hxx>
-
-namespace writerfilter
-{
-bool eqSalUInt32::operator () (sal_uInt32 n1, sal_uInt32 n2) const
-{
-    return n1 == n2;
-}
-
-WW8Analyzer::WW8Analyzer()
-{
-}
-
-WW8Analyzer::~WW8Analyzer()
-{
-    dumpStats(cout);
-}
-
-void WW8Analyzer::attribute(Id name, Value & val)
-{
-    string aAttrName = (*QNameToString::Instance())(name);
-    string aStr;
-
-    if (aAttrName.length() > 6)
-        aStr = aAttrName.substr(4, 2);
-    else
-        logger("DEBUG", "WW8Analyzer::attribute:" + aAttrName);
-
-    bool bAdd = false;
-    if (aStr.compare("LC") == 0 || aStr.compare("FC") == 0)
-    {
-        if (val.getInt() != 0)
-        {
-            bAdd = true;
-        }
-    }
-    else
-    {
-        bAdd = true;
-    }
-
-    if (bAdd)
-    {
-        if (mAttributeMap.count(name) > 0)
-        {
-            sal_uInt32 nCount = mAttributeMap[name] + 1;
-            mAttributeMap[name] = nCount;
-        }
-        else
-            mAttributeMap[name] = 1;
-
-        mAttributeIdSet.insert(name);
-    }
-}
-
-void WW8Analyzer::sprm(Sprm & sprm_)
-{
-    if (mSprmMap.count(sprm_.getId()) > 0)
-    {
-        sal_uInt32 nCount = mSprmMap[sprm_.getId()] + 1;
-        mSprmMap[sprm_.getId()] = nCount;
-    }
-    else
-        mSprmMap[sprm_.getId()] = 1;
-
-    mSprmIdSet.insert(sprm_.getId());
-
-    writerfilter::Reference<Properties>::Pointer_t pProps = sprm_.getProps();
-
-    if (pProps.get() != NULL)
-    {
-        pProps->resolve(*this);
-    }
-
-}
-
-void WW8Analyzer::entry(int /*pos*/, ::writerfilter::Reference<Properties>::Pointer_t ref)
-{
-    ref->resolve(*this);
-}
-
-void WW8Analyzer::data(const sal_uInt8 * /*buf*/, size_t /*len*/,
-                       ::writerfilter::Reference<Properties>::Pointer_t /*ref*/)
-{
-}
-
-void WW8Analyzer::startSectionGroup()
-{
-}
-
-void WW8Analyzer::endSectionGroup()
-{
-}
-
-void WW8Analyzer::startParagraphGroup()
-{
-}
-
-void WW8Analyzer::endParagraphGroup()
-{
-}
-
-void WW8Analyzer::startCharacterGroup()
-{
-}
-
-void WW8Analyzer::endCharacterGroup()
-{
-}
-
-void WW8Analyzer::text(const sal_uInt8 * /*data*/, size_t /*len*/)
-{
-}
-
-void WW8Analyzer::utext(const sal_uInt8 * /*data*/, size_t /*len*/)
-{
-}
-
-void WW8Analyzer::props(writerfilter::Reference<Properties>::Pointer_t ref)
-{
-    ref->resolve(*this);
-}
-
-void WW8Analyzer::table(Id /*id*/, writerfilter::Reference<Table>::Pointer_t ref)
-{
-    ref->resolve(*this);
-}
-
-void WW8Analyzer::substream(Id /*name*/,
-                            writerfilter::Reference<Stream>::Pointer_t ref)
-{
-    ref->resolve(*this);
-}
-
-void WW8Analyzer::info(const string & /*info*/)
-{
-}
-
-void WW8Analyzer::startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > /*xShape*/ )
-{
-}
-
-void WW8Analyzer::endShape( )
-{
-}
-
-void WW8Analyzer::dumpStats(ostream & o) const
-{
-    {
-        for (IdSet::const_iterator aIt = mSprmIdSet.begin();
-             aIt != mSprmIdSet.end(); ++aIt)
-        {
-            sal_uInt32 aId = *aIt;
-
-            o << "<sprm>" << endl
-              << "<id>" << hex << aId << "</id>" << endl
-              << "<name>" << (*SprmIdToString::Instance())(aId)
-              << "</name>"  << endl
-              << "<count>" << dec << mSprmMap[aId] << "</count>"
-              << endl
-              << "</sprm>" << endl;
-        }
-    }
-
-    {
-        for (IdSet::const_iterator aIt = mAttributeIdSet.begin();
-             aIt != mAttributeIdSet.end(); ++aIt)
-        {
-            sal_uInt32 aId = *aIt;
-
-            o << "<attribute>" << endl
-              << "<name>" << (*QNameToString::Instance())(aId) << "</name>"
-              << endl
-              << "<count>" << dec << mAttributeMap[aId] << "</count>"
-              << endl
-              << "</attribute>" << endl;
-        }
-    }
-
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/resourcemodel/WW8Analyzer.hxx b/writerfilter/source/resourcemodel/WW8Analyzer.hxx
deleted file mode 100644
index 23d4fa4..0000000
--- a/writerfilter/source/resourcemodel/WW8Analyzer.hxx
+++ /dev/null
@@ -1,93 +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_ANALYZER_HXX
-#define INCLUDED_WW8_ANALYZER_HXX
-
-#include <resourcemodel/WW8ResourceModel.hxx>
-
-#include <boost/unordered_set.hpp>
-#include <map>
-
-namespace writerfilter
-{
-using namespace std;
-
-struct eqSalUInt32
-{
-    bool operator () (sal_uInt32 n1, sal_uInt32 n2) const;
-};
-
-class WW8Analyzer : public Properties, public Table,
-                    public BinaryObj, public Stream
-{
-    typedef map<sal_uInt32, sal_uInt32> SprmMap;
-
-    typedef boost::unordered_set<sal_uInt32, boost::hash<sal_uInt32>, eqSalUInt32> IdSet;
-    typedef map<Id, sal_uInt32> AttributeMap;
-
-    mutable SprmMap mSprmMap;
-    IdSet mSprmIdSet;
-    mutable AttributeMap mAttributeMap;
-    IdSet mAttributeIdSet;
-
-public:
-    WW8Analyzer();
-    virtual ~WW8Analyzer();
-
-    // Properties
-
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
-    // Table
-
-    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
-
-    // BinaryObj
-
-    virtual void data(const sal_uInt8* buf, size_t len,
-                      writerfilter::Reference<Properties>::Pointer_t ref);
-
-    // Stream
-
-    virtual void startSectionGroup();
-    virtual void endSectionGroup();
-    virtual void startParagraphGroup();
-    virtual void endParagraphGroup();
-    virtual void startCharacterGroup();
-    virtual void endCharacterGroup();
-    virtual void text(const sal_uInt8 * data, size_t len);
-    virtual void utext(const sal_uInt8 * data, size_t len);
-    virtual void props(writerfilter::Reference<Properties>::Pointer_t ref);
-    virtual void table(Id name,
-                       writerfilter::Reference<Table>::Pointer_t ref);
-    virtual void substream(Id name,
-                           writerfilter::Reference<Stream>::Pointer_t ref);
-    virtual void info(const string & info);
-    virtual void startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
-    virtual void endShape( );
-
-    void dumpStats(ostream & o) const;
-};
-}
-
-#endif // INCLUDED_WW8_ANALYZER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list