summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brauer <mib@openoffice.org>2000-10-26 08:38:52 +0000
committerMichael Brauer <mib@openoffice.org>2000-10-26 08:38:52 +0000
commit06ffa5b271a172b9154677966edb95b8a33216d3 (patch)
treeed118f81b852edcf1b22c34866e915843e56386a
parentd90529e8e3871a58e4d76377051b162debe5aa76 (diff)
tables within headers and footers
-rw-r--r--sw/source/filter/xml/swxml.cxx8
-rw-r--r--sw/source/filter/xml/xmltbli.cxx19
-rw-r--r--sw/source/filter/xml/xmltbli.hxx21
3 files changed, 35 insertions, 13 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index d2e2d8176f5b..5b2465e54d4a 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swxml.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: mib $ $Date: 2000-10-06 06:37:01 $
+ * last change: $Author: mib $ $Date: 2000-10-26 09:38:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -142,6 +142,7 @@ sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName )
{
// if there is a medium and if this medium has a load environment,
// we get an active data source from the medium.
+ pMedium->GetInStream()->Seek( 0 );
xSource = pMedium->GetDataSource();
ASSERT( xSource.is(), "XMLReader:: got no data source from medium" );
}
@@ -270,6 +271,9 @@ sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName )
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.2 2000/10/06 06:37:01 mib
+ Added missing include XActiveDataControl
+
Revision 1.1.1.1 2000/09/18 17:14:59 hr
initial import
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index eacfe63b3832..bc43c5c14d3f 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmltbli.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: mib $ $Date: 2000-09-28 12:45:50 $
+ * last change: $Author: mib $ $Date: 2000-10-26 09:38:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -809,11 +809,13 @@ SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow,
return (*pRows)[nRow]->GetCell( nCol );
}
+TYPEINIT1( SwXMLTableContext, XMLTextTableContext );
+
SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ XMLTextTableContext( rImport, nPrfx, rLName ),
pRows( new SwXMLTableRows_Impl ),
pTableNode( 0 ),
pBox1( 0 ),
@@ -888,8 +890,8 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
{
xTable->initialize( 1, 1 );
- Reference< XTextContent > xTxtCnt( xTable, UNO_QUERY );
- GetImport().GetTextImport()->InsertTextContent( xTxtCnt );
+ xTextContent = Reference< XTextContent >( xTable, UNO_QUERY );
+ GetImport().GetTextImport()->InsertTextContent( xTextContent );
Reference<XUnoTunnel> xTableTunnel( xTable, UNO_QUERY);
if( xTableTunnel.is() )
@@ -927,7 +929,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ XMLTextTableContext( rImport, nPrfx, rLName ),
xParentTable( pTable ),
pRows( new SwXMLTableRows_Impl ),
pTableNode( pTable->pTableNode ),
@@ -2044,6 +2046,11 @@ void SwXMLTableContext::EndElement()
}
}
+Reference < XTextContent > SwXMLTableContext::GetXTextContent() const
+{
+ return xTextContent;
+}
+
class SwXMLTextImportHelper : public XMLTextImportHelper
{
protected:
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index fae90ba3cac8..aec7789deecf 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmltbli.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:15:00 $
+ * last change: $Author: mib $ $Date: 2000-10-26 09:38:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,8 +62,8 @@
#ifndef _XMLTBLI_HXX
#define _XMLTBLI_HXX
-#ifndef _XMLOFF_XMLICTXT_HXX
-#include <xmloff/xmlictxt.hxx>
+#ifndef _XMLOFF_XMLTEXTTABLECONTEXT_HXX
+#include <xmloff/XMLTextTableContext.hxx>
#endif
#if !defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_BOOLS_DECL)
@@ -82,6 +82,10 @@ class SwTableLineFmt;
class SwXMLTableCell_Impl;
class SwXMLTableRows_Impl;
+namespace com { namespace sun { namespace star {
+ namespace text { class XTextContent; }
+ namespace text { class XTextCursor; }
+} } }
#ifdef XML_CORE_API
enum SwXMLStyleSubFamily
@@ -94,7 +98,7 @@ enum SwXMLStyleSubFamily
#endif
-class SwXMLTableContext : public SvXMLImportContext
+class SwXMLTableContext : public XMLTextTableContext
{
::rtl::OUString aStyleName;
@@ -104,6 +108,8 @@ class SwXMLTableContext : public SvXMLImportContext
#ifndef XML_CORE_API
::com::sun::star::uno::Reference <
::com::sun::star::text::XTextCursor > xOldCursor;
+ ::com::sun::star::uno::Reference <
+ ::com::sun::star::text::XTextContent > xTextContent;
#endif
SwXMLTableRows_Impl *pRows;
@@ -151,6 +157,8 @@ class SwXMLTableContext : public SvXMLImportContext
public:
+ TYPEINFO();
+
SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
@@ -190,6 +198,9 @@ public:
const SwStartNode *InsertTableSection( const SwStartNode *pPrevSttNd=0 );
virtual void EndElement();
+
+ virtual ::com::sun::star::uno::Reference <
+ ::com::sun::star::text::XTextContent > GetXTextContent() const;
};
inline SwXMLTableContext *SwXMLTableContext::GetParentTable() const