You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 22:46:18 UTC
svn commit: r1409446 - in
/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml:
OOXMLFastContextHandler.cxx OOXMLFastContextHandler.hxx
Author: arist
Date: Wed Nov 14 21:46:17 2012
New Revision: 1409446
URL: http://svn.apache.org/viewvc?rev=1409446&view=rev
Log:
writerfilter10_18_da333da977c6.patch
# HG changeset patch
# User Henning Brinkmann <hb...@openoffice.org>
# Date 1297856598 -3600
# Node ID da333da977c6d8f73a20d5c33007186340808518
# Parent fb7e1780f0255c2e5fc69feb8b671915125b1856
Only pass on characters, when ordered so in model.xml
Modified:
incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1409446&r1=1409445&r2=1409446&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx Wed Nov 14 21:46:17 2012
@@ -337,7 +337,7 @@ sal_Int64 SAL_CALL OOXMLFastContextHandl
{
if( rId.getLength() == 16
&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
- rId.getConstArray(), 16 ) )
+ rId.getConstArray(), 16 ) )
{
return sal::static_int_cast<sal_Int64>
(reinterpret_cast<sal_IntPtr>(this));
@@ -835,6 +835,7 @@ void OOXMLFastContextHandler::text(const
debug_logger->chars(sText);
debug_logger->endElement("contexthandler.text");
#endif
+
if (isForwardEvents())
mpStream->utext(reinterpret_cast < const sal_uInt8 * >
(sText.getStr()),
@@ -1238,13 +1239,6 @@ void OOXMLFastContextHandlerStream::hand
getPropertySetAttrs()->resolve(aHyperlinkHandler);
}
-void OOXMLFastContextHandlerStream::lcl_characters
-(const ::rtl::OUString & rChars)
-throw (uno::RuntimeException, xml::sax::SAXException)
-{
- text(rChars);
-}
-
/*
class OOXMLFastContextHandlerProperties
*/
Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx?rev=1409446&r1=1409445&r2=1409446&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx Wed Nov 14 21:46:17 2012
@@ -306,8 +306,6 @@ public:
protected:
virtual void resolvePropertySetAttrs();
- virtual void lcl_characters(const ::rtl::OUString & aChars)
- throw (uno::RuntimeException, xml::sax::SAXException);
private:
mutable OOXMLPropertySet::Pointer_t mpPropertySetAttrs;