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

16 files changed, 16 insertions, 16 deletions

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