diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-06-04 09:41:18 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-06-04 09:41:18 +0000 |
| commit | a3acf41195f4c39cba7950c389dc817b824f76ed (patch) | |
| tree | 18166c83c4ed3fe7d971b9e17f5bce1e0f031df2 /chart2/source/inc | |
| parent | ce3275ad4a2c96c8178b3764c05085f9c8ad1265 (diff) | |
CWS-TOOLING: integrate CWS chart37
2009-05-22 09:10:36 +0200 iha r272170 : #i102130# color of pies is not loaded correctly
2009-04-27 17:16:20 +0200 iha r271294 : #i24203# compiler problem
2009-04-27 16:43:21 +0200 iha r271292 : #i101281# missing API documentation for secondary axis title properties
2009-04-27 15:26:05 +0200 hde r271276 : #i100987
2009-04-27 15:24:42 +0200 hde r271273 : #i100987
2009-04-24 15:08:33 +0200 iha r271214 : #i100995# crash with some logarithmic scalings
2009-04-22 18:50:56 +0200 dr r271134 : #i82177# write out deleted point labels
2009-04-22 18:40:48 +0200 iha r271133 : #i101281# missing API documentation for secondary axis title properties
2009-04-22 16:39:42 +0200 dr r271128 : #i82177# extensions for bubble charts
2009-04-22 14:37:00 +0200 dr r271114 : #i82177# import/export data label type and separator
2009-04-22 14:36:24 +0200 dr r271113 : #i82177# import/export data label type and separator
2009-04-21 15:25:26 +0200 dr r271038 : #i82177# import data label type and separator from BIFF8 CHFR records
2009-04-21 14:37:16 +0200 dr r271037 : #i82177# dump BIFF8 chart future records
2009-04-20 17:44:27 +0200 iha r271002 : #i96898# reduce library exports
2009-04-20 13:01:13 +0200 iha r270975 : #i24203# rotate data labels - help ids
2009-04-20 11:40:33 +0200 dr r270969 : #i96600# export of axis scaling/positioning properties
2009-04-16 16:02:31 +0200 dr r270892 : #i69599# keep Y axis left in 3d charts
2009-04-15 18:16:46 +0200 dr r270859 : #i69599# import of axis position settings
2009-04-15 18:16:01 +0200 dr r270858 : #i69599# correct handling of logarithmic crossing axes
2009-04-14 16:27:48 +0200 dr r270794 : #i96599# handle auto axis position on logarithmic axes
2009-04-09 19:59:51 +0200 dr r270722 : #i96599# import axis crossing settings, fix import of logarithmic scaling settings
2009-04-09 18:26:00 +0200 iha r270720 : #i96898# reduce library exports
2009-04-09 15:17:04 +0200 iha r270710 : #i96898# reduce library exports
2009-04-09 10:50:14 +0200 dr r270682 : #i24203# import/export of data label rotation, fixed some other broken stuff too
2009-04-08 16:54:54 +0200 dr r270657 : #i24203# import rotation for data point labels
2009-04-06 18:19:17 +0200 iha r270571 : #i100876# Axis scaling settings dialog wrong after API usage (anys different from double type)
2009-04-06 15:57:05 +0200 iha r270567 : #i100105# #i58585# leftover ->
2009-04-06 15:55:48 +0200 iha r270564 : #i58585# leftover ->
2009-04-02 16:41:07 +0200 iha r270422 : #i99721# remove unused code
2009-04-02 14:29:03 +0200 iha r270407 : #i99721# remove unused code
2009-03-26 10:58:23 +0100 iha r270059 : #i96898# reduce library exports
2009-03-26 10:13:49 +0100 iha r270055 : #i96898# reduce library exports
2009-03-25 09:39:13 +0100 iha r269998 : CWS-TOOLING: rebase CWS chart37 to trunk@269781 (milestone: DEV300:m44)
2009-03-24 17:56:56 +0100 iha r269986 : #i96898# reduce library exports
2009-03-24 16:56:44 +0100 iha r269974 : #i99721# remove unused code
2009-03-24 16:48:48 +0100 iha r269970 : #i89731# remove unused string
2009-03-24 15:44:04 +0100 iha r269961 : remove unused code
2009-03-24 15:22:45 +0100 iha r269959 : remove unused code
2009-03-24 15:17:17 +0100 iha r269957 : remove unused code
2009-03-24 11:14:53 +0100 iha r269923 : #i24203# rotate data labels
2009-03-09 12:10:25 +0100 hde r269076 : #i99300#
2009-03-06 15:56:26 +0100 iha r269011 : #i93953# Source Format for secondary axis without data
2009-02-17 15:59:05 +0100 iha r268177 : avoid warning during build
2009-02-17 15:01:59 +0100 iha r268173 : avoid warning during build
2009-02-13 09:39:03 +0100 ufi r267693 : i96999
2009-02-11 15:12:35 +0100 iha r267604 : removed unused string
2009-02-11 14:00:29 +0100 iha r267600 : #i96999# Corrected wording from 'correlation coefficient' to 'coefficient of determination'
2009-02-11 10:56:45 +0100 iha r267584 : #i89731# typo in resource string
2009-02-11 10:01:29 +0100 iha r267582 : #i89031# compile error on asian windows systems
2009-02-10 16:15:16 +0100 iha r267552 : #i24203# rotate data labels
2009-02-04 18:00:33 +0100 iha r267395 : #i98893# don't export defaults to file
2009-02-04 15:48:15 +0100 iha r267390 : #i92128# asian typography for chart elements
2009-02-04 15:17:41 +0100 iha r267386 : #i92128# asian typography for chart elements
2009-01-30 14:41:10 +0100 iha r267197 : CWS-TOOLING: rebase CWS chart37 to trunk@267171 (milestone: DEV300:m41)
Diffstat (limited to 'chart2/source/inc')
50 files changed, 196 insertions, 222 deletions
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index a6b91481af8a..d6d7e14bc7d3 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -51,6 +51,9 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS AxisHelper { public: + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > createLinearScaling(); + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > createLogarithmicScaling( double fBase = 10.0 ); + static ::com::sun::star::chart2::ScaleData createDefaultScale(); static void removeExplicitScaling( ::com::sun::star::chart2::ScaleData& rScaleData ); @@ -95,14 +98,14 @@ public: static sal_Bool isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ); - static void makeAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); + SAL_DLLPRIVATE static void makeAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); static void makeGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); - static void makeAxisInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); - static void makeGridInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); + SAL_DLLPRIVATE static void makeAxisInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); + SAL_DLLPRIVATE static void makeGridInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); - static sal_Bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties ); - static sal_Bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); + SAL_DLLPRIVATE static sal_Bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties ); + SAL_DLLPRIVATE static sal_Bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); static sal_Bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties ); static ::com::sun::star::uno::Reference< @@ -187,7 +190,7 @@ public: /** @param bOnlyVisible if </TRUE>, only axes with property "Show" set to </TRUE> are returned */ - static std::vector< + SAL_DLLPRIVATE static std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > > getAllAxesOfCoordinateSystem( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx index 3544f5678462..675b2ff5acd5 100644 --- a/chart2/source/inc/BaseGFXHelper.hxx +++ b/chart2/source/inc/BaseGFXHelper.hxx @@ -68,17 +68,15 @@ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Rectangle B2IRectangleToAWTRectangle( const ::basegfx::B2IRectangle& rB2IRectangle ); -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( +::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection ); -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rB3DVector ); -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Position3DToB3DVector( +::basegfx::B3DVector Position3DToB3DVector( const com::sun::star::drawing::Position3D& rPosition ); -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rB3DVector ); @@ -95,7 +93,6 @@ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DTuple GetRotationFromMatrix( OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DTuple GetScaleFromMatrix( const ::basegfx::B3DHomMatrix & rB3DMatrix ); -OOO_DLLPUBLIC_CHARTTOOLS void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix ); OOO_DLLPUBLIC_CHARTTOOLS double Deg2Rad( double fDegrees ); diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index bf60ba3e1930..22b2c9311085 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -37,7 +37,6 @@ #include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> #include "ServiceMacros.hxx" -#include "charttoolsdllapi.hxx" // interfaces and types #include <com/sun/star/lang/XServiceInfo.hpp> @@ -69,7 +68,7 @@ typedef ::cppu::WeakComponentImplHelper7< CachedDataSequence_Base; } -class OOO_DLLPUBLIC_CHARTTOOLS CachedDataSequence : +class CachedDataSequence : public ::comphelper::OMutexAndBroadcastHelper, public ::comphelper::OPropertyContainer, public ::comphelper::OPropertyArrayUsageHelper< CachedDataSequence >, @@ -84,25 +83,11 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); - /** creates a sequence and initializes it with the given vector of floating - point numbers - */ - explicit CachedDataSequence( const ::std::vector< double > & rVector ); - - /** creates a sequence and initializes it with the given vector of strings - */ - explicit CachedDataSequence( const ::std::vector< ::rtl::OUString > & rVector ); - /** creates a sequence and initializes it with the given string. This is especially useful for labels, which only have one element. */ explicit CachedDataSequence( const ::rtl::OUString & rSingleText ); - /** creates a sequence and initializes it with the given vector of arbitrary - content - */ - explicit CachedDataSequence( const ::std::vector< ::com::sun::star::uno::Any > & rVector ); - /// Copy CTOR explicit CachedDataSequence( const CachedDataSequence & rSource ); @@ -181,6 +166,7 @@ protected: */ void registerProperties(); +private: /** is used by interface method getNumericalData(). */ ::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const; diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index 092f614846b7..ae32f29ba20f 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -121,6 +121,7 @@ public: PROP_CHAR_COMPLEX_WEIGHT, PROP_CHAR_COMPLEX_POSTURE, PROP_CHAR_COMPLEX_LOCALE, + PROP_PARA_IS_CHARACTER_DISTANCE, PROP_WRITING_MODE, diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 797db8fe8d01..fa80d00413f7 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -34,6 +34,12 @@ #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/chart2/XUndoManager.hpp> +#include <com/sun/star/chart2/data/XDataProvider.hpp> +#include <com/sun/star/chart2/data/XRangeHighlighter.hpp> +#include <com/sun/star/chart/XChartDataArray.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> + #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/frame/XModel.hpp> #include "charttoolsdllapi.hxx" @@ -52,6 +58,19 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS ChartModelHelper { public: + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XUndoManager > createUndoManager(); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > createRangeHighlighter( + const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier >& xSelectionSupplier ); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > createInternalDataProvider(); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > createInternalDataProvider( + const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataArray >& xDataToCopy ); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > createInternalDataProvider( + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > findDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); @@ -60,7 +79,7 @@ public: ::com::sun::star::chart2::XDiagram > findDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); - static ::std::vector< ::com::sun::star::uno::Reference< + SAL_DLLPRIVATE static ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > getDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc ); diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index f99d39f63bcb..efa4758c4ccd 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -76,12 +76,12 @@ public: static ::com::sun::star::uno::Sequence < sal_Int32 > getSupportedMissingValueTreatments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static ::com::sun::star::drawing::Direction3D getDefaultSimpleLightDirection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static ::com::sun::star::drawing::Direction3D getDefaultRealisticLightDirection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static sal_Int32 getDefaultDirectLightColor( bool bSimple, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static sal_Int32 getDefaultAmbientLightColor( bool bSimple, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + SAL_DLLPRIVATE static ::com::sun::star::drawing::Direction3D getDefaultSimpleLightDirection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + SAL_DLLPRIVATE static ::com::sun::star::drawing::Direction3D getDefaultRealisticLightDirection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + SAL_DLLPRIVATE static sal_Int32 getDefaultDirectLightColor( bool bSimple, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + SAL_DLLPRIVATE static sal_Int32 getDefaultAmbientLightColor( bool bSimple, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); static sal_Int32 getNumberOfDisplayedSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nNumberOfSeries ); - static bool noBordersForSimpleScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + SAL_DLLPRIVATE static bool noBordersForSimpleScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); static sal_Int32 //one of ::com::sun::star::chart2::AxisType getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index a18757f4f8b7..c1391d9837cd 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -56,7 +56,7 @@ public: // returns true if AttributedDataPoints contains nPointIndex and the // property Color is DEFAULT - static bool hasPointOwnProperties( + SAL_DLLPRIVATE static bool hasPointOwnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesProperties , sal_Int32 nPointIndex ); diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index f27bad5a719c..102ffde71918 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -101,23 +101,11 @@ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D B3DVectorToDirecti OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); //----------------------------------------------------------------------------- -/** Direction3D -> B3DPoint -*/ -OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Direction3DToB3DPoint( const com::sun::star::drawing::Direction3D& rDirection); - -//----------------------------------------------------------------------------- /** Direction3D -> B3DVector */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection); //----------------------------------------------------------------------------- -/** two drawing::Position3D -> 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 @@ -168,21 +156,6 @@ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D , const com::sun::star::drawing::Direction3D& rDirection); //----------------------------------------------------------------------------- -/** Direction3D + Direction3D == 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 -*/ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D - operator-( const com::sun::star::drawing::Position3D& rPos - , const com::sun::star::drawing::Direction3D& rDirection); - - -//----------------------------------------------------------------------------- /** Position3D - Position3D == Direction3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D @@ -190,13 +163,6 @@ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D , const com::sun::star::drawing::Position3D& rPos2); //----------------------------------------------------------------------------- -/** Direction3D * double == Direction3D -*/ -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D - operator*( const com::sun::star::drawing::Direction3D& rDirection - , double fFraction); - -//----------------------------------------------------------------------------- /** Position3D == Position3D ? */ OOO_DLLPUBLIC_CHARTTOOLS @@ -242,13 +208,6 @@ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > Position3DToSequence( const com::sun::star::drawing::Position3D& rPosition ); //----------------------------------------------------------------------------- -/** drawing::Direction3D / double -*/ - -OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D - operator/( const com::sun::star::drawing::Direction3D& rDirection, double f ); - -//----------------------------------------------------------------------------- /** chart2::XDataSequence -> uno::Sequence< double > */ diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 7a27f93f338c..3fe9355fd8cb 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -44,12 +44,17 @@ namespace chart { + +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme > createConfigColorScheme( + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XComponentContext > & xContext ); + namespace impl { class ChartConfigItem; } -class OOO_DLLPUBLIC_CHARTTOOLS ConfigColorScheme : +class ConfigColorScheme : public ConfigItemListener, public ::cppu::WeakImplHelper2< ::com::sun::star::chart2::XColorScheme, @@ -59,7 +64,7 @@ public: explicit ConfigColorScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); - virtual ~ConfigColorScheme(); + SAL_DLLPRIVATE virtual ~ConfigColorScheme(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( ConfigColorScheme ) @@ -68,14 +73,14 @@ public: protected: // ____ XColorScheme ____ - virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) + SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::uno::RuntimeException); // ____ ConfigItemListener ____ - virtual void notify( const ::rtl::OUString & rPropertyName ); + SAL_DLLPRIVATE virtual void notify( const ::rtl::OUString & rPropertyName ); private: - void retrieveConfigColors(); + SAL_DLLPRIVATE void retrieveConfigColors(); // member variables ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index b7bf17def1cb..0440018d2c72 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -67,8 +67,8 @@ public: ::com::sun::star::frame::XModel > & xModel ); ~ControllerLockHelper(); - void lockControllers(); - void unlockControllers(); + SAL_DLLPRIVATE void lockControllers(); + SAL_DLLPRIVATE void unlockControllers(); private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 6434eb75ecec..ae179e5c5e83 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -50,7 +50,7 @@ namespace chart namespace DataSeriesHelper { -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString GetRole( +::rtl::OUString GetRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence ); diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 286e6b6116e1..555bbad847c4 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -37,12 +37,11 @@ #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include "ServiceMacros.hxx" -#include "charttoolsdllapi.hxx" namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS DataSource : public +class 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 40b03034fcf7..c2f29e42c6ba 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -34,11 +34,11 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> -#ifndef _COM_SUN_STAR_CHART2_XLABELEDDATASEQUENCE_HPP_ #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> + #include "charttoolsdllapi.hxx" #include <vector> @@ -55,6 +55,30 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS DataSourceHelper { public: + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > + createDataSource( const ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< + ::com::sun::star::chart2::data::XLabeledDataSequence > > & rSequences ); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > + createCachedDataSequence(); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > + createCachedDataSequence( const ::rtl::OUString & rSingleText ); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + createLabeledDataSequence( + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues , + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xLabels ); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + createLabeledDataSequence( + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues ); + + static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + createLabeledDataSequence( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > createArguments( bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ); @@ -65,7 +89,7 @@ public: const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ); - static void readArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments + SAL_DLLPRIVATE static void readArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments , ::rtl::OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories ); @@ -79,7 +103,7 @@ public: ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence , ::std::vector< ::rtl::OUString >& rOutRangeRepresentations ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); @@ -127,11 +151,11 @@ public: static bool allArgumentsForRectRangeDetected( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromLabeledDataSequence( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromLabeledDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromDataSource( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xSource ); }; diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index ae650e0a4898..119d206a2937 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -157,7 +157,7 @@ public: /** Replaces all occurences of xCooSysToReplace in the tree with xReplacement in the diagram's tree */ - static void replaceCoordinateSystem( + SAL_DLLPRIVATE static void replaceCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram, const ::com::sun::star::uno::Reference< @@ -230,12 +230,12 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc ); - static ::com::sun::star::uno::Sequence< rtl::OUString > + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< rtl::OUString > generateAutomaticCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCooSys ); - static void generateAutomaticCategoriesFromChartType( + SAL_DLLPRIVATE static void generateAutomaticCategoriesFromChartType( ::com::sun::star::uno::Sequence< rtl::OUString >& rRet, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); @@ -251,7 +251,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); - static bool areChartTypesCompatible( const ::com::sun::star::uno::Reference< + SAL_DLLPRIVATE static bool areChartTypesCompatible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xFirstType, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xSecondType ); diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 041e4aa6a5ab..4b586aefc8a9 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -50,6 +50,10 @@ namespace chart { +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createErrorBar( + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XComponentContext > & xContext ); + namespace impl { typedef ::cppu::WeakImplHelper6< @@ -62,7 +66,7 @@ typedef ::cppu::WeakImplHelper6< ErrorBar_Base; } -class OOO_DLLPUBLIC_CHARTTOOLS ErrorBar : +class 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 12a98e4fca47..a6d8926d36ac 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -49,10 +49,10 @@ class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider : public: ExplicitCategoriesProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel ); - virtual ~ExplicitCategoriesProvider(); + SAL_DLLPRIVATE virtual ~ExplicitCategoriesProvider(); //XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() + SAL_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); static ::rtl::OUString getCategoryByIndex( diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index 20c58c31b458..fe7734730a45 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -31,12 +31,11 @@ #define CHART2_EXPONENTIALREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" -#include "charttoolsdllapi.hxx" namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS ExponentialRegressionCurveCalculator : +class ExponentialRegressionCurveCalculator : public RegressionCurveCalculator { public: diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 5a7afc62c5fe..9bf598441b3a 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -41,7 +41,6 @@ #include <com/sun/star/util/XCloneable.hpp> #include <cppuhelper/implbase6.hxx> #include "ServiceMacros.hxx" -#include "charttoolsdllapi.hxx" #include "CachedDataSequence.hxx" @@ -75,7 +74,7 @@ typedef ::cppu::WeakImplHelper6< <p>The format for a complete range is "all". (Do we need more than that?)</p> */ -class OOO_DLLPUBLIC_CHARTTOOLS InternalDataProvider : +class InternalDataProvider : public impl::InternalDataProvider_Base { public: diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 23cfb7bb2743..3eba45bd2df9 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -31,7 +31,6 @@ #define CHART2_LABELEDDATASEQUENCE_HXX #include "ServiceMacros.hxx" #include "MutexContainer.hxx" -#include "charttoolsdllapi.hxx" #include <comphelper/uno3.hxx> #include <cppuhelper/implbase4.hxx> @@ -56,7 +55,7 @@ typedef cppu::WeakImplHelper4< LabeledDataSequence_Base; } -class OOO_DLLPUBLIC_CHARTTOOLS LabeledDataSequence : +class LabeledDataSequence : public MutexContainer, public impl::LabeledDataSequence_Base { diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 6b08c33b89da..26b9f09f7880 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -46,17 +46,17 @@ namespace apphelper { class LifeTimeGuard; -class OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager +class LifeTimeManager { friend class LifeTimeGuard; protected: mutable ::osl::Mutex m_aAccessMutex; public: - LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False ); - virtual ~LifeTimeManager(); +OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False ); +OOO_DLLPUBLIC_CHARTTOOLS virtual ~LifeTimeManager(); - sal_Bool impl_isDisposed(); - sal_Bool dispose() throw(::com::sun::star::uno::RuntimeException); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool impl_isDisposed(); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool dispose() throw(::com::sun::star::uno::RuntimeException); public: ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; @@ -85,7 +85,7 @@ protected: sal_Int32 volatile m_nLongLastingCallCount; }; -class OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager : public LifeTimeManager +class CloseableLifeTimeManager : public LifeTimeManager { protected: ::com::sun::star::util::XCloseable* m_pCloseable; @@ -103,19 +103,19 @@ protected: sal_Bool volatile m_bOwnershipIsWellKnown; public: - CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable +OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable , ::com::sun::star::lang::XComponent* pComponent , sal_Bool bLongLastingCallsCancelable = sal_False ); - virtual ~CloseableLifeTimeManager(); +OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); - sal_Bool impl_isDisposedOrClosed(); - sal_Bool g_close_startTryClose(sal_Bool bDeliverOwnership) +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool impl_isDisposedOrClosed(); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_startTryClose(sal_Bool bDeliverOwnership) throw ( ::com::sun::star::uno::Exception ); - sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex ) +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex ) throw ( ::com::sun::star::util::CloseVetoException ); - void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); - void g_close_endTryClose_doClose(); - sal_Bool g_addCloseListener( const ::com::sun::star::uno::Reference< +OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); +OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); +OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) throw(::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/inc/LineProperties.hxx b/chart2/source/inc/LineProperties.hxx index 9a4a978c09ce..3cc60c5f3aa7 100644 --- a/chart2/source/inc/LineProperties.hxx +++ b/chart2/source/inc/LineProperties.hxx @@ -62,9 +62,9 @@ public: static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); - static bool IsLineVisible( const ::com::sun::star::uno::Reference< + SAL_DLLPRIVATE static bool IsLineVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xLineProperties ); - static void SetLineVisible( const ::com::sun::star::uno::Reference< + SAL_DLLPRIVATE static void SetLineVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xLineProperties ); static void SetLineInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xLineProperties ); diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index 55147aa5874d..ad79a887c019 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -31,12 +31,11 @@ #define CHART2_LINEARREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" -#include "charttoolsdllapi.hxx" namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS LinearRegressionCurveCalculator : +class LinearRegressionCurveCalculator : public RegressionCurveCalculator { public: diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index 2913d9401b98..b0274600d543 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -31,12 +31,11 @@ #define CHART2_LOGARITHMICREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" -#include "charttoolsdllapi.hxx" namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS LogarithmicRegressionCurveCalculator : +class LogarithmicRegressionCurveCalculator : public RegressionCurveCalculator { public: diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index ea02d6a4fef5..8febb3d6078c 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -31,12 +31,11 @@ #define CHART2_MEANVALUEREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" -#include "charttoolsdllapi.hxx" namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS MeanValueRegressionCurveCalculator : +class MeanValueRegressionCurveCalculator : public RegressionCurveCalculator { public: diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 403c842fa45b..35cc90d30ca7 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -202,7 +202,7 @@ public: sal_Bool ISSET_SetEmbedded; protected: - void impl_init(); +SAL_DLLPRIVATE void impl_init(); }; } diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index a664816930f8..92e7a778348c 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -53,11 +53,11 @@ public: virtual ~ModifyListenerCallBack(); void startListening( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >& xBroadcaster ); - void stopListening(); + SAL_DLLPRIVATE void stopListening(); private: //methods - ModifyListenerCallBack(); - ModifyListenerCallBack( const ModifyListenerCallBack& ); + SAL_DLLPRIVATE ModifyListenerCallBack(); + SAL_DLLPRIVATE ModifyListenerCallBack( const ModifyListenerCallBack& ); private: //member ModifyListenerCallBack_impl* pModifyListener_impl; diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 7c02d0356299..fa2977fd1b44 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -58,6 +58,8 @@ namespace chart namespace ModifyListenerHelper { +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > createModifyEventForwarder(); + // ================================================================================ /** This helper class serves as forwarder of modify events. It can be used @@ -68,7 +70,7 @@ namespace ModifyListenerHelper life time of the listeners is independent of the broadcaster's lifetime in this case.</p> */ -class OOO_DLLPUBLIC_CHARTTOOLS ModifyEventForwarder : +class ModifyEventForwarder : public MutexContainer, public ::cppu::WeakComponentImplHelper2< ::com::sun::star::util::XModifyBroadcaster, @@ -77,8 +79,6 @@ class OOO_DLLPUBLIC_CHARTTOOLS ModifyEventForwarder : public: ModifyEventForwarder(); - void FireEvent( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XWeak > & xSource ); void FireEvent( const ::com::sun::star::lang::EventObject & rEvent ); void AddListener( diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 104fd941f217..9a55884d9535 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -45,6 +45,9 @@ namespace chart { //............................................................................. +OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer( + const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName ); + namespace impl { typedef ::cppu::WeakImplHelper3< @@ -54,7 +57,7 @@ typedef ::cppu::WeakImplHelper3< NameContainer_Base; } -class OOO_DLLPUBLIC_CHARTTOOLS NameContainer : public impl::NameContainer_Base +class 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 c2e54d41da5f..00517f87c61a 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -80,6 +80,8 @@ public: protected: explicit OPropertySet( const OPropertySet & rOther, ::osl::Mutex & rMutex ); + void SetNewValuesExplicitlyEvenIfTheyEqualDefault(); + /** implement this method to provide default values for all properties supporting defaults. If a property does not have a default value, you may throw an UnknownPropertyException. @@ -311,6 +313,7 @@ private: /// pImpl idiom implementation ::std::auto_ptr< impl::ImplOPropertySet > m_pImplProperties; + bool m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault; }; } // namespace property diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 973e896f846a..7793cd57d21e 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -124,13 +124,7 @@ public: ::com::sun::star::frame::XModel >& xChartModel , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc - static rtl::OUString createClassifiedIdentifierForAxis( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XAxis >& xAxis - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); - - static rtl::OUString createParticleForDiagram( + SAL_DLLPRIVATE static rtl::OUString createParticleForDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram , const ::com::sun::star::uno::Reference< @@ -195,7 +189,7 @@ public: static rtl::OUString createDataCurveCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine ); static rtl::OUString createDataCurveEquationCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex ); - static rtl::OUString getObjectID( const rtl::OUString& rCID ); + SAL_DLLPRIVATE static rtl::OUString getObjectID( const rtl::OUString& rCID ); static rtl::OUString getParticleID( const rtl::OUString& rCID ); static rtl::OUString getFullParentParticle( const rtl::OUString& rCID ); diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index ea3e621bf6e8..f5b8a7c7428f 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -37,7 +37,7 @@ namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS PotentialRegressionCurveCalculator : +class PotentialRegressionCurveCalculator : public RegressionCurveCalculator { public: diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 4bf0dc4e158e..caa424dc4f05 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -31,7 +31,6 @@ #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> @@ -56,7 +55,7 @@ typedef ::cppu::WeakComponentImplHelper2< RangeHighlighter_Base; } -class OOO_DLLPUBLIC_CHARTTOOLS RangeHighlighter : +class RangeHighlighter : public MutexContainer, public impl::RangeHighlighter_Base { diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 6d8612d79f73..c6505c4d3796 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -64,7 +64,6 @@ public: ::com::sun::star::chart2::XChartDocument > & xChartDoc ); ::com::sun::star::awt::Size getPageSize() const; - bool useAutoScale() const; /** Retrieves the state auto-resize from all objects that support this feature. If all objects return the same state, AUTO_RESIZE_YES or @@ -78,11 +77,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc ); - /** Retrieves the current auto-resize state from the internally set chart - document - */ - AutoResizeState getAutoResizeState() const; - /** sets or resets the auto-resize at all objects that support this feature for text to the opposite of the current setting. If the current state is ambiguous, it is turned on. If the current state is unknown it stays @@ -90,16 +84,12 @@ public: */ void toggleAutoResizeState(); - /** sets the auto-resize at all objects that support this feature for text. - eNewState must be either AUTO_RESIZE_YES or AUTO_RESIZE_NO - */ - void setAutoResizeState( AutoResizeState eNewState ); /** Sets the ReferencePageSize according to the internal settings of this class at the XPropertySet, and the adapted font sizes if bAdaptFontSizes is </TRUE>. */ - void setValuesAtPropertySet( + SAL_DLLPRIVATE void setValuesAtPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xProp, bool bAdaptFontSizes = true ); @@ -108,7 +98,7 @@ public: class at the XTitle, and the adapted font sizes at the contained XFormattedStrings */ - void setValuesAtTitle( + SAL_DLLPRIVATE void setValuesAtTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > & xTitle ); @@ -118,6 +108,14 @@ public: */ void setValuesAtAllDataSeries(); +private: + SAL_DLLPRIVATE bool useAutoScale() const; + + /** sets the auto-resize at all objects that support this feature for text. + eNewState must be either AUTO_RESIZE_YES or AUTO_RESIZE_NO + */ + SAL_DLLPRIVATE void setAutoResizeState( AutoResizeState eNewState ); + /** Retrieves the auto-resize state from the given propertyset. The result will be put into eInOutState. If you initialize eInOutState with AUTO_RESIZE_UNKNOWN, you will get the actual state. If you pass any @@ -125,23 +123,15 @@ public: esp. AUTO_RESIZE_AMBIGUOUS, if the value was NO before, and is YES for the current property set, or the other way round. */ - static void getAutoResizeFromPropSet( + SAL_DLLPRIVATE static void getAutoResizeFromPropSet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xProp, AutoResizeState & rInOutState ); - /** calls getAutoResizeFromPropSet with the title's property set - */ - static void getAutoResizeFromTitle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle > & xTitle, - AutoResizeState & rInOutState ); - -private: - void impl_setValuesAtTitled( + SAL_DLLPRIVATE void impl_setValuesAtTitled( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitled > & xTitled ); - static void impl_getAutoResizeFromTitled( + SAL_DLLPRIVATE static void impl_getAutoResizeFromTitled( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitled > & xTitled, AutoResizeState & rInOutState ); diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 8ca8849c6bf0..0168ca2f57ba 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -34,12 +34,11 @@ #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> -#include "charttoolsdllapi.hxx" namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS RegressionCurveCalculator : public +class 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 8cfe8b6f9ac8..3f18fa6c46c8 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -49,14 +49,14 @@ class OOO_DLLPUBLIC_CHARTTOOLS RegressionCurveHelper { public: /// returns a model mean-value line - static ::com::sun::star::uno::Reference< + SAL_DLLPRIVATE static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > createMeanValueLine( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); /// returns a model regression curve - static ::com::sun::star::uno::Reference< + SAL_DLLPRIVATE static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > createRegressionCurveByServiceName( const ::com::sun::star::uno::Reference< @@ -187,7 +187,7 @@ public: If false, the sequence (1, 2, 3, ...) will always be used, even if there is a data-sequence with role "values-x" */ - static void initializeCurveCalculator( + SAL_DLLPRIVATE static void initializeCurveCalculator( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 628fd0fdd017..e8e7dde535b5 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -77,7 +77,7 @@ public: been changed to the given one. The passed object size is taken into account for shifting the position. */ - static ::com::sun::star::chart2::RelativePosition + SAL_DLLPRIVATE static ::com::sun::star::chart2::RelativePosition getReanchoredPosition( const ::com::sun::star::chart2::RelativePosition & rPosition, const ::com::sun::star::chart2::RelativeSize & rObjectSize, diff --git a/chart2/source/inc/RessourceManager.hxx b/chart2/source/inc/RessourceManager.hxx index a0d12cf2ed07..6cefa1a23d02 100644 --- a/chart2/source/inc/RessourceManager.hxx +++ b/chart2/source/inc/RessourceManager.hxx @@ -38,7 +38,7 @@ class ResMgr; namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS RessourceManager +class RessourceManager { public: static ::ResMgr & getRessourceManager(); diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 31b32cac65e9..8f5e83c5254e 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -30,7 +30,6 @@ #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> @@ -46,7 +45,7 @@ namespace chart /** */ -class OOO_DLLPUBLIC_CHARTTOOLS LogarithmicScaling : +class LogarithmicScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, @@ -67,13 +66,12 @@ public: APPHELPER_XSERVICEINFO_DECL() // ____ XScaling ____ - virtual double SAL_CALL - doScaling( double value ) + virtual double SAL_CALL doScaling( double value ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ virtual ::rtl::OUString SAL_CALL getServiceName() @@ -88,7 +86,7 @@ private: // ---------------------------------------- -class OOO_DLLPUBLIC_CHARTTOOLS ExponentialScaling : +class ExponentialScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, @@ -129,7 +127,7 @@ private: // ---------------------------------------- -class OOO_DLLPUBLIC_CHARTTOOLS LinearScaling : public ::cppu::WeakImplHelper3 < +class LinearScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, ::com::sun::star::lang::XServiceInfo @@ -150,13 +148,12 @@ public: APPHELPER_XSERVICEINFO_DECL() // ____ XScaling ____ - virtual double SAL_CALL - doScaling( double value ) + virtual double SAL_CALL doScaling( double value ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ virtual ::rtl::OUString SAL_CALL getServiceName() @@ -171,7 +168,7 @@ private: // ---------------------------------------- -class OOO_DLLPUBLIC_CHARTTOOLS PowerScaling : public ::cppu::WeakImplHelper3 < +class 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/Strings.hrc b/chart2/source/inc/Strings.hrc index 78b53e9807f4..0af8f7e1ae04 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.hrc @@ -33,7 +33,8 @@ // this includes no link dependency #include <svtools/solar.hrc> -//next is 281 +//single free is: 134 +//next free is 282 //#define RID_APP_START 30000 ////#define STR_NULL (RID_APP_START + 1) @@ -149,7 +150,7 @@ #define STR_INDICATE_BOTH (RID_APP_START + 131) #define STR_INDICATE_UP (RID_APP_START + 132) #define STR_INDICATE_DOWN (RID_APP_START + 133) -#define STR_REGRESSION_NONE (RID_APP_START + 134) + #define STR_REGRESSION_LINEAR (RID_APP_START + 135) #define STR_REGRESSION_LOG (RID_APP_START + 136) #define STR_REGRESSION_EXP (RID_APP_START + 137) @@ -287,6 +288,7 @@ #define STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE (RID_APP_START + 266) #define STR_PAGE_POSITIONING (RID_APP_START + 277) +#define STR_PAGE_ASIAN (RID_APP_START + 281) //----------------------------------------------------------------------------- //strings used as description for actions on toolbar icons, as tip help or for undo diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index cb860a193b73..62eaba4ffa77 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -105,7 +105,7 @@ public: sal_Int32 nElevationDeg, sal_Int32 nRotationDeg , double& rfXAngleRad, double& rfYAngleRad, double& rfZAngleRad ); - static void convertXYZAngleRadToElevationRotationDeg( + SAL_DLLPRIVATE static void convertXYZAngleRadToElevationRotationDeg( sal_Int32& rnElevationDeg, sal_Int32& rnRotationDeg , double fXRad, double fYRad, double fZRad ); @@ -116,8 +116,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSceneProperties , double fCameraDistance ); - static void ensureCameraDistanceRange( double& rfCameraDistance ); - static void getCameraDistanceRange( double& rfMinimumDistance, double& rfMaximumDistance ); + SAL_DLLPRIVATE static void ensureCameraDistanceRange( double& rfCameraDistance ); + SAL_DLLPRIVATE static void getCameraDistanceRange( double& rfMinimumDistance, double& rfMaximumDistance ); static double CameraDistanceToPerspective( double fCameraDistance ); static double PerspectiveToCameraDistance( double fPerspective ); diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 3a46ebed6008..2a5e23602738 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -73,7 +73,7 @@ typedef ::cppu::WeakComponentImplHelper8< UncachedDataSequence_Base; } -class OOO_DLLPUBLIC_CHARTTOOLS UncachedDataSequence : +class 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 98cffab939af..cdefdcd44c41 100644 --- a/chart2/source/inc/UndoGuard.hxx +++ b/chart2/source/inc/UndoGuard.hxx @@ -41,7 +41,7 @@ namespace chart { /** Base Class for UndoGuard and UndoLiveUpdateGuard */ -class OOO_DLLPUBLIC_CHARTTOOLS UndoGuard_Base +class UndoGuard_Base { public: explicit UndoGuard_Base( const rtl::OUString & rUndoMessage @@ -51,7 +51,7 @@ public: ::com::sun::star::frame::XModel > & xModel ); virtual ~UndoGuard_Base(); - void commitAction(); +OOO_DLLPUBLIC_CHARTTOOLS void commitAction(); protected: ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/UndoManager.hxx b/chart2/source/inc/UndoManager.hxx index d8c1690963ff..6c71e668a2b5 100644 --- a/chart2/source/inc/UndoManager.hxx +++ b/chart2/source/inc/UndoManager.hxx @@ -32,7 +32,6 @@ #include "ConfigItemListener.hxx" #include "MutexContainer.hxx" -#include "charttoolsdllapi.hxx" #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -82,7 +81,7 @@ typedef ::cppu::WeakComponentImplHelper3< redo-stacks support the css::util::XCloneable interface, which is implemented such that the entire model is cloned. */ -class OOO_DLLPUBLIC_CHARTTOOLS UndoManager : +class UndoManager : public MutexContainer, public ConfigItemListener, public impl::UndoManager_Base diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index cd5f472c12a0..936e6e4ab4cf 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -36,7 +36,6 @@ #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase1.hxx> -#include "charttoolsdllapi.hxx" namespace chart { @@ -94,7 +93,7 @@ private: // -------------------------------------------------------------------------------- -class OOO_DLLPUBLIC_CHARTTOOLS WeakModifyListenerAdapter : +class WeakModifyListenerAdapter : public WeakListenerAdapter< ::com::sun::star::util::XModifyListener > { public: @@ -110,7 +109,7 @@ protected: // -------------------------------------------------------------------------------- -class OOO_DLLPUBLIC_CHARTTOOLS WeakSelectionChangeListenerAdapter : +class WeakSelectionChangeListenerAdapter : public WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener > { public: diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 168967aa7fbf..db45c5291a9a 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -52,13 +52,13 @@ public: virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const +SAL_DLLPRIVATE virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const +SAL_DLLPRIVATE virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const +SAL_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); protected: @@ -72,8 +72,8 @@ public: static void addIgnoreLineProperties( std::vector< WrappedProperty* >& rList ); static void addIgnoreFillProperties( std::vector< WrappedProperty* >& rList ); - static void addIgnoreFillProperties_without_BitmapProperties( std::vector< WrappedProperty* >& rList ); - static void addIgnoreFillProperties_only_BitmapProperties( std::vector< WrappedProperty* >& rList ); + SAL_DLLPRIVATE static void addIgnoreFillProperties_without_BitmapProperties( std::vector< WrappedProperty* >& rList ); + SAL_DLLPRIVATE static void addIgnoreFillProperties_only_BitmapProperties( std::vector< WrappedProperty* >& rList ); }; //............................................................................. diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 99aaadcd3c11..3a6f19b06473 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -116,11 +116,11 @@ protected: //methods virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() = 0; - ::com::sun::star::uno::Reference< + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > getInnerPropertyState(); ::cppu::IPropertyArrayHelper& getInfoHelper(); - tWrappedPropertyMap& getWrappedPropertyMap(); + SAL_DLLPRIVATE tWrappedPropertyMap& getWrappedPropertyMap(); const WrappedProperty* getWrappedProperty( const ::rtl::OUString& rOuterName ); const WrappedProperty* getWrappedProperty( sal_Int32 nHandle ); diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index 3e948c4567fc..32bb08f4a552 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -65,10 +65,8 @@ struct OOO_DLLPUBLIC_CHARTTOOLS CellRange ::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/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 10ddc9657c7b..caec07d58a15 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -62,15 +62,15 @@ private: DrawModelWrapper(); public: - DrawModelWrapper(::com::sun::star::uno::Reference< + SAL_DLLPRIVATE DrawModelWrapper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext ); - virtual ~DrawModelWrapper(); + SAL_DLLPRIVATE virtual ~DrawModelWrapper(); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getShapeFactory(); // the main page will contain the normal view objects ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getMainDrawPage(); - void clearMainDrawPage(); + SAL_DLLPRIVATE void clearMainDrawPage(); // the extra page is not visible, but contains some extras like the symbols for data points ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getHiddenDrawPage(); @@ -80,25 +80,25 @@ public: ::com::sun::star::drawing::XDrawPage>& xPage ); - void lockControllers(); - void unlockControllers(); + SAL_DLLPRIVATE void lockControllers(); + SAL_DLLPRIVATE void unlockControllers(); /// tries to get an OutputDevice from the XParent of the model to use as reference device - void attachParentReferenceDevice( + SAL_DLLPRIVATE void attachParentReferenceDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel ); OutputDevice* getReferenceDevice() const; SfxItemPool& GetItemPool(); - const SfxItemPool& GetItemPool() const; + SAL_DLLPRIVATE const SfxItemPool& GetItemPool() const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getUnoModel(); SdrModel& getSdrModel(); - void updateTablesFromChartModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); + SAL_DLLPRIVATE void updateTablesFromChartModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); XColorTable* GetColorTable() const; XDashList* GetDashList() const; diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index 645e25166594..2f96bed91fa5 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -91,7 +91,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); - static sal_Int32 getPercentNumberFormat( const ::com::sun::star::uno::Reference< + SAL_DLLPRIVATE static sal_Int32 getPercentNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); static sal_Int32 getExplicitNumberFormatKeyForLabel( diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx index 71a6f20acb0d..0305ffdfd905 100644 --- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx @@ -64,7 +64,7 @@ private: //private member }; -class OOO_DLLPUBLIC_CHARTVIEW FixedNumberFormatter +class FixedNumberFormatter { public: FixedNumberFormatter( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier |