diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-28 13:17:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-01 13:58:41 +0100 |
| commit | 32b4936c9944111382d2491d99fc375b31d76723 (patch) | |
| tree | 4fe4cd24998bd8764bb871a4ec25432e7356ce31 /sc | |
| parent | 62d2d59f5fdb0068226165aac62c093c8174a674 (diff) | |
Don't use boost::optional forward declarations
...in preparation for wholesale replacement of boost::optional with
o3tl::optional (which will be a using declaration for either std::optional or
boost::optional, hence can't be forward-declared easily)
Change-Id: I031ed1812a0c939f37253f7753e358f1ad9153a3
Reviewed-on: https://gerrit.libreoffice.org/84126
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/sheetevents.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/XMLExportDataPilot.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx index e205ed1d801e..3fb0e28d1568 100644 --- a/sc/inc/sheetevents.hxx +++ b/sc/inc/sheetevents.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> #include <memory> -namespace boost { template <class T> class optional; } +#include <boost/optional.hpp> enum class ScSheetEventId { FOCUS, UNFOCUS, SELECT, DOUBLECLICK, RIGHTCLICK, CHANGE, CALCULATE, COUNT, diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index a08262eedf54..2fe6602a9fa7 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -20,13 +20,15 @@ #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDATAPILOT_HXX #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDATAPILOT_HXX +#include <sal/config.h> + +#include <boost/optional.hpp> + #include <rtl/ustring.hxx> #include <global.hxx> #include <xmloff/xmltoken.hxx> #include <unotools/textsearch.hxx> -namespace boost { template <class T> class optional; } - class ScXMLExport; class ScDocument; class ScDPSaveDimension; diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 00a109b311a4..f965ded0e605 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -11,12 +11,14 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_RANDOMNUMBERGENERATORDIALOG_HXX #define INCLUDED_SC_SOURCE_UI_INC_RANDOMNUMBERGENERATORDIALOG_HXX +#include <sal/config.h> + +#include <boost/optional.hpp> + #include <address.hxx> #include "anyrefdg.hxx" #include "viewdata.hxx" -namespace boost { template <typename T> class optional; } - class ScRandomNumberGeneratorDialog : public ScAnyRefDlgController { public: |