[Libreoffice-commits] core.git: desktop/source include/comphelper include/editeng include/sax include/toolkit include/unotools sax/source sfx2/source unotools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Aug 31 07:55:48 UTC 2018
desktop/source/deployment/dp_log.cxx | 2 +-
desktop/source/deployment/registry/dp_backend.cxx | 2 +-
include/comphelper/unwrapargs.hxx | 3 ++-
include/editeng/editeng.hxx | 3 ++-
include/sax/tools/converter.hxx | 3 +--
include/toolkit/controls/unocontrols.hxx | 2 +-
include/unotools/historyoptions.hxx | 3 ++-
sax/source/tools/converter.cxx | 1 +
sfx2/source/doc/SfxDocumentMetaData.cxx | 1 +
unotools/source/config/historyoptions.cxx | 1 +
10 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit bf01403479096eb3e0d8c7d7dc09390570a1f262
Author: Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Thu Aug 30 21:42:54 2018 +0200
Commit: Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Fri Aug 31 09:55:21 2018 +0200
tdf#42949 Fix IWYU warnings: boost/optional in include/
Found with bin/find-unneeded-includes a few low hanging
boost/optional headers.
This gets us about 75M includebloat reduction; still much to go
Change-Id: I5c737631767970f9145609aad298a5d11e3fed65
Reviewed-on: https://gerrit.libreoffice.org/59840
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index fbf08fb0dc12..4728b3c772fa 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <stdio.h>
-
+#include <boost/optional.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 98029f2a2bb2..c036e613da04 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <unotools/tempfile.hxx>
-
+#include <boost/optional.hpp>
using namespace ::dp_misc;
using namespace ::com::sun::star;
diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx
index afea437bcf7e..a7f7f0001898 100644
--- a/include/comphelper/unwrapargs.hxx
+++ b/include/comphelper/unwrapargs.hxx
@@ -25,7 +25,8 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <cppu/unotype.hxx>
-#include <boost/optional.hpp>
+
+namespace boost { template <class T> class optional; }
namespace comphelper {
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index a94cf2abd0fb..3803822628ee 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -41,9 +41,10 @@
#include <o3tl/typed_flags_set.hxx>
#include <svl/languageoptions.hxx>
#include <vcl/errcode.hxx>
-#include <boost/optional.hpp>
#include <functional>
+namespace boost { template <class T> class optional; }
+
namespace com { namespace sun { namespace star {
namespace linguistic2 {
class XSpellChecker1;
diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index c7fe12f4c100..a8880d962920 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -22,8 +22,6 @@
#include <sax/saxdllapi.h>
-#include <boost/optional/optional.hpp>
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
@@ -31,6 +29,7 @@
#include <com/sun/star/util/MeasureUnit.hpp>
#include <tools/color.hxx>
+namespace boost { template <class T> class optional; }
namespace com { namespace sun { namespace star {
namespace uno {
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index e794147f9f2d..c7fd44c520f7 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -58,7 +58,7 @@
#include <memory>
#include <vector>
-#include <boost/optional.hpp>
+namespace boost { template <class T> class optional; }
class ImageHelper
{
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index df9030a7e8fa..57b7d50da92c 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
#define INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
-#include <boost/optional.hpp>
#include <unotools/unotoolsdllapi.h>
#include <sal/types.h>
#include <com/sun/star/uno/Sequence.h>
@@ -29,6 +28,8 @@
#include <unotools/options.hxx>
#include <memory>
+namespace boost { template <class T> class optional; }
+
// The method GetList() returns a list of property values.
// Use follow defines to separate values by names.
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 416ada3f4ce4..79f84c09697e 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/util/Duration.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/uno/Sequence.hxx>
+#include <boost/optional.hpp>
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 6de2cf153da3..78dfda2cd53a 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -78,6 +78,7 @@
#include <sfx2/docfile.hxx>
#include <sax/tools/converter.hxx>
#include <i18nlangtag/languagetag.hxx>
+#include <boost/optional.hpp>
#include <utility>
#include <vector>
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index e08aa57c09cb..1f528bd428cb 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -37,6 +37,7 @@
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
+#include <boost/optional.hpp>
using namespace ::std;
using namespace ::utl;
More information about the Libreoffice-commits
mailing list