diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 16:52:40 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 17:47:20 +0200 |
commit | 747519fd051f1224ee6b707b6bf51853dd705156 (patch) | |
tree | e535ee0dc52411c00eb98798d9af482b0792e587 /lotuswordpro | |
parent | 19dd5cf23052d67d78742a24f1c5be500e20a287 (diff) |
Remove useless IXFObject
Change-Id: I11bdee00bd42ef302dbbfe9f52de5824aec985ee
Diffstat (limited to 'lotuswordpro')
18 files changed, 26 insertions, 121 deletions
diff --git a/lotuswordpro/source/filter/xfilter/ixfobject.hxx b/lotuswordpro/source/filter/xfilter/ixfobject.hxx deleted file mode 100644 index f8396537948b..000000000000 --- a/lotuswordpro/source/filter/xfilter/ixfobject.hxx +++ /dev/null @@ -1,90 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 - * - * Sun Microsystems Inc., October, 2000 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (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.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: IBM Corporation - * - * Copyright: 2008 by IBM Corporation - * - * All Rights Reserved. - * - * Contributor(s): _______________________________________ - * - * - ************************************************************************/ -/************************************************************************* - * @file - * Interfer face for all object that will responsible for xml element output - ************************************************************************/ -#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFOBJECT_HXX -#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFOBJECT_HXX - -class IXFStream; -/************************************************************************* - * @descr - * This is the root interface for all object which will output something to - * the Sax Stream. - * I'll add reference management code later. - ************************************************************************/ -class IXFObject -{ -public: - /** - * Virtual destructure function for all class,This makes the XFilter module - * a single-root framework. - */ - virtual ~IXFObject(){} - - /** - * The funciton to serial the object to the sax stream. - * The objects that must implements ToXml is divided into two types: - * 1. IXFStyle objects that has something to do with styles. - * 2. XFContent objects that contents text or picture. - */ - virtual void ToXml(IXFStream *pSaxStream) = 0; -}; - -#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFOBJECT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/ixfproperty.hxx b/lotuswordpro/source/filter/xfilter/ixfproperty.hxx index 86c35d988486..fd98b77ebbbb 100644 --- a/lotuswordpro/source/filter/xfilter/ixfproperty.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfproperty.hxx @@ -60,9 +60,7 @@ #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFPROPERTY_HXX #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFPROPERTY_HXX -#include "ixfobject.hxx" - -class IXFProperty : public IXFObject +class IXFProperty { public: diff --git a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx index eb2dcf184ba1..39a4d9cbeb23 100644 --- a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx @@ -65,7 +65,7 @@ * @descr * Interface for all style object. */ -class IXFStyle : public IXFObject +class IXFStyle { public: virtual ~IXFStyle(){} @@ -104,6 +104,7 @@ public: */ virtual bool Equal(IXFStyle *pStyle) = 0; + virtual void ToXml(IXFStream * stream) = 0; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx index 5d0a84d37768..4681bf07c9b7 100644 --- a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx @@ -82,7 +82,7 @@ public: /** * @descr Output breaks object. */ - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; + void ToXml(IXFStream *pStrm); friend bool operator==(XFBreaks& b1, XFBreaks& b2); friend bool operator!=(XFBreaks& b1, XFBreaks& b2); diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx index 5cda6829c783..0f0de07c75cd 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx @@ -70,7 +70,7 @@ /** * @descr Columns object for page or section. */ -class XFColumn : public IXFObject +class XFColumn { public: XFColumn() @@ -94,7 +94,7 @@ public: /** * @descr output column style as an xml node. */ - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; + void ToXml(IXFStream *pStrm); friend bool operator==(XFColumn& c1, XFColumn& c2); friend bool operator!=(XFColumn& c1, XFColumn& c2); @@ -106,7 +106,7 @@ private: double m_fMarginRight; }; -class XFColumnSep : public IXFObject +class XFColumnSep { public: XFColumnSep() @@ -121,7 +121,7 @@ public: void SetColor(XFColor& color); void SetVerticalAlign(enumXFAlignType align); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; + void ToXml(IXFStream *pStrm); friend bool operator==(XFColumnSep& sep1, XFColumnSep& sep2); friend bool operator!=(XFColumnSep& sep1, XFColumnSep& sep2); diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/source/filter/xfilter/xfcontent.hxx index 8988a2800edf..04622723df1d 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontent.hxx @@ -64,15 +64,16 @@ #include <rtl/ustring.hxx> -#include "ixfobject.hxx" #include "xfdefs.hxx" +class IXFStream; + /** * @descr * Base class for all content object. * There is only two properties:style name and content type in this class. */ -class XFContent : public IXFObject +class XFContent { public: virtual ~XFContent() {} @@ -92,6 +93,8 @@ public: */ OUString GetStyleName() {return m_strStyleName;} + virtual void ToXml(IXFStream * stream) = 0; + protected: XFContent() {} diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx index 916356c1e1be..be3c405a6afa 100644 --- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx @@ -80,7 +80,7 @@ public: void Reset(); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; + void ToXml(IXFStream *pStrm); friend bool operator==(XFDropcap& dc1, XFDropcap& dc2); friend bool operator!=(XFDropcap& dc1, XFDropcap& dc2); diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.hxx b/lotuswordpro/source/filter/xfilter/xfglobal.hxx index a7c4321ce944..c5b6939c355e 100644 --- a/lotuswordpro/source/filter/xfilter/xfglobal.hxx +++ b/lotuswordpro/source/filter/xfilter/xfglobal.hxx @@ -67,7 +67,6 @@ #include <rtl/ustring.hxx> -#include "ixfobject.hxx" #include "ixfstream.hxx" #include "ixfattrlist.hxx" diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.hxx b/lotuswordpro/source/filter/xfilter/xfmargins.hxx index aed52b27de5c..2e3811bc882e 100644 --- a/lotuswordpro/source/filter/xfilter/xfmargins.hxx +++ b/lotuswordpro/source/filter/xfilter/xfmargins.hxx @@ -84,7 +84,7 @@ public: double GetTop(); double GetBottom(); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; + void ToXml(IXFStream *pStrm); friend bool operator==(XFMargins& indent1, XFMargins& indent2); friend bool operator!=(XFMargins& indent1, XFMargins& indent2); diff --git a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx index 8a1bb65e0151..f31519c56612 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx +++ b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx @@ -127,7 +127,7 @@ public: m_nStartValue = start; } - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE + void ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx index f8e2f4ccc564..19d9be4aadac 100644 --- a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx +++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx @@ -63,7 +63,7 @@ #include "xfglobal.hxx" -class XFOfficeMeta : public IXFObject +class XFOfficeMeta { public: XFOfficeMeta(){} @@ -76,7 +76,7 @@ public: void SetLastTime(const OUString& lstime); void SetEditTime(const OUString& edtime); - virtual void ToXml(IXFStream *pStream) SAL_OVERRIDE; + void ToXml(IXFStream *pStream); private: OUString m_strGenerator; OUString m_strTitle; diff --git a/lotuswordpro/source/filter/xfilter/xfpadding.hxx b/lotuswordpro/source/filter/xfilter/xfpadding.hxx index a39c1252d1c6..094f917d3587 100644 --- a/lotuswordpro/source/filter/xfilter/xfpadding.hxx +++ b/lotuswordpro/source/filter/xfilter/xfpadding.hxx @@ -106,7 +106,7 @@ public: /** * @descr Output padding properties. */ - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; + void ToXml(IXFStream *pStrm); friend bool operator==(XFPadding& p1, XFPadding& p2); friend bool operator!=(XFPadding& p1, XFPadding& p2); diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx index ac2aa18ea72d..74464e93bf11 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx @@ -108,7 +108,7 @@ public: OUString ToString(); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; + void ToXml(IXFStream *pStrm); friend bool operator==(XFShadow& s1, XFShadow& s2); friend bool operator!=(XFShadow& s1, XFShadow& s2); diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx index d4f3ecb03cde..d390ed60577d 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx @@ -70,7 +70,7 @@ XFStyleContainer::XFStyleContainer(const OUString& strStyleNamePrefix) { } -XFStyleContainer::XFStyleContainer(const XFStyleContainer& other):IXFObject(other), +XFStyleContainer::XFStyleContainer(const XFStyleContainer& other): m_aStyles(other.m_aStyles), m_strStyleNamePrefix(other.m_strStyleNamePrefix) { } diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx index 8c477722909b..50dae185a30d 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx @@ -69,7 +69,7 @@ class IXFStyle; * @descr container object for styles. * All styles can be placed into an style container. */ -class XFStyleContainer : public IXFObject +class XFStyleContainer { public: XFStyleContainer(){} @@ -117,7 +117,7 @@ public: /** * @descr Output all style. */ - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; + virtual void ToXml(IXFStream *pStrm); friend bool operator==(XFStyleContainer& b1, XFStyleContainer& b2); friend bool operator!=(XFStyleContainer& b1, XFStyleContainer& b2); diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx index 5f03f55582c0..a96ad5c731a6 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx @@ -80,7 +80,7 @@ class XFEndnoteConfig; * Style manager for the filter. * This is a global object, all styles will be placed here before output. */ -class XFStyleManager// : public IXFObject +class XFStyleManager { public: XFStyleManager(); diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx index 391b65a67c89..1492b09415f7 100644 --- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx @@ -53,10 +53,7 @@ * * ************************************************************************/ -/************************************************************************* - * @file - * Text content, it's an adapter for string to IXFObject. - ************************************************************************/ + #include "xftextcontent.hxx" #include "ixfstream.hxx" diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx index c7894fb9ff52..eef5c18d0983 100644 --- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx @@ -53,10 +53,7 @@ * * ************************************************************************/ -/************************************************************************* - * @file - * Text content, it's an adapter for string to IXFObject. - ************************************************************************/ + #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTCONTENT_HXX #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTCONTENT_HXX |