Kaydet (Commit) be3d2309 authored tarafından Noel Grandin's avatar Noel Grandin

other #includes should be AFTER the include-once #define

found with the following script:
git ls-files *.hxx | xargs perl -0777 -ne 'if
(/include.*
.*
.*

"; close ARGV }'

Change-Id: I3afb0e81eb315c34bc0eb6bb4733dd1f0537d5c0
üst 734cbb22
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <config_features.h>
#ifndef INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX #ifndef INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
#define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX #define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
#include <config_features.h>
class ResMgr; class ResMgr;
#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() ) #define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#ifndef INCLUDED_DRAWINGLAYER_SOURCE_DUMPER_ENHANCEDSHAPEDUMPER_HXX
#define INCLUDED_DRAWINGLAYER_SOURCE_DUMPER_ENHANCEDSHAPEDUMPER_HXX
#include <libxml/xmlwriter.h> #include <libxml/xmlwriter.h>
...@@ -28,9 +30,6 @@ ...@@ -28,9 +30,6 @@
#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
#ifndef INCLUDED_DRAWINGLAYER_SOURCE_DUMPER_ENHANCEDSHAPEDUMPER_HXX
#define INCLUDED_DRAWINGLAYER_SOURCE_DUMPER_ENHANCEDSHAPEDUMPER_HXX
class EnhancedShapeDumper class EnhancedShapeDumper
{ {
public: public:
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_BOOTSTRAP_HXX #ifndef INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
#define INCLUDED_UNOTOOLS_BOOTSTRAP_HXX #define INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
#include <unotools/unotoolsdllapi.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
namespace utl namespace utl
......
...@@ -17,11 +17,10 @@ ...@@ -17,11 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_CHARCLASS_HXX #ifndef INCLUDED_UNOTOOLS_CHARCLASS_HXX
#define INCLUDED_UNOTOOLS_CHARCLASS_HXX #define INCLUDED_UNOTOOLS_CHARCLASS_HXX
#include <unotools/unotoolsdllapi.h>
#include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/i18n/KCharacterType.hpp> #include <com/sun/star/i18n/KCharacterType.hpp>
#include <com/sun/star/i18n/KParseTokens.hpp> #include <com/sun/star/i18n/KParseTokens.hpp>
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX #ifndef INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
#define INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX #define INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
#include <unotools/unotoolsdllapi.h>
#include <com/sun/star/i18n/XCollator.hpp> #include <com/sun/star/i18n/XCollator.hpp>
namespace com { namespace sun { namespace star { namespace uno { namespace com { namespace sun { namespace star { namespace uno {
......
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_CONFIGPATHS_HXX #ifndef INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
#define INCLUDED_UNOTOOLS_CONFIGPATHS_HXX #define INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
#include <unotools/unotoolsdllapi.h>
#include <sal/types.h> #include <sal/types.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
//= conversions UNO3.TimeClass <-> Tools.TimeClass (Date/Time/DateTime)
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_DATETIME_HXX #ifndef INCLUDED_UNOTOOLS_DATETIME_HXX
#define INCLUDED_UNOTOOLS_DATETIME_HXX #define INCLUDED_UNOTOOLS_DATETIME_HXX
//= conversions UNO3.TimeClass <-> Tools.TimeClass (Date/Time/DateTime)
#include <unotools/unotoolsdllapi.h>
#include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/DateTime.hpp>
......
...@@ -16,11 +16,12 @@ ...@@ -16,11 +16,12 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX #ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
#define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX #define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
#include <unotools/unotoolsdllapi.h>
namespace utl namespace utl
{ {
......
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_INTLWRAPPER_HXX #ifndef INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
#define INCLUDED_UNOTOOLS_INTLWRAPPER_HXX #define INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
#include <unotools/unotoolsdllapi.h>
#include <unotools/charclass.hxx> #include <unotools/charclass.hxx>
#include <unotools/localedatawrapper.hxx> #include <unotools/localedatawrapper.hxx>
#include <unotools/calendarwrapper.hxx> #include <unotools/calendarwrapper.hxx>
......
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX #ifndef INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
#define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX #define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
#include <unotools/unotoolsdllapi.h>
#include <com/sun/star/i18n/XNativeNumberSupplier.hpp> #include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
......
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX #ifndef INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
#define INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX #define INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
#include <unotools/unotoolsdllapi.h>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/ucb/XProgressHandler.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp>
......
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_STREAMHELPER_HXX #ifndef INCLUDED_UNOTOOLS_STREAMHELPER_HXX
#define INCLUDED_UNOTOOLS_STREAMHELPER_HXX #define INCLUDED_UNOTOOLS_STREAMHELPER_HXX
#include <unotools/unotoolsdllapi.h>
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XSeekable.hpp>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_STREAMWRAP_HXX #ifndef INCLUDED_UNOTOOLS_STREAMWRAP_HXX
#define INCLUDED_UNOTOOLS_STREAMWRAP_HXX #define INCLUDED_UNOTOOLS_STREAMWRAP_HXX
#include <unotools/unotoolsdllapi.h>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_TEMPFILE_HXX #ifndef INCLUDED_UNOTOOLS_TEMPFILE_HXX
#define INCLUDED_UNOTOOLS_TEMPFILE_HXX #define INCLUDED_UNOTOOLS_TEMPFILE_HXX
#include <unotools/unotoolsdllapi.h>
#include <tools/stream.hxx> #include <tools/stream.hxx>
namespace utl namespace utl
......
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_TEXTSEARCH_HXX #ifndef INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
#define INCLUDED_UNOTOOLS_TEXTSEARCH_HXX #define INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
#include <unotools/unotoolsdllapi.h>
#include <i18nlangtag/lang.h> #include <i18nlangtag/lang.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.h>
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX #ifndef INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
#define INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX #define INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
#include <unotools/unotoolsdllapi.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/i18n/XExtendedTransliteration.hpp> #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <vcl/bitmapfilter.hxx>
#ifndef INCLUDED_VCL_BITMAPSCALESUPER_HXX #ifndef INCLUDED_VCL_BITMAPSCALESUPER_HXX
#define INCLUDED_VCL_BITMAPSCALESUPER_HXX #define INCLUDED_VCL_BITMAPSCALESUPER_HXX
#include <vcl/bitmapfilter.hxx>
class VCL_DLLPUBLIC BitmapScaleSuper : public BitmapFilter class VCL_DLLPUBLIC BitmapScaleSuper : public BitmapFilter
{ {
public: public:
......
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#ifndef INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
#define INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
#include <com/sun/star/table/XCell.hpp> #include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/BorderLine.hpp>
#include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextTable.hpp>
#ifndef INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
#define INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
typedef std::map<OUString, css::table::BorderLine> BorderLineMap; typedef std::map<OUString, css::table::BorderLine> BorderLineMap;
typedef std::pair<OUString, css::table::BorderLine> StringBorderPair; typedef std::pair<OUString, css::table::BorderLine> StringBorderPair;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment