Author: orw
Date: Thu Dec 19 12:36:16 2013
New Revision: 1552295
URL: http://svn.apache.org/r1552295
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.
cherry-picked from branch ooxml-osba
Modified:
openoffice/trunk/ (props changed)
openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
Propchange: openoffice/trunk/
------------------------------------------------------------------------------
Merged /openoffice/branches/ooxml-osba:r1546395
Modified:
openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1552295&r1=1552294&r2=1552295&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
(original)
+++ openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
Thu Dec 19 12:36:16 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/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx?rev=1552295&r1=1552294&r2=1552295&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
(original)
+++ openoffice/trunk/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
Thu Dec 19 12:36:16 2013
@@ -418,7 +418,7 @@ protected:
void addCurrentChild();
};
-class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandler
+class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandlerProperties
{
public:
OOXMLFastContextHandlerXNote(OOXMLFastContextHandler * pContext);
