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 /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 'sot')
| -rw-r--r-- | sot/Library_sot.mk | 5 | ||||
| -rw-r--r-- | sot/inc/sysformats.hxx | 36 | ||||
| -rw-r--r-- | sot/source/base/exchange.cxx | 2 | ||||
| -rw-r--r-- | sot/source/base/formats.cxx | 5 |
4 files changed, 44 insertions, 4 deletions
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 97381d0a88f5..a17ce3868b64 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -31,6 +31,11 @@ $(eval $(call gb_Library_add_defs,sot,\ $(eval $(call gb_Library_set_precompiled_header,sot,$(SRCDIR)/sot/inc/pch/precompiled_sot)) +$(eval $(call gb_Library_set_include,sot,\ + -I$(SRCDIR)/sot/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_libraries,sot,\ comphelper \ cppu \ diff --git a/sot/inc/sysformats.hxx b/sot/inc/sysformats.hxx new file mode 100644 index 000000000000..ccad25210050 --- /dev/null +++ b/sot/inc/sysformats.hxx @@ -0,0 +1,36 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SOT_SYSFORMATS_HXX +#define INCLUDED_SOT_SYSFORMATS_HXX + +#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 // INCLUDED_SOT_SYSFORMATS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index ce7574d6b9be..13ca02f52cc2 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _SOT_FORMATS_INCLUDE_SYSTEMFORMATS #include <tools/debug.hxx> #include <tools/solar.h> #include <tools/globname.hxx> #include <sot/sotdata.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> +#include <sysformats.hxx> #include <comphelper/classids.hxx> #include <rtl/instance.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 948ee4ea8c40..a22d3c70258f 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -17,13 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SOT_FORMATS_INCLUDE_SYSTEMFORMATS #include <tools/solar.h> #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include "sot/filelist.hxx" +#include <sot/filelist.hxx> +#include <sysformats.hxx> #include <comphelper/classids.hxx> #include <tools/globname.hxx> |