sax/source/expatwrap/sax_expat.cxx | 5 +---- sax/source/expatwrap/saxwriter.cxx | 5 +---- sax/source/fastparser/fastparser.cxx | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-)
New commits: commit f740673ed74b1e2daf2a65d9b167dc3a38e1dd25 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Aug 7 18:35:59 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I2d4e4be562cc752e7545792b148d5ed0cf551f25 diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 9735e07..78906eb 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> @@ -48,10 +49,6 @@ using namespace ::com::sun::star::io; #include "attrlistimpl.hxx" #include "xml2utf.hxx" -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } - namespace { // Useful macros for correct String conversion depending on the chosen expat-mode diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 331173e..0409240 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -24,6 +24,7 @@ #include <stack> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> @@ -51,10 +52,6 @@ using namespace ::com::sun::star::io; #include "xml2utf.hxx" #include <boost/scoped_array.hpp> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } - #define LINEFEED 10 #define SEQUENCESIZE 1024 #define MAXCOLUMNCOUNT 72 diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index d3103d1..1e08851 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -22,6 +22,7 @@ #include "xml2utf.hxx" #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <com/sun/star/xml/sax/XFastContextHandler.hpp> @@ -45,10 +46,6 @@ #include <cstring> #include <expat.h> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } - using namespace ::std; using namespace ::osl; using namespace ::cppu; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits