Author: orw
Date: Thu Nov 28 16:48:25 2013
New Revision: 1546395
URL: http://svn.apache.org/r1546395
Log:
123771: *.docx import - handle properties of annotations
intrinsic patches from OSBA OOXML improvement project which introduced
the import of author initials of annotations does not work, because properties
of imported annotations are not handled.
Modified:
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
Modified:
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1546395&r1=1546394&r2=1546395&view=diff
==============================================================================
---
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
(original)
+++
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
Thu Nov 28 16:48:25 2013
@@ -1621,8 +1621,10 @@ void OOXMLFastContextHandlerTable::newPr
*/
OOXMLFastContextHandlerXNote::OOXMLFastContextHandlerXNote
-(OOXMLFastContextHandler * pContext)
-: OOXMLFastContextHandler(pContext)
+ ( OOXMLFastContextHandler * pContext )
+ : OOXMLFastContextHandlerProperties( pContext )
+ , mbForwardEventsSaved( false )
+ , msMyXNoteId()
{
}
@@ -1649,7 +1651,8 @@ void OOXMLFastContextHandlerXNote::lcl_e
(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
- endAction(Element);
+ // handle properties by calling parent class' method
+ OOXMLFastContextHandlerProperties::lcl_endFastElement( Element );
setForwardEvents(mbForwardEventsSaved);
}
Modified:
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx?rev=1546395&r1=1546394&r2=1546395&view=diff
==============================================================================
---
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
(original)
+++
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
Thu Nov 28 16:48:25 2013
@@ -418,7 +418,7 @@ protected:
void addCurrentChild();
};
-class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandler
+class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandlerProperties
{
public:
OOXMLFastContextHandlerXNote(OOXMLFastContextHandler * pContext);
