summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--avmedia/source/inc/mediamisc.hxx4
-rw-r--r--drawinglayer/source/dumper/EnhancedShapeDumper.hxx5
-rw-r--r--include/unotools/bootstrap.hxx2
-rw-r--r--include/unotools/charclass.hxx3
-rw-r--r--include/unotools/collatorwrapper.hxx2
-rw-r--r--include/unotools/configpaths.hxx3
-rw-r--r--include/unotools/datetime.hxx4
-rw-r--r--include/unotools/desktopterminationobserver.hxx3
-rw-r--r--include/unotools/intlwrapper.hxx3
-rw-r--r--include/unotools/nativenumberwrapper.hxx3
-rw-r--r--include/unotools/progresshandlerwrap.hxx3
-rw-r--r--include/unotools/streamhelper.hxx3
-rw-r--r--include/unotools/streamwrap.hxx2
-rw-r--r--include/unotools/tempfile.hxx2
-rw-r--r--include/unotools/textsearch.hxx3
-rw-r--r--include/unotools/transliterationwrapper.hxx2
-rw-r--r--include/vcl/bitmapscalesuper.hxx4
-rw-r--r--sw/qa/extras/inc/bordertest.hxx4
18 files changed, 30 insertions, 25 deletions
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 3a9fa0cd1ddb..a34f318499a7 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
-
#ifndef INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
#define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
+#include <config_features.h>
+
class ResMgr;
#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx
index 4413d1754e3c..a9547be30c57 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx
@@ -6,6 +6,8 @@
* 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/.
*/
+#ifndef INCLUDED_DRAWINGLAYER_SOURCE_DUMPER_ENHANCEDSHAPEDUMPER_HXX
+#define INCLUDED_DRAWINGLAYER_SOURCE_DUMPER_ENHANCEDSHAPEDUMPER_HXX
#include <libxml/xmlwriter.h>
@@ -28,9 +30,6 @@
#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
-#ifndef INCLUDED_DRAWINGLAYER_SOURCE_DUMPER_ENHANCEDSHAPEDUMPER_HXX
-#define INCLUDED_DRAWINGLAYER_SOURCE_DUMPER_ENHANCEDSHAPEDUMPER_HXX
-
class EnhancedShapeDumper
{
public:
diff --git a/include/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx
index e7afaee98097..fc581831e5ac 100644
--- a/include/unotools/bootstrap.hxx
+++ b/include/unotools/bootstrap.hxx
@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
#define INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
+#include <unotools/unotoolsdllapi.h>
#include <rtl/ustring.hxx>
namespace utl
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 32092dcffc04..15041eb82314 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -17,11 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
-
#ifndef INCLUDED_UNOTOOLS_CHARCLASS_HXX
#define INCLUDED_UNOTOOLS_CHARCLASS_HXX
+#include <unotools/unotoolsdllapi.h>
#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/i18n/KCharacterType.hpp>
#include <com/sun/star/i18n/KParseTokens.hpp>
diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx
index a644f3899a48..c968178f1199 100644
--- a/include/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
#define INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
+#include <unotools/unotoolsdllapi.h>
#include <com/sun/star/i18n/XCollator.hpp>
namespace com { namespace sun { namespace star { namespace uno {
diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx
index b6f1e78f71ac..7bb90a5c7d76 100644
--- a/include/unotools/configpaths.hxx
+++ b/include/unotools/configpaths.hxx
@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
#define INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
+
+#include <unotools/unotoolsdllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index c7de9badd3f8..fd35a31d231f 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -17,12 +17,12 @@
* 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
#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/Time.hpp>
#include <com/sun/star/util/DateTime.hpp>
diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx
index 2baa8df0d1a6..799aa45724df 100644
--- a/include/unotools/desktopterminationobserver.hxx
+++ b/include/unotools/desktopterminationobserver.hxx
@@ -16,11 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
#define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
+#include <unotools/unotoolsdllapi.h>
+
namespace utl
{
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 30ca525e1523..a78d4bdcab12 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
#define INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
+
+#include <unotools/unotoolsdllapi.h>
#include <unotools/charclass.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/calendarwrapper.hxx>
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index 10f6c5deec74..064a438a85ef 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
#define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
+
+#include <unotools/unotoolsdllapi.h>
#include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
namespace com { namespace sun { namespace star {
diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx
index 61aff766709c..8afd861be2e8 100644
--- a/include/unotools/progresshandlerwrap.hxx
+++ b/include/unotools/progresshandlerwrap.hxx
@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
#define INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
+
+#include <unotools/unotoolsdllapi.h>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/ucb/XProgressHandler.hpp>
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index 708899886cb9..2fbd5dec550b 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef 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/XSeekable.hpp>
#include <osl/mutex.hxx>
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index 4a4729873511..1fb8d2b45dde 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_STREAMWRAP_HXX
#define INCLUDED_UNOTOOLS_STREAMWRAP_HXX
+#include <unotools/unotoolsdllapi.h>
#include <osl/mutex.hxx>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index a5a12d1158b3..df4f4fbccd3f 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_TEMPFILE_HXX
#define INCLUDED_UNOTOOLS_TEMPFILE_HXX
+#include <unotools/unotoolsdllapi.h>
#include <tools/stream.hxx>
namespace utl
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index d90c07990c18..20c9e65d261c 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -16,10 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
#define INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
+
+#include <unotools/unotoolsdllapi.h>
#include <i18nlangtag/lang.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index 900ce9f8c0eb..1b0fa57ddc0a 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/unotoolsdllapi.h>
#ifndef INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
#define INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
+#include <unotools/unotoolsdllapi.h>
#include <rtl/ustring.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
diff --git a/include/vcl/bitmapscalesuper.hxx b/include/vcl/bitmapscalesuper.hxx
index 599b1b91d140..0f279617a6e1 100644
--- a/include/vcl/bitmapscalesuper.hxx
+++ b/include/vcl/bitmapscalesuper.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/bitmapfilter.hxx>
-
#ifndef INCLUDED_VCL_BITMAPSCALESUPER_HXX
#define INCLUDED_VCL_BITMAPSCALESUPER_HXX
+#include <vcl/bitmapfilter.hxx>
+
class VCL_DLLPUBLIC BitmapScaleSuper : public BitmapFilter
{
public:
diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index 111bae289356..5f948a206455 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -6,13 +6,13 @@
* 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/.
*/
+#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/BorderLine.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::pair<OUString, css::table::BorderLine> StringBorderPair;
generated by cgit (git 2.34.1) at 2024-07-11 17:46:26 +0000