chart2/Library_chart2.mk | 6 - chart2/inc/ChartModel.hxx | 2 chart2/inc/ChartTypeManager.hxx | 3 chart2/inc/ChartView.hxx | 2 chart2/inc/pch/precompiled_chart2.hxx | 3 chart2/source/controller/dialogs/DialogModel.hxx | 2 chart2/source/inc/Axis.hxx | 5 - chart2/source/inc/AxisHelper.hxx | 7 - chart2/source/inc/BaseGFXHelper.hxx | 22 ++--- chart2/source/inc/CharacterProperties.hxx | 7 - chart2/source/inc/ChartModelHelper.hxx | 3 chart2/source/inc/ChartType.hxx | 3 chart2/source/inc/ChartTypeHelper.hxx | 13 +-- chart2/source/inc/ChartTypeTemplate.hxx | 3 chart2/source/inc/ChartViewHelper.hxx | 3 chart2/source/inc/ColorPerPointHelper.hxx | 5 - chart2/source/inc/CommonConverters.hxx | 65 +++++++--------- chart2/source/inc/CommonFunctors.hxx | 5 - chart2/source/inc/ConfigColorScheme.hxx | 3 chart2/source/inc/ControllerLockGuard.hxx | 12 +- chart2/source/inc/DataBrowserModel.hxx | 2 chart2/source/inc/DataSeries.hxx | 5 - chart2/source/inc/DataSeriesHelper.hxx | 27 ------ chart2/source/inc/DataSource.hxx | 3 chart2/source/inc/DataSourceHelper.hxx | 13 +-- chart2/source/inc/DataTable.hxx | 4 chart2/source/inc/Diagram.hxx | 5 - chart2/source/inc/DiagramHelper.hxx | 7 - chart2/source/inc/ErrorBar.hxx | 3 chart2/source/inc/ExplicitCategoriesProvider.hxx | 5 - chart2/source/inc/FillProperties.hxx | 5 - chart2/source/inc/FormattedString.hxx | 2 chart2/source/inc/GridProperties.hxx | 2 chart2/source/inc/LabeledDataSequence.hxx | 3 chart2/source/inc/Legend.hxx | 5 - chart2/source/inc/LegendHelper.hxx | 3 chart2/source/inc/LifeTime.hxx | 11 +- chart2/source/inc/LinePropertiesHelper.hxx | 5 - chart2/source/inc/MediaDescriptorHelper.hxx | 5 - chart2/source/inc/ModifyListenerCallBack.hxx | 5 - chart2/source/inc/NumberFormatterWrapper.hxx | 3 chart2/source/inc/OPropertySet.hxx | 3 chart2/source/inc/ObjectIdentifier.hxx | 7 - chart2/source/inc/PopupRequest.hxx | 3 chart2/source/inc/PropertyHelper.hxx | 17 +--- chart2/source/inc/RangeSelectionHelper.hxx | 4 chart2/source/inc/RangeSelectionListener.hxx | 2 chart2/source/inc/ReferenceSizeProvider.hxx | 17 +--- chart2/source/inc/RegressionCurveHelper.hxx | 61 +++++++-------- chart2/source/inc/RelativePositionHelper.hxx | 5 - chart2/source/inc/RelativeSizeHelper.hxx | 4 chart2/source/inc/ResId.hxx | 3 chart2/source/inc/SceneProperties.hxx | 5 - chart2/source/inc/StatisticsHelper.hxx | 25 ++---- chart2/source/inc/ThreeDHelper.hxx | 9 -- chart2/source/inc/TimerTriggeredControllerLock.hxx | 4 chart2/source/inc/Title.hxx | 2 chart2/source/inc/TitleHelper.hxx | 3 chart2/source/inc/UserDefinedProperties.hxx | 4 chart2/source/inc/WrappedDefaultProperty.hxx | 3 chart2/source/inc/WrappedDirectStateProperty.hxx | 3 chart2/source/inc/WrappedIgnoreProperty.hxx | 15 +-- chart2/source/inc/WrappedProperty.hxx | 3 chart2/source/inc/WrappedPropertySet.hxx | 7 - chart2/source/inc/XMLRangeHelper.hxx | 5 - chart2/source/inc/charttoolsdllapi.hxx | 32 ------- chart2/source/inc/chartview/DataPointSymbolSupplier.hxx | 3 chart2/source/inc/chartview/DrawModelWrapper.hxx | 17 +--- chart2/source/inc/chartview/ExplicitScaleValues.hxx | 5 - chart2/source/inc/chartview/ExplicitValueProvider.hxx | 3 chart2/source/inc/chartview/chartviewdllapi.hxx | 32 ------- 71 files changed, 221 insertions(+), 382 deletions(-)
New commits: commit c976458eb2ef4309bb6b9eff6f00740d2dd6e558 Author: Noel Grandin <[email protected]> AuthorDate: Sat Mar 29 14:22:12 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Mar 31 07:50:55 2025 +0200 simplify the DLL annotations in chart2 now that the libraries are merged, nothing needs to be visible Change-Id: I009f062301ccec9cf9c57b3280a3cd7452adcf38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183482 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/chart2/Library_chart2.mk b/chart2/Library_chart2.mk index fb5fcec449f5..34e6f39fd31d 100644 --- a/chart2/Library_chart2.mk +++ b/chart2/Library_chart2.mk @@ -18,12 +18,6 @@ $(eval $(call gb_Library_set_include,chart2,\ -I$(SRCDIR)/chart2/inc \ )) -# not ideal - we should use a single core define ideally -$(eval $(call gb_Library_add_defs,chart2,\ - -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \ - -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ -)) - $(eval $(call gb_Library_set_precompiled_header,chart2,chart2/inc/pch/precompiled_chart2)) $(eval $(call gb_Library_use_externals,chart2,\ diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 911fcc4e409f..49012cd5e0a1 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -115,7 +115,7 @@ typedef cppu::WeakImplHelper< class UndoManager; class ChartView; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) SAL_LOPLUGIN_ANNOTATE("crosscast") ChartModel final : +class SAL_LOPLUGIN_ANNOTATE("crosscast") ChartModel final : public impl::ChartModel_Base { diff --git a/chart2/inc/ChartTypeManager.hxx b/chart2/inc/ChartTypeManager.hxx index ac2c56263432..2970503d3e24 100644 --- a/chart2/inc/ChartTypeManager.hxx +++ b/chart2/inc/ChartTypeManager.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/chart2/XChartTypeManager.hpp> -#include <charttoolsdllapi.hxx> #include <rtl/ref.hxx> #include <ChartTypeTemplate.hxx> @@ -31,7 +30,7 @@ namespace com::sun::star::uno { class XComponentContext; } namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ChartTypeManager final : +class ChartTypeManager final : public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XMultiServiceFactory, diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index e77fe760b67f..7c9cd0ceb78a 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -82,7 +82,7 @@ struct TimeBasedInfo * The View is not responsible to handle single user events (that is instead * done by the ChartWindow). */ -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) ChartView final : public ::cppu::WeakImplHelper< +class ChartView final : public ::cppu::WeakImplHelper< css::lang::XInitialization ,css::lang::XServiceInfo ,css::datatransfer::XTransferable diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx index 64dd101a2167..53c4fc617a59 100644 --- a/chart2/inc/pch/precompiled_chart2.hxx +++ b/chart2/inc/pch/precompiled_chart2.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2025-03-29 13:43:14 using: + Generated on 2025-03-30 09:01:07 using: ./bin/update_pch chart2 chart2 --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -600,7 +600,6 @@ #include <VLineProperties.hxx> #include <ViewElementListProvider.hxx> #include <WrappedProperty.hxx> -#include <charttoolsdllapi.hxx> #include <defines.hxx> #include <servicenames.hxx> #include <servicenames_charttypes.hxx> diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index 93a4ecf6455f..857803fe46f1 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -55,7 +55,7 @@ struct DialogModelTimeBasedInfo sal_Int32 nEnd; }; -class OOO_DLLPUBLIC_CHARTTOOLS DialogModel +class DialogModel { public: explicit DialogModel( rtl::Reference<::chart::ChartModel> xChartDocument ); diff --git a/chart2/source/inc/Axis.hxx b/chart2/source/inc/Axis.hxx index e36acdbad7aa..d42832c0fb7e 100644 --- a/chart2/source/inc/Axis.hxx +++ b/chart2/source/inc/Axis.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/util/XCloneable.hpp> #include "ModifyListenerHelper.hxx" -#include "charttoolsdllapi.hxx" #include "PropertyHelper.hxx" namespace chart @@ -47,7 +46,7 @@ typedef ::cppu::WeakImplHelper< Axis_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) Axis final : +class Axis final : public impl::Axis_Base, public ::property::OPropertySet { @@ -138,7 +137,7 @@ private: rtl::Reference< ::chart::Title > m_xTitle; }; -OOO_DLLPUBLIC_CHARTTOOLS const ::chart::tPropertyValueMap & StaticAxisDefaults(); +const ::chart::tPropertyValueMap & StaticAxisDefaults(); } // namespace chart diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 0b96ddc03484..eff1bb4e28c4 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -19,7 +19,6 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" #include <com/sun/star/chart2/ScaleData.hpp> #include <rtl/ref.hxx> #include "GridProperties.hxx" @@ -39,7 +38,7 @@ class BaseCoordinateSystem; class ChartType; class Diagram; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) AxisHelper +class AxisHelper { public: static css::uno::Reference< css::chart2::XScaling > createLinearScaling(); @@ -101,7 +100,7 @@ public: static void hideAxisIfNoDataIsAttached( const rtl::Reference< ::chart::Axis >& xAxis , const rtl::Reference< ::chart::Diagram >& xDiagram); - SAL_DLLPRIVATE static bool areAxisLabelsVisible( const rtl::Reference< ::chart::Axis >& xAxisProperties ); + static bool areAxisLabelsVisible( const rtl::Reference< ::chart::Axis >& xAxisProperties ); static bool isAxisVisible( const rtl::Reference< ::chart::Axis >& xAxis ); static bool isGridVisible( const rtl::Reference< ::chart::GridProperties >& xGridProperties ); @@ -161,7 +160,7 @@ public: /** @param bOnlyVisible if </TRUE>, only axes with property "Show" set to </sal_True> are returned */ - SAL_DLLPRIVATE static std::vector< rtl::Reference< ::chart::Axis > > + static std::vector< rtl::Reference< ::chart::Axis > > getAllAxesOfCoordinateSystem( const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSys , bool bOnlyVisible = false ); diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx index 4ba4a65c8250..54f26896339a 100644 --- a/chart2/source/inc/BaseGFXHelper.hxx +++ b/chart2/source/inc/BaseGFXHelper.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/Position3D.hpp> -#include "charttoolsdllapi.hxx" namespace com::sun::star::awt { struct Rectangle; } namespace com::sun::star::drawing { struct PolyPolygonShape3D; } @@ -37,23 +36,23 @@ namespace com::sun::star::drawing { struct PolyPolygonShape3D; } namespace chart::BaseGFXHelper { -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ::basegfx::B3DRange getBoundVolume( const css::drawing::PolyPolygonShape3D& rPolyPoly ); +::basegfx::B3DRange getBoundVolume( const css::drawing::PolyPolygonShape3D& rPolyPoly ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ::basegfx::B3DRange getBoundVolume( const std::vector<std::vector<css::drawing::Position3D>>& rPolyPoly ); +::basegfx::B3DRange getBoundVolume( const std::vector<std::vector<css::drawing::Position3D>>& rPolyPoly ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ::basegfx::B2IRectangle makeRectangle( +::basegfx::B2IRectangle makeRectangle( const css::awt::Point& rPosition, const css::awt::Size& rSize ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ::basegfx::B2IRectangle makeRectangle( const css::awt::Rectangle& rRect ); +::basegfx::B2IRectangle makeRectangle( const css::awt::Rectangle& rRect ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::awt::Point B2IRectangleToAWTPoint( +css::awt::Point B2IRectangleToAWTPoint( const ::basegfx::B2IRectangle& rB2IRectangle ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::awt::Size B2IRectangleToAWTSize( +css::awt::Size B2IRectangleToAWTSize( const ::basegfx::B2IRectangle& rB2IRectangle ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::awt::Rectangle toAwtRectangle(const basegfx::B2IRectangle& rB2IRectangle); +css::awt::Rectangle toAwtRectangle(const basegfx::B2IRectangle& rB2IRectangle); ::basegfx::B3DVector Direction3DToB3DVector( const css::drawing::Direction3D& rDirection ); @@ -67,17 +66,16 @@ css::drawing::Direction3D B3DVectorToDirection3D( css::drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rB3DVector ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( +::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const css::drawing::HomogenMatrix & rHomogenMatrix ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix & rB3DMatrix ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ::basegfx::B3DTuple GetRotationFromMatrix( +::basegfx::B3DTuple GetRotationFromMatrix( const ::basegfx::B3DHomMatrix & rB3DMatrix ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ::basegfx::B3DTuple GetScaleFromMatrix( +::basegfx::B3DTuple GetScaleFromMatrix( const ::basegfx::B3DHomMatrix & rB3DMatrix ); void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix ); diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index cbc77c3859c0..04ce6840babc 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -20,7 +20,6 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" -#include "charttoolsdllapi.hxx" #include <com/sun/star/awt/FontDescriptor.hpp> #include <vector> @@ -120,12 +119,12 @@ namespace CharacterProperties FAST_PROPERTY_ID_END_CHAR_PROP }; - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddPropertiesToVector( + void AddPropertiesToVector( std::vector< css::beans::Property > & rOutProperties ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); + void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool IsCharacterPropertyHandle( sal_Int32 nHandle ); + bool IsCharacterPropertyHandle( sal_Int32 nHandle ); } } // namespace chart diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 4694c35725d2..14d16854fb11 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -20,7 +20,6 @@ #include <config_options.h> #include <com/sun/star/awt/Size.hpp> -#include "charttoolsdllapi.hxx" #include <rtl/ref.hxx> #include <vector> @@ -34,7 +33,7 @@ class ChartType; class DataSeries; class InternalDataProvider; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ChartModelHelper +class ChartModelHelper { public: static rtl::Reference< InternalDataProvider > createInternalDataProvider( diff --git a/chart2/source/inc/ChartType.hxx b/chart2/source/inc/ChartType.hxx index 697b0d7ffc91..1c1bbc0bae0e 100644 --- a/chart2/source/inc/ChartType.hxx +++ b/chart2/source/inc/ChartType.hxx @@ -30,7 +30,6 @@ #include <rtl/ref.hxx> #include <vector> -#include "charttoolsdllapi.hxx" namespace chart { @@ -60,7 +59,7 @@ typedef ::cppu::WeakImplHelper< ChartType_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ChartType : +class ChartType : public impl::ChartType_Base, public ::property::OPropertySet { diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 8716ab9301ea..4321ee49d1bb 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -21,7 +21,6 @@ #include <config_options.h> #include <com/sun/star/drawing/Direction3D.hpp> -#include "charttoolsdllapi.hxx" #include "ChartType.hxx" #include <rtl/ref.hxx> @@ -30,7 +29,7 @@ namespace chart class ChartType; class DataSeries; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ChartTypeHelper +class ChartTypeHelper { public: static bool isSupportingGeometryProperties( const rtl::Reference< ::chart::ChartType >& xChartType, sal_Int32 nDimensionCount ); @@ -62,12 +61,12 @@ public: static css::uno::Sequence < sal_Int32 > getSupportedMissingValueTreatments( const rtl::Reference< ::chart::ChartType >& xChartType ); - SAL_DLLPRIVATE static css::drawing::Direction3D getDefaultSimpleLightDirection( const rtl::Reference< ::chart::ChartType >& xChartType ); - SAL_DLLPRIVATE static css::drawing::Direction3D getDefaultRealisticLightDirection( const rtl::Reference< ::chart::ChartType >& xChartType ); - SAL_DLLPRIVATE static sal_Int32 getDefaultDirectLightColor( bool bSimple, const rtl::Reference< ::chart::ChartType >& xChartType ); - SAL_DLLPRIVATE static sal_Int32 getDefaultAmbientLightColor( bool bSimple, const rtl::Reference< ::chart::ChartType >& xChartType ); + static css::drawing::Direction3D getDefaultSimpleLightDirection( const rtl::Reference< ::chart::ChartType >& xChartType ); + static css::drawing::Direction3D getDefaultRealisticLightDirection( const rtl::Reference< ::chart::ChartType >& xChartType ); + static sal_Int32 getDefaultDirectLightColor( bool bSimple, const rtl::Reference< ::chart::ChartType >& xChartType ); + static sal_Int32 getDefaultAmbientLightColor( bool bSimple, const rtl::Reference< ::chart::ChartType >& xChartType ); static sal_Int32 getNumberOfDisplayedSeries( const rtl::Reference< ::chart::ChartType >& xChartType, sal_Int32 nNumberOfSeries ); - SAL_DLLPRIVATE static bool noBordersForSimpleScheme( const rtl::Reference< ::chart::ChartType >& xChartType ); + static bool noBordersForSimpleScheme( const rtl::Reference< ::chart::ChartType >& xChartType ); static bool isSeriesInFrontOfAxisLine( const rtl::Reference< ::chart::ChartType >& xChartType ); diff --git a/chart2/source/inc/ChartTypeTemplate.hxx b/chart2/source/inc/ChartTypeTemplate.hxx index 2bf0a880dbae..9e641eeaea1e 100644 --- a/chart2/source/inc/ChartTypeTemplate.hxx +++ b/chart2/source/inc/ChartTypeTemplate.hxx @@ -23,7 +23,6 @@ #include "StackMode.hxx" #include <com/sun/star/chart2/XChartTypeTemplate.hpp> #include <com/sun/star/lang/XServiceName.hpp> -#include "charttoolsdllapi.hxx" #include <rtl/ref.hxx> #include <vector> @@ -76,7 +75,7 @@ class Diagram; * create an XLegend via the global service factory, set it at the diagram. */ -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ChartTypeTemplate : public ::cppu::WeakImplHelper< +class ChartTypeTemplate : public ::cppu::WeakImplHelper< css::chart2::XChartTypeTemplate, css::lang::XServiceName > { diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index 0ffe60220f60..1a6425ffae55 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -19,7 +19,6 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" #include <rtl/ref.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -35,10 +34,8 @@ class ChartModel; namespace ChartViewHelper { -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void setViewToDirtyState(const rtl::Reference<ChartModel>& xChartModel); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void setViewToDirtyState_UNO(const css::uno::Reference<css::chart2::XChartDocument>& xChartModel); }; diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index 575019e9bbb2..bfcf2022815f 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -20,7 +20,6 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" #include <rtl/ref.hxx> namespace com::sun::star::beans { class XPropertySet; } @@ -30,7 +29,7 @@ namespace chart { class DataSeries; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ColorPerPointHelper +class ColorPerPointHelper { public: static bool hasPointOwnColor( @@ -41,7 +40,7 @@ public: // returns true if AttributedDataPoints contains nPointIndex and the // property Color is DEFAULT - SAL_DLLPRIVATE static bool hasPointOwnProperties( + static bool hasPointOwnProperties( const rtl::Reference< ::chart::DataSeries >& xDataSeries , sal_Int32 nPointIndex ); }; diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index c6dc7b2ecd1d..2716849ba804 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -30,7 +30,6 @@ #include <basegfx/point/b3dpoint.hxx> #include <basegfx/vector/b3dvector.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include "charttoolsdllapi.hxx" namespace com::sun::star::awt { struct Rectangle; } namespace com::sun::star::chart2::data { class XDataSequence; } @@ -46,136 +45,136 @@ and operations e.g drawing::Position3D + drawing::Direction3D /** ::basegfx::B3DHomMatrix -> HomogenMatrix */ -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::HomogenMatrix +css::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix& rM ); /** HomogenMatrix -> ::basegfx::B3DHomMatrix */ -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const css::drawing::HomogenMatrix& rHM ); +::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const css::drawing::HomogenMatrix& rHM ); /** ::basegfx::B3DHomMatrix -> B2DHomMatrix */ -OOO_DLLPUBLIC_CHARTTOOLS + ::basegfx::B2DHomMatrix IgnoreZ( const ::basegfx::B3DHomMatrix& rM ); /** B2DHomMatrix <-> HomogenMatrix3 */ -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::HomogenMatrix3 +css::drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM ); /** Position3D -> B3DPoint */ -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Position3DToB3DPoint( const css::drawing::Position3D& rPosition ); +::basegfx::B3DPoint Position3DToB3DPoint( const css::drawing::Position3D& rPosition ); /** B3DVector -> Direction3D */ -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector); +css::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector); /** B3DPoint -> Position3D */ -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); +css::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); /** Direction3D -> B3DVector */ -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const css::drawing::Direction3D& rDirection); +::basegfx::B3DVector Direction3DToB3DVector( const css::drawing::Direction3D& rDirection); /** PolyPolygonShape3D + drawing::Position3D -> PolyPolygonShape3D */ -OOO_DLLPUBLIC_CHARTTOOLS + void AddPointToPoly( css::drawing::PolyPolygonShape3D& rPoly , const css::drawing::Position3D& rPos , sal_Int32 nSequenceIndex=0 ); -OOO_DLLPUBLIC_CHARTTOOLS + void AddPointToPoly( std::vector<std::vector<css::drawing::Position3D>>& rPoly , const css::drawing::Position3D& rPos , sal_Int32 nSequenceIndex=0 ); /** get a single Point from a Polygon */ -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D getPointFromPoly( +css::drawing::Position3D getPointFromPoly( const std::vector<std::vector<css::drawing::Position3D>>& rPolygon , sal_Int32 nPointIndex, sal_Int32 nPolyIndex ); -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D getPointFromPoly( +css::drawing::Position3D getPointFromPoly( const css::drawing::PolyPolygonShape3D& rPolygon , sal_Int32 nPointIndex, sal_Int32 nPolyIndex ); -OOO_DLLPUBLIC_CHARTTOOLS + void addPolygon( std::vector<std::vector<css::drawing::Position3D>>& rRet , const std::vector<std::vector<css::drawing::Position3D>>& rAdd ); /** PolyPolygonShape3D + PolyPolygonShape3D -> PolyPolygonShape3D */ -OOO_DLLPUBLIC_CHARTTOOLS + void appendPoly( std::vector<std::vector<css::drawing::Position3D>>& rRet , const std::vector<std::vector<css::drawing::Position3D>>& rAdd ); /** PolyPolygonBezierCoords -> PolyPolygonShape3D */ -OOO_DLLPUBLIC_CHARTTOOLS + css::drawing::PolyPolygonShape3D BezierToPoly( const css::drawing::PolyPolygonBezierCoords& rBezier ); /** PolyPolygonShape3D -> drawing::PointSequenceSequence (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS + css::drawing::PointSequenceSequence PolyToPointSequence( const css::drawing::PolyPolygonShape3D& rPolyPolygon ); -OOO_DLLPUBLIC_CHARTTOOLS + css::drawing::PointSequenceSequence PolyToPointSequence( const std::vector<std::vector<css::drawing::Position3D>>& rPolyPolygon ); /** PolyPolygonShape3D -> basegfx::B2DPolyPolygon (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS + basegfx::B2DPolyPolygon PolyToB2DPolyPolygon( const std::vector<std::vector<css::drawing::Position3D>>& rPolyPolygon ); /** drawing::PointSequenceSequence + drawing::PointSequenceSequence */ -OOO_DLLPUBLIC_CHARTTOOLS + void appendPointSequence( css::drawing::PointSequenceSequence& rTarget , const css::drawing::PointSequenceSequence& rAdd ); /** Position3D + Direction3D == Position3D */ -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D +css::drawing::Position3D operator+( const css::drawing::Position3D& rPos , const css::drawing::Direction3D& rDirection); /** Position3D - Position3D == Direction3D */ -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Direction3D +css::drawing::Direction3D operator-( const css::drawing::Position3D& rPos1 , const css::drawing::Position3D& rPos2); /** awt::Rect --> awt::Point (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS css::awt::Point ToPoint( const css::awt::Rectangle& rRectangle ); +css::awt::Point ToPoint( const css::awt::Rectangle& rRectangle ); /** awt::Rect --> awt::Size (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS css::awt::Size ToSize( const css::awt::Rectangle& rRectangle ); +css::awt::Size ToSize( const css::awt::Rectangle& rRectangle ); /** Position3D --> awt::Point (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS css::awt::Point Position3DToAWTPoint( const css::drawing::Position3D& rPos ); +css::awt::Point Position3DToAWTPoint( const css::drawing::Position3D& rPos ); /** Direction3D --> awt::Size (2D) */ -OOO_DLLPUBLIC_CHARTTOOLS css::awt::Size Direction3DToAWTSize( const css::drawing::Direction3D& rDirection ); +css::awt::Size Direction3DToAWTSize( const css::drawing::Direction3D& rDirection ); /** Sequence<double> -> drawing::Position3D */ -OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D +css::drawing::Position3D SequenceToPosition3D( const css::uno::Sequence< double >& rSeq ); /** chart2::XDataSequence -> uno::Sequence< double > */ -OOO_DLLPUBLIC_CHARTTOOLS + css::uno::Sequence< double > DataSequenceToDoubleSequence( const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence ); -OOO_DLLPUBLIC_CHARTTOOLS + css::uno::Sequence< OUString > DataSequenceToStringSequence( const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence ); @@ -201,15 +200,15 @@ std::vector< T > return aResult; } -OOO_DLLPUBLIC_CHARTTOOLS + bool hasDoubleValue( const css::uno::Any& rAny ); -OOO_DLLPUBLIC_CHARTTOOLS + bool hasLongOrShortValue( const css::uno::Any& rAny ); -OOO_DLLPUBLIC_CHARTTOOLS + sal_Int16 getShortForLongAlso( const css::uno::Any& rAny ); -OOO_DLLPUBLIC_CHARTTOOLS + bool replaceParamterInString( OUString & rInOutResourceString, std::u16string_view rParamToReplace, std::u16string_view rReplaceWith ); diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 2d01e7ad27ae..bbbdce3ed960 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> -#include "charttoolsdllapi.hxx" #include <algorithm> #include <limits> @@ -50,7 +49,7 @@ struct makeAny <p>For conversion of OUString, rtl::math::StringToDouble is used.</p> <p>In case no number can be generated from the Any, NaN is returned.</p> */ -struct OOO_DLLPUBLIC_CHARTTOOLS ToDouble +struct ToDouble { double operator() ( const css::uno::Any & rAny ) { @@ -75,7 +74,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS ToDouble <p>For conversion of doubles, rtl::math::DoubleToOUString is used.</p> */ -struct OOO_DLLPUBLIC_CHARTTOOLS ToString +struct ToString { OUString operator() ( const css::uno::Any & rAny ) { diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index fe73dc671bb6..d494a7508006 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -18,7 +18,6 @@ */ #pragma once -#include "charttoolsdllapi.hxx" #include <cppuhelper/implbase.hxx> #include <com/sun/star/chart2/XColorScheme.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -30,7 +29,7 @@ namespace com::sun::star::uno { class XComponentContext; } namespace chart { -OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::XColorScheme > createConfigColorScheme( +css::uno::Reference< css::chart2::XColorScheme > createConfigColorScheme( const css::uno::Reference< css::uno::XComponentContext > & xContext ); namespace impl diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index 6de9212a0268..41fc545c4681 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -19,7 +19,7 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" + #include <rtl/ref.hxx> namespace chart @@ -33,7 +33,7 @@ namespace chart unlockControllers in the DTOR. Using this ensures that controllers do not remain locked when leaving a function even in case an exception is thrown. */ -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ControllerLockGuardUNO +class ControllerLockGuardUNO { public: explicit ControllerLockGuardUNO(rtl::Reference<::chart::ChartModel> xModel); @@ -59,14 +59,14 @@ private: Use the ControllerLockHelperGuard to lock/unlock the model during a block of instructions. */ -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ControllerLockHelper +class ControllerLockHelper { public: explicit ControllerLockHelper(rtl::Reference<::chart::ChartModel> xModel); ~ControllerLockHelper(); - SAL_DLLPRIVATE void lockControllers(); - SAL_DLLPRIVATE void unlockControllers(); + void lockControllers(); + void unlockControllers(); private: rtl::Reference<::chart::ChartModel> m_xModel; @@ -77,7 +77,7 @@ private: do not remain locked when leaving a function even in case an exception is thrown. */ -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ControllerLockHelperGuard +class ControllerLockHelperGuard { public: explicit ControllerLockHelperGuard(ControllerLockHelper& rHelper); diff --git a/chart2/source/inc/DataBrowserModel.hxx b/chart2/source/inc/DataBrowserModel.hxx index 7608e7098ad6..53aff9ade60e 100644 --- a/chart2/source/inc/DataBrowserModel.hxx +++ b/chart2/source/inc/DataBrowserModel.hxx @@ -38,7 +38,7 @@ namespace chart class DialogModel; class ChartModel; -class OOO_DLLPUBLIC_CHARTTOOLS DataBrowserModel final +class DataBrowserModel final { public: explicit DataBrowserModel( diff --git a/chart2/source/inc/DataSeries.hxx b/chart2/source/inc/DataSeries.hxx index be4c0b5c68b4..8cee22dd326e 100644 --- a/chart2/source/inc/DataSeries.hxx +++ b/chart2/source/inc/DataSeries.hxx @@ -37,7 +37,6 @@ #include <map> #include "OPropertySet.hxx" -#include "charttoolsdllapi.hxx" namespace com::sun::star::beans { class XPropertySet; } @@ -60,7 +59,7 @@ typedef ::cppu::WeakImplHelper< DataSeries_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) DataSeries +class DataSeries final : public impl::DataSeries_Base , public ::property::OPropertySet @@ -184,7 +183,7 @@ private: rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder; }; -OOO_DLLPUBLIC_CHARTTOOLS const tPropertyValueMap & StaticDataSeriesDefaults(); +const tPropertyValueMap & StaticDataSeriesDefaults(); } // namespace chart diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 56e99040b9d9..4078da33e1ae 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -20,7 +20,6 @@ #include <config_options.h> #include "StackMode.hxx" -#include "charttoolsdllapi.hxx" #include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> #include <rtl/ref.hxx> @@ -43,7 +42,6 @@ namespace chart { class ChartModel; } namespace chart::DataSeriesHelper { -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString getRole( const css::uno::Reference<css::chart2::data::XLabeledDataSequence>& xLabeledDataSequence ); /** Retrieves the data sequence in the given data source that matches the @@ -56,7 +54,6 @@ OUString getRole( const css::uno::Reference<css::chart2::data::XLabeledDataSeque @param aRole The role that is to be filtered out. */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::uno::Reference< css::chart2::data::XLabeledDataSequence > getDataSequenceByRole( const css::uno::Reference< css::chart2::data::XDataSource > & xSource, const OUString& aRole, @@ -71,18 +68,15 @@ css::uno::Reference< css::chart2::data::XLabeledDataSequence > @param aRole The role that is to be filtered out. */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > getAllDataSequencesByRole( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & aDataSequences, const OUString& aRole ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > getAllDataSequencesByRole( const std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & aDataSequences, const OUString& aRole ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > getAllDataSequences( const std::vector<rtl::Reference<::chart::DataSeries> >& aSeries ); @@ -91,97 +85,76 @@ getAllDataSequences( into a data source. The order of sequences will match the order of the data series. */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference< ::chart::DataSource > getDataSource( const std::vector< rtl::Reference< ::chart::DataSeries > > & aSeries ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void setStackModeAtSeries( const std::vector< rtl::Reference< ::chart::DataSeries > > & aSeries, const rtl::Reference< ::chart::BaseCoordinateSystem > & xCorrespondingCoordinateSystem, StackMode eStackMode ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) sal_Int32 getAttachedAxisIndex( const rtl::Reference< ::chart::DataSeries > & xSeries ); /// @param nAxisIndex, if -1 it is determined by the given data series via getAttachedAxisIndex -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) sal_Int32 getNumberFormatKeyFromAxis( const rtl::Reference< ::chart::DataSeries > & xSeries, const rtl::Reference< ::chart::BaseCoordinateSystem > & xCorrespondingCoordinateSystem, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex = -1 ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference< ::chart::BaseCoordinateSystem > getCoordinateSystemOfSeries( const rtl::Reference< ::chart::DataSeries > & xSeries, const rtl::Reference< ::chart::Diagram > & xDiagram ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference< ::chart::ChartType > getChartTypeOfSeries( const rtl::Reference< ::chart::DataSeries > & xSeries, const rtl::Reference< ::chart::Diagram > & xDiagram ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void deleteSeries( const rtl::Reference< ::chart::DataSeries > & xSeries, const rtl::Reference< ::chart::ChartType > & xChartType ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void switchSymbolsOnOrOff( const rtl::Reference< ::chart::DataSeries > & xSeries, bool bSymbolsOn, sal_Int32 nSeriesIndex ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void switchLinesOnOrOff( const rtl::Reference< ::chart::DataSeries > & xSeries, bool bLinesOn ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void makeLinesThickOrThin( const rtl::Reference< ::chart::DataSeries > & xSeries, bool bThick ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void setPropertyAlsoToAllAttributedDataPoints( const rtl::Reference< ::chart::DataSeries >& xSeries, const OUString& rPropertyName, const css::uno::Any& rPropertyValue ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool hasAttributedDataPointDifferentValue( const rtl::Reference< ::chart::DataSeries >& xSeries, const OUString& rPropertyName, const css::uno::Any& rPropertyValue ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nClippedIndex, const css::uno::Reference< css::chart2::data::XDataSequence >& xDataSequence, bool bTranslate ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool hasDataLabelsAtSeries( const rtl::Reference< ::chart::DataSeries >& xSeries ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool hasDataLabelsAtPoints( const rtl::Reference< ::chart::DataSeries >& xSeries ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool hasDataLabelAtPoint( const rtl::Reference< ::chart::DataSeries >& xSeries, sal_Int32 nPointIndex ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void insertDataLabelsToSeriesAndAllPoints( const rtl::Reference< ::chart::DataSeries >& xSeries ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void insertDataLabelToPoint( const css::uno::Reference< css::beans::XPropertySet >& xPointPropertySet ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void deleteDataLabelsFromSeriesAndAllPoints( const rtl::Reference< ::chart::DataSeries >& xSeries ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void deleteDataLabelsFromPoint( const css::uno::Reference< css::beans::XPropertySet >& xPointPropertySet ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) sal_Int32 getExplicitNumberFormatKeyForDataLabel( const css::uno::Reference< css::beans::XPropertySet >& xPointPropertySet); diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 7e1b32340caf..f7f837d90b17 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -24,12 +24,11 @@ #include <com/sun/star/chart2/data/XDataSink.hpp> #include <cppuhelper/implbase.hxx> #include <vector> -#include "charttoolsdllapi.hxx" namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) DataSource final : public +class DataSource final : public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::chart2::data::XDataSource, diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index 37daf1e0bb93..4b4bcc804d7a 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -20,7 +20,6 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> #include <rtl/ref.hxx> @@ -37,7 +36,7 @@ class DataSource; class Diagram; class LabeledDataSequence; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) DataSourceHelper +class DataSourceHelper { public: static css::uno::Reference< css::chart2::data::XDataSequence > @@ -68,14 +67,14 @@ public: const css::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ); - SAL_DLLPRIVATE static void readArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments + static void readArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments , OUString & rRangeRepresentation, css::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories ); static rtl::Reference< ::chart::DataSource > pressUsedDataIntoRectangularFormat( const rtl::Reference< ::chart::ChartModel >& xChartDoc ); - SAL_DLLPRIVATE static css::uno::Sequence< OUString > getUsedDataRanges( + static css::uno::Sequence< OUString > getUsedDataRanges( const rtl::Reference< ::chart::Diagram > & xDiagram ); static css::uno::Sequence< OUString > getUsedDataRanges( @@ -109,13 +108,13 @@ public: static bool allArgumentsForRectRangeDetected( const rtl::Reference<::chart::ChartModel>& xChartDocument ); - SAL_DLLPRIVATE static css::uno::Sequence< OUString > getRangesFromLabeledDataSequence( + static css::uno::Sequence< OUString > getRangesFromLabeledDataSequence( const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xLSeq ); - SAL_DLLPRIVATE static OUString getRangeFromValues( + static OUString getRangeFromValues( const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xLSeq ); - SAL_DLLPRIVATE static css::uno::Sequence< OUString > getRangesFromDataSource( + static css::uno::Sequence< OUString > getRangesFromDataSource( const css::uno::Reference< css::chart2::data::XDataSource > & xSource ); }; diff --git a/chart2/source/inc/DataTable.hxx b/chart2/source/inc/DataTable.hxx index fdebc6f1751a..849c2303de60 100644 --- a/chart2/source/inc/DataTable.hxx +++ b/chart2/source/inc/DataTable.hxx @@ -13,7 +13,6 @@ #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> -#include "charttoolsdllapi.hxx" #include <com/sun/star/chart2/XDataTable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XCloneable.hpp> @@ -27,8 +26,7 @@ typedef cppu::WeakImplHelper<css::chart2::XDataTable, css::lang::XServiceInfo, DataTable_Base; /** Data table implementation */ -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) DataTable final : public DataTable_Base, - public ::property::OPropertySet +class DataTable final : public DataTable_Base, public ::property::OPropertySet { public: explicit DataTable(); diff --git a/chart2/source/inc/Diagram.hxx b/chart2/source/inc/Diagram.hxx index 62e9eeeac69a..4945c7bde95b 100644 --- a/chart2/source/inc/Diagram.hxx +++ b/chart2/source/inc/Diagram.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include "ModifyListenerHelper.hxx" -#include "charttoolsdllapi.hxx" #include <vector> @@ -72,7 +71,7 @@ typedef ::cppu::WeakImplHelper< Diagram_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) Diagram +class Diagram final : public impl::Diagram_Base , public ::property::OPropertySet @@ -263,7 +262,7 @@ public: /** Replaces all occurrences of xCooSysToReplace in the tree with xReplacement in the diagram's tree */ - SAL_DLLPRIVATE void replaceCoordinateSystem( + void replaceCoordinateSystem( const rtl::Reference< ::chart::BaseCoordinateSystem > & xCooSysToReplace, const rtl::Reference< ::chart::BaseCoordinateSystem > & xReplacement ); diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 986cbb9788ec..880f3e786a94 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -19,7 +19,6 @@ #pragma once #include "StackMode.hxx" -#include "charttoolsdllapi.hxx" #include "ChartTypeTemplate.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <rtl/ref.hxx> @@ -34,7 +33,7 @@ class BaseCoordinateSystem; class ChartType; class DataSeries; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) DiagramHelper +class DiagramHelper { public: @@ -59,7 +58,7 @@ public: static css::uno::Sequence< OUString > getExplicitSimpleCategories( ChartModel& rModel ); - SAL_DLLPRIVATE static css::uno::Sequence< OUString > + static css::uno::Sequence< OUString > generateAutomaticCategoriesFromCooSys( const rtl::Reference< ::chart::BaseCoordinateSystem > & xCooSys ); @@ -76,7 +75,7 @@ public: static sal_Int32 getPercentNumberFormat( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); - SAL_DLLPRIVATE static bool areChartTypesCompatible( + static bool areChartTypesCompatible( const rtl::Reference< ::chart::ChartType >& xFirstType, const rtl::Reference< ::chart::ChartType >& xSecondType ); diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 939b95c739e8..869b3e306fdc 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -19,7 +19,6 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" #include <cppuhelper/implbase.hxx> @@ -75,7 +74,7 @@ private: sal_Int32 meStyle; public: - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) explicit ErrorBar(); + explicit ErrorBar(); virtual ~ErrorBar() override; /// XServiceInfo declarations diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index cffdcd5b1191..a7b97214f628 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -19,7 +19,6 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" #include <unotools/weakref.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> @@ -36,7 +35,7 @@ namespace chart { class BaseCoordinateSystem; -struct OOO_DLLPUBLIC_CHARTTOOLS ComplexCategory +struct ComplexCategory { OUString Text; sal_Int32 Count; @@ -54,7 +53,7 @@ public: virtual css::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0; }; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ExplicitCategoriesProvider final +class ExplicitCategoriesProvider final { public: ExplicitCategoriesProvider( const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSysModel diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index ce1c6d83629c..c76ee51d1a2f 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -20,7 +20,6 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" -#include "charttoolsdllapi.hxx" #include <vector> @@ -63,10 +62,10 @@ namespace FillProperties , PROP_FILL_BACKGROUND }; - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddPropertiesToVector( + void AddPropertiesToVector( std::vector< css::beans::Property > & rOutProperties ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); + void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); } } // namespace chart diff --git a/chart2/source/inc/FormattedString.hxx b/chart2/source/inc/FormattedString.hxx index 23c81454facf..cf3c68dd0a56 100644 --- a/chart2/source/inc/FormattedString.hxx +++ b/chart2/source/inc/FormattedString.hxx @@ -135,7 +135,7 @@ private: rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder; }; -OOO_DLLPUBLIC_CHARTTOOLS const ::chart::tPropertyValueMap & StaticFormattedStringDefaults(); +const ::chart::tPropertyValueMap & StaticFormattedStringDefaults(); } // namespace chart diff --git a/chart2/source/inc/GridProperties.hxx b/chart2/source/inc/GridProperties.hxx index da19322675e3..05108f739473 100644 --- a/chart2/source/inc/GridProperties.hxx +++ b/chart2/source/inc/GridProperties.hxx @@ -39,7 +39,7 @@ typedef ::cppu::WeakImplHelper< GridProperties_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) GridProperties final : +class GridProperties final : public impl::GridProperties_Base, public ::property::OPropertySet { diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index aa37753695f9..c36f1918cfa5 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include "ModifyListenerHelper.hxx" -#include "charttoolsdllapi.hxx" namespace com::sun::star::chart2::data { class XDataSequence; } namespace com::sun::star::util { class XCloneable; } @@ -41,7 +40,7 @@ typedef cppu::WeakImplHelper< LabeledDataSequence_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) LabeledDataSequence final : +class LabeledDataSequence final : public impl::LabeledDataSequence_Base { public: diff --git a/chart2/source/inc/Legend.hxx b/chart2/source/inc/Legend.hxx index dbc3db602400..7927f20fcc3b 100644 --- a/chart2/source/inc/Legend.hxx +++ b/chart2/source/inc/Legend.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XCloneable.hpp> #include "ModifyListenerHelper.hxx" -#include "charttoolsdllapi.hxx" #include "PropertyHelper.hxx" namespace chart @@ -42,7 +41,7 @@ typedef ::cppu::WeakImplHelper< Legend_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) Legend final : +class Legend final : public impl::Legend_Base, public ::property::OPropertySet { @@ -99,7 +98,7 @@ private: rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder; }; -OOO_DLLPUBLIC_CHARTTOOLS const ::chart::tPropertyValueMap& StaticLegendDefaults(); +const ::chart::tPropertyValueMap& StaticLegendDefaults(); } // namespace chart diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index df7959a02fb2..577047888ee8 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -21,7 +21,6 @@ #include <config_options.h> #include <com/sun/star/uno/Reference.hxx> #include <rtl/ref.hxx> -#include "charttoolsdllapi.hxx" namespace chart { class ChartModel; } namespace com::sun::star::uno { class XComponentContext; } @@ -31,7 +30,7 @@ namespace chart class Diagram; class Legend; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) LegendHelper +class LegendHelper { public: static rtl::Reference< ::chart::Legend > diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index c07a52e51c8b..1e3e2cee26ab 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -22,7 +22,6 @@ #include <mutex> #include <osl/conditn.hxx> #include <comphelper/interfacecontainer4.hxx> -#include "charttoolsdllapi.hxx" namespace com::sun::star::document { class XStorageChangeListener; } namespace com::sun::star::lang { class XComponent; } @@ -36,7 +35,7 @@ namespace com::sun::star::view { class XSelectionChangeListener; } namespace apphelper { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) LifeTimeManager +class LifeTimeManager { friend class LifeTimeGuard; public: @@ -55,11 +54,11 @@ public: ::comphelper::OInterfaceContainerHelper4<css::view::XSelectionChangeListener> m_aSelectionChangeListeners; protected: - SAL_DLLPRIVATE virtual bool impl_canStartApiCall(); - SAL_DLLPRIVATE virtual void impl_apiCallCountReachedNull(std::unique_lock<std::mutex>& /*rGuard*/){} + virtual bool impl_canStartApiCall(); + virtual void impl_apiCallCountReachedNull(std::unique_lock<std::mutex>& /*rGuard*/){} - SAL_DLLPRIVATE void impl_registerApiCall(bool bLongLastingCall); - SAL_DLLPRIVATE void impl_unregisterApiCall(std::unique_lock<std::mutex>& rGuard, bool bLongLastingCall); + void impl_registerApiCall(bool bLongLastingCall); + void impl_unregisterApiCall(std::unique_lock<std::mutex>& rGuard, bool bLongLastingCall); css::lang::XComponent* m_pComponent; ::osl::Condition m_aNoAccessCountCondition; diff --git a/chart2/source/inc/LinePropertiesHelper.hxx b/chart2/source/inc/LinePropertiesHelper.hxx index efa5a6e6b847..d664273916b3 100644 --- a/chart2/source/inc/LinePropertiesHelper.hxx +++ b/chart2/source/inc/LinePropertiesHelper.hxx @@ -20,7 +20,6 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" -#include "charttoolsdllapi.hxx" #include <vector> @@ -48,10 +47,10 @@ namespace LinePropertiesHelper PROP_LINE_CAP }; - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddPropertiesToVector( + void AddPropertiesToVector( std::vector< css::beans::Property > & rOutProperties ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); + void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); bool IsLineVisible( const css::uno::Reference< css::beans::XPropertySet >& xLineProperties ); diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 46edb2657598..49893e543241 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include "charttoolsdllapi.hxx" namespace com::sun::star::beans { struct PropertyValue; } namespace com::sun::star::embed { class XStorage; } @@ -44,7 +43,7 @@ namespace com::sun::star::io { class XStream; } namespace apphelper { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) MediaDescriptorHelper final +class MediaDescriptorHelper final { public: MediaDescriptorHelper( const css::uno::Sequence< css::beans::PropertyValue > & rMediaDescriptor ); @@ -83,7 +82,7 @@ public: bool ISSET_Stream; private: - SAL_DLLPRIVATE void impl_init(); + void impl_init(); }; } diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index b9006bad5a13..433512bb8244 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -23,7 +23,6 @@ #include <tools/link.hxx> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include "charttoolsdllapi.hxx" namespace chart { @@ -33,7 +32,7 @@ without becoming a XModifyListener yourself class ModifyListenerCallBack_impl; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ModifyListenerCallBack final +class ModifyListenerCallBack final { public: explicit ModifyListenerCallBack(const Link<void*, void>& rCallBack); @@ -41,7 +40,7 @@ public: ~ModifyListenerCallBack(); void startListening(const css::uno::Reference<css::util::XModifyBroadcaster>& xBroadcaster); - SAL_DLLPRIVATE void stopListening(); + void stopListening(); private: //methods ModifyListenerCallBack(const ModifyListenerCallBack&) = delete; diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index aff249d84f33..a229beafcda2 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -19,7 +19,6 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <tools/date.hxx> @@ -29,7 +28,7 @@ class Color; namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) NumberFormatterWrapper final +class NumberFormatterWrapper final { public: NumberFormatterWrapper( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier ); diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 0dd19a236e8a..037d626fcf83 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -29,14 +29,13 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/style/XStyleSupplier.hpp> -#include "charttoolsdllapi.hxx" #include <unordered_map> namespace property { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OPropertySet : +class SAL_DLLPUBLIC_RTTI OPropertySet : protected cppu::BaseMutex, public ::cppu::OBroadcastHelper, // includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index d72e4b132392..2376d7073b79 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -23,7 +23,6 @@ #include <string_view> #include "TitleHelper.hxx" -#include "charttoolsdllapi.hxx" #include <rtl/ustring.hxx> #include <rtl/ref.hxx> @@ -74,7 +73,7 @@ enum ObjectType OBJECTTYPE_UNKNOWN }; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ObjectIdentifier +class ObjectIdentifier { //CID == ClassifiedIdentifier <--> name of shape //semicolon, colon, equal sign and slash have special meanings in a CID @@ -129,7 +128,7 @@ public: , const rtl::Reference<::chart::ChartModel>& xChartModel , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc - SAL_DLLPRIVATE static OUString createParticleForDiagram(); + static OUString createParticleForDiagram(); static OUString createParticleForCoordinateSystem( const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSys @@ -190,7 +189,7 @@ public: static OUString createDataCurveCID( std::u16string_view rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine ); static OUString createDataCurveEquationCID( std::u16string_view rSeriesParticle, sal_Int32 nCurveIndex ); - SAL_DLLPRIVATE static OUString getObjectID( std::u16string_view rCID ); + static OUString getObjectID( std::u16string_view rCID ); static std::u16string_view getParticleID( std::u16string_view rCID ); static std::u16string_view getFullParentParticle( std::u16string_view rCID ); diff --git a/chart2/source/inc/PopupRequest.hxx b/chart2/source/inc/PopupRequest.hxx index 90fe315d2471..3caeffc0d98a 100644 --- a/chart2/source/inc/PopupRequest.hxx +++ b/chart2/source/inc/PopupRequest.hxx @@ -10,7 +10,6 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" #include <comphelper/compbase.hxx> #include <com/sun/star/awt/XRequestCallback.hpp> @@ -22,7 +21,7 @@ namespace impl typedef comphelper::WeakComponentImplHelper<css::awt::XRequestCallback> PopupRequest_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) PopupRequest final : public impl::PopupRequest_Base +class PopupRequest final : public impl::PopupRequest_Base { public: explicit PopupRequest(); diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index 3e1949057361..26f395fa1b06 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -21,7 +21,6 @@ #include <config_options.h> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/uno/Any.hxx> -#include "charttoolsdllapi.hxx" #include <unordered_map> @@ -42,7 +41,7 @@ namespace PropertyHelper @return The name used for storing this element in the table */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addLineDashUniqueNameToTable( +OUString addLineDashUniqueNameToTable( const css::uno::Any & rValue, const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); @@ -52,7 +51,7 @@ UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addLineDashUniqueNameToTable @return The name used for storing this element in the table */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addGradientUniqueNameToTable( +OUString addGradientUniqueNameToTable( const css::uno::Any & rValue, const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); @@ -62,7 +61,6 @@ UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addGradientUniqueNameToTable @return The name used for storing this element in the table */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addTransparencyGradientUniqueNameToTable( const css::uno::Any & rValue, const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, @@ -73,7 +71,7 @@ OUString addTransparencyGradientUniqueNameToTable( @return The name used for storing this element in the table */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addHatchUniqueNameToTable( +OUString addHatchUniqueNameToTable( const css::uno::Any & rValue, const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); @@ -83,7 +81,7 @@ UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addHatchUniqueNameToTable( @return The name used for storing this element in the table */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addBitmapUniqueNameToTable( +OUString addBitmapUniqueNameToTable( const css::uno::Any & rValue, const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); @@ -93,7 +91,6 @@ UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString addBitmapUniqueNameToTable( @param any is the value encapsulated in the variant type Any */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ); @@ -112,7 +109,7 @@ template< typename Value > template<> void setPropertyValue< css::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ); -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ); +void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny ); /** Calls setPropertyValue() but asserts that the given property hasn't been set before. @@ -131,11 +128,11 @@ template<> /** Calls setPropertyValueDefault() with an empty Any as value */ -UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key ); +void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key ); } // namespace PropertyHelper -struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess +struct PropertyNameLess { bool operator() ( const css::beans::Property & first, const css::beans::Property & second ) diff --git a/chart2/source/inc/RangeSelectionHelper.hxx b/chart2/source/inc/RangeSelectionHelper.hxx index 5d6a0e60c8b5..d71c861d0314 100644 --- a/chart2/source/inc/RangeSelectionHelper.hxx +++ b/chart2/source/inc/RangeSelectionHelper.hxx @@ -23,8 +23,6 @@ #include <rtl/ustring.hxx> #include <rtl/ref.hxx> -#include "charttoolsdllapi.hxx" - namespace com::sun::star::beans { struct PropertyValue; } namespace com::sun::star { @@ -39,7 +37,7 @@ namespace chart class ChartModel; class RangeSelectionListenerParent; -class OOO_DLLPUBLIC_CHARTTOOLS RangeSelectionHelper +class RangeSelectionHelper { public: explicit RangeSelectionHelper( diff --git a/chart2/source/inc/RangeSelectionListener.hxx b/chart2/source/inc/RangeSelectionListener.hxx index 345adaba5d4a..873043f9b4a5 100644 --- a/chart2/source/inc/RangeSelectionListener.hxx +++ b/chart2/source/inc/RangeSelectionListener.hxx @@ -32,7 +32,7 @@ namespace chart { class ChartModel; -class OOO_DLLPUBLIC_CHARTTOOLS RangeSelectionListenerParent +class RangeSelectionListenerParent { public: virtual void listeningFinished(const OUString& rNewRange) = 0; diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 246712fdae25..006618dd5dba 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -20,7 +20,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/awt/Size.hpp> -#include "charttoolsdllapi.hxx" #include <rtl/ref.hxx> #include <ChartModel.hxx> @@ -37,7 +36,7 @@ namespace com::sun::star { namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ReferenceSizeProvider +class ReferenceSizeProvider { public: @@ -77,7 +76,7 @@ public: class at the XPropertySet, and the adapted font sizes if bAdaptFontSizes is </sal_True>. */ - SAL_DLLPRIVATE void setValuesAtPropertySet( + void setValuesAtPropertySet( const css::uno::Reference< css::beans::XPropertySet > & xProp, bool bAdaptFontSizes = true ); @@ -85,7 +84,7 @@ public: class at the XTitle, and the adapted font sizes at the contained XFormattedStrings */ - SAL_DLLPRIVATE void setValuesAtTitle( + void setValuesAtTitle( const css::uno::Reference< css::chart2::XTitle > & xTitle ); /** Sets the internal value at all data series in the currently set model. @@ -95,12 +94,12 @@ public: void setValuesAtAllDataSeries(); private: - SAL_DLLPRIVATE bool useAutoScale() const { return m_bUseAutoScale;} + bool useAutoScale() const { return m_bUseAutoScale;} /** sets the auto-resize at all objects that support this feature for text. eNewState must be either AUTO_RESIZE_YES or AUTO_RESIZE_NO */ - SAL_DLLPRIVATE void setAutoResizeState( AutoResizeState eNewState ); + void setAutoResizeState( AutoResizeState eNewState ); /** Retrieves the auto-resize state from the given propertyset. The result will be put into eInOutState. If you initialize eInOutState with @@ -109,13 +108,13 @@ private: esp. AUTO_RESIZE_AMBIGUOUS, if the value was NO before, and is YES for the current property set, or the other way round. */ - SAL_DLLPRIVATE static void getAutoResizeFromPropSet( + static void getAutoResizeFromPropSet( const css::uno::Reference< css::beans::XPropertySet > & xProp, AutoResizeState & rInOutState ); - SAL_DLLPRIVATE void impl_setValuesAtTitled( + void impl_setValuesAtTitled( const css::uno::Reference< css::chart2::XTitled > & xTitled ); - SAL_DLLPRIVATE static void impl_getAutoResizeFromTitled( + static void impl_getAutoResizeFromTitled( const css::uno::Reference< css::chart2::XTitled > & xTitled, AutoResizeState & rInOutState ); diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 481ac5bb3f69..cc5a32f1dd2f 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -20,7 +20,6 @@ #include <config_options.h> #include <svx/chrtitem.hxx> -#include "charttoolsdllapi.hxx" #include <rtl/ref.hxx> #include <vector> @@ -44,20 +43,20 @@ namespace chart::RegressionCurveHelper rtl::Reference<::chart::RegressionCurveModel> createRegressionCurveByServiceName( std::u16string_view aServiceName ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool hasMeanValueLine( + bool hasMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer> & xRegCnt ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool hasMeanValueLine( + bool hasMeanValueLine( const rtl::Reference<::chart::DataSeries> & xRegCnt ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool isMeanValueLine( + bool isMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurve> & xRegCurve ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool isMeanValueLine( + bool isMeanValueLine( const rtl::Reference<::chart::RegressionCurveModel> & xRegCurve ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveModel> + rtl::Reference<::chart::RegressionCurveModel> getMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer> & xRegCnt ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveModel> + rtl::Reference<::chart::RegressionCurveModel> getMeanValueLine( const rtl::Reference<::chart::DataSeries> & xRegCnt ); @@ -66,31 +65,31 @@ namespace chart::RegressionCurveHelper @param xSeriesProp If set, this property-set will be used to apply a line color */ - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void addMeanValueLine( + void addMeanValueLine( css::uno::Reference<css::chart2::XRegressionCurveContainer> const & xRegCnt, const css::uno::Reference<css::beans::XPropertySet>& xSeriesProp ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void addMeanValueLine( + void addMeanValueLine( rtl::Reference<::chart::DataSeries> const & xRegCnt, const css::uno::Reference<css::beans::XPropertySet>& xSeriesProp ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void removeMeanValueLine( + void removeMeanValueLine( css::uno::Reference<css::chart2::XRegressionCurveContainer> const & xRegCnt ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void removeMeanValueLine( + void removeMeanValueLine( rtl::Reference<::chart::DataSeries> const & xRegCnt ); /** Returns the first regression curve found that is not of type mean-value line */ - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveModel> + rtl::Reference<::chart::RegressionCurveModel> getFirstCurveNotMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveModel> + rtl::Reference<::chart::RegressionCurveModel> getFirstCurveNotMeanValueLine( const rtl::Reference<::chart::DataSeries>& xCurveContainer ); /** Returns the regression curve found at the index provided. */ - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveModel> + rtl::Reference<::chart::RegressionCurveModel> getRegressionCurveAtIndex( const rtl::Reference<::chart::DataSeries>& xCurveContainer, sal_Int32 aIndex); @@ -98,10 +97,10 @@ namespace chart::RegressionCurveHelper /** Returns the type of the first regression curve found that is not of type mean-value line */ - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) SvxChartRegress getFirstRegressTypeNotMeanValueLine( + SvxChartRegress getFirstRegressTypeNotMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) SvxChartRegress getRegressionType( + SvxChartRegress getRegressionType( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); /** @param xPropertySource is taken as source to copy all properties from if @@ -109,7 +108,7 @@ namespace chart::RegressionCurveHelper @param xEquationProperties is set at the new regression curve as equation properties if not null */ - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveModel> + rtl::Reference<::chart::RegressionCurveModel> addRegressionCurve( SvxChartRegress eType, css::uno::Reference<css::chart2::XRegressionCurveContainer> const & xCurveContainer, @@ -117,7 +116,7 @@ namespace chart::RegressionCurveHelper css::uno::Reference<css::beans::XPropertySet>(), const css::uno::Reference<css::beans::XPropertySet>& xEquationProperties = css::uno::Reference<css::beans::XPropertySet>() ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveModel> + rtl::Reference<::chart::RegressionCurveModel> addRegressionCurve( SvxChartRegress eType, rtl::Reference<::chart::DataSeries> const & xCurveContainer, @@ -126,20 +125,20 @@ namespace chart::RegressionCurveHelper const css::uno::Reference<css::beans::XPropertySet>& xEquationProperties = css::uno::Reference<css::beans::XPropertySet>() ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool removeAllExceptMeanValueLine( + bool removeAllExceptMeanValueLine( rtl::Reference<::chart::DataSeries> const & xCurveContainer ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void removeEquations( + void removeEquations( rtl::Reference<::chart::DataSeries> const & xCurveContainer ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveModel> + rtl::Reference<::chart::RegressionCurveModel> changeRegressionCurveType( SvxChartRegress eType, css::uno::Reference<css::chart2::XRegressionCurveContainer> const & xRegressionCurveContainer, css::uno::Reference<css::chart2::XRegressionCurve> const & xRegressionCurve ); /// returns a calculator object for regression curves (used by the view) - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) rtl::Reference<::chart::RegressionCurveCalculator> + rtl::Reference<::chart::RegressionCurveCalculator> createRegressionCurveCalculatorByServiceName( std::u16string_view aServiceName ); /** recalculates the regression parameters according to the data given in @@ -167,33 +166,33 @@ namespace chart::RegressionCurveHelper necessary that the data::XDataSource is an XDataSeries, thus this parameter also changed. */ - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void initializeCurveCalculator( + void initializeCurveCalculator( const css::uno::Reference<css::chart2::XRegressionCurveCalculator>& xOutCurveCalculator, const rtl::Reference<::chart::DataSeries>& xSeries, const rtl::Reference<::chart::ChartModel>& xModel ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString getUINameForRegressionCurve( + OUString getUINameForRegressionCurve( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString getRegressionCurveName( + OUString getRegressionCurveName( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString getRegressionCurveGenericName( + OUString getRegressionCurveGenericName( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) OUString getRegressionCurveSpecificName( + OUString getRegressionCurveSpecificName( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void resetEquationPosition( + void resetEquationPosition( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); /// @return the index of the given curve in the given container. -1 if not contained - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) sal_Int32 getRegressionCurveIndex( + sal_Int32 getRegressionCurveIndex( const rtl::Reference<::chart::DataSeries>& xContainer, const rtl::Reference<::chart::RegressionCurveModel>& xCurve ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool hasEquation(const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool MayHaveCorrelationCoefficient(const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); + bool hasEquation(const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); + bool MayHaveCorrelationCoefficient(const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); } // namespace chart diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 03ea72eebeed..71b25fc153b1 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/drawing/Alignment.hpp> #include <com/sun/star/awt/Point.hpp> -#include "charttoolsdllapi.hxx" namespace com::sun::star::awt { struct Size; } namespace com::sun::star::chart2 { struct RelativeSize; } @@ -31,7 +30,7 @@ namespace com::sun::star::chart2 { struct RelativeSize; } namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) RelativePositionHelper +class RelativePositionHelper { public: /** returns the upper left corner of an object that has size aObjectSize and @@ -61,7 +60,7 @@ public: been changed to the given one. The passed object size is taken into account for shifting the position. */ - SAL_DLLPRIVATE static css::chart2::RelativePosition + static css::chart2::RelativePosition getReanchoredPosition( const css::chart2::RelativePosition & rPosition, const css::chart2::RelativeSize & rObjectSize, diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index 6b3dbb7c2dee..753d4deabe83 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -19,17 +19,17 @@ #pragma once #include <config_options.h> -#include "charttoolsdllapi.hxx" namespace com::sun::star::awt { struct Size; } namespace com::sun::star::beans { class XPropertySet; } namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace css = ::com::sun::star; class SvxShapeText; namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) RelativeSizeHelper +class RelativeSizeHelper { public: static double calculate( diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx index 48baf852ab04..816b4b2471a7 100644 --- a/chart2/source/inc/ResId.hxx +++ b/chart2/source/inc/ResId.hxx @@ -19,12 +19,11 @@ #pragma once #include <rtl/ustring.hxx> -#include "charttoolsdllapi.hxx" #include <unotools/resmgr.hxx> namespace chart { -OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(TranslateId aId); +OUString SchResId(TranslateId aId); } // namespace chart diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index 1fdae1b6703f..69eaec2b4c16 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -21,7 +21,6 @@ #include <config_options.h> #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" -#include "charttoolsdllapi.hxx" #include <vector> @@ -72,10 +71,10 @@ namespace SceneProperties PROP_SCENE_LIGHT_ON_8 }; - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddPropertiesToVector( + void AddPropertiesToVector( std::vector< css::beans::Property > & rOutProperties ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); + void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); } } // namespace chart diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 9c3d97c8b6ec..44fcb600d38c 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> #include <rtl/ref.hxx> -#include "charttoolsdllapi.hxx" namespace com::sun::star::beans { class XPropertySet; } namespace com::sun::star::chart2::data { class XDataProvider; } @@ -38,33 +37,33 @@ namespace chart::StatisticsHelper @see http://mathworld.wolfram.com/Variance.html */ - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) double getVariance( const css::uno::Sequence< double > & rData ); + double getVariance( const css::uno::Sequence< double > & rData ); // square root of the variance - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) double getStandardDeviation( const css::uno::Sequence< double > & rData ); + double getStandardDeviation( const css::uno::Sequence< double > & rData ); // also called "Standard deviation of the mean (SDOM)" - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) double getStandardError( const css::uno::Sequence< double > & rData ); + double getStandardError( const css::uno::Sequence< double > & rData ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::uno::Reference< css::chart2::data::XLabeledDataSequence > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > getErrorLabeledDataSequenceFromDataSource( const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource, bool bPositiveValue, bool bYError = true ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::uno::Reference< css::chart2::data::XDataSequence > + css::uno::Reference< css::chart2::data::XDataSequence > getErrorDataSequenceFromDataSource( const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource, bool bPositiveValue, bool bYError = true ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) double getErrorFromDataSource( + double getErrorFromDataSource( const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource, sal_Int32 nIndex, bool bPositiveValue, bool bYError = true ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void setErrorDataSequence( + void setErrorDataSequence( const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource, const css::uno::Reference< css::chart2::data::XDataProvider > & xDataProvider, const OUString & rNewRange, @@ -73,26 +72,26 @@ namespace chart::StatisticsHelper OUString const * pXMLRange = nullptr ); /// @return the newly created or existing error bar object - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::uno::Reference< css::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > addErrorBars( const rtl::Reference< ::chart::DataSeries > & xDataSeries, sal_Int32 nStyle, bool bYError = true ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) css::uno::Reference< css::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > getErrorBars( const rtl::Reference< ::chart::DataSeries > & xDataSeries, bool bYError = true ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool hasErrorBars( + bool hasErrorBars( const rtl::Reference< ::chart::DataSeries > & xDataSeries, bool bYError = true ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void removeErrorBars( + void removeErrorBars( const rtl::Reference< ::chart::DataSeries > & xDataSeries, bool bYError = true ); - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) bool usesErrorBarRanges( + bool usesErrorBarRanges( const rtl::Reference< ::chart::DataSeries > & xDataSeries, bool bYError = true ); diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index 8a14c8fccf4d..04df1f8a22a3 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -22,7 +22,6 @@ #include <config_options.h> #include <com/sun/star/drawing/CameraGeometry.hpp> #include <rtl/ref.hxx> -#include "charttoolsdllapi.hxx" namespace chart { @@ -45,7 +44,7 @@ enum CuboidPlanePosition CuboidPlanePosition_Back }; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ThreeDHelper +class ThreeDHelper { public: @@ -67,12 +66,12 @@ public: sal_Int32 nElevationDeg, sal_Int32 nRotationDeg , double& rfXAngleRad, double& rfYAngleRad, double& rfZAngleRad ); - SAL_DLLPRIVATE static void convertXYZAngleRadToElevationRotationDeg( + static void convertXYZAngleRadToElevationRotationDeg( sal_Int32& rnElevationDeg, sal_Int32& rnRotationDeg , double fXRad, double fYRad, double fZRad ); - SAL_DLLPRIVATE static void ensureCameraDistanceRange( double& rfCameraDistance ); - SAL_DLLPRIVATE static void getCameraDistanceRange( double& rfMinimumDistance, double& rfMaximumDistance ); + static void ensureCameraDistanceRange( double& rfCameraDistance ); + static void getCameraDistanceRange( double& rfMinimumDistance, double& rfMaximumDistance ); static double CameraDistanceToPerspective( double fCameraDistance ); static double PerspectiveToCameraDistance( double fPerspective ); diff --git a/chart2/source/inc/TimerTriggeredControllerLock.hxx b/chart2/source/inc/TimerTriggeredControllerLock.hxx index df557d9af770..d7a5d7652ce9 100644 --- a/chart2/source/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/inc/TimerTriggeredControllerLock.hxx @@ -24,8 +24,6 @@ #include <memory> -#include "charttoolsdllapi.hxx" - namespace chart { class ControllerLockGuardUNO; @@ -35,7 +33,7 @@ namespace chart { class ChartModel; -class OOO_DLLPUBLIC_CHARTTOOLS TimerTriggeredControllerLock final +class TimerTriggeredControllerLock final { public: TimerTriggeredControllerLock(rtl::Reference<::chart::ChartModel> xModel); diff --git a/chart2/source/inc/Title.hxx b/chart2/source/inc/Title.hxx index 230267918de2..ba16c5377617 100644 --- a/chart2/source/inc/Title.hxx +++ b/chart2/source/inc/Title.hxx @@ -40,7 +40,7 @@ typedef ::cppu::WeakImplHelper< Title_Base; } -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) Title final : +class Title final : public impl::Title_Base, public ::property::OPropertySet { diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index a2cf94f6cf0d..3f52ab105f8d 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/uno/Reference.h> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> -#include "charttoolsdllapi.hxx" #include "Title.hxx" namespace chart { class ChartModel; } @@ -31,7 +30,7 @@ namespace com::sun::star::uno { class XComponentContext; } namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) TitleHelper +class TitleHelper { public: enum eTitleType diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index 3d4e587db745..0254cafe7035 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -20,11 +20,11 @@ #include <config_options.h> #include "FastPropertyIdRanges.hxx" -#include "charttoolsdllapi.hxx" #include <vector> namespace com::sun::star::beans { struct Property; } +namespace css = ::com::sun::star; namespace chart { @@ -46,7 +46,7 @@ namespace UserDefinedProperties PROP_XML_USERDEF }; - UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) void AddPropertiesToVector( + void AddPropertiesToVector( std::vector< css::beans::Property > & rOutProperties ); } diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index f9fdbff2cbf9..d793cfdd15fe 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -19,12 +19,11 @@ #pragma once #include "WrappedProperty.hxx" -#include "charttoolsdllapi.hxx" namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) WrappedDefaultProperty : public WrappedProperty +class WrappedDefaultProperty : public WrappedProperty { public: explicit WrappedDefaultProperty( diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index 082a70ed0a76..afc1237f7d17 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -19,11 +19,10 @@ #pragma once #include "WrappedProperty.hxx" -#include "charttoolsdllapi.hxx" namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) WrappedDirectStateProperty : public WrappedProperty +class WrappedDirectStateProperty : public WrappedProperty { public: explicit WrappedDirectStateProperty(const OUString& rOuterName, const OUString& rInnerName); diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 22c1673cc956..0340358c8122 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -19,14 +19,13 @@ #pragma once #include "WrappedProperty.hxx" -#include "charttoolsdllapi.hxx" #include <vector> namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) WrappedIgnoreProperty final : public WrappedProperty +class WrappedIgnoreProperty final : public WrappedProperty { public: WrappedIgnoreProperty( const OUString& rOuterName, const css::uno::Any& rDefaultValue ); @@ -36,25 +35,25 @@ public: virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; -SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; +virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; -SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; +virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; -SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; +virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: css::uno::Any m_aDefaultValue; mutable css::uno::Any m_aCurrentValue; }; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) WrappedIgnoreProperties +class WrappedIgnoreProperties { public: static void addIgnoreLineProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); static void addIgnoreFillProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); - SAL_DLLPRIVATE static void addIgnoreFillProperties_without_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); - SAL_DLLPRIVATE static void addIgnoreFillProperties_only_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); + static void addIgnoreFillProperties_without_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); + static void addIgnoreFillProperties_only_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); }; } //namespace chart diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index de6e0095e354..d2560cfa783d 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> -#include "charttoolsdllapi.hxx" #include <map> #include <memory> @@ -34,7 +33,7 @@ namespace com::sun::star::uno { template <class interface_type> class Reference; namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) WrappedProperty +class WrappedProperty { /** The property visible to the outer PropertySet in the PropertySetWrapper may have a different name, type and value than a corresponding property of the inner PropertySet. Use this class to do the conversion between the two. diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index dabc6e33c5c4..88dd8248d6e9 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -20,7 +20,6 @@ #include <config_options.h> #include "WrappedProperty.hxx" -#include "charttoolsdllapi.hxx" #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -37,7 +36,7 @@ namespace cppu { class OPropertyArrayHelper; } namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) WrappedPropertySet : +class WrappedPropertySet : public ::cppu::WeakImplHelper < css::beans::XPropertySet , css::beans::XMultiPropertySet @@ -95,10 +94,10 @@ protected: //methods virtual std::vector< std::unique_ptr<WrappedProperty> > createWrappedProperties()=0; virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() = 0; - SAL_DLLPRIVATE css::uno::Reference< css::beans::XPropertyState > getInnerPropertyState(); + css::uno::Reference< css::beans::XPropertyState > getInnerPropertyState(); ::cppu::IPropertyArrayHelper& getInfoHelper(); - SAL_DLLPRIVATE tWrappedPropertyMap& getWrappedPropertyMap(); + tWrappedPropertyMap& getWrappedPropertyMap(); const WrappedProperty* getWrappedProperty( const OUString& rOuterName ); const WrappedProperty* getWrappedProperty( sal_Int32 nHandle ); diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index 519c9b772271..ba8ac8481e0f 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -20,12 +20,11 @@ #include <sal/types.h> #include <rtl/ustring.hxx> -#include "charttoolsdllapi.hxx" namespace chart::XMLRangeHelper { -struct OOO_DLLPUBLIC_CHARTTOOLS Cell +struct Cell { sal_Int32 nColumn; sal_Int32 nRow; @@ -44,7 +43,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS Cell bool empty() const { return bIsEmpty; } }; -struct OOO_DLLPUBLIC_CHARTTOOLS CellRange +struct CellRange { Cell aUpperLeft; Cell aLowerRight; diff --git a/chart2/source/inc/charttoolsdllapi.hxx b/chart2/source/inc/charttoolsdllapi.hxx deleted file mode 100644 index 96336e1012ae..000000000000 --- a/chart2/source/inc/charttoolsdllapi.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <sal/config.h> - -#include <sal/types.h> - -#if defined OOO_DLLIMPLEMENTATION_CHARTTOOLS -#define OOO_DLLPUBLIC_CHARTTOOLS SAL_DLLPUBLIC_EXPORT -#else -#define OOO_DLLPUBLIC_CHARTTOOLS SAL_DLLPUBLIC_IMPORT -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index d0701a167cc6..8c10bd098cc6 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -19,7 +19,6 @@ #pragma once -#include <chartview/chartviewdllapi.hxx> #include <rtl/ref.hxx> #include <svx/unoshape.hxx> @@ -28,7 +27,7 @@ namespace com::sun::star::drawing { struct Direction3D; } namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) DataPointSymbolSupplier +class DataPointSymbolSupplier { public: static rtl::Reference< SvxShapeGroup > diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 931b2e6992e9..c5101899087d 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -21,7 +21,6 @@ #include <svx/svdmodel.hxx> #include <svx/unopage.hxx> #include <svx/unoshape.hxx> -#include <chartview/chartviewdllapi.hxx> namespace com::sun::star::lang { class XMultiServiceFactory; } namespace com::sun::star::frame { class XModel; } @@ -32,7 +31,7 @@ class SdrObject; namespace chart { -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) DrawModelWrapper final : private SdrModel +class DrawModelWrapper final : private SdrModel { private: rtl::Reference<SvxDrawPage> m_xMainDrawPage; @@ -41,14 +40,14 @@ private: VclPtr<OutputDevice> m_pRefDevice; public: - SAL_DLLPRIVATE DrawModelWrapper(); - SAL_DLLPRIVATE virtual ~DrawModelWrapper() override; + DrawModelWrapper(); + virtual ~DrawModelWrapper() override; css::uno::Reference< css::lang::XMultiServiceFactory > getShapeFactory(); // the main page will contain the normal view objects const rtl::Reference<SvxDrawPage> & getMainDrawPage(); - SAL_DLLPRIVATE void clearMainDrawPage(); + void clearMainDrawPage(); // the extra page is not visible, but contains some extras like the symbols for data points const rtl::Reference<SvxDrawPage> & getHiddenDrawPage(); @@ -56,16 +55,16 @@ public: static rtl::Reference<SvxShapeGroupAnyD> getChartRootShape( const rtl::Reference<SvxDrawPage>& xPage ); - SAL_DLLPRIVATE void lockControllers(); - SAL_DLLPRIVATE void unlockControllers(); + void lockControllers(); + void unlockControllers(); OutputDevice* getReferenceDevice() const; SfxItemPool& GetItemPool(); - SAL_DLLPRIVATE virtual css::uno::Reference< css::frame::XModel > + virtual css::uno::Reference< css::frame::XModel > createUnoModel() override; - SAL_DLLPRIVATE const css::uno::Reference< css::frame::XModel > & + const css::uno::Reference< css::frame::XModel > & getUnoModel(); SdrModel& getSdrModel(); diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx index 07b8290cb7db..350d6e35ef67 100644 --- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx +++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx @@ -19,7 +19,6 @@ #pragma once #include <config_options.h> -#include <chartview/chartviewdllapi.hxx> #include <com/sun/star/chart/TimeInterval.hpp> #include <com/sun/star/chart2/AxisOrientation.hpp> #include <com/sun/star/chart2/XScaling.hpp> @@ -36,7 +35,7 @@ namespace chart /** This structure contains the explicit values for a scale like Minimum and Maximum. See also css::chart2::ScaleData. */ -struct UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) ExplicitScaleData +struct ExplicitScaleData { ExplicitScaleData(); @@ -74,7 +73,7 @@ struct ExplicitSubIncrement /** describes how tickmarks are positioned on the scale of an axis. */ -struct UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) ExplicitIncrementData +struct ExplicitIncrementData { ExplicitIncrementData(); diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index 46fc979c4f2d..6c526382410f 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -20,7 +20,6 @@ #include <config_options.h> #include <sal/types.h> -#include <chartview/chartviewdllapi.hxx> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> @@ -41,7 +40,7 @@ class ChartModel; struct ExplicitIncrementData; struct ExplicitScaleData; -class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) SAL_LOPLUGIN_ANNOTATE("crosscast") ExplicitValueProvider +class SAL_LOPLUGIN_ANNOTATE("crosscast") ExplicitValueProvider { public: /** Gives calculated scale and increment values for a given xAxis in the current view. diff --git a/chart2/source/inc/chartview/chartviewdllapi.hxx b/chart2/source/inc/chartview/chartviewdllapi.hxx deleted file mode 100644 index 533a5cb8338e..000000000000 --- a/chart2/source/inc/chartview/chartviewdllapi.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <sal/config.h> - -#include <sal/types.h> - -#if defined OOO_DLLIMPLEMENTATION_CHARTVIEW -#define OOO_DLLPUBLIC_CHARTVIEW SAL_DLLPUBLIC_EXPORT -#else -e ... etc. - the rest is truncated
