From 504d2209e47ffeb223b2bcde9fc24e828cc5cd6f Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 20 Sep 2021 21:56:37 +0200
Subject: [PATCH] Remove some "Attention" comments of little value

...and rather add sal/config.h includes, while at it

Change-Id: I0ea917b101d89f16228bea6b3102b630c8202e07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122369
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 framework/inc/helper/propertysetcontainer.hxx           | 5 ++---
 framework/inc/helper/statusindicatorfactory.hxx         | 4 ++--
 framework/inc/recording/dispatchrecorder.hxx            | 5 ++---
 framework/inc/uielement/menubarmanager.hxx              | 5 ++---
 framework/source/fwe/xml/saxnamespacefilter.cxx         | 5 ++---
 framework/source/layoutmanager/toolbarlayoutmanager.hxx | 5 ++---
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index f943a112a7ac..75c8414c3698 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -19,9 +19,8 @@
 
 #pragma once
 
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
-               with solaris headers ...
-*/
+#include <sal/config.h>
+
 #include <vector>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/container/XIndexContainer.hpp>
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 3443bd881d25..b3f3984f7a2c 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -19,8 +19,8 @@
 
 #pragma once
 
-// Attention: stl headers must(!) be included at first. Otherwise it can make trouble
-// with solaris headers ...
+#include <sal/config.h>
+
 #include <vector>
 #include <mutex>
 
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index e8ba276da891..ec03189d3cb4 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -19,9 +19,8 @@
 
 #pragma once
 
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
-               with solaris headers ...
-*/
+#include <sal/config.h>
+
 #include <vector>
 
 #include <rtl/ustring.hxx>
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index e9fb1a9c32ae..a77552a67213 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -19,9 +19,8 @@
 
 #pragma once
 
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
-               with solaris headers ...
-*/
+#include <sal/config.h>
+
 #include <unordered_map>
 #include <vector>
 
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 18baa687422b..ac1ff571c26a 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -17,9 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
-               with solaris headers ...
-*/
+#include <sal/config.h>
+
 #include <vector>
 
 #include <com/sun/star/xml/sax/SAXException.hpp>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 3741875c1d3f..d91938a55d47 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -19,9 +19,8 @@
 
 #pragma once
 
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
-               with solaris headers ...
-*/
+#include <sal/config.h>
+
 #include <vector>
 
 #include <uiconfiguration/globalsettings.hxx>