[Libreoffice-commits] core.git: include/oox oox/source

[Jorenz Paragas]

 include/oox/mathml/export.hxx      |    7 ++++---
 include/oox/mathml/import.hxx      |    4 +---
 include/oox/mathml/importutils.hxx |   10 ++++++++--
 oox/source/mathml/importutils.cxx  |    2 ++
 4 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 7b9ea3348ac08d775ae452132239853724c65a41
Author: Jorenz Paragas <j.paragas.237 at gmail.com>
Date:   Tue May 10 20:51:18 2016 -0700

    tdf#42949: clean up includes in include/oox/mathml with iwyu
    
    Change-Id: Iefb4e7184009318c0b8859aa895e0b25fc9d9213
    Reviewed-on: https://gerrit.libreoffice.org/24871
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/oox/mathml/export.hxx b/include/oox/mathml/export.hxx
index 20b6b21..5711337 100644
--- a/include/oox/mathml/export.hxx
+++ b/include/oox/mathml/export.hxx
@@ -9,11 +9,12 @@
 #ifndef INCLUDED_OOX_MATHML_EXPORT_HXX
 #define INCLUDED_OOX_MATHML_EXPORT_HXX
 
-#include <sax/fshelper.hxx>
-#include <rtl/strbuf.hxx>
 #include <oox/core/filterbase.hxx>
-#include <oox/export/utils.hxx>
 #include <oox/dllapi.h>
+#include <oox/export/utils.hxx>
+#include <rtl/strbuf.hxx>
+#include <rtl/textenc.h>
+#include <sax/fshelper.hxx>
 
 namespace oox
 {
diff --git a/include/oox/mathml/import.hxx b/include/oox/mathml/import.hxx
index b2ed99b..92db9a8 100644
--- a/include/oox/mathml/import.hxx
+++ b/include/oox/mathml/import.hxx
@@ -10,10 +10,8 @@
 #define INCLUDED_OOX_MATHML_IMPORT_HXX
 
 #include <oox/dllapi.h>
-
-#include <tools/gen.hxx>
-
 #include <rtl/ref.hxx>
+#include <tools/gen.hxx>
 
 namespace oox
 {
diff --git a/include/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx
index 2ec7af7..bdfdf7c 100644
--- a/include/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
@@ -9,12 +9,18 @@
 #ifndef INCLUDED_OOX_MATHML_IMPORTUTILS_HXX
 #define INCLUDED_OOX_MATHML_IMPORTUTILS_HXX
 
-#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
-#include <oox/token/tokens.hxx>
 #include <map>
 #include <vector>
 
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
+#include <oox/token/tokens.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace xml { namespace sax { class XFastAttributeList; } }
+} } }
 
 namespace oox
 {
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index e3f4d90..ed97abd 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -11,6 +11,8 @@
 
 #include <assert.h>
 
+#include <com/sun/star/xml/FastAttribute.hpp>
+#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <oox/token/namespacemap.hxx>
 #include <oox/token/tokenmap.hxx>
 #include <oox/token/tokens.hxx>