summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-22 11:45:36 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-22 11:45:36 +0000
commitd0b404ffe1b5040c680bc7f319e9e859bfa43c7f (patch)
tree5f656b137a6ac353d858681e7676b6cb519c27e0 /writerfilter
parentcca3ef40c7a1239dee4defc208896c350dffee4b (diff)
INTEGRATION: CWS xmlfilter06 (1.5.6); FILE MERGED
2008/06/05 15:59:01 hbrinkm 1.5.6.4: debug code 2008/06/02 15:12:56 hbrinkm 1.5.6.3: no need to TagLogger 2008/05/30 12:18:07 hbrinkm 1.5.6.2: handleLastParagraphInSection, sendPropertiesWithId 2008/05/27 11:36:09 dr 1.5.6.1: joined changes from CWS xmlfilter05
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.hxx15
1 files changed, 10 insertions, 5 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 180db16404bd..c4a79a696e68 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: OOXMLFastContextHandler.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
* This file is part of OpenOffice.org.
*
@@ -135,6 +135,7 @@ public:
virtual ResourceEnum_t getResource() const { return UNKNOWN; }
+ static XMLTag::Pointer_t toPropertiesTag(OOXMLPropertySet::Pointer_t);
virtual XMLTag::Pointer_t toTag() const;
virtual string toString() const;
@@ -181,6 +182,8 @@ public:
void setFallback(bool bFallbac);
bool isFallback() const;
+ OOXMLParserState::Pointer_t getParserState() const;
+
#ifdef DEBUG_MEMORY
virtual void SAL_CALL acquire() throw();
virtual void SAL_CALL release() throw();
@@ -225,8 +228,10 @@ protected:
virtual void lcl_characters(const ::rtl::OUString & aChars)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void startAction(Token_t Element);
- virtual void endAction(Token_t Element);
+ void startAction(Token_t Element);
+ virtual void lcl_startAction(Token_t Element);
+ void endAction(Token_t Element);
+ virtual void lcl_endAction(Token_t Element);
// Returns string for resource of this context. (debug)
@@ -258,11 +263,13 @@ protected:
void cr();
void noBreakHyphen();
void softHyphen();
+ void handleLastParagraphInSection();
void endOfParagraph();
void text(const ::rtl::OUString & sText);
virtual void propagateCharacterProperties();
virtual void propagateCharacterPropertiesAsSet(const Id & rId);
virtual bool propagatesProperties() const;
+ void sendPropertiesWithId(const Id & rId);
void propagateTableProperties();
void clearProps();
@@ -303,8 +310,6 @@ public:
virtual void sendProperty(Id nId);
virtual OOXMLPropertySet::Pointer_t getPropertySet() const;
- virtual XMLTag::Pointer_t toTag() const;
-
void handleHyperlink();
protected: