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/fmgridif.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/fmgridif.hxx')
| -rw-r--r-- | include/svx/fmgridif.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 9747eab45432..25370fafe376 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -200,7 +200,7 @@ typedef ::cppu::ImplHelper10< css::form::XBoundComponent, > FmXGridControl_BASE; class FmXGridPeer; -class SVX_DLLPUBLIC SAL_WARN_UNUSED FmXGridControl :public UnoControl +class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridControl :public UnoControl ,public FmXGridControl_BASE { FmXModifyMultiplexer m_aModifyListeners; @@ -311,7 +311,7 @@ protected: // FmXGridPeer -> Peer for the Gridcontrol class FmGridControl; -class SVX_DLLPUBLIC SAL_WARN_UNUSED FmXGridPeer: +class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridPeer: public cppu::ImplInheritanceHelper< VCLXWindow, css::form::XGridPeer, |