Author: damjan
Date: Wed Feb 24 02:17:39 2016
New Revision: 1732011
URL: http://svn.apache.org/viewvc?rev=1732011&view=rev
Log:
Merge r1409446 from branches/gbuild:
Only pass on characters, when ordered so in model.xml
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 02:17:39 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409436,1409438,1409440,1409442,1409444-1409445,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1732011&r1=1732010&r2=1732011&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
Wed Feb 24 02:17:39 2016
@@ -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()),
@@ -1232,13 +1233,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:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx?rev=1732011&r1=1732010&r2=1732011&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
Wed Feb 24 02:17:39 2016
@@ -308,8 +308,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;
