diff options
99 files changed, 415 insertions, 177 deletions
diff --git a/chart2/chartview.pmk b/chart2/chartview.pmk new file mode 100644 index 000000000000..0699561555f5 --- /dev/null +++ b/chart2/chartview.pmk @@ -0,0 +1,34 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: $ +# +# $Revision: $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +VISIBILITY_HIDDEN = TRUE + +CDEFS += -DOOO_DLLIMPLEMENTATION_CHARTVIEW diff --git a/chart2/source/controller/accessibility/makefile.mk b/chart2/source/controller/accessibility/makefile.mk index 4edfd80f827d..0d17ab8140e6 100644 --- a/chart2/source/controller/accessibility/makefile.mk +++ b/chart2/source/controller/accessibility/makefile.mk @@ -35,6 +35,7 @@ PRJNAME= chart2 TARGET= chcaccessibility ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/controller/chartapiwrapper/makefile.mk b/chart2/source/controller/chartapiwrapper/makefile.mk index e5b742e54346..402b5870292c 100644 --- a/chart2/source/controller/chartapiwrapper/makefile.mk +++ b/chart2/source/controller/chartapiwrapper/makefile.mk @@ -36,6 +36,7 @@ TARGET= chchartapiwrapper PRJINC= $(PRJ)$/source ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/controller/dialogs/makefile.mk b/chart2/source/controller/dialogs/makefile.mk index 52f5d4e8ab2f..6b64f2cae8db 100644 --- a/chart2/source/controller/dialogs/makefile.mk +++ b/chart2/source/controller/dialogs/makefile.mk @@ -35,6 +35,7 @@ PRJNAME= chart2 TARGET= chcdialogs ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE GEN_HID_OTHER=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/controller/drawinglayer/makefile.mk b/chart2/source/controller/drawinglayer/makefile.mk index def51b0f50d4..0293bb4b460b 100644 --- a/chart2/source/controller/drawinglayer/makefile.mk +++ b/chart2/source/controller/drawinglayer/makefile.mk @@ -35,6 +35,7 @@ PRJNAME= chart2 TARGET= chcdrawinglayer ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/controller/itemsetwrapper/makefile.mk b/chart2/source/controller/itemsetwrapper/makefile.mk index 35414d635c0e..0ab981bba643 100644 --- a/chart2/source/controller/itemsetwrapper/makefile.mk +++ b/chart2/source/controller/itemsetwrapper/makefile.mk @@ -34,6 +34,7 @@ PRJNAME= chart2 TARGET= chcitemsetwrapper ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index 3625dc4b81ac..7507aa9dd0cf 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -95,20 +95,20 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] = extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries_chart2_controller ); } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/chart2/source/controller/main/makefile.mk b/chart2/source/controller/main/makefile.mk index cc854f849b5e..6ee09d8c7c72 100644 --- a/chart2/source/controller/main/makefile.mk +++ b/chart2/source/controller/main/makefile.mk @@ -35,6 +35,7 @@ PRJNAME= chart2 TARGET= chcontroller ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk index d5dad7189053..38eaec110f74 100644 --- a/chart2/source/controller/makefile.mk +++ b/chart2/source/controller/makefile.mk @@ -35,6 +35,7 @@ TARGET= chartcontroller USE_DEFFILE= TRUE ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 3fc650b9ced7..6f4c9c162301 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -30,6 +30,7 @@ #ifndef _CHART2_TOOLS_AXISHELPER_HXX #define _CHART2_TOOLS_AXISHELPER_HXX +#include "charttoolsdllapi.hxx" #include "ReferenceSizeProvider.hxx" #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XCoordinateSystem.hpp> @@ -47,7 +48,7 @@ namespace chart /** */ -class AxisHelper +class OOO_DLLPUBLIC_CHARTTOOLS AxisHelper { public: static ::com::sun::star::chart2::ScaleData createDefaultScale(); diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx index b61aadc6aa4f..3544f5678462 100644 --- a/chart2/source/inc/BaseGFXHelper.hxx +++ b/chart2/source/inc/BaseGFXHelper.hxx @@ -45,55 +45,61 @@ #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> +#include "charttoolsdllapi.hxx" namespace chart { namespace BaseGFXHelper { -::basegfx::B3DRange getBoundVolume( const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPoly ); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DRange getBoundVolume( const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPoly ); -::basegfx::B2IRectangle makeRectangle( +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B2IRectangle makeRectangle( const com::sun::star::awt::Point& rPosition, const com::sun::star::awt::Size& rSize ); -com::sun::star::awt::Point B2IRectangleToAWTPoint( +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Point B2IRectangleToAWTPoint( const ::basegfx::B2IRectangle& rB2IRectangle ); -com::sun::star::awt::Size B2IRectangleToAWTSize( +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Size B2IRectangleToAWTSize( const ::basegfx::B2IRectangle& rB2IRectangle ); +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Rectangle B2IRectangleToAWTRectangle( const ::basegfx::B2IRectangle& rB2IRectangle ); -::basegfx::B3DVector Direction3DToB3DVector( +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection ); +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rB3DVector ); -::basegfx::B3DVector Position3DToB3DVector( +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Position3DToB3DVector( const com::sun::star::drawing::Position3D& rPosition ); +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rB3DVector ); -::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const ::com::sun::star::drawing::HomogenMatrix & rHomogenMatrix ); +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix & rB3DMatrix ); -::basegfx::B3DTuple GetRotationFromMatrix( +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DTuple GetRotationFromMatrix( const ::basegfx::B3DHomMatrix & rB3DMatrix ); -::basegfx::B3DTuple GetScaleFromMatrix( +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DTuple GetScaleFromMatrix( const ::basegfx::B3DHomMatrix & rB3DMatrix ); +OOO_DLLPUBLIC_CHARTTOOLS void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix ); -double Deg2Rad( double fDegrees ); -double Rad2Deg( double fRadians ); +OOO_DLLPUBLIC_CHARTTOOLS double Deg2Rad( double fDegrees ); +OOO_DLLPUBLIC_CHARTTOOLS double Rad2Deg( double fRadians ); } // namespace BaseGFXHelper } // namespace chart diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 4dcf766c7d7e..c13c8883baf9 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -37,6 +37,7 @@ #include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> #include "ServiceMacros.hxx" +#include "charttoolsdllapi.hxx" // interfaces and types #include <com/sun/star/lang/XServiceInfo.hpp> @@ -68,7 +69,7 @@ typedef ::cppu::WeakComponentImplHelper7< CachedDataSequence_Base; } -class CachedDataSequence : +class OOO_DLLPUBLIC_CHARTTOOLS CachedDataSequence : public ::comphelper::OMutexAndBroadcastHelper, public ::comphelper::OPropertyContainer, public ::comphelper::OPropertyArrayUsageHelper< CachedDataSequence >, diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index c3f2f40b0e9b..092f614846b7 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -32,6 +32,7 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> @@ -45,7 +46,7 @@ namespace chart // com.sun.star.style.CharacterProperties // com.sun.star.style.CharacterPropertiesAsian // com.sun.star.style.CharacterPropertiesComplex -class CharacterProperties +class OOO_DLLPUBLIC_CHARTTOOLS CharacterProperties { public: // FastProperty Ids for properties diff --git a/chart2/source/inc/ChartDebugTrace.hxx b/chart2/source/inc/ChartDebugTrace.hxx index 4c7b306410c2..84b8541a38fb 100644 --- a/chart2/source/inc/ChartDebugTrace.hxx +++ b/chart2/source/inc/ChartDebugTrace.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XDiagram.hpp> +#include "charttoolsdllapi.hxx" #define CHART_TRACE_OSL_DEBUG_LEVEL 2 @@ -47,7 +48,7 @@ namespace debug If OSL_DEBUG_LEVEL is less than CHART_TRACE_OSL_DEBUG_LEVEL this function does nothing. */ -void ChartDebugTraceDocument( +OOO_DLLPUBLIC_CHARTTOOLS void ChartDebugTraceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xDoc, int nIndent = 0 ); @@ -58,7 +59,7 @@ void ChartDebugTraceDocument( If OSL_DEBUG_LEVEL is less than CHART_TRACE_OSL_DEBUG_LEVEL this function does nothing. */ -void ChartDebugTraceDiagram( +OOO_DLLPUBLIC_CHARTTOOLS void ChartDebugTraceDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram, int nIndent = 0 ); diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 2efe3dd950e3..c6ff89d59c12 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/frame/XModel.hpp> +#include "charttoolsdllapi.hxx" #include <vector> @@ -48,7 +49,7 @@ namespace chart /** */ -class ChartModelHelper +class OOO_DLLPUBLIC_CHARTTOOLS ChartModelHelper { public: static ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 96112e4976b3..f99d39f63bcb 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/Direction3D.hpp> +#include "charttoolsdllapi.hxx" //............................................................................. namespace chart @@ -46,7 +47,7 @@ namespace chart /** */ -class ChartTypeHelper +class OOO_DLLPUBLIC_CHARTTOOLS ChartTypeHelper { public: static sal_Bool isSupportingGeometryProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index f23016c9cbf2..f373d4a10da0 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -31,6 +31,7 @@ #define _CHART2_CONTROLLER_CHARTVIEWHELPER_HXX #include <com/sun/star/frame/XModel.hpp> +#include "charttoolsdllapi.hxx" //............................................................................. namespace chart @@ -41,7 +42,7 @@ namespace chart /** */ -class ChartViewHelper +class OOO_DLLPUBLIC_CHARTTOOLS ChartViewHelper { public: static void setViewToDirtyState( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index 04906b91dec0..a18757f4f8b7 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -32,6 +32,7 @@ #define _CHART2_COLORPERPOINTHELPER_HXX #include <com/sun/star/beans/XPropertySet.hpp> +#include "charttoolsdllapi.hxx" //............................................................................. namespace chart @@ -42,7 +43,7 @@ namespace chart /** */ -class ColorPerPointHelper +class OOO_DLLPUBLIC_CHARTTOOLS ColorPerPointHelper { public: static bool hasPointOwnColor( diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index b2253a9d8a90..f27bad5a719c 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -46,6 +46,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b3dpoint.hxx> #include <basegfx/vector/b3dvector.hxx> +#include "charttoolsdllapi.hxx" #include <vector> #include <algorithm> @@ -64,60 +65,62 @@ and operations e.g drawing::Position3D + drawing::Direction3D //----------------------------------------------------------------------------- /** ::basegfx::B3DHomMatrix -> HomogenMatrix */ -com::sun::star::drawing::HomogenMatrix +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix& rM ); //----------------------------------------------------------------------------- /** HomogenMatrix -> ::basegfx::B3DHomMatrix */ -::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const com::sun::star::drawing::HomogenMatrix& rHM ); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const com::sun::star::drawing::HomogenMatrix& rHM ); //----------------------------------------------------------------------------- /** ::basegfx::B3DHomMatrix -> B2DHomMatrix */ +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B2DHomMatrix IgnoreZ( const ::basegfx::B3DHomMatrix& rM ); //----------------------------------------------------------------------------- /** B2DHomMatrix <-> HomogenMatrix3 */ -com::sun::star::drawing::HomogenMatrix3 +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM ); //----------------------------------------------------------------------------- /** Position3D -> B3DPoint */ -::basegfx::B3DPoint Position3DToB3DPoint( const com::sun::star::drawing::Position3D& rPosition ); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Position3DToB3DPoint( const com::sun::star::drawing::Position3D& rPosition ); //----------------------------------------------------------------------------- /** B3DVector -> Direction3D */ -com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector); +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector); //----------------------------------------------------------------------------- /** B3DPoint -> Position3D */ -com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); //----------------------------------------------------------------------------- /** Direction3D -> B3DPoint */ -::basegfx::B3DPoint Direction3DToB3DPoint( const com::sun::star::drawing::Direction3D& rDirection); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Direction3DToB3DPoint( const com::sun::star::drawing::Direction3D& rDirection); //----------------------------------------------------------------------------- /** Direction3D -> B3DVector */ -::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection); +OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection); //----------------------------------------------------------------------------- /** two drawing::Position3D -> PolyPolygonShape3D */ -::com::sun::star::drawing::PolyPolygonShape3D +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::drawing::PolyPolygonShape3D MakeLine3D( const ::com::sun::star::drawing::Position3D & rStart, const ::com::sun::star::drawing::Position3D & rEnd ); //----------------------------------------------------------------------------- /** PolyPolygonShape3D + drawing::Position3D -> PolyPolygonShape3D */ +OOO_DLLPUBLIC_CHARTTOOLS void AddPointToPoly( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly , const com::sun::star::drawing::Position3D& rPos , sal_Int32 nSequenceIndex=0 ); @@ -125,52 +128,56 @@ void AddPointToPoly( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly //----------------------------------------------------------------------------- /** get a single Point from a Polygon */ -::com::sun::star::drawing::Position3D getPointFromPoly( +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::drawing::Position3D getPointFromPoly( const ::com::sun::star::drawing::PolyPolygonShape3D& rPolygon , sal_Int32 nPointIndex, sal_Int32 nPolyIndex=0 ); //----------------------------------------------------------------------------- /** PolyPolygonShape3D + PolyPolygonShape3D -> PolyPolygonShape3D */ +OOO_DLLPUBLIC_CHARTTOOLS void appendPoly( com::sun::star::drawing::PolyPolygonShape3D& rRet , const com::sun::star::drawing::PolyPolygonShape3D& rAdd ); //----------------------------------------------------------------------------- /** PolyPolygonBezierCoords -> PolyPolygonShape3D */ +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::PolyPolygonShape3D BezierToPoly( const com::sun::star::drawing::PolyPolygonBezierCoords& rBezier ); //----------------------------------------------------------------------------- /** PolyPolygonShape3D -> drawing::PointSequenceSequence (2D) */ +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::PointSequenceSequence PolyToPointSequence( const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon ); //----------------------------------------------------------------------------- /** drawing::PointSequenceSequence + drawing::PointSequenceSequence */ +OOO_DLLPUBLIC_CHARTTOOLS void appendPointSequence( com::sun::star::drawing::PointSequenceSequence& rTarget , com::sun::star::drawing::PointSequenceSequence& rAdd ); //----------------------------------------------------------------------------- /** Position3D + Direction3D == Position3D */ -com::sun::star::drawing::Position3D +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D operator+( const com::sun::star::drawing::Position3D& rPos , const com::sun::star::drawing::Direction3D& rDirection); //----------------------------------------------------------------------------- /** Direction3D + Direction3D == Direction3D */ -com::sun::star::drawing::Direction3D +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D operator+( const com::sun::star::drawing::Direction3D& rDirection , const com::sun::star::drawing::Direction3D& rDirectionAdd); //----------------------------------------------------------------------------- /** Position3D - Direction3D == Position3D */ -com::sun::star::drawing::Position3D +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D operator-( const com::sun::star::drawing::Position3D& rPos , const com::sun::star::drawing::Direction3D& rDirection); @@ -178,77 +185,79 @@ com::sun::star::drawing::Position3D //----------------------------------------------------------------------------- /** Position3D - Position3D == Direction3D */ -com::sun::star::drawing::Direction3D +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D operator-( const com::sun::star::drawing::Position3D& rPos1 , const com::sun::star::drawing::Position3D& rPos2); //----------------------------------------------------------------------------- /** Direction3D * double == Direction3D */ -com::sun::star::drawing::Direction3D +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D operator*( const com::sun::star::drawing::Direction3D& rDirection , double fFraction); //----------------------------------------------------------------------------- /** Position3D == Position3D ? */ +OOO_DLLPUBLIC_CHARTTOOLS bool operator==( const com::sun::star::drawing::Position3D& rPos1 , const com::sun::star::drawing::Position3D& rPos2); //----------------------------------------------------------------------------- /** awt::Rect --> awt::Point (2D) */ -::com::sun::star::awt::Point ToPoint( const com::sun::star::awt::Rectangle& rRectangle ); +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point ToPoint( const com::sun::star::awt::Rectangle& rRectangle ); //----------------------------------------------------------------------------- /** awt::Rect --> awt::Size (2D) */ -::com::sun::star::awt::Size ToSize( const com::sun::star::awt::Rectangle& rRectangle ); +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size ToSize( const com::sun::star::awt::Rectangle& rRectangle ); //----------------------------------------------------------------------------- /** Position3D --> awt::Point (2D) */ -::com::sun::star::awt::Point Position3DToAWTPoint( const com::sun::star::drawing::Position3D& rPos ); +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point Position3DToAWTPoint( const com::sun::star::drawing::Position3D& rPos ); //----------------------------------------------------------------------------- /** Direction3D --> awt::Size (2D) */ -::com::sun::star::awt::Size Direction3DToAWTSize( const com::sun::star::drawing::Direction3D& rDirection ); +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size Direction3DToAWTSize( const com::sun::star::drawing::Direction3D& rDirection ); //----------------------------------------------------------------------------- /** B3DPoint -> Sequence<double> */ -com::sun::star::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint ); +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint ); //----------------------------------------------------------------------------- /** Sequence<double> -> drawing::Position3D */ -com::sun::star::drawing::Position3D +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D SequenceToPosition3D( const com::sun::star::uno::Sequence< double >& rSeq ); //----------------------------------------------------------------------------- /** drawing::Position3D -> Sequence<double> */ -com::sun::star::uno::Sequence< double > +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > Position3DToSequence( const com::sun::star::drawing::Position3D& rPosition ); //----------------------------------------------------------------------------- /** drawing::Direction3D / double */ -com::sun::star::drawing::Direction3D +OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D operator/( const com::sun::star::drawing::Direction3D& rDirection, double f ); //----------------------------------------------------------------------------- /** chart2::XDataSequence -> uno::Sequence< double > */ +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Sequence< double > DataSequenceToDoubleSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); - +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Sequence< rtl::OUString > DataSequenceToStringSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); @@ -291,11 +300,15 @@ template< typename T > return aResult; } +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool hasDoubleValue( const ::com::sun::star::uno::Any& rAny ); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny ); +OOO_DLLPUBLIC_CHARTTOOLS sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny ); +OOO_DLLPUBLIC_CHARTTOOLS bool replaceParamterInString( rtl::OUString & rInOutResourceString, const rtl::OUString & rParamToReplace, const rtl::OUString & rReplaceWith ); diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 6866807ad8f2..1c4a76efd229 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include "charttoolsdllapi.hxx" namespace chart { @@ -61,7 +62,7 @@ template< typename T > <p>In case no number can be generated from the Any, NaN (see rtl::math::SetNAN()) is returned.</p> */ -struct AnyToDouble : public ::std::unary_function< ::com::sun::star::uno::Any, double > +struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::com::sun::star::uno::Any, double > { double operator() ( const ::com::sun::star::uno::Any & rAny ) { @@ -92,7 +93,7 @@ struct AnyToDouble : public ::std::unary_function< ::com::sun::star::uno::Any, d /** unary function to convert ::com::sun::star::uno::Any into an ::rtl::OUString. */ -struct AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, ::rtl::OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, ::rtl::OUString > { ::rtl::OUString operator() ( const ::com::sun::star::uno::Any & rAny ) { @@ -120,7 +121,7 @@ struct AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, <p>For conversion rtl::math::StringToDouble is used.</p> */ -struct OUStringToDouble : public ::std::unary_function< ::rtl::OUString, double > +struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< ::rtl::OUString, double > { double operator() ( const ::rtl::OUString & rStr ) { @@ -138,7 +139,7 @@ struct OUStringToDouble : public ::std::unary_function< ::rtl::OUString, double <p>For conversion rtl::math::DoubleToOUString is used.</p> */ -struct DoubleToOUString : public ::std::unary_function< double, ::rtl::OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, ::rtl::OUString > { ::rtl::OUString operator() ( double fNumber ) { diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 78a0e839e65a..7a27f93f338c 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -32,6 +32,7 @@ #include "ServiceMacros.hxx" #include "ConfigItemListener.hxx" +#include "charttoolsdllapi.hxx" #include <cppuhelper/implbase2.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/chart2/XColorScheme.hpp> @@ -48,7 +49,7 @@ namespace impl class ChartConfigItem; } -class ConfigColorScheme : +class OOO_DLLPUBLIC_CHARTTOOLS ConfigColorScheme : public ConfigItemListener, public ::cppu::WeakImplHelper2< ::com::sun::star::chart2::XColorScheme, diff --git a/chart2/source/inc/ConfigItemListener.hxx b/chart2/source/inc/ConfigItemListener.hxx index 1d313ce99c6c..146cc1e596ad 100644 --- a/chart2/source/inc/ConfigItemListener.hxx +++ b/chart2/source/inc/ConfigItemListener.hxx @@ -31,11 +31,12 @@ #define CHART2_CONFIGITEMLISTENER_HXX #include <rtl/ustring.hxx> +#include "charttoolsdllapi.hxx" namespace chart { -class ConfigItemListener +class OOO_DLLPUBLIC_CHARTTOOLS ConfigItemListener { public: virtual void notify( const ::rtl::OUString & rPropertyName ) = 0; diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index 500df34757e1..b7bf17def1cb 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -31,6 +31,7 @@ #define CHART2_CONTROLLERLOCKGUARD_HXX #include <com/sun/star/frame/XModel.hpp> +#include "charttoolsdllapi.hxx" namespace chart { @@ -39,7 +40,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 ControllerLockGuard +class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockGuard { public: explicit ControllerLockGuard( @@ -58,7 +59,7 @@ private: Use the ControllerLockHelperGuard to lock/unlock the model during a block of instructions. */ -class ControllerLockHelper +class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockHelper { public: explicit ControllerLockHelper( @@ -79,7 +80,7 @@ private: do not remain locked when leaving a function even in case an exception is thrown. */ -class ControllerLockHelperGuard +class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockHelperGuard { public: explicit ControllerLockHelperGuard( ControllerLockHelper & rHelper ); diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 3652a27a5059..d302674f4867 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -38,6 +38,7 @@ #include <com/sun/star/chart2/XChartType.hpp> #include "StackMode.hxx" +#include "charttoolsdllapi.hxx" #include <vector> #include <functional> @@ -48,7 +49,7 @@ namespace chart namespace DataSeriesHelper { -::rtl::OUString GetRole( +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString GetRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence ); @@ -62,7 +63,7 @@ namespace DataSeriesHelper @param aRole The role that is to be filtered out. */ -::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > getDataSequenceByRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xSource, ::rtl::OUString aRole, @@ -77,7 +78,7 @@ namespace DataSeriesHelper @param aRole The role that is to be filtered out. */ -::std::vector< +OOO_DLLPUBLIC_CHARTTOOLS ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > getAllDataSequencesByRole( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< @@ -89,7 +90,7 @@ namespace DataSeriesHelper into a data source. The order of sequences will match the order of the data series. */ -::com::sun::star::uno::Reference< +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > getDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< @@ -102,71 +103,74 @@ namespace DataSeriesHelper The data sequence contained in xSeries that has this role will be used to take its label. */ -::rtl::OUString getDataSeriesLabel( +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getDataSeriesLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, const ::rtl::OUString & rLabelSequenceRole ); /** Get the label of a labeled sequence including neccessary automatic generation */ -::rtl::OUString getLabelForLabeledDataSequence( +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getLabelForLabeledDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xLabeledSeq ); -void setStackModeAtSeries( +OOO_DLLPUBLIC_CHARTTOOLS void setStackModeAtSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > & aSeries, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, StackMode eStackMode ); -sal_Int32 getAttachedAxisIndex( +OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getAttachedAxisIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries ); /// @param nAxisIndex, if -1 it is determined by the given data series via getAttachedAxisIndex -sal_Int32 getNumberFormatKeyFromAxis( +OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getNumberFormatKeyFromAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex = -1 ); +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > getCoordinateSystemOfSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > getChartTypeOfSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); -void deleteSeries( +OOO_DLLPUBLIC_CHARTTOOLS void deleteSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > & xChartType ); -void switchSymbolsOnOrOff( +OOO_DLLPUBLIC_CHARTTOOLS void switchSymbolsOnOrOff( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSeriesProperties, bool bSymbolsOn, sal_Int32 nSeriesIndex ); -void switchLinesOnOrOff( +OOO_DLLPUBLIC_CHARTTOOLS void switchLinesOnOrOff( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSeriesProperties, bool bLinesOn ); +OOO_DLLPUBLIC_CHARTTOOLS void makeLinesThickOrThin( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSeriesProperties, bool bThick ); -void setPropertyAlsoToAllAttributedDataPoints( +OOO_DLLPUBLIC_CHARTTOOLS void setPropertyAlsoToAllAttributedDataPoints( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& rPropertyValue ); -bool hasAttributedDataPointDifferentValue( +OOO_DLLPUBLIC_CHARTTOOLS bool hasAttributedDataPointDifferentValue( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, const ::rtl::OUString& rPropertyName, diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 555bbad847c4..286e6b6116e1 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -37,11 +37,12 @@ #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include "ServiceMacros.hxx" +#include "charttoolsdllapi.hxx" namespace chart { -class DataSource : public +class OOO_DLLPUBLIC_CHARTTOOLS DataSource : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::chart2::data::XDataSource, diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index 289628efcecc..40b03034fcf7 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -39,6 +39,7 @@ #endif #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XModel.hpp> +#include "charttoolsdllapi.hxx" #include <vector> @@ -51,7 +52,7 @@ namespace chart /** */ -class DataSourceHelper +class OOO_DLLPUBLIC_CHARTTOOLS DataSourceHelper { public: static ::com::sun::star::uno::Sequence< diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 95aa249e84c9..ae650e0a4898 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -31,6 +31,7 @@ #define CHART2_DIAGRAMHELPER_HXX #include "StackMode.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/XChartTypeTemplate.hpp> @@ -48,7 +49,7 @@ namespace chart { -class DiagramHelper +class OOO_DLLPUBLIC_CHARTTOOLS DiagramHelper { public: typedef ::std::pair< diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 4ab6901d89b8..041e4aa6a5ab 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -34,6 +34,7 @@ #include "OPropertySet.hxx" #include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" +#include "charttoolsdllapi.hxx" #include <cppuhelper/implbase6.hxx> #include <comphelper/uno3.hxx> @@ -61,7 +62,7 @@ typedef ::cppu::WeakImplHelper6< ErrorBar_Base; } -class ErrorBar : +class OOO_DLLPUBLIC_CHARTTOOLS ErrorBar : public MutexContainer, public impl::ErrorBar_Base, public ::property::OPropertySet diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 7f11410c1ae8..12a98e4fca47 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -36,11 +36,13 @@ #include <com/sun/star/chart2/XCoordinateSystem.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/frame/XModel.hpp> +#include "charttoolsdllapi.hxx" namespace chart { -class ExplicitCategoriesProvider : public ::cppu::WeakImplHelper1< +class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider : + public ::cppu::WeakImplHelper1< ::com::sun::star::chart2::data::XTextualDataSequence > { diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index 777758d9e83c..20c58c31b458 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -31,11 +31,13 @@ #define CHART2_EXPONENTIALREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" +#include "charttoolsdllapi.hxx" namespace chart { -class ExponentialRegressionCurveCalculator : public RegressionCurveCalculator +class OOO_DLLPUBLIC_CHARTTOOLS ExponentialRegressionCurveCalculator : + public RegressionCurveCalculator { public: ExponentialRegressionCurveCalculator(); diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index 47d79e7561b8..95f8068c6c23 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -32,6 +32,7 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/beans/Property.hpp> #include <vector> @@ -40,7 +41,7 @@ namespace chart { // implements service FillProperties -class FillProperties +class OOO_DLLPUBLIC_CHARTTOOLS FillProperties { public: // FastProperty Ids for properties diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index 23081fa7fd45..d867b69ff175 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -33,13 +33,14 @@ #include <com/sun/star/chart2/XFormattedString.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include "charttoolsdllapi.hxx" //............................................................................. namespace chart { //............................................................................. -class FormattedStringHelper +class OOO_DLLPUBLIC_CHARTTOOLS FormattedStringHelper { public: static ::com::sun::star::uno::Sequence< diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 9bf598441b3a..5a7afc62c5fe 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -41,6 +41,7 @@ #include <com/sun/star/util/XCloneable.hpp> #include <cppuhelper/implbase6.hxx> #include "ServiceMacros.hxx" +#include "charttoolsdllapi.hxx" #include "CachedDataSequence.hxx" @@ -74,7 +75,7 @@ typedef ::cppu::WeakImplHelper6< <p>The format for a complete range is "all". (Do we need more than that?)</p> */ -class InternalDataProvider : +class OOO_DLLPUBLIC_CHARTTOOLS InternalDataProvider : public impl::InternalDataProvider_Base { public: diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 3eba45bd2df9..23cfb7bb2743 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -31,6 +31,7 @@ #define CHART2_LABELEDDATASEQUENCE_HXX #include "ServiceMacros.hxx" #include "MutexContainer.hxx" +#include "charttoolsdllapi.hxx" #include <comphelper/uno3.hxx> #include <cppuhelper/implbase4.hxx> @@ -55,7 +56,7 @@ typedef cppu::WeakImplHelper4< LabeledDataSequence_Base; } -class LabeledDataSequence : +class OOO_DLLPUBLIC_CHARTTOOLS LabeledDataSequence : public MutexContainer, public impl::LabeledDataSequence_Base { diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index a1944b42a7c3..f6c792ab48f1 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include "charttoolsdllapi.hxx" //............................................................................. namespace chart @@ -46,7 +47,7 @@ namespace chart /** */ -class LegendHelper +class OOO_DLLPUBLIC_CHARTTOOLS LegendHelper { public: static ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index b363c03b3a7c..6b08c33b89da 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -40,12 +40,13 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/weakref.hxx> +#include "charttoolsdllapi.hxx" namespace apphelper { class LifeTimeGuard; -class LifeTimeManager +class OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager { friend class LifeTimeGuard; protected: @@ -84,7 +85,7 @@ protected: sal_Int32 volatile m_nLongLastingCallCount; }; -class CloseableLifeTimeManager : public LifeTimeManager +class OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager : public LifeTimeManager { protected: ::com::sun::star::util::XCloseable* m_pCloseable; @@ -200,12 +201,12 @@ your XComponent::dispose method has to be implemented in the following way: */ //----------------------------------------------------------------- -class LifeTimeGuard : public ::osl::ResettableMutexGuard +class OOO_DLLPUBLIC_CHARTTOOLS LifeTimeGuard { public: LifeTimeGuard( LifeTimeManager& rManager ) - : ::osl::ResettableGuard< ::osl::Mutex >( rManager.m_aAccessMutex ) + : m_guard( rManager.m_aAccessMutex ) , m_rManager(rManager) , m_bCallRegistered(sal_False) , m_bLongLastingCallRegistered(sal_False) @@ -213,9 +214,11 @@ public: } sal_Bool startApiCall(sal_Bool bLongLastingCall=sal_False); - virtual ~LifeTimeGuard(); + ~LifeTimeGuard(); + void clear() { m_guard.clear(); } private: + osl::ClearableMutexGuard m_guard; LifeTimeManager& m_rManager; sal_Bool m_bCallRegistered; sal_Bool m_bLongLastingCallRegistered; diff --git a/chart2/source/inc/LineProperties.hxx b/chart2/source/inc/LineProperties.hxx index 608985bdd460..9a4a978c09ce 100644 --- a/chart2/source/inc/LineProperties.hxx +++ b/chart2/source/inc/LineProperties.hxx @@ -32,6 +32,7 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/beans/Property.hpp> #include <vector> @@ -40,7 +41,7 @@ namespace chart { // implements service LineProperties -class LineProperties +class OOO_DLLPUBLIC_CHARTTOOLS LineProperties { public: // FastProperty Ids for properties diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index 21a7058d88d7..55147aa5874d 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -31,11 +31,13 @@ #define CHART2_LINEARREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" +#include "charttoolsdllapi.hxx" namespace chart { -class LinearRegressionCurveCalculator : public RegressionCurveCalculator +class OOO_DLLPUBLIC_CHARTTOOLS LinearRegressionCurveCalculator : + public RegressionCurveCalculator { public: LinearRegressionCurveCalculator(); diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index 137491253377..2913d9401b98 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -31,11 +31,13 @@ #define CHART2_LOGARITHMICREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" +#include "charttoolsdllapi.hxx" namespace chart { -class LogarithmicRegressionCurveCalculator : public RegressionCurveCalculator +class OOO_DLLPUBLIC_CHARTTOOLS LogarithmicRegressionCurveCalculator : + public RegressionCurveCalculator { public: LogarithmicRegressionCurveCalculator(); diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index b15d723742d5..ea02d6a4fef5 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -31,11 +31,13 @@ #define CHART2_MEANVALUEREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" +#include "charttoolsdllapi.hxx" namespace chart { -class MeanValueRegressionCurveCalculator : public RegressionCurveCalculator +class OOO_DLLPUBLIC_CHARTTOOLS MeanValueRegressionCurveCalculator : + public RegressionCurveCalculator { public: MeanValueRegressionCurveCalculator(); diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 4b8698fc7fc4..403c842fa45b 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -38,6 +38,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include "charttoolsdllapi.hxx" /* * This class helps to read and write the properties mentioned in the service description @@ -53,7 +54,7 @@ namespace apphelper { -class MediaDescriptorHelper +class OOO_DLLPUBLIC_CHARTTOOLS MediaDescriptorHelper { private: //MediaDescriptorHelper(){}; diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index 7ecdd2d2d04c..a664816930f8 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -35,6 +35,7 @@ #include <tools/link.hxx> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> +#include "charttoolsdllapi.hxx" namespace chart { @@ -44,7 +45,7 @@ without becoming a XModifyListener yourself class ModifyListenerCallBack_impl; -class ModifyListenerCallBack +class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack { public: explicit ModifyListenerCallBack( const Link& rCallBack ); diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index f5dbb370560b..7c02d0356299 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -40,6 +40,7 @@ #include <cppuhelper/weakref.hxx> #include "MutexContainer.hxx" +#include "charttoolsdllapi.hxx" #include <list> #include <algorithm> @@ -67,7 +68,7 @@ namespace ModifyListenerHelper life time of the listeners is independent of the broadcaster's lifetime in this case.</p> */ -class ModifyEventForwarder : +class OOO_DLLPUBLIC_CHARTTOOLS ModifyEventForwarder : public MutexContainer, public ::cppu::WeakComponentImplHelper2< ::com::sun::star::util::XModifyBroadcaster, diff --git a/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx index b8a46e04a963..68d7f9f74fd0 100644 --- a/chart2/source/inc/MutexContainer.hxx +++ b/chart2/source/inc/MutexContainer.hxx @@ -31,11 +31,12 @@ #define CHART_MUTEXCONTAINER_HXX #include <osl/mutex.hxx> +#include "charttoolsdllapi.hxx" namespace chart { -class MutexContainer +class OOO_DLLPUBLIC_CHARTTOOLS MutexContainer { public: virtual ~MutexContainer(); diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index bff3d3f3c516..104fd941f217 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <cppuhelper/implbase3.hxx> +#include "charttoolsdllapi.hxx" #include <map> @@ -53,7 +54,7 @@ typedef ::cppu::WeakImplHelper3< NameContainer_Base; } -class NameContainer : public impl::NameContainer_Base +class OOO_DLLPUBLIC_CHARTTOOLS NameContainer : public impl::NameContainer_Base { public: NameContainer( const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName ); diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index ed37118af1f4..c2e54d41da5f 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -48,6 +48,7 @@ // #include <com/sun/star/beans/XFastPropertyState.hpp> // #endif #include <osl/mutex.hxx> +#include "charttoolsdllapi.hxx" #include <memory> @@ -58,7 +59,7 @@ namespace impl { class ImplOPropertySet; } -class OPropertySet : +class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet : public ::cppu::OBroadcastHelper, // includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet public ::cppu::OPropertySetHelper, diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index a5dc0429297c..973e896f846a 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include "TitleHelper.hxx" +#include "charttoolsdllapi.hxx" // header for class OUString #include <rtl/ustring.hxx> @@ -81,7 +82,7 @@ enum ObjectType OBJECTTYPE_UNKNOWN }; -class ObjectIdentifier +class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier { //CID == ClassifiedIdentifier <--> name of shape //semicolon, colon, equal sign and slash have special meanings in a CID diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 8cd63ffcad6e..ea3e621bf6e8 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -31,12 +31,14 @@ #define CHART2_POTENTIALREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" +#include "charttoolsdllapi.hxx" namespace chart { -class PotentialRegressionCurveCalculator : public RegressionCurveCalculator +class OOO_DLLPUBLIC_CHARTTOOLS PotentialRegressionCurveCalculator : + public RegressionCurveCalculator { public: PotentialRegressionCurveCalculator(); diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index f47cb7c28912..6646f8cf086d 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/property.hxx> #include <map> +#include "charttoolsdllapi.hxx" namespace chart { @@ -54,7 +55,7 @@ namespace PropertyHelper @return The name used for storing this element in the table */ -::rtl::OUString addLineDashUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addLineDashUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, @@ -65,7 +66,7 @@ namespace PropertyHelper @return The name used for storing this element in the table */ -::rtl::OUString addGradientUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, @@ -76,6 +77,7 @@ namespace PropertyHelper @return The name used for storing this element in the table */ +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addTransparencyGradientUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< @@ -87,7 +89,7 @@ namespace PropertyHelper @return The name used for storing this element in the table */ -::rtl::OUString addHatchUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addHatchUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, @@ -98,7 +100,7 @@ namespace PropertyHelper @return The name used for storing this element in the table */ -::rtl::OUString addBitmapUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addBitmapUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, @@ -111,6 +113,7 @@ namespace PropertyHelper @param any is the value encapsulated in the variant type Any */ +OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ); @@ -129,7 +132,7 @@ template< typename Value > template<> void setPropertyValue< ::com::sun::star::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ); -void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ); +OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const ::com::sun::star::uno::Any & rAny ); /** Calls setPropertyValue() but asserts that the given property hasn't been set before. @@ -148,14 +151,14 @@ template<> /** Calls setPropertyValueDefault() with an empty Any as value */ -void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key ); +OOO_DLLPUBLIC_CHARTTOOLS void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key ); } // namespace PropertyHelper // ================================================================================ -struct PropertyNameLess +struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess { inline bool operator() ( const ::com::sun::star::beans::Property & first, const ::com::sun::star::beans::Property & second ) @@ -164,7 +167,7 @@ struct PropertyNameLess } }; -struct PropertyLess : public ::std::binary_function< +struct OOO_DLLPUBLIC_CHARTTOOLS PropertyLess : public ::std::binary_function< ::com::sun::star::beans::Property, ::com::sun::star::beans::Property, bool > @@ -176,7 +179,7 @@ struct PropertyLess : public ::std::binary_function< } }; -struct PropertyValueNameEquals : public ::std::unary_function< ::com::sun::star::beans::PropertyValue, bool > +struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_function< ::com::sun::star::beans::PropertyValue, bool > { explicit PropertyValueNameEquals( const ::rtl::OUString & rName ) : m_aName( rName ) diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 2fb7703d9f42..fa464743ae0c 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -31,6 +31,7 @@ #define CHART2_RANGEHIGHLIGHTER_HXX #include "MutexContainer.hxx" +#include "charttoolsdllapi.hxx" #include <cppuhelper/compbase2.hxx> #include <com/sun/star/chart2/data/XRangeHighlighter.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> @@ -55,7 +56,7 @@ typedef ::cppu::WeakComponentImplHelper2< RangeHighlighter_Base; } -class RangeHighlighter : +class OOO_DLLPUBLIC_CHARTTOOLS RangeHighlighter : public MutexContainer, public impl::RangeHighlighter_Base { diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 4951743c3b61..6d8612d79f73 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/awt/Size.hpp> +#include "charttoolsdllapi.hxx" namespace com { namespace sun { namespace star { namespace chart2 { @@ -45,7 +46,7 @@ namespace chart2 { namespace chart { -class ReferenceSizeProvider +class OOO_DLLPUBLIC_CHARTTOOLS ReferenceSizeProvider { public: diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 0168ca2f57ba..8ca8849c6bf0 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -34,11 +34,12 @@ #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> +#include "charttoolsdllapi.hxx" namespace chart { -class RegressionCurveCalculator : public +class OOO_DLLPUBLIC_CHARTTOOLS RegressionCurveCalculator : public ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator > { public: diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 73317572236c..8cfe8b6f9ac8 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -38,13 +38,14 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XModel.hpp> +#include "charttoolsdllapi.hxx" #include <vector> namespace chart { -class RegressionCurveHelper +class OOO_DLLPUBLIC_CHARTTOOLS RegressionCurveHelper { public: /// returns a model mean-value line diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 7be2fc055003..628fd0fdd017 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/drawing/Alignment.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> +#include "charttoolsdllapi.hxx" //............................................................................. namespace chart @@ -46,7 +47,7 @@ namespace chart /** */ -class RelativePositionHelper +class OOO_DLLPUBLIC_CHARTTOOLS RelativePositionHelper { public: /** returns the upper left corner of an object that has size aObjectSize and diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index 0f337bd71940..aaacd124bed2 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -32,11 +32,12 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include "charttoolsdllapi.hxx" namespace chart { -class RelativeSizeHelper +class OOO_DLLPUBLIC_CHARTTOOLS RelativeSizeHelper { public: static double calculate( diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx index f73610d78654..5cc98eb230c0 100644 --- a/chart2/source/inc/ResId.hxx +++ b/chart2/source/inc/ResId.hxx @@ -32,11 +32,12 @@ #include <tools/resid.hxx> #include <rtl/ustring.hxx> +#include "charttoolsdllapi.hxx" namespace chart { -class SchResId : public ResId +class OOO_DLLPUBLIC_CHARTTOOLS SchResId : public ResId { public: SchResId( sal_Int16 nId ); diff --git a/chart2/source/inc/RessourceManager.hxx b/chart2/source/inc/RessourceManager.hxx index af81366ba9d3..a0d12cf2ed07 100644 --- a/chart2/source/inc/RessourceManager.hxx +++ b/chart2/source/inc/RessourceManager.hxx @@ -30,13 +30,15 @@ #ifndef CHART2_RESSOURCEMANAGER_HXX #define CHART2_RESSOURCEMANAGER_HXX +#include "charttoolsdllapi.hxx" + // defined in <tools/resmgr.hxx> class ResMgr; namespace chart { -class RessourceManager +class OOO_DLLPUBLIC_CHARTTOOLS RessourceManager { public: static ::ResMgr & getRessourceManager(); diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 1022fcec5c0d..31b32cac65e9 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -30,6 +30,7 @@ #ifndef _CHART2_SCALING_HXX #define _CHART2_SCALING_HXX #include "ServiceMacros.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/chart2/XScaling.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceName.hpp> @@ -45,7 +46,8 @@ namespace chart /** */ -class LogarithmicScaling : public ::cppu::WeakImplHelper3 < +class OOO_DLLPUBLIC_CHARTTOOLS LogarithmicScaling : + public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, ::com::sun::star::lang::XServiceInfo @@ -86,7 +88,8 @@ private: // ---------------------------------------- -class ExponentialScaling : public ::cppu::WeakImplHelper3 < +class OOO_DLLPUBLIC_CHARTTOOLS ExponentialScaling : + public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, ::com::sun::star::lang::XServiceInfo @@ -126,7 +129,7 @@ private: // ---------------------------------------- -class LinearScaling : public ::cppu::WeakImplHelper3 < +class OOO_DLLPUBLIC_CHARTTOOLS LinearScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, ::com::sun::star::lang::XServiceInfo @@ -168,7 +171,7 @@ private: // ---------------------------------------- -class PowerScaling : public ::cppu::WeakImplHelper3 < +class OOO_DLLPUBLIC_CHARTTOOLS PowerScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, ::com::sun::star::lang::XServiceInfo diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index aefc083b4b05..f37fbf86b0ce 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -32,6 +32,7 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/beans/Property.hpp> #include <vector> @@ -40,7 +41,7 @@ namespace chart { // implements service SceneProperties -class SceneProperties +class OOO_DLLPUBLIC_CHARTTOOLS SceneProperties { public: // FastProperty Ids for properties diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 77270752ae3d..1d49940fd46c 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -35,11 +35,12 @@ #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> +#include "charttoolsdllapi.hxx" namespace chart { -class StatisticsHelper +class OOO_DLLPUBLIC_CHARTTOOLS StatisticsHelper { public: /** Calculates 1/n * sum (x_i - x_mean)^2. diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index 738cde2bb203..cb860a193b73 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -34,6 +34,7 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> +#include "charttoolsdllapi.hxx" //............................................................................. namespace chart @@ -61,7 +62,7 @@ enum CuboidPlanePosition CuboidPlanePosition_Back }; -class ThreeDHelper +class OOO_DLLPUBLIC_CHARTTOOLS ThreeDHelper { public: diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index 3cdbc24c232a..96ecee79dc3e 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -31,6 +31,7 @@ #define _CHART2_TOOLS_TITLEHELPER_HXX #include "ReferenceSizeProvider.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -41,7 +42,7 @@ namespace chart { //............................................................................. -class TitleHelper +class OOO_DLLPUBLIC_CHARTTOOLS TitleHelper { public: enum eTitleType diff --git a/chart2/source/inc/TrueGuard.hxx b/chart2/source/inc/TrueGuard.hxx index 423b7d37047e..5b9c007d33a0 100644 --- a/chart2/source/inc/TrueGuard.hxx +++ b/chart2/source/inc/TrueGuard.hxx @@ -30,11 +30,13 @@ #ifndef CHART2_TRUEGUARD_HXX #define CHART2_TRUEGUARD_HXX +#include "charttoolsdllapi.hxx" + namespace chart { /** This guard sets the given boolean reference to true in the constructor and to false in the destructor */ -class TrueGuard +class OOO_DLLPUBLIC_CHARTTOOLS TrueGuard { public: explicit TrueGuard( bool& rbTrueDuringGuardedTime ); diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index c8f8c6609c4c..6fedbdd1ba12 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -37,6 +37,7 @@ #include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> #include "ServiceMacros.hxx" +#include "charttoolsdllapi.hxx" // interfaces and types #include <com/sun/star/lang/XServiceInfo.hpp> @@ -72,7 +73,7 @@ typedef ::cppu::WeakComponentImplHelper8< UncachedDataSequence_Base; } -class UncachedDataSequence : +class OOO_DLLPUBLIC_CHARTTOOLS UncachedDataSequence : public ::comphelper::OMutexAndBroadcastHelper, public ::comphelper::OPropertyContainer, public ::comphelper::OPropertyArrayUsageHelper< UncachedDataSequence >, diff --git a/chart2/source/inc/UndoGuard.hxx b/chart2/source/inc/UndoGuard.hxx index 3624af7eb744..98cffab939af 100644 --- a/chart2/source/inc/UndoGuard.hxx +++ b/chart2/source/inc/UndoGuard.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/chart2/XUndoManager.hpp> +#include "charttoolsdllapi.hxx" // header for class OUString #include <rtl/ustring.hxx> @@ -40,7 +41,7 @@ namespace chart { /** Base Class for UndoGuard and UndoLiveUpdateGuard */ -class UndoGuard_Base +class OOO_DLLPUBLIC_CHARTTOOLS UndoGuard_Base { public: explicit UndoGuard_Base( const rtl::OUString & rUndoMessage @@ -66,7 +67,7 @@ protected: cancelAction in the DTOR if no other method is called. If commitAction is called the destructor does nothin anymore. */ -class UndoGuard : public UndoGuard_Base +class OOO_DLLPUBLIC_CHARTTOOLS UndoGuard : public UndoGuard_Base { public: explicit UndoGuard( const rtl::OUString& rUndoMessage @@ -81,7 +82,7 @@ public: cancelActionUndo in the DTOR if no other method is called. If commitAction is called the destructor does nothin anymore. */ -class UndoLiveUpdateGuard : public UndoGuard_Base +class OOO_DLLPUBLIC_CHARTTOOLS UndoLiveUpdateGuard : public UndoGuard_Base { public: explicit UndoLiveUpdateGuard( const rtl::OUString& rUndoMessage @@ -95,7 +96,8 @@ public: /** Same as UndoLiveUpdateGuard but with additional storage of the chart's data. Only use this if the data has internal data. */ -class UndoLiveUpdateGuardWithData : public UndoGuard_Base +class OOO_DLLPUBLIC_CHARTTOOLS UndoLiveUpdateGuardWithData : + public UndoGuard_Base { public: explicit UndoLiveUpdateGuardWithData( const rtl::OUString& rUndoMessage @@ -106,7 +108,7 @@ public: virtual ~UndoLiveUpdateGuardWithData(); }; -class UndoGuardWithSelection : public UndoGuard_Base +class OOO_DLLPUBLIC_CHARTTOOLS UndoGuardWithSelection : public UndoGuard_Base { public: explicit UndoGuardWithSelection( const rtl::OUString& rUndoMessage diff --git a/chart2/source/inc/UndoManager.hxx b/chart2/source/inc/UndoManager.hxx index 6c71e668a2b5..d8c1690963ff 100644 --- a/chart2/source/inc/UndoManager.hxx +++ b/chart2/source/inc/UndoManager.hxx @@ -32,6 +32,7 @@ #include "ConfigItemListener.hxx" #include "MutexContainer.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -81,7 +82,7 @@ typedef ::cppu::WeakComponentImplHelper3< redo-stacks support the css::util::XCloneable interface, which is implemented such that the entire model is cloned. */ -class UndoManager : +class OOO_DLLPUBLIC_CHARTTOOLS UndoManager : public MutexContainer, public ConfigItemListener, public impl::UndoManager_Base diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index d312e011f160..a94f64b2cf5f 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -32,6 +32,7 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" +#include "charttoolsdllapi.hxx" #include <com/sun/star/beans/Property.hpp> #include <vector> @@ -40,7 +41,7 @@ namespace chart { // implements service com.sun.star.xml.UserDefinedAttributeSupplier -class UserDefinedProperties +class OOO_DLLPUBLIC_CHARTTOOLS UserDefinedProperties { public: // FastProperty Ids for properties diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 936e6e4ab4cf..cd5f472c12a0 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase1.hxx> +#include "charttoolsdllapi.hxx" namespace chart { @@ -93,7 +94,7 @@ private: // -------------------------------------------------------------------------------- -class WeakModifyListenerAdapter : +class OOO_DLLPUBLIC_CHARTTOOLS WeakModifyListenerAdapter : public WeakListenerAdapter< ::com::sun::star::util::XModifyListener > { public: @@ -109,7 +110,7 @@ protected: // -------------------------------------------------------------------------------- -class WeakSelectionChangeListenerAdapter : +class OOO_DLLPUBLIC_CHARTTOOLS WeakSelectionChangeListenerAdapter : public WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener > { public: diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index 11ae01633d99..7f60a42a78ed 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -31,11 +31,12 @@ #define CHART2_WRAPPEDDEFAULTPROPERTY_HXX #include "WrappedProperty.hxx" +#include "charttoolsdllapi.hxx" namespace chart { -class WrappedDefaultProperty : public WrappedProperty +class OOO_DLLPUBLIC_CHARTTOOLS WrappedDefaultProperty : public WrappedProperty { public: explicit WrappedDefaultProperty( diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index 6b5f4289755b..50221bec97df 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -31,11 +31,13 @@ #define CHART2_WRAPPEDDIRECTSTATEPROPERTY_HXX #include "WrappedProperty.hxx" +#include "charttoolsdllapi.hxx" namespace chart { -class WrappedDirectStateProperty : public WrappedProperty +class OOO_DLLPUBLIC_CHARTTOOLS WrappedDirectStateProperty : + public WrappedProperty { public: explicit WrappedDirectStateProperty( diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 838a4cb8937b..168967aa7fbf 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -31,6 +31,7 @@ #define CHART_WRAPPED_IGNORE_PROPERTY_HXX #include "WrappedProperty.hxx" +#include "charttoolsdllapi.hxx" #include <vector> @@ -39,7 +40,7 @@ namespace chart { //............................................................................. -class WrappedIgnoreProperty : public WrappedProperty +class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty { public: WrappedIgnoreProperty( const ::rtl::OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue ); @@ -65,7 +66,7 @@ protected: mutable ::com::sun::star::uno::Any m_aCurrentValue; }; -class WrappedIgnoreProperties +class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperties { public: static void addIgnoreLineProperties( std::vector< WrappedProperty* >& rList ); diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index 90f54a473475..5fd3e3e624bd 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> +#include "charttoolsdllapi.hxx" #include <map> @@ -40,7 +41,7 @@ namespace chart { //............................................................................. -class WrappedProperty +class OOO_DLLPUBLIC_CHARTTOOLS 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 4cbd39b4b7ed..99aaadcd3c11 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -32,6 +32,7 @@ #include "WrappedProperty.hxx" #include "MutexContainer.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> @@ -52,7 +53,8 @@ namespace chart { //............................................................................. -class WrappedPropertySet : public MutexContainer +class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet : + public MutexContainer , public ::cppu::WeakImplHelper4 < ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XMultiPropertySet diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index 4bb5abd94847..3e948c4567fc 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -32,13 +32,14 @@ #include <sal/types.h> #include <rtl/ustring.hxx> +#include "charttoolsdllapi.hxx" namespace chart { namespace XMLRangeHelper { -struct Cell +struct OOO_DLLPUBLIC_CHARTTOOLS Cell { sal_Int32 nColumn; sal_Int32 nRow; @@ -57,15 +58,17 @@ struct Cell inline bool empty() const { return bIsEmpty; } }; -struct CellRange +struct OOO_DLLPUBLIC_CHARTTOOLS CellRange { Cell aUpperLeft; Cell aLowerRight; ::rtl::OUString aTableName; }; +OOO_DLLPUBLIC_CHARTTOOLS CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString ); +OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getXMLStringFromCellRange( const CellRange & rRange ); diff --git a/chart2/source/inc/charttoolsdllapi.hxx b/chart2/source/inc/charttoolsdllapi.hxx new file mode 100644 index 000000000000..c920823b8b96 --- /dev/null +++ b/chart2/source/inc/charttoolsdllapi.hxx @@ -0,0 +1,43 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2008 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* $RCSfile: $ +* +* $Revision: $ +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#ifndef INCLUDED_CHART2_SOURCE_INC_CHARTTOOLSDLLAPI_HXX +#define INCLUDED_CHART2_SOURCE_INC_CHARTTOOLSDLLAPI_HXX + +#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 + +#endif diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index c036fef846b0..f53cf5525d0b 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -34,6 +34,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/XShapes.hpp> +#include "chartviewdllapi.hxx" //............................................................................. namespace chart @@ -44,7 +45,7 @@ namespace chart /** */ -class DataPointSymbolSupplier +class OOO_DLLPUBLIC_CHARTVIEW DataPointSymbolSupplier { public: static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index fc385c6430c7..10ddc9657c7b 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -40,13 +40,14 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include "chartviewdllapi.hxx" //............................................................................. namespace chart { //............................................................................. -class DrawModelWrapper : private SdrModel +class OOO_DLLPUBLIC_CHARTVIEW DrawModelWrapper : private SdrModel { private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory > m_xMCF; diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index f46823d57883..645e25166594 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -40,6 +40,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include "chartviewdllapi.hxx" //............................................................................. namespace chart @@ -51,7 +52,7 @@ namespace chart */ class DrawModelWrapper; -class ExplicitValueProvider +class OOO_DLLPUBLIC_CHARTVIEW ExplicitValueProvider { public: /** Gives calculated scale and increment values for a given xAxis in the current view. diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx index 687aec8ad7d0..71a6f20acb0d 100644 --- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx @@ -32,6 +32,7 @@ #include <svtools/zforlist.hxx> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include "chartviewdllapi.hxx" //............................................................................. namespace chart @@ -43,7 +44,7 @@ namespace chart */ class FixedNumberFormatter; -class NumberFormatterWrapper +class OOO_DLLPUBLIC_CHARTVIEW NumberFormatterWrapper { public: NumberFormatterWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ); @@ -63,7 +64,7 @@ private: //private member }; -class FixedNumberFormatter +class OOO_DLLPUBLIC_CHARTVIEW FixedNumberFormatter { public: FixedNumberFormatter( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier diff --git a/chart2/source/inc/chartview/chartviewdllapi.hxx b/chart2/source/inc/chartview/chartviewdllapi.hxx new file mode 100644 index 000000000000..f18291ac49e3 --- /dev/null +++ b/chart2/source/inc/chartview/chartviewdllapi.hxx @@ -0,0 +1,43 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2008 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* $RCSfile: $ +* +* $Revision: $ +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#ifndef INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_CHARTVIEWDLLAPI_HXX +#define INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_CHARTVIEWDLLAPI_HXX + +#include "sal/config.h" + +#include "sal/types.h" + +#if defined OOO_DLLIMPLEMENTATION_CHARTVIEW +#define OOO_DLLPUBLIC_CHARTVIEW SAL_DLLPUBLIC_EXPORT +#else +#define OOO_DLLPUBLIC_CHARTVIEW SAL_DLLPUBLIC_IMPORT +#endif + +#endif diff --git a/chart2/source/model/filter/makefile.mk b/chart2/source/model/filter/makefile.mk index 9d59f9c35dfe..1d0ee39d8768 100644 --- a/chart2/source/model/filter/makefile.mk +++ b/chart2/source/model/filter/makefile.mk @@ -36,6 +36,7 @@ TARGET= chmodelfilter PRJINC= $(PRJ)$/source ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx index 08dda3aa2693..b2b8ae8a84cc 100644 --- a/chart2/source/model/main/_serviceregistration_model.cxx +++ b/chart2/source/model/main/_serviceregistration_model.cxx @@ -190,13 +190,13 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_model[] = extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { return (::cppu::component_writeInfoHelper( @@ -206,7 +206,7 @@ sal_Bool SAL_CALL component_writeInfo( ChartTypeEntriesForServiceRegistration::getImplementationEntries() )); } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pResult = ::cppu::component_getFactoryHelper( diff --git a/chart2/source/model/main/makefile.mk b/chart2/source/model/main/makefile.mk index 775e7b60e9b9..409e29eaca7d 100644 --- a/chart2/source/model/main/makefile.mk +++ b/chart2/source/model/main/makefile.mk @@ -36,6 +36,7 @@ TARGET= chmodelmain PRJINC= $(PRJ)$/source ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/model/makefile.mk b/chart2/source/model/makefile.mk index 8639fdb2c5c3..4d70f1048d68 100644 --- a/chart2/source/model/makefile.mk +++ b/chart2/source/model/makefile.mk @@ -35,6 +35,7 @@ TARGET= chartmodel USE_DEFFILE= TRUE ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/model/template/makefile.mk b/chart2/source/model/template/makefile.mk index 6e469bd0eba9..0913c42a89e2 100644 --- a/chart2/source/model/template/makefile.mk +++ b/chart2/source/model/template/makefile.mk @@ -36,6 +36,7 @@ TARGET= chmodeltemplate PRJINC= $(PRJ)$/source ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index fe5b23eab2ec..6f873b98580e 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -467,8 +467,7 @@ LifeTimeGuard::~LifeTimeGuard() try { //do acquire the mutex if it was cleared before - if(!pT) - reset(); + osl::MutexGuard g(m_rManager.m_aAccessMutex); if(m_bCallRegistered) { //Mutex needs to be acquired exactly ones diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx index 1726a0540ac2..475dfaac5bc3 100644 --- a/chart2/source/tools/_serviceregistration_tools.cxx +++ b/chart2/source/tools/_serviceregistration_tools.cxx @@ -40,6 +40,7 @@ #include "RegressionCurveModel.hxx" #include "RegressionEquation.hxx" #include "InternalDataProvider.hxx" +#include "charttoolsdllapi.hxx" static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] = { @@ -179,20 +180,20 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] = extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +OOO_DLLPUBLIC_CHARTTOOLS void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries_chart2_tools ); } //================================================================================================== -void * SAL_CALL component_getFactory( +OOO_DLLPUBLIC_CHARTTOOLS void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/chart2/source/tools/makefile.mk b/chart2/source/tools/makefile.mk index a6e05c8e9a68..62e2771e64cc 100644 --- a/chart2/source/tools/makefile.mk +++ b/chart2/source/tools/makefile.mk @@ -37,11 +37,14 @@ PRJINC= $(PRJ)$/source USE_DEFFILE= TRUE ENABLE_EXCEPTIONS= TRUE +VISIBILITY_HIDDEN= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: $(PRJ)$/util$/makefile.pmk +CDEFS += -DOOO_DLLIMPLEMENTATION_CHARTTOOLS + # --- export library ------------------------------------------------- #You can use several library macros of this form to build libraries that diff --git a/chart2/source/view/axes/makefile.mk b/chart2/source/view/axes/makefile.mk index ebf6d4a9054c..52996a78c8cd 100644 --- a/chart2/source/view/axes/makefile.mk +++ b/chart2/source/view/axes/makefile.mk @@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE: $(PRJ)$/chartview.pmk + #.IF "$(GUI)" == "WNT" #CFLAGS+=-GR #.ENDIF @@ -61,7 +63,6 @@ SLOFILES = \ $(SLO)$/VPolarRadiusAxis.obj \ $(SLO)$/VPolarGrid.obj \ $(SLO)$/VPolarCoordinateSystem.obj \ - $(SLO)$/ExplicitCategoriesProvider.obj \ $(SLO)$/VCoordinateSystem.obj # --- Targets ----------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/makefile.mk b/chart2/source/view/charttypes/makefile.mk index 2eab57590554..434db9304788 100644 --- a/chart2/source/view/charttypes/makefile.mk +++ b/chart2/source/view/charttypes/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE: $(PRJ)$/chartview.pmk # --- export library ------------------------------------------------- diff --git a/chart2/source/view/diagram/makefile.mk b/chart2/source/view/diagram/makefile.mk index 94a4ad939cb0..0be65486a0c5 100644 --- a/chart2/source/view/diagram/makefile.mk +++ b/chart2/source/view/diagram/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE: $(PRJ)$/chartview.pmk # --- export library ------------------------------------------------- diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index 472d90a81ec1..7a0cde2ab3fb 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -51,20 +51,20 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_view[] = extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries_chart2_view ); } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/chart2/source/view/main/makefile.mk b/chart2/source/view/main/makefile.mk index 22ad29caa86c..8726b7e03f1a 100644 --- a/chart2/source/view/main/makefile.mk +++ b/chart2/source/view/main/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE: $(PRJ)$/chartview.pmk # --- export library ------------------------------------------------- diff --git a/chart2/source/view/makefile.mk b/chart2/source/view/makefile.mk index 538b53c5d53a..4f74241075fe 100644 --- a/chart2/source/view/makefile.mk +++ b/chart2/source/view/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: $(PRJ)$/util$/makefile.pmk +.INCLUDE: $(PRJ)$/chartview.pmk # --- export library ------------------------------------------------- diff --git a/sc/source/ui/vba/makefile.mk b/sc/source/ui/vba/makefile.mk index c529e9abe764..99aa230e93ac 100644 --- a/sc/source/ui/vba/makefile.mk +++ b/sc/source/ui/vba/makefile.mk @@ -34,6 +34,7 @@ PRJ=..$/..$/.. PRJNAME=sc TARGET=vbaobj ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index b8241626dd86..cb30bbcf8a93 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -62,14 +62,14 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { OSL_TRACE("In component_getImplementationEnv"); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { OSL_TRACE("In component_writeInfo"); @@ -98,7 +98,7 @@ extern "C" return sal_False; } - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/sc/util/makefile.pmk b/sc/util/makefile.pmk index 579474da0d39..237d49cf8a7f 100644 --- a/sc/util/makefile.pmk +++ b/sc/util/makefile.pmk @@ -33,15 +33,4 @@ INCPRE+=$(SOLARINCDIR)$/offuh # define SC_DLLIMPLEMENTATION (see @ scdllapi.h) CDEFS += -DSC_DLLIMPLEMENTATION -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGS += -fvisibility=hidden -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" -CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 +VISIBILITY_HIDDEN=TRUE diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk index e4a215bc1de2..72cdad75d317 100644 --- a/sccomp/source/solver/makefile.mk +++ b/sccomp/source/solver/makefile.mk @@ -34,6 +34,7 @@ PRJNAME=sccomp TARGET=solver ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE USE_DEFFILE=TRUE LIBTARGET=NO diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 9506ebb7926a..96644ae79423 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -647,7 +647,7 @@ uno::Reference<uno::XInterface> SolverComponent_createInstance( const uno::Refer extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -655,7 +655,7 @@ extern "C" // ------------------------------------------------------------------------- - sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) { if (pRegistryKey) { @@ -683,7 +683,7 @@ extern "C" // ------------------------------------------------------------------------- - void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { OUString aImplName( OUString::createFromAscii( pImplName ) ); void* pRet = 0; |