diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-11-01 18:07:24 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-11-01 23:16:44 +0100 |
| commit | f9da456711619c3fe501000945290d887fc4a468 (patch) | |
| tree | d83e35930ebf08693462bcd189796b85c77df60c /sc | |
| parent | a14892eda219b273726d2ca001955dfeb36360c3 (diff) | |
scflt.hxx is only included from sc/source/filter/starcalc
...but itself includes sc/source/filter/starcalc/collect.hxx, which only happens
to work because of -I$(dir $(3)) in gb_CObject__command_pattern (in
solenv/gbuild/platform/com_{GCC,MSC}_class.mk). Clean that up by moving the
file.
Change-Id: I55db90a7039e6c1e3fdaa28c1df58347e117a87f
Reviewed-on: https://gerrit.libreoffice.org/44170
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/starcalc/scflt.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/starcalc/scflt.hxx (renamed from sc/source/filter/inc/scflt.hxx) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 84ecf76a0c84..f1e74b1544c8 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -58,7 +58,7 @@ #include <stlsheet.hxx> #include <stlpool.hxx> #include <filter.hxx> -#include <scflt.hxx> +#include "scflt.hxx" #include <formulacell.hxx> #include <scfobj.hxx> #include <docoptio.hxx> diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/starcalc/scflt.hxx index 6dd4a27438dc..aeb10e086250 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/starcalc/scflt.hxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SC_SOURCE_FILTER_INC_SCFLT_HXX -#define INCLUDED_SC_SOURCE_FILTER_INC_SCFLT_HXX +#ifndef INCLUDED_SC_SOURCE_FILTER_STARCALC_SCFLT_HXX +#define INCLUDED_SC_SOURCE_FILTER_STARCALC_SCFLT_HXX #include <memory> #include <viewopti.hxx> -#include <collect.hxx> +#include "collect.hxx" #include <tools/solar.h> // Error numbers |