diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-08 21:06:30 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-08 21:08:13 +0200 |
commit | 2541f60615ebbdebeab870625817a1f4d8ad1682 (patch) | |
tree | c8d9c6edebcd4ef3112012c3fb85321816578586 /writerfilter/source/doctok | |
parent | e25eb1e062a0b30f9b95bd8168a712a5274083fd (diff) |
writerfilter: drop unused WW8OutputWithDepth
Change-Id: I7526953ba1f4d95cb550be13df6616cb6046e518
Diffstat (limited to 'writerfilter/source/doctok')
-rw-r--r-- | writerfilter/source/doctok/WW8Clx.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8OutputWithDepth.cxx | 43 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8OutputWithDepth.hxx | 47 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8Picture.cxx | 11 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8PropertySetImpl.hxx | 1 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 35 | ||||
-rw-r--r-- | writerfilter/source/doctok/resourcesimpl.xsl | 6 |
7 files changed, 5 insertions, 140 deletions
diff --git a/writerfilter/source/doctok/WW8Clx.hxx b/writerfilter/source/doctok/WW8Clx.hxx index e985d218b6f8..b15c5e21a7d2 100644 --- a/writerfilter/source/doctok/WW8Clx.hxx +++ b/writerfilter/source/doctok/WW8Clx.hxx @@ -22,8 +22,6 @@ #include <doctok/resources.hxx> -#include "WW8OutputWithDepth.hxx" - namespace writerfilter { namespace doctok { diff --git a/writerfilter/source/doctok/WW8OutputWithDepth.cxx b/writerfilter/source/doctok/WW8OutputWithDepth.cxx deleted file mode 100644 index fcde204ed7e2..000000000000 --- a/writerfilter/source/doctok/WW8OutputWithDepth.cxx +++ /dev/null @@ -1,43 +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 <iostream> -#include "WW8OutputWithDepth.hxx" - -namespace writerfilter { -namespace doctok -{ - -using namespace ::std; - -WW8OutputWithDepth::WW8OutputWithDepth() -: OutputWithDepth<string>("<tablegroup>", "</tablegroup>") -{ -} - -void WW8OutputWithDepth::output(const string & str) const -{ - cout << str << endl; -} - -WW8OutputWithDepth output; - -}} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/doctok/WW8OutputWithDepth.hxx b/writerfilter/source/doctok/WW8OutputWithDepth.hxx deleted file mode 100644 index 8b168a3d7ee0..000000000000 --- a/writerfilter/source/doctok/WW8OutputWithDepth.hxx +++ /dev/null @@ -1,47 +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_OUTPUT_WITH_DEPTH -#define INCLUDED_WW8_OUTPUT_WITH_DEPTH - -#include <resourcemodel/OutputWithDepth.hxx> - -#include <string> - -using namespace ::std; - -namespace writerfilter { -namespace doctok -{ -class WW8OutputWithDepth : public OutputWithDepth<string> -{ -protected: - void output(const string & output) const; -public: - WW8OutputWithDepth(); - virtual ~WW8OutputWithDepth() { finalize(); } -}; - -extern WW8OutputWithDepth output; - -}} - -#endif // INCLUDED_WW8_OUTPUT_WITH_DEPTH - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/doctok/WW8Picture.cxx b/writerfilter/source/doctok/WW8Picture.cxx index ab589b7a4d33..9022f833b588 100644 --- a/writerfilter/source/doctok/WW8Picture.cxx +++ b/writerfilter/source/doctok/WW8Picture.cxx @@ -39,16 +39,7 @@ WW8PICF::get_DffRecord() writerfilter::Reference<Properties>::Pointer_t WW8PICF::get_ffdata() { - writerfilter::Reference<Properties>::Pointer_t - pRet(new WW8FFDATA(this, get_cbHeader(), getCount() - get_cbHeader())); - - WW8StructBase::Pointer_t pStruct - (new WW8StructBase(this, get_cbHeader(), - getCount() - get_cbHeader())); - - pStruct->dump(output); - - return pRet; + return writerfilter::Reference<Properties>::Pointer_t(); } writerfilter::Reference<Properties>::Pointer_t diff --git a/writerfilter/source/doctok/WW8PropertySetImpl.hxx b/writerfilter/source/doctok/WW8PropertySetImpl.hxx index 78340a8a479f..928b518b0b38 100644 --- a/writerfilter/source/doctok/WW8PropertySetImpl.hxx +++ b/writerfilter/source/doctok/WW8PropertySetImpl.hxx @@ -23,7 +23,6 @@ #include <resourcemodel/WW8ResourceModel.hxx> #include <doctok/WW8Document.hxx> #include "WW8StructBase.hxx" -#include "WW8OutputWithDepth.hxx" #include <map> diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx index 10f5891eb239..ca707ecfe101 100644 --- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx +++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx @@ -19,7 +19,6 @@ #include "WW8ResourceModelImpl.hxx" #include <doctok/resources.hxx> -#include "WW8OutputWithDepth.hxx" #include <resourcemodel/TableManager.hxx> #include <rtl/string.hxx> #include <resourcemodel/QNameToString.hxx> @@ -52,63 +51,37 @@ public: virtual void endCell(const string & end); }; -void WW8TableDataHandler::startTable(unsigned int nRows, unsigned int nDepth, +void WW8TableDataHandler::startTable(unsigned int /*nRows*/, unsigned int /*nDepth*/, TablePropsPointer_t /*pProps*/) { - char sBuffer[256]; - - string tmpStr = "<tabledata.table rows=\""; - snprintf(sBuffer, sizeof(sBuffer), "%u", nRows); - tmpStr += sBuffer; - tmpStr += "\" depth=\""; - snprintf(sBuffer, sizeof(sBuffer), "%u", nDepth); - tmpStr += sBuffer; - tmpStr += "\">"; - - output.addItem(tmpStr); } void WW8TableDataHandler::endTable(unsigned int /*nestedTableLevel*/) { - output.addItem("</tabledata.table>"); } void WW8TableDataHandler::startRow -(unsigned int nCols, TablePropsPointer_t /*pProps*/) +(unsigned int /*nCols*/, TablePropsPointer_t /*pProps*/) { - char sBuffer[256]; - - snprintf(sBuffer, sizeof(sBuffer), "%u", nCols); - string tmpStr = "<tabledata.row cells=\""; - tmpStr += sBuffer; - tmpStr += "\">"; - output.addItem(tmpStr); } void WW8TableDataHandler::endRow() { - output.addItem("</tabledata.row>"); } -void WW8TableDataHandler::startCell(const string & start, +void WW8TableDataHandler::startCell(const string & /*start*/, TablePropsPointer_t /*pProps*/) { - output.addItem("<tabledata.cell>"); - output.addItem(start); - output.addItem(", "); } -void WW8TableDataHandler::endCell(const string & end) +void WW8TableDataHandler::endCell(const string & /*end*/) { - output.addItem(end); - output.addItem("</tabledata.cell>"); } //-------- WW8TableReference ----------------------------------- void WW8TableReference::resolve(Table & /*rHandler*/) { - output.addItem("<table/>"); } string WW8TableReference::getType() const diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl index 196b44e724e2..a1e7748054c8 100644 --- a/writerfilter/source/doctok/resourcesimpl.xsl +++ b/writerfilter/source/doctok/resourcesimpl.xsl @@ -26,10 +26,6 @@ <xsl:text> #include <doctok/resources.hxx> -#ifndef WW8_OUTPUT_WITH_DEPTH -#include <doctok/WW8OutputWithDepth.hxx> -#endif - #ifndef INCLUDED_SPRMIDS_HXX #include <doctok/sprmids.hxx> #endif @@ -37,8 +33,6 @@ namespace writerfilter { namespace doctok { -extern WW8OutputWithDepth output; - using namespace ::std; </xsl:text> <xsl:apply-templates select='/XMI/XMI.content/UML:Model' mode="sprmkind"/> |