diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-08-18 14:14:47 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-08-18 14:14:47 +0200 |
commit | d4cf8c2518c77631f91db8564bf3a506f0ab8e70 (patch) | |
tree | 7bb7d8e7097ead135608ec1dce4886116859b983 /sd/inc/CustomAnimationPreset.hxx | |
parent | 2d73a9d7e8541397595021377ee67c56e6d22c03 (diff) |
Generally better to have DLLPUBLIC class with some DLLPRIVATE members
...in the same vein as 80a1a2599e04142683d2286d0e32d0e13fb45de3.
Change-Id: I330665957aec2c9b98c7aff7fa7f25525e4cdf7d
Diffstat (limited to 'sd/inc/CustomAnimationPreset.hxx')
-rw-r--r-- | sd/inc/CustomAnimationPreset.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index efe50de9d87f..26e949550fcd 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -88,38 +88,38 @@ struct PresetCategory typedef boost::shared_ptr< PresetCategory > PresetCategoryPtr; typedef std::vector< PresetCategoryPtr > PresetCategoryList; -class CustomAnimationPresets +class SD_DLLPUBLIC CustomAnimationPresets { public: - CustomAnimationPresets(); - virtual ~CustomAnimationPresets(); + SAL_DLLPRIVATE CustomAnimationPresets(); + SAL_DLLPRIVATE virtual ~CustomAnimationPresets(); - void init(); + SAL_DLLPRIVATE void init(); - SD_DLLPUBLIC static const CustomAnimationPresets& getCustomAnimationPresets(); + static const CustomAnimationPresets& getCustomAnimationPresets(); - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const; + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const; - SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const OUString& rPresetId ) const; + CustomAnimationPresetPtr getEffectDescriptor( const OUString& rPresetId ) const; - const OUString& getUINameForPresetId( const OUString& rPresetId ) const; - const OUString& getUINameForProperty( const OUString& rProperty ) const; + SAL_DLLPRIVATE const OUString& getUINameForPresetId( const OUString& rPresetId ) const; + SAL_DLLPRIVATE const OUString& getUINameForProperty( const OUString& rProperty ) const; - const PresetCategoryList& getEntrancePresets() const { return maEntrancePresets; } - const PresetCategoryList& getEmphasisPresets() const { return maEmphasisPresets; } - const PresetCategoryList& getExitPresets() const { return maExitPresets; } - const PresetCategoryList& getMotionPathsPresets() const { return maMotionPathsPresets; } - const PresetCategoryList& getMiscPresets() const { return maMiscPresets; } + SAL_DLLPRIVATE const PresetCategoryList& getEntrancePresets() const { return maEntrancePresets; } + SAL_DLLPRIVATE const PresetCategoryList& getEmphasisPresets() const { return maEmphasisPresets; } + SAL_DLLPRIVATE const PresetCategoryList& getExitPresets() const { return maExitPresets; } + SAL_DLLPRIVATE const PresetCategoryList& getMotionPathsPresets() const { return maMotionPathsPresets; } + SAL_DLLPRIVATE const PresetCategoryList& getMiscPresets() const { return maMiscPresets; } - void changePresetSubType( CustomAnimationEffectPtr pEffect, const OUString& rPresetSubType ) const; + SAL_DLLPRIVATE void changePresetSubType( CustomAnimationEffectPtr pEffect, const OUString& rPresetSubType ) const; private: - void importEffects(); - void importResources(); + SAL_DLLPRIVATE void importEffects(); + SAL_DLLPRIVATE void importResources(); - void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap ); + SAL_DLLPRIVATE void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap ); - const OUString& translateName( const OUString& rId, const UStringMap& rNameMap ) const; + SAL_DLLPRIVATE const OUString& translateName( const OUString& rId, const UStringMap& rNameMap ) const; private: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode; @@ -133,7 +133,7 @@ private: PresetCategoryList maMotionPathsPresets; PresetCategoryList maMiscPresets; - static CustomAnimationPresets* mpCustomAnimationPresets; + SAL_DLLPRIVATE static CustomAnimationPresets* mpCustomAnimationPresets; }; typedef boost::shared_ptr< CustomAnimationPresets > CustomAnimationPresetsPtr; |