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/contdlg.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/contdlg.hxx')
| -rw-r--r-- | include/svx/contdlg.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index ee3dd3ec9ac2..5e596ff63295 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -33,7 +33,7 @@ class Graphic; -class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxContourDlgChildWindow : public SfxChildWindow +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow { public: SvxContourDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); @@ -43,7 +43,7 @@ public: class SvxSuperContourDlg; -class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxContourDlg : public SfxFloatingWindow +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow { using Window::Update; |