summaryrefslogtreecommitdiffstats
path: root/include/svx/chrtitem.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-12-10 13:30:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-12-10 13:30:01 +0100
commit5fa9ce570dc59a3fc9eb47f28b3fed739f20ab23 (patch)
tree6032150d8fe8b3825bd2feb65d3a677823becdd5 /include/svx/chrtitem.hxx
parentremove misleading comment (diff)
downloadcore-5fa9ce570dc59a3fc9eb47f28b3fed739f20ab23.tar.gz
core-5fa9ce570dc59a3fc9eb47f28b3fed739f20ab23.zip
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/chrtitem.hxx')
-rw-r--r--include/svx/chrtitem.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 3ffbc4be9a01..dad68cc30ba8 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -162,7 +162,7 @@ enum SvxChartRegress
#define CHREGRESS_COUNT (CHREGRESS_UNKNOWN + 1)
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartStyleItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem
{
public:
SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/,
@@ -176,7 +176,7 @@ public:
};
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartRegressItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem
{
public:
SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/,
@@ -192,7 +192,7 @@ public:
sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override;
};
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartDataDescrItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem
{
public:
SvxChartDataDescrItem(SvStream& rIn,
@@ -204,7 +204,7 @@ public:
sal_uInt16 GetValueCount() const override { return CHDESCR_COUNT; }
};
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrderItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem
{
public:
SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/,
@@ -223,7 +223,7 @@ public:
{ return (SvxChartTextOrder)SfxEnumItem::GetValue(); }
};
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrientItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem
{
public:
SvxChartTextOrientItem(SvStream& rIn,
@@ -235,7 +235,7 @@ public:
sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; }
};
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartKindErrorItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem
{
public:
SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/,
@@ -253,7 +253,7 @@ public:
sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override;
};
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartIndicateItem : public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem
{
public:
SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/,
@@ -271,7 +271,7 @@ public:
sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override;
};
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxDoubleItem : public SfxPoolItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem
{
double fVal;