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/dlgctl3d.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/dlgctl3d.hxx')
| -rw-r--r-- | include/svx/dlgctl3d.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 |