summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brauer <mib@openoffice.org>2000-12-02 10:04:42 +0000
committerMichael Brauer <mib@openoffice.org>2000-12-02 10:04:42 +0000
commitfc6b2f5836df26ecd1ae2155b72b55e4a25ede8b (patch)
tree69dd63d05a7184296a55f21598e1401e211513fb
parent89bbf41f22528a65b315c6e0e0d1ecfb0d6fe5ae (diff)
#80795#: XML package filter
-rw-r--r--sw/source/filter/basflt/fltini.cxx10
-rw-r--r--sw/source/filter/inc/fltini.hxx6
2 files changed, 11 insertions, 5 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 9296d859b61c..376813b5aad3 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fltini.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jp $ $Date: 2000-11-20 14:17:21 $
+ * last change: $Author: mib $ $Date: 2000-12-02 11:03:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -238,7 +238,8 @@ void _InitFilter()
_SetFltPtr( nCnt, new WW1Reader, sWW1 );
_SetFltPtr( nCnt, pWW8Rd, sWW5 );
_SetFltPtr( nCnt, ReadSwg, sSwg1 );
- _SetFltPtr( nCnt, (ReadXML = new XMLReader), FILTER_XML );
+ _SetFltPtr( nCnt, (ReadXML = new XMLReader), FILTER_CXML );
+ _SetFltPtr( nCnt, ReadXML, FILTER_XML );
#ifdef NEW_WW97_EXPORT
aReaderWriter[ 9 ].fnGetWriter = &::GetWW8Writer;
@@ -1545,6 +1546,9 @@ Color ConvertBrushStyle(const Color& rCol, const Color& rFillCol, BYTE nStyle)
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.4 2000/11/20 14:17:21 jp
+ ReadFilterFlags removed, use new class SwFilterOptions
+
Revision 1.3 2000/11/13 10:46:09 jp
remove IniManager
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index af34201e27dd..d83692fd7518 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fltini.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jp $ $Date: 2000-11-20 13:04:22 $
+ * last change: $Author: mib $ $Date: 2000-12-02 11:04:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -153,6 +153,8 @@ class XMLReader : public Reader
{
virtual ULONG Read(SwDoc &,SwPaM &,const String &);
public:
+ virtual int GetReaderType();
+
XMLReader();
};