From 5fa9ce570dc59a3fc9eb47f28b3fed739f20ab23 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 10 Dec 2015 13:30:01 +0100 Subject: 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 --- include/svx/dlgctl3d.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/svx/dlgctl3d.hxx') 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 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 -- cgit