Kaydet (Commit) 24e56929 authored tarafından Jorenz Paragas's avatar Jorenz Paragas Kaydeden (comit) Michael Stahl

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/24632Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst a5a731da
...@@ -21,9 +21,12 @@ ...@@ -21,9 +21,12 @@
#define INCLUDED_OOX_DUMP_DFFDUMPER_HXX #define INCLUDED_OOX_DUMP_DFFDUMPER_HXX
#include <oox/dump/dumperbase.hxx> #include <oox/dump/dumperbase.hxx>
#include <sal/types.h>
#if OOX_INCLUDE_DUMPER #if OOX_INCLUDE_DUMPER
namespace oox { class BinaryInputStream; }
namespace oox { namespace oox {
namespace dump { namespace dump {
......
...@@ -20,19 +20,25 @@ ...@@ -20,19 +20,25 @@
#ifndef INCLUDED_OOX_DUMP_DUMPERBASE_HXX #ifndef INCLUDED_OOX_DUMP_DUMPERBASE_HXX
#define INCLUDED_OOX_DUMP_DUMPERBASE_HXX #define INCLUDED_OOX_DUMP_DUMPERBASE_HXX
#include <math.h> #include <cmath>
#include <vector> #include <cstddef>
#include <stack>
#include <set>
#include <map> #include <map>
#include <memory> #include <memory>
#include <rtl/strbuf.hxx> #include <set>
#include <rtl/ustrbuf.hxx> #include <utility>
#include <vector>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/DateTime.hpp>
#include <oox/helper/binaryinputstream.hxx> #include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/helper.hxx> #include <oox/helper/binarystreambase.hxx>
#include <oox/helper/storagebase.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) #define OOX_INCLUDE_DUMPER (OSL_DEBUG_LEVEL > 0)
...@@ -45,12 +51,7 @@ namespace com { namespace sun { namespace star { ...@@ -45,12 +51,7 @@ namespace com { namespace sun { namespace star {
namespace uno { class XComponentContext; } namespace uno { class XComponentContext; }
} } } } } }
namespace comphelper {
class IDocPasswordVerifier;
}
namespace oox { namespace oox {
class BinaryOutputStream;
class TextInputStream; class TextInputStream;
} }
...@@ -355,7 +356,7 @@ public: ...@@ -355,7 +356,7 @@ public:
template< typename Type > template< typename Type >
void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth ) 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 > template< typename Type >
...@@ -389,8 +390,6 @@ public: ...@@ -389,8 +390,6 @@ public:
static const String EMPTY_STRING; static const String EMPTY_STRING;
class Base;
/** Base class for all dumper classes. /** Base class for all dumper classes.
Derived classes implement the virtual function implIsValid(). It should Derived classes implement the virtual function implIsValid(). It should
......
...@@ -20,8 +20,17 @@ ...@@ -20,8 +20,17 @@
#ifndef INCLUDED_OOX_DUMP_OLEDUMPER_HXX #ifndef INCLUDED_OOX_DUMP_OLEDUMPER_HXX
#define 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/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 #if OOX_INCLUDE_DUMPER
......
...@@ -20,10 +20,19 @@ ...@@ -20,10 +20,19 @@
#ifndef INCLUDED_OOX_DUMP_PPTXDUMPER_HXX #ifndef INCLUDED_OOX_DUMP_PPTXDUMPER_HXX
#define INCLUDED_OOX_DUMP_PPTXDUMPER_HXX #define INCLUDED_OOX_DUMP_PPTXDUMPER_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <oox/dump/dumperbase.hxx> #include <oox/dump/dumperbase.hxx>
#include <rtl/ustring.hxx>
#if OOX_INCLUDE_DUMPER #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 oox {
namespace dump { namespace dump {
namespace pptx { namespace pptx {
......
...@@ -20,16 +20,26 @@ ...@@ -20,16 +20,26 @@
#ifndef INCLUDED_OOX_DUMP_XLSBDUMPER_HXX #ifndef INCLUDED_OOX_DUMP_XLSBDUMPER_HXX
#define 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 <oox/dump/dumperbase.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#if OOX_INCLUDE_DUMPER #if OOX_INCLUDE_DUMPER
namespace oox { namespace xls { namespace com { namespace sun { namespace star {
class FontPortionModelList; namespace io { class XInputStream; }
class PhoneticPortionModelList; namespace uno { class XComponentContext; }
struct FunctionInfo; } } }
class FunctionProvider;
} } namespace oox {
class BinaryInputStream;
class SequenceInputStream;
}
namespace oox { namespace core { class FilterBase; } }
namespace oox { namespace oox {
namespace dump { namespace dump {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment