Fix order of SAL_WARN_UNUSED and DLLPUBLIC for clang-cl

...which, somewhat arbitrarily, expects GNU extension __attribute__((...)) to
come before MSVC extension __declspec(...) with

  MaybeParseGNUAttributes(attrs);
  MaybeParseMicrosoftDeclSpecs(attrs);

in Parser::ParseClassSpecifier (lib/Parse/ParseDeclCXX.cpp).

Change-Id: I5936558c8fc08b278575b6c678cde6eccd4647fb

84 files changed, 136 insertions, 136 deletions

diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index 4358e056d26f..ae6fdf2b322d 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -40,7 +40,7 @@ namespace basegfx
 
         @see B3DTuple
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColor : public B3DTuple
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColor : public B3DTuple
     {
     public:
         /** Create a Color with red, green and blue components from [0.0 to 1.0]
diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index 52956aaca318..899c1537f74a 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -56,7 +56,7 @@ namespace basegfx
         All usages should handle instances of BColorModifier encapsulated
         into these shared pointers.
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier
     {
     private:
         BColorModifier(const BColorModifier&) = delete;
@@ -89,7 +89,7 @@ namespace basegfx
 {
     /** convert color to gray
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_gray : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_gray : public BColorModifier
     {
     private:
     protected:
@@ -117,7 +117,7 @@ namespace basegfx
 
         returns a color where red green and blue are inverted using 1.0 - n
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_invert : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_invert : public BColorModifier
     {
     private:
     protected:
@@ -149,7 +149,7 @@ namespace basegfx
         This derivation is used for the svg importer and does exactly what SVG
         defines for this needed case.
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_luminance_to_alpha : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_luminance_to_alpha : public BColorModifier
     {
     private:
     protected:
@@ -179,7 +179,7 @@ namespace basegfx
         given color, replacing everything. Useful e.g. for unified shadow
         creation
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_replace : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_replace : public BColorModifier
     {
     private:
         ::basegfx::BColor           maBColor;
@@ -216,7 +216,7 @@ namespace basegfx
 
         col * (1 - f) + aSourceColor * f
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_interpolate : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_interpolate : public BColorModifier
     {
     private:
         ::basegfx::BColor           maBColor;
@@ -254,7 +254,7 @@ namespace basegfx
         returns black when the luminance of the given color is less than
         the given treshhold value in the range [0.0 .. 1.0], else white
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_black_and_white : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_black_and_white : public BColorModifier
     {
     private:
         double                      mfValue;
@@ -291,7 +291,7 @@ namespace basegfx
 
         col(r,g,b) = clamp(pow(col(r,g,b), 1.0 / gamma), 0.0, 1.0)
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_gamma : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_gamma : public BColorModifier
     {
     private:
         double                      mfValue;
@@ -329,7 +329,7 @@ namespace basegfx
         - be able to cover a bigger change range utilizing the combination
         - allow execution by a small, common, precalculated table
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_RGBLuminanceContrast : public BColorModifier
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_RGBLuminanceContrast : public BColorModifier
     {
     private:
         double                      mfRed;
diff --git a/include/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx
index 5c4777436adc..e092e35a6b1f 100644
--- a/include/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
@@ -35,7 +35,7 @@ namespace basegfx
 
         @see B2ITuple
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B2IPoint : public ::basegfx::B2ITuple
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2IPoint : public ::basegfx::B2ITuple
     {
     public:
         /** Create a 2D Point
diff --git a/include/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx
index 272bff9c229c..cc740203d631 100644
--- a/include/basegfx/point/b3dpoint.hxx
+++ b/include/basegfx/point/b3dpoint.hxx
@@ -35,7 +35,7 @@ namespace basegfx
 
         @see B3DTuple
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B3DPoint : public ::basegfx::B3DTuple
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B3DPoint : public ::basegfx::B3DTuple
     {
     public:
         /** Create a 3D Point
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index 8d5d50f9afda..6c4067085963 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -106,7 +106,7 @@ namespace basegfx
         /** Helper class to transport PointIndices to a PolyPolygon,
             with an operator< for convenient sorting in a std::set usage
          */
-        class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED PointIndex
+        class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC PointIndex
         {
         private:
             sal_uInt32 mnPolygonIndex;
diff --git a/include/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx
index 5c5aac7cdbaa..124fea65eb3c 100644
--- a/include/basegfx/tuple/b2i64tuple.hxx
+++ b/include/basegfx/tuple/b2i64tuple.hxx
@@ -35,7 +35,7 @@ namespace basegfx
         @derive Use this class to implement Points or Vectors
         which are based on two sal_Int64 values
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B2I64Tuple
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2I64Tuple
     {
     protected:
         sal_Int64                                       mnX;
diff --git a/include/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx
index e7a4c0f1fc8c..530d631588a7 100644
--- a/include/basegfx/tuple/b2ituple.hxx
+++ b/include/basegfx/tuple/b2ituple.hxx
@@ -35,7 +35,7 @@ namespace basegfx
         @derive Use this class to implement Points or Vectors
         which are based on two sal_Int32 values
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B2ITuple
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2ITuple
     {
     protected:
         sal_Int32                                       mnX;
diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index a1d4addcfe2b..842e3bcbd381 100644
--- a/include/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
@@ -37,7 +37,7 @@ namespace basegfx
         @derive Use this class to implement Points or Vectors
         which are based on three double values
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B3DTuple
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B3DTuple
     {
     protected:
         double                                      mfX;
diff --git a/include/basegfx/tuple/b3ituple.hxx b/include/basegfx/tuple/b3ituple.hxx
index 69a2ccaf6441..971da9f042f8 100644
--- a/include/basegfx/tuple/b3ituple.hxx
+++ b/include/basegfx/tuple/b3ituple.hxx
@@ -34,7 +34,7 @@ namespace basegfx
         @derive Use this class to implement Points or Vectors
         which are based on three sal_Int32 values
     */
-    class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B3ITuple
+    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B3ITuple
     {
     protected:
         sal_Int32                                       mnX;
diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx
index 7f448dcda765..41451d9c9a0e 100644
--- a/include/svtools/menuoptions.hxx
+++ b/include/svtools/menuoptions.hxx
@@ -40,7 +40,7 @@ class SvtMenuOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options
+class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
 {
     public:
 
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 00431635dd89..d2b0d8ddf5fa 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -27,7 +27,7 @@
 
 class SvStream;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxOrientationItem: public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -67,7 +67,7 @@ public:
     void                    SetFromRotation( sal_Int32 nRotation, bool bStacked );
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxMarginItem: public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem
 {
     sal_Int16       nLeftMargin;
     sal_Int16       nTopMargin;
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 0149813db49a..b8c404e1b8fd 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -56,7 +56,7 @@ public:
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBmpMaskChildWindow : public SfxChildWindow
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow
 {
  public:
                             SvxBmpMaskChildWindow( vcl::Window*,
@@ -76,7 +76,7 @@ class MaskData;
 class MaskSet;
 class ColorWindow;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBmpMask : public SfxDockingWindow
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
 {
     friend class MaskData;
     friend class MaskSet;
diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx
index 02250630a138..10fbbf6044d9 100644
--- a/include/svx/camera3d.hxx
+++ b/include/svx/camera3d.hxx
@@ -29,7 +29,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED Camera3D : public Viewport3D
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Camera3D : public Viewport3D
 {
  protected:
     basegfx::B3DPoint   aResetPos;
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 7d0af00e0053..963e96276852 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -36,7 +36,7 @@ namespace svx
     class SvxShowCharSetVirtualAcc;
 }
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxShowCharSet : public Control
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxShowCharSet : public Control
 {
 public:
                     SvxShowCharSet( vcl::Window* pParent );
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index 3d54da34f425..766bebac34c5 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED ChartHelper
+class SAL_WARN_UNUSED SVX_DLLPUBLIC ChartHelper
 {
 public:
     /// Check that the XDiagram is a real 3D chart.
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 3ffbc4be9a01..dad68cc30ba8 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -162,7 +162,7 @@ enum SvxChartRegress
 
 #define CHREGRESS_COUNT (CHREGRESS_UNKNOWN + 1)
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartStyleItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem
 {
 public:
     SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/,
@@ -176,7 +176,7 @@ public:
 };
 
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartRegressItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem
 {
 public:
     SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/,
@@ -192,7 +192,7 @@ public:
     sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override;
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartDataDescrItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem
 {
 public:
     SvxChartDataDescrItem(SvStream& rIn,
@@ -204,7 +204,7 @@ public:
     sal_uInt16 GetValueCount() const override { return CHDESCR_COUNT; }
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrderItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem
 {
 public:
     SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/,
@@ -223,7 +223,7 @@ public:
         { return (SvxChartTextOrder)SfxEnumItem::GetValue(); }
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrientItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem
 {
 public:
     SvxChartTextOrientItem(SvStream& rIn,
@@ -235,7 +235,7 @@ public:
     sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; }
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartKindErrorItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem
 {
 public:
     SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/,
@@ -253,7 +253,7 @@ public:
     sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override;
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartIndicateItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem
 {
 public:
     SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/,
@@ -271,7 +271,7 @@ public:
     sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override;
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxDoubleItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem
 {
     double fVal;
 
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 1512003bdbf8..f244d32be7fb 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -30,7 +30,7 @@
 class PopupMenu;
 class SvxClipboardFormatItem;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipBoardControl : public SfxToolBoxControl
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl
 {
     SfxPoolItem*            pClipboardFmtItem;
     PopupMenu*              pPopup;
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index b37a9785cbb8..c3f6186fb31d 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -26,7 +26,7 @@
 
 struct SvxClipboardFormatItem_Impl;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFormatItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipboardFormatItem : public SfxPoolItem
 {
     SvxClipboardFormatItem_Impl* pImpl;
 protected:
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index e7b4897bbe9e..9b00d24e7f01 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -31,7 +31,7 @@
 
 class SdrGrafObj;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED CompressGraphicsDialog : public ModalDialog
+class SAL_WARN_UNUSED SVX_DLLPUBLIC CompressGraphicsDialog : public ModalDialog
 {
 private:
     VclPtr<FixedText>       m_pLabelGraphicType;
diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx
index a51d9d175413..e74b480c9792 100644
--- a/include/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
@@ -32,7 +32,7 @@ class SdrObjList;
 |* SvxXConnectionPreview
 |*
 \************************************************************************/
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxXConnectionPreview : public Control
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXConnectionPreview : public Control
 {
  friend class SvxConnectionPage;
 
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index ee3dd3ec9ac2..5e596ff63295 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -33,7 +33,7 @@
 
 class Graphic;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxContourDlgChildWindow : public SfxChildWindow
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
 {
 public:
     SvxContourDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
@@ -43,7 +43,7 @@ public:
 
 class SvxSuperContourDlg;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxContourDlg : public SfxFloatingWindow
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow
 {
     using Window::Update;
 
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 4e6c81791426..60110b1119ab 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -42,7 +42,7 @@ enum class SvxRedlinDateMode
 };
 
 /// Struct for sorting data.
-class SVX_DLLPUBLIC SAL_WARN_UNUSED RedlinData
+class SAL_WARN_UNUSED SVX_DLLPUBLIC RedlinData
 {
 public:
                     RedlinData();
@@ -83,7 +83,7 @@ public:
     SvLBoxItem*     Create() const override;
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxRedlinTable : public SvSimpleTable
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRedlinTable : public SvSimpleTable
 {
     using SvTabListBox::InsertEntry;
 
@@ -166,7 +166,7 @@ public:
 };
 
 /// Tabpage with the filter text entries etc.
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPFilter: public TabPage
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPFilter: public TabPage
 {
 private:
 
@@ -272,7 +272,7 @@ public:
 };
 
 /// Tabpage with the redlining entries.
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPView : public TabPage
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPView : public TabPage
 {
 private:
 
@@ -330,7 +330,7 @@ public:
 
 
 //  Redlining - Control (Accept- Changes)
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxAcceptChgCtr
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxAcceptChgCtr
     : public TabControl
     , public VclBuilderContainer
 {
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 62d0354dcd5d..34fad4320bb6 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -41,7 +41,7 @@ enum { CUBE_BOTTOM = 0x0001, CUBE_BACK = 0x0002, CUBE_LEFT = 0x0004,
        CUBE_FULL = 0x003F, CUBE_OPEN_TB = 0x0036, CUBE_OPEN_LR = 0x002B,
        CUBE_OPEN_FB = 0x001D };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED E3dCubeObj : public E3dCompoundObject
+class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dCubeObj : public E3dCompoundObject
 {
 private:
     // Parameter
diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx
index 6d16fed497e2..8cef557f2878 100644
--- a/include/svx/dataaccessdescriptor.hxx
+++ b/include/svx/dataaccessdescriptor.hxx
@@ -61,7 +61,7 @@ namespace svx
 
     /** class encapsulating the css::sdb::DataAccessDescriptor service.
     */
-    class SVX_DLLPUBLIC SAL_WARN_UNUSED ODataAccessDescriptor
+    class SAL_WARN_UNUSED SVX_DLLPUBLIC ODataAccessDescriptor
     {
     protected:
         ODADescriptorImpl*      m_pImpl;
diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx
index 69999a94fd5e..9ce8f53e0560 100644
--- a/include/svx/databaselocationinput.hxx
+++ b/include/svx/databaselocationinput.hxx
@@ -45,7 +45,7 @@ namespace svx
 
         This helper class controls such two UI elements.
     */
-    class SVX_DLLPUBLIC SAL_WARN_UNUSED DatabaseLocationInputController
+    class SAL_WARN_UNUSED SVX_DLLPUBLIC DatabaseLocationInputController
     {
     public:
         DatabaseLocationInputController(
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 4a9f5c4c0e63..19fe21a0cc11 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -50,7 +50,7 @@ namespace svx
 
     //= OColumnTransferable
 
-    class SVX_DLLPUBLIC SAL_WARN_UNUSED OColumnTransferable : public TransferableHelper
+    class SAL_WARN_UNUSED SVX_DLLPUBLIC OColumnTransferable : public TransferableHelper
     {
     protected:
         ODataAccessDescriptor      m_aDescriptor;
@@ -176,7 +176,7 @@ namespace svx
 
     /** class for transferring data access objects (tables, queries, statements ...)
     */
-    class SVX_DLLPUBLIC SAL_WARN_UNUSED ODataAccessObjectTransferable : public TransferableHelper
+    class SAL_WARN_UNUSED SVX_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper
     {
         ODataAccessDescriptor   m_aDescriptor;
         OUString         m_sCompatibleObjectDescription;
@@ -264,7 +264,7 @@ namespace svx
 
     /** class for transferring multiple columns
     */
-    class SVX_DLLPUBLIC SAL_WARN_UNUSED OMultiColumnTransferable : public TransferableHelper
+    class SAL_WARN_UNUSED SVX_DLLPUBLIC OMultiColumnTransferable : public TransferableHelper
     {
         css::uno::Sequence< css::beans::PropertyValue >   m_aDescriptors;
 
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index 30e28a853506..c5a2aa5f1fa4 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -36,7 +36,7 @@ namespace svx
 
     //= OComponentTransferable
 
-    class SVX_DLLPUBLIC SAL_WARN_UNUSED OComponentTransferable : public TransferableHelper
+    class SAL_WARN_UNUSED SVX_DLLPUBLIC OComponentTransferable : public TransferableHelper
     {
     protected:
         ODataAccessDescriptor   m_aDescriptor;
diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index d76ad0b5fd41..da8e3162e384 100644
--- a/include/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
@@ -31,7 +31,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED E3dDefaultAttributes
+class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dDefaultAttributes
 {
 private:
     // Compound object
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index d400e08b6071..eee778321cdc 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -75,7 +75,7 @@ private:
     -   Shows the value entered/modified in the numeric field.
     -   Enables/disables/shows/hides the field according to own state changes.
  */
-class SVX_DLLPUBLIC SAL_WARN_UNUSED DialControl : public Control
+class SAL_WARN_UNUSED SVX_DLLPUBLIC DialControl : public Control
 {
 public:
     explicit            DialControl( vcl::Window* pParent, WinBits nBits );
@@ -163,7 +163,7 @@ private:
 };
 
 /** Wrapper for usage of a DialControl in item connections. */
-class SVX_DLLPUBLIC SAL_WARN_UNUSED DialControlWrapper : public sfx::SingleControlWrapper< DialControl, sal_Int32 >
+class SAL_WARN_UNUSED SVX_DLLPUBLIC DialControlWrapper : public sfx::SingleControlWrapper< DialControl, sal_Int32 >
 {
 public:
     explicit            DialControlWrapper( DialControl& rDial );
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index a57742a0ddec..5c62d8b6f4ba 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -35,7 +35,7 @@ class E3dObject;
 
 enum class SvxPreviewObjectType { SPHERE, CUBE };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DPreviewControl : public Control
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DPreviewControl : public Control
 {
 protected:
     FmFormModel*            mpModel;
@@ -63,7 +63,7 @@ public:
     virtual void Set3DAttributes(const SfxItemSet& rAttr);
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DLightControl : public Svx3DPreviewControl
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl
 {
     // Callback for interactive changes
     Link<Svx3DLightControl*,void>  maChangeCallback;
@@ -135,7 +135,7 @@ public:
     basegfx::B3DVector GetLightDirection(sal_uInt32 nNum) const;
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxLightCtl3D : public Control
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLightCtl3D : public Control
 {
 private:
     // local controls
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 9757cd0e7d38..596222cb9c99 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -69,7 +69,7 @@ namespace o3tl
 class SvxRectCtlAccessibleContext;
 class SvxPixelCtlAccessible;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxRectCtl : public Control
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRectCtl : public Control
 {
 private:
     SVX_DLLPRIVATE void             InitSettings(vcl::RenderContext& rRenderContext);
@@ -146,7 +146,7 @@ public:
 |* Preview control for the display of bitmaps
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBitmapCtl
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBitmapCtl
 {
 protected:
     sal_uInt16      nLines;
@@ -169,7 +169,7 @@ public:
 |* Control for editing bitmaps
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxPixelCtl : public Control
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxPixelCtl : public Control
 {
 private:
     using OutputDevice::SetLineColor;
@@ -232,7 +232,7 @@ public:
 
 /************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED ColorLB : public ColorListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC ColorLB : public ColorListBox
 {
 
 public:
@@ -247,7 +247,7 @@ public:
 
 /************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED HatchingLB : public ListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC HatchingLB : public ListBox
 {
     XHatchListRef mpList;
 public:
@@ -261,7 +261,7 @@ public:
 
 /************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED GradientLB : public ListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC GradientLB : public ListBox
 {
     XGradientListRef mpList;
 public:
@@ -277,7 +277,7 @@ public:
 
 /************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED BitmapLB : public ListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC BitmapLB : public ListBox
 {
 public:
     explicit BitmapLB(vcl::Window* pParent, WinBits aWB);
@@ -295,7 +295,7 @@ private:
 
 /************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FillAttrLB : public ColorListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FillAttrLB : public ColorListBox
 {
 private:
     BitmapEx        maBitmapEx;
@@ -310,7 +310,7 @@ public:
 
 /************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FillTypeLB : public ListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FillTypeLB : public ListBox
 {
 
 public:
@@ -322,7 +322,7 @@ public:
 
 /************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED LineLB : public ListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC LineLB : public ListBox
 {
 private:
     /// bitfield
@@ -343,7 +343,7 @@ public:
 
 /************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED LineEndLB : public ListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC LineEndLB : public ListBox
 {
 
 public:
@@ -401,7 +401,7 @@ public:
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxXLinePreview : public SvxPreviewBase
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXLinePreview : public SvxPreviewBase
 {
 private:
     SdrPathObj*                                     mpLineObjA;
@@ -434,7 +434,7 @@ public:
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxXRectPreview : public SvxPreviewBase
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXRectPreview : public SvxPreviewBase
 {
 private:
     SdrObject*                                      mpRectangleObject;
@@ -456,7 +456,7 @@ public:
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxXShadowPreview : public SvxPreviewBase
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXShadowPreview : public SvxPreviewBase
 {
 private:
     Point maShadowOffset;
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index c8fa8c87d6c4..969432ab2490 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <svx/svxdllapi.h>
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxColorListItem: public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxColorListItem: public SfxPoolItem
 {
     XColorListRef     pColorList;
 
@@ -50,7 +50,7 @@ public:
     XColorListRef           GetColorList() const { return pColorList; }
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxGradientListItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxGradientListItem : public SfxPoolItem
 {
     XGradientListRef  pGradientList;
 
@@ -75,7 +75,7 @@ public:
     XGradientListRef        GetGradientList() const { return pGradientList; }
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxHatchListItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxHatchListItem : public SfxPoolItem
 {
     XHatchListRef     pHatchList;
 
@@ -99,7 +99,7 @@ public:
     XHatchListRef           GetHatchList() const { return pHatchList; }
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBitmapListItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBitmapListItem : public SfxPoolItem
 {
     XBitmapListRef    pBitmapList;
 
@@ -124,7 +124,7 @@ public:
     XBitmapListRef          GetBitmapList() const { return pBitmapList; }
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxDashListItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDashListItem : public SfxPoolItem
 {
     XDashListRef      pDashList;
 
@@ -149,7 +149,7 @@ public:
     XDashListRef            GetDashList() const { return pDashList; }
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxLineEndListItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLineEndListItem : public SfxPoolItem
 {
     XLineEndListRef   pLineEndList;
 
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 9dc5ed3cd339..f9e40960fd1f 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -26,7 +26,7 @@
 
 class SvStream;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxB3DVectorItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
 {
     basegfx::B3DVector  aVal;
 
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 52ab60e86caa..d9f2d6a90f97 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -81,7 +81,7 @@ class SAL_WARN_UNUSED E3dRotateUndoAction : public E3dUndoAction
 |* Undo for 3D attributes (implemented using Set3DAttributes())
 |*
 \************************************************************************/
-class SVX_DLLPUBLIC SAL_WARN_UNUSED E3dAttributesUndoAction : public SdrUndoAction
+class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
 {
     using SdrUndoAction::Repeat;
 
diff --git a/include/svx/extedit.hxx b/include/svx/extedit.hxx
index ae89d165204a..5ee2864a94a2 100644
--- a/include/svx/extedit.hxx
+++ b/include/svx/extedit.hxx
@@ -19,7 +19,7 @@ class Graphic;
 class GraphicObject;
 class FileChangedChecker;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED ExternalToolEdit
+class SAL_WARN_UNUSED SVX_DLLPUBLIC ExternalToolEdit
 {
 protected:
     OUString m_aFileName;
@@ -42,7 +42,7 @@ public:
 class FmFormView;
 class SdrObject;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SdrExternalToolEdit
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SdrExternalToolEdit
     : public ExternalToolEdit
     , public SfxListener
 {
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 06b5b6eafc42..d884674db66e 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -29,7 +29,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED E3dExtrudeObj : public E3dCompoundObject
+class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dExtrudeObj : public E3dCompoundObject
 {
 private:
     // to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid()
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index afd8de097e31..3b44d3e9986c 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -35,7 +35,7 @@ namespace svx
 
 SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded );
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED ExtrusionBar : public SfxShell
+class SAL_WARN_UNUSED SVX_DLLPUBLIC ExtrusionBar : public SfxShell
 {
 public:
     SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR)
diff --git a/include/svx/f3dchild.hxx b/include/svx/f3dchild.hxx
index 4bc6aad3ac27..87d4062e5fea 100644
--- a/include/svx/f3dchild.hxx
+++ b/include/svx/f3dchild.hxx
@@ -31,7 +31,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DChildWindow : public SfxChildWindow
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow
 {
  public:
     Svx3DChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index ebe56f069df6..5276d286de02 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -41,7 +41,7 @@ class ListBox;
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFillToolBoxControl : public SfxToolBoxControl
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFillToolBoxControl : public SfxToolBoxControl
 {
 private:
     std::unique_ptr< XFillStyleItem >    mpStyleItem;
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 72ea295193e5..6c44b44a2ffd 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -53,7 +53,7 @@ class SvxConvertTo3DItem;
 
 struct Svx3DWinImpl;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DWin : public SfxDockingWindow
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DWin : public SfxDockingWindow
 {
     friend class        Svx3DChildWindow;
     friend class        Svx3DCtrlItem;
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 49550433edfd..a654599f1a29 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -30,7 +30,7 @@
 // FmGridHeader
 
 struct FmGridHeaderData;
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FmGridHeader
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridHeader
             :public ::svt::EditBrowserHeader
             ,public DropTargetHelper
 {
@@ -92,7 +92,7 @@ private:
 // FmGridControl
 
 class FmXGridPeer;
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FmGridControl : public DbGridControl
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridControl : public DbGridControl
 
 {
     friend class FmGridHeader;
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 9747eab45432..25370fafe376 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -200,7 +200,7 @@ typedef ::cppu::ImplHelper10<   css::form::XBoundComponent,
                             >   FmXGridControl_BASE;
 
 class FmXGridPeer;
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FmXGridControl  :public UnoControl
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridControl  :public UnoControl
                         ,public FmXGridControl_BASE
 {
     FmXModifyMultiplexer        m_aModifyListeners;
@@ -311,7 +311,7 @@ protected:
 // FmXGridPeer -> Peer for the Gridcontrol
 
 class FmGridControl;
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FmXGridPeer:
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridPeer:
     public cppu::ImplInheritanceHelper<
         VCLXWindow,
         css::form::XGridPeer,
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 9c00f8ce9ba3..5fa3e216002c 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -55,7 +55,7 @@ namespace svx
 }
 
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FmDesignModeChangedHint : public SfxHint
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint
 {
     bool m_bDesignMode;
 
diff --git a/include/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx
index 5177751b6728..ab6beaad1c3d 100644
--- a/include/svx/fmsrccfg.hxx
+++ b/include/svx/fmsrccfg.hxx
@@ -91,7 +91,7 @@ namespace svxform
     // = class FmSearchConfigItem - a ConfigItem, that remembers search parameters
 
 
-    class SVX_DLLPUBLIC SAL_WARN_UNUSED FmSearchConfigItem
+    class SAL_WARN_UNUSED SVX_DLLPUBLIC FmSearchConfigItem
                 :protected  FmSearchParams
                 ,public     ::utl::OConfigurationValueContainer
                 // order matters!
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index d543296da544..74305a99a721 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -163,7 +163,7 @@ enum FMSEARCH_MODE { SM_BRUTE, SM_ALLOWSCHEDULE, SM_USETHREAD };
 
 typedef std::vector< css::uno::Reference< css::uno::XInterface> > InterfaceArray;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FmSearchEngine
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FmSearchEngine
 {
     friend class FmSearchThread;
 
diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx
index b0f9be3d9689..acd2cfd3f2bc 100644
--- a/include/svx/fntctl.hxx
+++ b/include/svx/fntctl.hxx
@@ -30,7 +30,7 @@ class SfxBindings;
 
 // class SvxFontMenuControl ----------------------------------------------
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontMenuControl : public SfxMenuControl, public SfxListener
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontMenuControl : public SfxMenuControl, public SfxListener
 {
 private:
     FontNameMenu*   pMenu;
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index fc975cd29cbf..44b776fa5f2a 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -30,7 +30,7 @@
 class SfxItemSet;
 class FontPrevWin_Impl;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontPrevWindow : public vcl::Window
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontPrevWindow : public vcl::Window
 {
     using OutputDevice::SetFont;
 private:
diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx
index 2b110b7a06ef..5cd78617b2c9 100644
--- a/include/svx/fntszctl.hxx
+++ b/include/svx/fntszctl.hxx
@@ -29,7 +29,7 @@ class FontSizeMenu;
 
 // class SvxFontSizeMenuControl ------------------------------------------
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontSizeMenuControl : public SfxMenuControl
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontSizeMenuControl : public SfxMenuControl
 {
 private:
     FontSizeMenu*   pMenu;
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index c9be5b5bbd7f..1b5ff867139f 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -59,7 +59,7 @@ public:
 
 
 /** A list box supporting formatted string entries. */
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontListBox : public SvTabListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontListBox : public SvTabListBox
 {
 private:
     vcl::Font                   maStdFont;      /// Used for entries without specific font.
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index e56e6226596f..48939bc5ecc6 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -73,7 +73,7 @@ public:
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontWorkChildWindow : public SfxChildWindow
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
 {
  public:
     SvxFontWorkChildWindow(vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*);
@@ -86,7 +86,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontWorkChildWindow : public SfxChildWind
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontWorkDialog : public SfxDockingWindow
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
 {
 #define CONTROLLER_COUNT 11
 
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 67ed03c7c52d..02f891938154 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -35,7 +35,7 @@ namespace svx
 
 bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus );
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FontworkBar : public SfxShell
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FontworkBar : public SfxShell
 {
 public:
     SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR)
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 3e004723a2ca..d1a238b7619c 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -60,7 +60,7 @@ public:
     sal_Int32 getScale() const;
 };
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkGalleryDialog : public ModalDialog
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
 {
     VclPtr<ValueSet>    mpCtlFavorites;
     VclPtr<OKButton>    mpOKButton;
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index 3294b9c43226..d4805246d6ec 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -32,7 +32,7 @@ namespace svx
 /**
 */
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FormatPaintBrushToolBoxControl : public SfxToolBoxControl
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 2ef4f4a5357f..e8596b495d93 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -104,7 +104,7 @@ enum RefMode
                                 |
                                 |<- middle of the frame border
  */
-class SVX_DLLPUBLIC SAL_WARN_UNUSED Style
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Style
 {
 public:
     /** Constructs an invisible frame style. */
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index a1d1f6350937..f09f338811eb 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -58,7 +58,7 @@ struct ArrayImpl;
     whether to mirror the double frame styles, and whether to swap diagonal
     frame borders.
  */
-class SVX_DLLPUBLIC SAL_WARN_UNUSED Array
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Array
 {
 public:
     /** Constructs an empty array. */
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 8704edc464e3..567d21ec1472 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -36,7 +36,7 @@ namespace svx {
     The control works on the SvxFrameDirection enumeration (i.e. left-to-right,
     right-to-left), used i.e. in conjunction with the SvxFrameDirectionItem.
  */
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FrameDirectionListBox : public ListBox
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameDirectionListBox : public ListBox
 {
 public:
     explicit            FrameDirectionListBox( vcl::Window* pParent, WinBits nBits );
@@ -66,7 +66,7 @@ typedef FrameDirectionListBox FrameDirListBox;
 
 
 /** Wrapper for usage of a FrameDirectionListBox in item connections. */
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FrameDirListBoxWrapper : public sfx::SingleControlWrapper< FrameDirListBox, SvxFrameDirection >
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameDirListBoxWrapper : public sfx::SingleControlWrapper< FrameDirListBox, SvxFrameDirection >
 {
 public:
     explicit            FrameDirListBoxWrapper( FrameDirListBox& rListBox );
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 33240c7333a8..312693e53259 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -80,7 +80,7 @@ enum FrameBorderState
 
 
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FrameSelector : public Control
+class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameSelector : public Control
 {
 public:
     FrameSelector(vcl::Window* pParent);
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index 9f5011e19cba..68cbae987ac3 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -27,7 +27,7 @@
 
 class Gradient;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED XGradient
+class SAL_WARN_UNUSED SVX_DLLPUBLIC XGradient
 {
 protected:
     css::awt::GradientStyle  eStyle;
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index a6e621e9a253..849920c418a1 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -30,7 +30,7 @@ class SvStream;
 
 class Fraction;
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED BigInt
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC BigInt
 {
 private:
     long            nVal;
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 0451a6912251..9162a9f6a416 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -88,7 +88,7 @@ typedef sal_uInt32 ColorData;
 
 // Color
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Color
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Color
 {
 protected:
     ColorData mnColor;
diff --git a/include/tools/date.hxx b/include/tools/date.hxx
index ffb425c2a0ff..f450c7b7bf23 100644
--- a/include/tools/date.hxx
+++ b/include/tools/date.hxx
@@ -28,7 +28,7 @@ enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY,
                  SATURDAY, SUNDAY };
 
 // TODO FIXME: make it handle signed year?
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Date
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Date
 {
 private:
     sal_uInt32      nDate;
diff --git a/include/tools/datetime.hxx b/include/tools/datetime.hxx
index 07e620343ed8..228ac4ea9a8e 100644
--- a/include/tools/datetime.hxx
+++ b/include/tools/datetime.hxx
@@ -26,7 +26,7 @@
 
 #include <iomanip>
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED DateTime : public Date, public tools::Time
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC DateTime : public Date, public tools::Time
 {
 public:
     enum DateTimeInitSystem
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index efa7a17dc028..adecddff35c3 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -27,7 +27,7 @@ class SvStream;
 
 // This class uses the platform defined type 'long' as valid values but do all
 // calculations using sal_Int64 with checks for 'long' overflows.
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Fraction
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Fraction
 {
     struct Impl;
 
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 7a98f0a4e913..4cd4e6daad7f 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -71,7 +71,7 @@ inline bool Pair::operator != ( const Pair& rPair ) const
 
 // Point
 
-class SAL_DLLPUBLIC_EXPORT SAL_WARN_UNUSED Point : public Pair
+class SAL_WARN_UNUSED SAL_DLLPUBLIC_EXPORT Point : public Pair
 {
 public:
                         Point() {}
@@ -293,7 +293,7 @@ inline std::basic_ostream<charT, traits> & operator <<(
 #define RECT_MAX    LONG_MAX
 #define RECT_MIN    LONG_MIN
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Rectangle
 {
 public:
                         Rectangle();
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 1d25800c6267..a956b200651a 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -70,7 +70,7 @@ namespace basegfx
 
 namespace tools {
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Polygon
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Polygon
 {
 private:
     ImplPolygon*        mpImplPolygon;
@@ -185,7 +185,7 @@ public:
 };
 
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED PolyPolygon
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC PolyPolygon
 {
 private:
     ImplPolyPolygon*    mpImplPolyPolygon;
diff --git a/include/tools/time.hxx b/include/tools/time.hxx
index ee88343eff43..12f1e909c8ec 100644
--- a/include/tools/time.hxx
+++ b/include/tools/time.hxx
@@ -32,7 +32,7 @@
 
 namespace tools {
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Time
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Time
 {
 private:
     sal_Int64       nTime;
diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx
index 66a65f59d8c1..47da311ea13b 100644
--- a/include/tools/unqidx.hxx
+++ b/include/tools/unqidx.hxx
@@ -25,7 +25,7 @@
 
 #define UNIQUEINDEX_ENTRY_NOTFOUND   CONTAINER_ENTRY_NOTFOUND
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED UniqueIndexImpl
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC UniqueIndexImpl
 {
 private:
     std::map<sal_uInt32, void*> maMap;
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 0d49bdf765f8..2d2c356e35e4 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -79,7 +79,7 @@ enum class INetProtocol
     LAST = Cmis
 };
 
-class TOOLS_DLLPUBLIC SAL_WARN_UNUSED INetURLObject
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC INetURLObject
 {
 public:
     // Get- and Set-Methods:
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index b5216afd2f86..ad772647845b 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
@@ -47,7 +47,7 @@ class SvtCommandOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtCommandOptions : public utl::detail::Options
 {
     friend class SvtCommandOptions_Impl;
 
diff --git a/include/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx
index fd1bf29811c6..7877087e6a94 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.hxx
@@ -26,7 +26,7 @@
 class SvtDefaultOptions_Impl;
 
 class SvtDefaultOptions_Impl;
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDefaultOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDefaultOptions : public utl::detail::Options
 {
 private:
     SvtDefaultOptions_Impl* pImp;
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index 4b04a40521a3..e56d27ac9c38 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -60,7 +60,7 @@ class SvtDynamicMenuOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDynamicMenuOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions : public utl::detail::Options
 {
     public:
         /*-****************************************************************************************************
diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx
index 5c11c630b838..c843f4b49db3 100644
--- a/include/unotools/extendedsecurityoptions.hxx
+++ b/include/unotools/extendedsecurityoptions.hxx
@@ -42,7 +42,7 @@ class SvtExtendedSecurityOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtExtendedSecurityOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions : public utl::detail::Options
 {
     public:
         // Must be zero based!
diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
index 286ed7424e6d..51e349fdc159 100644
--- a/include/unotools/fontoptions.hxx
+++ b/include/unotools/fontoptions.hxx
@@ -39,7 +39,7 @@ class SvtFontOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtFontOptions : public utl::detail::Options
 {
     public:
         /*-****************************************************************************************************
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 71a8d3cb67ef..4c0d5a75756e 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -54,7 +54,7 @@ class SvtHistoryOptions_Impl;
     key "PickList": The last used documents displayed in the file menu.
     key "History":  The last opened documents general.
 */
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtHistoryOptions : public utl::detail::Options
 {
 public:
     SvtHistoryOptions();
diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx
index e315c61a1168..ff183fe68766 100644
--- a/include/unotools/localisationoptions.hxx
+++ b/include/unotools/localisationoptions.hxx
@@ -38,7 +38,7 @@ class SvtLocalisationOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtLocalisationOptions : public utl::detail::Options
 {
     public:
         /*-****************************************************************************************************
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index c884908c8688..b2a7160ad7ad 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -45,7 +45,7 @@ class SvtModuleOptions_Impl;
     @devstatus      ready to use
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtModuleOptions : public utl::detail::Options
 {
     public:
 
diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx
index db566e965d8f..b703eec536c6 100644
--- a/include/unotools/options.hxx
+++ b/include/unotools/options.hxx
@@ -72,7 +72,7 @@ namespace detail {
 // shared between unotools, svl and svt)
 // It also provides an implementation for a Configuration Listener and inherits a broadcaster implementation
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC Options
     : public utl::ConfigurationBroadcaster, public utl::ConfigurationListener
 {
 public:
diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx
index aae2cf0a1542..a99775c12a94 100644
--- a/include/unotools/optionsdlg.hxx
+++ b/include/unotools/optionsdlg.hxx
@@ -25,7 +25,7 @@
 
 class SvtOptionsDlgOptions_Impl;
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtOptionsDialogOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtOptionsDialogOptions : public utl::detail::Options
 {
 private:
     SvtOptionsDlgOptions_Impl* m_pImp;
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index 482d48bda824..f69954e351bb 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -28,7 +28,7 @@
 // class SvtPathOptions --------------------------------------------------
 
 class SvtPathOptions_Impl;
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPathOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtPathOptions : public utl::detail::Options
 {
 private:
     SvtPathOptions_Impl*    pImp;
diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx
index 5aa0c3a84547..7c425539a6c2 100644
--- a/include/unotools/printwarningoptions.hxx
+++ b/include/unotools/printwarningoptions.hxx
@@ -40,7 +40,7 @@ class SvtPrintWarningOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPrintWarningOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtPrintWarningOptions : public utl::detail::Options
 {
     public:
         /*-****************************************************************************************************
diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx
index 8e8fe91d7a77..471ac3afb44b 100644
--- a/include/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.hxx
@@ -54,7 +54,7 @@ enum EBasicSecurityMode
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSecurityOptions : public utl::detail::Options
 {
     public:
 
diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx
index 444b3969747e..92f226c12cbd 100644
--- a/include/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
@@ -41,7 +41,7 @@ class SvtSysLocaleOptions_Impl;
 class SvtListener;
 namespace osl { class Mutex; }
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSysLocaleOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSysLocaleOptions : public utl::detail::Options
 {
     static  SvtSysLocaleOptions_Impl*   pOptions;
     static  sal_Int32                   nRefCount;
diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index 0b3db72d4f31..710e1e3e86ea 100644
--- a/include/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.hxx
@@ -50,7 +50,7 @@ enum class UserOptToken
 
 // class SvtUserOptions --------------------------------------------------
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtUserOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtUserOptions : public utl::detail::Options
 {
 public:
     SvtUserOptions ();
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index e2b57cd6261b..71192fcf4fe7 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -95,7 +95,7 @@ enum EViewType
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Options
+class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtViewOptions : public utl::detail::Options
 {
 
     //  public methods