[Libreoffice-commits] core.git: include/oox oox/source sc/source sw/source
Jorenz Paragas
j.paragas.237 at gmail.com
Fri May 13 10:06:06 UTC 2016
include/oox/ole/axbinaryreader.hxx | 9 +++++++-
include/oox/ole/axbinarywriter.hxx | 5 ++++
include/oox/ole/axcontrol.hxx | 12 +++++++++-
include/oox/ole/axcontrolfragment.hxx | 7 ++++++
include/oox/ole/axfontdata.hxx | 10 ++++++---
include/oox/ole/olehelper.hxx | 34 ++++++++++++++-----------------
include/oox/ole/oleobjecthelper.hxx | 3 ++
include/oox/ole/olestorage.hxx | 9 ++++++++
include/oox/ole/vbacontrol.hxx | 18 ++++++++++++++--
include/oox/ole/vbaexport.hxx | 5 +++-
include/oox/ole/vbahelper.hxx | 2 +
include/oox/ole/vbainputstream.hxx | 4 +++
include/oox/ole/vbamodule.hxx | 2 +
include/oox/ole/vbaproject.hxx | 19 +++++++++++------
oox/source/ole/axbinaryreader.cxx | 1
oox/source/ole/olehelper.cxx | 5 ++++
sc/source/filter/inc/excelhandlers.hxx | 1
sc/source/filter/oox/drawingfragment.cxx | 1
sw/source/filter/ww8/wrtw8nds.cxx | 1
19 files changed, 115 insertions(+), 33 deletions(-)
New commits:
commit 96d5516429bc1846fc6cf7119590f7b05a65eef8
Author: Jorenz Paragas <j.paragas.237 at gmail.com>
Date: Wed May 11 22:02:58 2016 -0700
tdf#42949: clean up includes in include/oox/ole with iwyu
Change-Id: I9cbdc78b540b0f735c451ac561f0f0ccdaf7efbd
Reviewed-on: https://gerrit.libreoffice.org/24911
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index 5823fbb..81b1053 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -20,10 +20,17 @@
#ifndef INCLUDED_OOX_OLE_AXBINARYREADER_HXX
#define INCLUDED_OOX_OLE_AXBINARYREADER_HXX
+#include <cstddef>
#include <utility>
+#include <vector>
+
#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binarystreambase.hxx>
#include <oox/helper/refvector.hxx>
-#include <oox/ole/axfontdata.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox { namespace ole { struct AxFontData; } }
namespace oox {
namespace ole {
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index 66dc500..d1fe1a2 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -10,9 +10,14 @@
#ifndef INCLUDED_OOX_OLE_AXBINARYWRITER_HXX
#define INCLUDED_OOX_OLE_AXBINARYWRITER_HXX
+#include <cstddef>
#include <utility>
+
#include <oox/helper/binaryoutputstream.hxx>
+#include <oox/helper/binarystreambase.hxx>
#include <oox/helper/refvector.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace oox {
namespace ole {
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index e8c879a..4d91f97 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -20,12 +20,19 @@
#ifndef INCLUDED_OOX_OLE_AXCONTROL_HXX
#define INCLUDED_OOX_OLE_AXCONTROL_HXX
+#include <memory>
+#include <vector>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <oox/dllapi.h>
#include <oox/helper/binarystreambase.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/ole/axbinaryreader.hxx>
+#include <oox/ole/axfontdata.hxx>
#include <oox/ole/olehelper.hxx>
-#include <oox/dllapi.h>
-#include <memory>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace awt { class XControlModel; }
@@ -38,6 +45,7 @@ namespace com { namespace sun { namespace star {
namespace oox {
class BinaryInputStream;
+ class BinaryOutputStream;
class GraphicHelper;
class PropertyMap;
}
diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx
index b4284cf..a741aed 100644
--- a/include/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
@@ -20,7 +20,14 @@
#ifndef INCLUDED_OOX_OLE_AXCONTROLFRAGMENT_HXX
#define INCLUDED_OOX_OLE_AXCONTROLFRAGMENT_HXX
+#include <oox/core/contexthandler.hxx>
+#include <oox/core/contexthandler2.hxx>
#include <oox/core/fragmenthandler2.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }
namespace oox {
namespace ole {
diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx
index 05694fb..b6bcf9e 100644
--- a/include/oox/ole/axfontdata.hxx
+++ b/include/oox/ole/axfontdata.hxx
@@ -20,10 +20,14 @@
#ifndef INCLUDED_OOX_OLE_AXFONTDATA_HXX
#define INCLUDED_OOX_OLE_AXFONTDATA_HXX
-#include <oox/helper/binaryinputstream.hxx>
-#include <oox/helper/binaryoutputstream.hxx>
-#include <oox/helper/refvector.hxx>
#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox {
+ class BinaryInputStream;
+ class BinaryOutputStream;
+}
namespace oox {
namespace ole {
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 0a6ba4a..d848cc4 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -20,24 +20,24 @@
#ifndef INCLUDED_OOX_OLE_OLEHELPER_HXX
#define INCLUDED_OOX_OLE_OLEHELPER_HXX
-#include <rtl/ustring.hxx>
-#include <tools/ref.hxx>
-#include <oox/helper/binarystreambase.hxx>
-#include <oox/helper/storagebase.hxx>
-#include <oox/helper/graphichelper.hxx>
-#include <com/sun/star/form/XFormComponent.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/uno/Reference.hxx>
#include <filter/msfilter/msocximex.hxx>
#include <oox/dllapi.h>
+#include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/graphichelper.hxx>
+#include <oox/helper/helper.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <tools/ref.hxx>
+
+namespace com { namespace sun { namespace star {
+ namespace awt { class XControlModel; }
+ namespace awt { struct Size; }
+ namespace form { class XFormComponent; }
+ namespace frame { class XModel; }
+ namespace io { class XOutputStream; }
+ namespace uno { class XComponentContext; }
+} } }
class SotStorage;
class SotStorageStream;
@@ -46,8 +46,6 @@ class SvGlobalName;
namespace oox {
class BinaryInputStream;
class BinaryOutputStream;
- class BinaryXInputStream;
- class GraphicHelper;
}
namespace oox {
diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx
index 0947ad1..604785f 100644
--- a/include/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
@@ -20,8 +20,11 @@
#ifndef INCLUDED_OOX_OLE_OLEOBJECTHELPER_HXX
#define INCLUDED_OOX_OLE_OLEOBJECTHELPER_HXX
+#include <com/sun/star/uno/Reference.hxx>
#include <oox/dllapi.h>
#include <oox/helper/binarystreambase.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace awt { struct Size; }
diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index 9039cae..88b0ff8 100644
--- a/include/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
@@ -20,10 +20,19 @@
#ifndef INCLUDED_OOX_OLE_OLESTORAGE_HXX
#define INCLUDED_OOX_OLE_OLESTORAGE_HXX
+#include <vector>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/dllapi.h>
#include <oox/helper/storagebase.hxx>
+#include <rtl/ustring.hxx>
namespace com { namespace sun { namespace star {
namespace container { class XNameContainer; }
+ namespace embed { class XStorage; }
+ namespace io { class XInputStream; }
+ namespace io { class XOutputStream; }
+ namespace io { class XStream; }
namespace uno { class XComponentContext; }
} } }
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index daf3f1b..395b2c7 100644
--- a/include/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
@@ -20,15 +20,29 @@
#ifndef INCLUDED_OOX_OLE_VBACONTROL_HXX
#define INCLUDED_OOX_OLE_VBACONTROL_HXX
+#include <memory>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/helper/refvector.hxx>
+#include <oox/ole/axbinaryreader.hxx>
#include <oox/ole/axcontrol.hxx>
-#include <com/sun/star/frame/XModel.hpp>
+#include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
+ namespace awt { class XControlModel; }
namespace container { class XNameContainer; }
+ namespace frame { class XModel; }
namespace uno { class XComponentContext; }
} } }
-namespace oox { class StorageBase; }
+namespace oox {
+ class BinaryInputStream;
+ class GraphicHelper;
+ class PropertyMap;
+ class StorageBase;
+}
namespace oox {
namespace ole {
diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx
index 732a50c..987bbdf 100644
--- a/include/oox/ole/vbaexport.hxx
+++ b/include/oox/ole/vbaexport.hxx
@@ -10,9 +10,12 @@
#ifndef INCLUDED_OOX_OLE_VBAEXPORT_HXX
#define INCLUDED_OOX_OLE_VBAEXPORT_HXX
-#include <com/sun/star/uno/XInterface.hpp>
+#include <cstddef>
+#include <com/sun/star/uno/Reference.hxx>
#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
class SotStorage;
class SvStream;
diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx
index 94a63ef..9c9c3c3 100644
--- a/include/oox/ole/vbahelper.hxx
+++ b/include/oox/ole/vbahelper.hxx
@@ -21,6 +21,8 @@
#define INCLUDED_OOX_OLE_VBAHELPER_HXX
#include <oox/helper/binarystreambase.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace oox { class BinaryInputStream; }
diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx
index dd6e53a..f002ce8 100644
--- a/include/oox/ole/vbainputstream.hxx
+++ b/include/oox/ole/vbainputstream.hxx
@@ -20,8 +20,12 @@
#ifndef INCLUDED_OOX_OLE_VBAINPUTSTREAM_HXX
#define INCLUDED_OOX_OLE_VBAINPUTSTREAM_HXX
+#include <cstddef>
#include <vector>
+
#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binarystreambase.hxx>
+#include <sal/types.h>
namespace oox {
namespace ole {
diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx
index 68aef13..cb36828 100644
--- a/include/oox/ole/vbamodule.hxx
+++ b/include/oox/ole/vbamodule.hxx
@@ -21,7 +21,9 @@
#define INCLUDED_OOX_OLE_VBAMODULE_HXX
#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace container { class XNameAccess; }
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index d523098..ea7ffcc 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -20,27 +20,34 @@
#ifndef INCLUDED_OOX_OLE_VBAPROJECT_HXX
#define INCLUDED_OOX_OLE_VBAPROJECT_HXX
+#include <functional>
#include <map>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <oox/helper/refvector.hxx>
-#include <oox/helper/storagebase.hxx>
+
+#include <com/sun/star/uno/Reference.hxx>
#include <oox/dllapi.h>
-#include <oox/ole/vbamodule.hxx>
+#include <oox/helper/refmap.hxx>
+#include <oox/helper/refvector.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace container { class XNameContainer; }
- namespace document { class XEventsSupplier; }
namespace frame { class XModel; }
namespace script { class XLibraryContainer; }
namespace script { namespace vba { class XVBAMacroResolver; } }
namespace uno { class XComponentContext; }
+ namespace uno { class XInterface; }
} } }
-namespace oox { class GraphicHelper; }
+namespace oox {
+ class GraphicHelper;
+ class StorageBase;
+}
namespace oox {
namespace ole {
+class VbaModule;
class OOX_DLLPUBLIC VbaFilterConfig
{
diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index 362a155..e552dbf 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -19,6 +19,7 @@
#include "oox/ole/axbinaryreader.hxx"
+#include <oox/ole/axfontdata.hxx>
#include "oox/ole/olehelper.hxx"
#include <osl/diagnose.h>
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 9b032d7..6747bbc 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -23,6 +23,7 @@
#include <sot/storage.hxx>
#include <osl/diagnose.h>
#include "oox/helper/binaryinputstream.hxx"
+#include <oox/helper/binaryoutputstream.hxx>
#include "oox/helper/graphichelper.hxx"
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
@@ -31,8 +32,12 @@
#include "oox/helper/propertyset.hxx"
#include "oox/ole/olestorage.hxx"
+#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/form/FormComponentType.hpp>
+#include <com/sun/star/form/XFormComponent.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/awt/Size.hpp>
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 5763aec..17c6ed6 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_EXCELHANDLERS_HXX
#include <oox/core/fragmenthandler2.hxx>
+#include <oox/helper/binaryinputstream.hxx>
#include "worksheethelper.hxx"
namespace oox {
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 91c68bc..7c22093 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/drawing/XControlShape.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
#include <rtl/strbuf.hxx>
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 3704b3a..3152878 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -80,6 +80,7 @@
#include <txtatr.hxx>
#include <fmtsrnd.hxx>
#include <fmtrowsplt.hxx>
+#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <oox/export/vmlexport.hxx>
More information about the Libreoffice-commits
mailing list