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/dialcontrol.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/svx/dialcontrol.hxx') 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 ); -- cgit