diff options
author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-11-18 07:49:58 -0500 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-12-04 11:26:22 +0000 |
commit | a027ed9573858f3ec6361577ff541d7f2495bd32 (patch) | |
tree | 2cb6864e2b27f22af72d3d491e40e8f21d23699a /writerfilter | |
parent | 9e2973dbb90b5d9ce004cbf333f5000e4d50dc18 (diff) |
Wingdi RGB macro handling improved
Improved the isolation of windows headers.
Specifically, RGB macro is better handled now.
Change-Id: I0eeea16d0de9da3455810c80b0715f7b54ae8c3f
Reviewed-on: https://gerrit.libreoffice.org/20039
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/inc/pch/precompiled_writerfilter.hxx | 66 |
1 files changed, 7 insertions, 59 deletions
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 12a403e9ccc6..67990b76e03d 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -13,8 +13,8 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2015-11-14 14:16:42 using: - ./bin/update_pch writerfilter writerfilter --cutoff=3 --exclude:system --exclude:module --include:local + Generated on 2015-12-02 15:48:57 using: + ./bin/update_pch writerfilter writerfilter --cutoff=5 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./writerfilter/inc/pch/precompiled_writerfilter.hxx "/opt/lo/bin/make writerfilter.build" --find-conflicts @@ -22,27 +22,25 @@ #include <cassert> #include <cstddef> -#include <cstdlib> #include <iomanip> #include <iostream> -#include <limits> #include <map> #include <memory> #include <ostream> -#include <sstream> #include <stdlib.h> -#include <string.h> -#include <string> #include <vector> #include <boost/intrusive_ptr.hpp> #include <boost/logic/tribool.hpp> #include <boost/optional.hpp> #include <boost/tuple/tuple.hpp> #include <osl/diagnose.h> +#include <osl/doublecheckedlocking.h> #include <osl/file.hxx> -#include <osl/mutex.h> +#include <osl/getglobalmutex.hxx> #include <osl/mutex.hxx> #include <osl/process.h> +#include <osl/thread.hxx> +#include <rtl/instance.hxx> #include <rtl/math.hxx> #include <rtl/strbuf.hxx> #include <rtl/string.hxx> @@ -51,52 +49,24 @@ #include <rtl/ustring.hxx> #include <rtl/uuid.h> #include <sal/config.h> -#include <sal/detail/log.h> -#include <sal/log.hxx> #include <sal/macros.h> -#include <sal/saldllapi.h> #include <sal/types.h> #include <vcl/dllapi.h> -#include <vcl/svapp.hxx> -#include <basegfx/color/bcolor.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> -#include <com/sun/star/drawing/XControlShape.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> +#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/SizeType.hpp> -#include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/text/WritingMode.hpp> -#include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -107,40 +77,18 @@ #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/genfunc.hxx> -#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> #include <comphelper/comphelperdllapi.h> -#include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/sequenceashashmap.hxx> -#include <comphelper/string.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/supportsservice.hxx> -#include <dmapper/GraphicZOrderHelper.hxx> -#include <dmapper/resourcemodel.hxx> #include <filter/msfilter/util.hxx> -#include <i18nlangtag/i18nlangtagdllapi.h> -#include <i18nlangtag/lang.h> -#include <i18nlangtag/languagetag.hxx> #include <o3tl/typed_flags_set.hxx> #include <oox/dllapi.h> -#include <oox/drawingml/drawingmltypes.hxx> -#include <oox/helper/storagebase.hxx> -#include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> #include <ooxml/QNameToString.hxx> #include <ooxml/resourceids.hxx> -#include <svl/poolitem.hxx> -#include <svx/svxdllapi.h> -#include <tools/color.hxx> -#include <tools/errinf.hxx> #include <tools/gen.hxx> -#include <tools/lineend.hxx> -#include <tools/ref.hxx> #include <tools/solar.h> -#include <tools/stream.hxx> #include <tools/toolsdllapi.h> #include <uno/data.h> #include <uno/sequence2.h> |