diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 13:30:01 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 13:30:01 +0100 |
commit | 5fa9ce570dc59a3fc9eb47f28b3fed739f20ab23 (patch) | |
tree | 6032150d8fe8b3825bd2feb65d3a677823becdd5 /include/svx/drawitem.hxx | |
parent | 66bd1e491102de97ceeb1db5705a15ff2dd69a58 (diff) |
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
Diffstat (limited to 'include/svx/drawitem.hxx')
-rw-r--r-- | include/svx/drawitem.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
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; |