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>
This commit is contained in:
Ashod Nakashian
Michael Stahl
parent
4db3342e84
commit
bf6d72afea
12 changed files with 52 additions and 23 deletions
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
#include <com/sun/star/frame/XFrame.hpp>
|
||||
#include <com/sun/star/frame/XModel.hpp>
|
||||
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
||||
#include <rtl/ustring.hxx>
|
||||
#include <sfx2/dllapi.h>
|
||||
#include <tools/link.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 -
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
|
||||
#include <tools/gen.hxx>
|
||||
#include <vcl/virdev.hxx>
|
||||
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
|
||||
|
||||
namespace vcl
|
||||
{
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
#include <svl/sharedstringpool.hxx>
|
||||
|
||||
#include <algorithm>
|
||||
#include <string.h>
|
||||
|
||||
const sal_uInt16 TokenPool::nScTokenOff = 8192;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include "xlformula.hxx"
|
||||
|
||||
#include <algorithm>
|
||||
#include "compiler.hxx"
|
||||
#include "rangenam.hxx"
|
||||
#include "token.hxx"
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
#ifndef INCLUDED_SD_INC_STRMNAME_H
|
||||
#define INCLUDED_SD_INC_STRMNAME_H
|
||||
|
||||
#include <rtl/ustring.hxx>
|
||||
|
||||
// PowerPoint-Filter
|
||||
static const OUString pFilterPowerPoint97( "MS PowerPoint 97" );
|
||||
static const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" );
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
36
sot/inc/sysformats.hxx
Normal file
36
sot/inc/sysformats.hxx
Normal file
|
|
@ -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: */
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include <vcl/help.hxx>
|
||||
#include <vcl/virdev.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
#include <vcl/tabctrl.hxx>
|
||||
#include <tools/diagnose_ex.h>
|
||||
|
||||
#include <memory>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,8 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include <o3tl/lru_map.hxx>
|
||||
|
||||
|
||||
#include "opengl/win/gdiimpl.hxx"
|
||||
|
||||
#include <o3tl/lru_map.hxx>
|
||||
#include <win/wincomp.hxx>
|
||||
#include <win/saldata.hxx>
|
||||
#include <win/salframe.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue