diff options
Diffstat (limited to 'chart2/source/inc/chartview')
4 files changed, 7 insertions, 5 deletions
diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index 58d8a9ff2e4d..304b0f5a486f 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -29,7 +29,7 @@ namespace com::sun::star::drawing { struct Direction3D; } namespace chart { -class OOO_DLLPUBLIC_CHARTVIEW DataPointSymbolSupplier +class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) DataPointSymbolSupplier { public: static rtl::Reference< SvxShapeGroup > diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 080587e7ecfe..e555fb7ab021 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -35,7 +35,7 @@ class SdrObject; namespace chart { -class OOO_DLLPUBLIC_CHARTVIEW DrawModelWrapper final : private SdrModel +class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) DrawModelWrapper final : private SdrModel { private: rtl::Reference<SvxDrawPage> m_xMainDrawPage; diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx index a49dddeb6658..07b8290cb7db 100644 --- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx +++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <config_options.h> #include <chartview/chartviewdllapi.hxx> #include <com/sun/star/chart/TimeInterval.hpp> #include <com/sun/star/chart2/AxisOrientation.hpp> @@ -35,7 +36,7 @@ namespace chart /** This structure contains the explicit values for a scale like Minimum and Maximum. See also css::chart2::ScaleData. */ -struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData +struct UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) ExplicitScaleData { ExplicitScaleData(); @@ -73,7 +74,7 @@ struct ExplicitSubIncrement /** describes how tickmarks are positioned on the scale of an axis. */ -struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData +struct UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) ExplicitIncrementData { ExplicitIncrementData(); diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index 4370e38cf1b8..f4bc4aac874b 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <config_options.h> #include <sal/types.h> #include <chartview/chartviewdllapi.hxx> #include <rtl/ref.hxx> @@ -48,7 +49,7 @@ class ChartModel; struct ExplicitIncrementData; struct ExplicitScaleData; -class OOO_DLLPUBLIC_CHARTVIEW SAL_LOPLUGIN_ANNOTATE("crosscast") ExplicitValueProvider +class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) SAL_LOPLUGIN_ANNOTATE("crosscast") ExplicitValueProvider { public: /** Gives calculated scale and increment values for a given xAxis in the current view. |