diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-11-10 16:34:55 -0500 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-10 22:18:45 +0000 |
| commit | bf6d72afeac77b791f5770a6bb353d4d133e9e56 (patch) | |
| tree | 22c24139528cfc49158f1fa177ed162cf70dd109 /include/sot | |
| parent | 4db3342e84dbbc80e0cb893b4739f6c617e9c19c (diff) | |
Missing includes
Restored some missing includes and
refactored sot/formats.hxx.
Change-Id: I11b7102b06889f426f5e0f3efa3a835c6e774d88
Reviewed-on: https://gerrit.libreoffice.org/19891
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'include/sot')
| -rw-r--r-- | include/sot/formats.hxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx index c85a10fb7c03..fa3c768c211f 100644 --- a/include/sot/formats.hxx +++ b/include/sot/formats.hxx @@ -20,21 +20,6 @@ #ifndef INCLUDED_SOT_FORMATS_HXX #define INCLUDED_SOT_FORMATS_HXX -#ifdef _SOT_FORMATS_INCLUDE_SYSTEMFORMATS - -#ifdef WNT -#ifdef _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable: 4917) -#endif -#include <shlobj.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif -#endif - -#endif - #include <tools/solar.h> // - predefined formats - |