diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-14 15:43:34 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-10-15 08:26:59 +0200 |
| commit | 4704acf63f4fed3a99fc95ff63c82eb5a9ae3908 (patch) | |
| tree | 4766526f4e060537e8fb965e5dbc6c1e24e4b465 /sw | |
| parent | 46d630f98f1c07ec2048da35d1a4804181148ac5 (diff) | |
move HAVE_FEATURE_DESKTOP/OPENCL to their dedicated headers
HAVE_FEATURE_OPENCL is included by a common Calc header
and HAVE_FEATURE_DESKTOP is included by a common Writer header,
causing pretty much their full rebuilds if any feature changes.
Change-Id: If29bf78bd4fd70b37981e0826a577777fd255c89
Reviewed-on: https://gerrit.libreoffice.org/80776
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/viewopt.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/viscrs.hxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 2 |
5 files changed, 8 insertions, 2 deletions
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 19eb9d546595..c727452685c7 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_INC_VIEWOPT_HXX #define INCLUDED_SW_INC_VIEWOPT_HXX -#include <config_features.h> +#include <config_feature_desktop.h> #include <tools/gen.hxx> #include <tools/color.hxx> diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 2361bed32ecc..16209bcd486d 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_INC_VISCRS_HXX #define INCLUDED_SW_INC_VISCRS_HXX -#include <config_features.h> +#include <config_feature_desktop.h> #include <vcl/cursor.hxx> #include "swcrsr.hxx" diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 13d72cd9aed5..8703385f2398 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -9,6 +9,8 @@ #include <swmodeltestbase.hxx> +#include <config_features.h> + #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 7398af46b798..529932ade5f7 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -9,6 +9,8 @@ #include <swmodeltestbase.hxx> +#include <config_features.h> + #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XFootnote.hpp> diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index a86987be9409..82f3211c612f 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -10,6 +10,8 @@ #include <memory> #include <swmodeltestbase.hxx> +#include <config_features.h> + #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> |