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

[Jorenz Paragas]

 include/oox/dump/dffdumper.hxx  |    3 +++
 include/oox/dump/dumperbase.hxx |   29 ++++++++++++++---------------
 include/oox/dump/oledumper.hxx  |   11 ++++++++++-
 include/oox/dump/pptxdumper.hxx |    9 +++++++++
 include/oox/dump/xlsbdumper.hxx |   22 ++++++++++++++++------
 5 files changed, 52 insertions(+), 22 deletions(-)

New commits:
commit 24e56929445f0e3e22c7129bf18e912ae1ac6fc1
Author: Jorenz Paragas <j.paragas.237 at gmail.com>
Date:   Tue May 3 23:11:01 2016 -0700

    tdf#42949: clean up includes in include/oox/dump with iwyu
    
    Additionally, include cmath instead of math.h in dumperbase.hxx.
    
    Change-Id: I0ee7158c86bdf266c783340bcf891aff44399066
    Reviewed-on: https://gerrit.libreoffice.org/24632
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index 2cde09d..5f49b81 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -21,9 +21,12 @@
 #define INCLUDED_OOX_DUMP_DFFDUMPER_HXX
 
 #include <oox/dump/dumperbase.hxx>
+#include <sal/types.h>
 
 #if OOX_INCLUDE_DUMPER
 
+namespace oox { class BinaryInputStream; }
+
 namespace oox {
 namespace dump {
 
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 4561720..7e10ee1 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -20,19 +20,25 @@
 #ifndef INCLUDED_OOX_DUMP_DUMPERBASE_HXX
 #define INCLUDED_OOX_DUMP_DUMPERBASE_HXX
 
-#include <math.h>
-#include <vector>
-#include <stack>
-#include <set>
+#include <cmath>
+#include <cstddef>
 #include <map>
 #include <memory>
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
+#include <set>
+#include <utility>
+#include <vector>
+
 #include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include <oox/helper/binaryinputstream.hxx>
-#include <oox/helper/helper.hxx>
+#include <oox/helper/binarystreambase.hxx>
 #include <oox/helper/storagebase.hxx>
+#include <rtl/string.hxx>
+#include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <sal/types.h>
 
 #define OOX_INCLUDE_DUMPER (OSL_DEBUG_LEVEL > 0)
 
@@ -45,12 +51,7 @@ namespace com { namespace sun { namespace star {
     namespace uno { class XComponentContext; }
 } } }
 
-namespace comphelper {
-    class IDocPasswordVerifier;
-}
-
 namespace oox {
-    class BinaryOutputStream;
     class TextInputStream;
 }
 
@@ -355,7 +356,7 @@ public:
 template< typename Type >
 void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth )
 {
-    appendDec( rStr, static_cast< double >( nData ) / pow( 2.0, 4.0 * sizeof( Type ) ), nWidth );
+    appendDec( rStr, static_cast< double >( nData ) / std::pow( 2.0, 4.0 * sizeof( Type ) ), nWidth );
 }
 
 template< typename Type >
@@ -389,8 +390,6 @@ public:
 static const String EMPTY_STRING;
 
 
-class Base;
-
 /** Base class for all dumper classes.
 
     Derived classes implement the virtual function implIsValid(). It should
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index 0edae38..95d9db4 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -20,8 +20,17 @@
 #ifndef INCLUDED_OOX_DUMP_OLEDUMPER_HXX
 #define INCLUDED_OOX_DUMP_OLEDUMPER_HXX
 
-#include <oox/helper/storagebase.hxx>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/dump/dumperbase.hxx>
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/storagebase.hxx>
+#include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 #if OOX_INCLUDE_DUMPER
 
diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index 9b0a148..0660447 100644
--- a/include/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
@@ -20,10 +20,19 @@
 #ifndef INCLUDED_OOX_DUMP_PPTXDUMPER_HXX
 #define INCLUDED_OOX_DUMP_PPTXDUMPER_HXX
 
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/dump/dumperbase.hxx>
+#include <rtl/ustring.hxx>
 
 #if OOX_INCLUDE_DUMPER
 
+namespace com { namespace sun { namespace star {
+    namespace io { class XInputStream; }
+    namespace uno { class XComponentContext; }
+} } }
+
+namespace oox { namespace core { class FilterBase; } }
+
 namespace oox {
 namespace dump {
 namespace pptx {
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index 1d8c282..8c4e5f3 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -20,16 +20,26 @@
 #ifndef INCLUDED_OOX_DUMP_XLSBDUMPER_HXX
 #define INCLUDED_OOX_DUMP_XLSBDUMPER_HXX
 
+#include <memory>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/dump/dumperbase.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 #if OOX_INCLUDE_DUMPER
 
-namespace oox { namespace xls {
-    class FontPortionModelList;
-    class PhoneticPortionModelList;
-    struct FunctionInfo;
-    class FunctionProvider;
-} }
+namespace com { namespace sun { namespace star {
+    namespace io { class XInputStream; }
+    namespace uno { class XComponentContext; }
+} } }
+
+namespace oox {
+    class BinaryInputStream;
+    class SequenceInputStream;
+}
+
+namespace oox { namespace core { class FilterBase; } }
 
 namespace oox {
 namespace dump {