Generally better to have DLLPUBLIC class with some DLLPRIVATE members

...in the same vein as 80a1a259.

Change-Id: I330665957aec2c9b98c7aff7fa7f25525e4cdf7d

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;

sd/inc/anminfo.hxx

@@ -31,7 +31,7 @@
 class SdrObject;
 class SdrPathObj;
 
-class SdAnimationInfo : public SdrObjUserData
+class SD_DLLPUBLIC SdAnimationInfo : public SdrObjUserData
 {
 public:
     PresObjKind             mePresObjKind;
@@ -60,14 +60,14 @@ public:
     sal_uLong                   mnPresOrder;
     SdrObject&                  mrObject;
 
-    SD_DLLPUBLIC void           SetBookmark( const OUString& rBookmark );
-    SD_DLLPUBLIC OUString       GetBookmark();
+    void           SetBookmark( const OUString& rBookmark );
+    OUString       GetBookmark();
 public:
-                            SdAnimationInfo(SdrObject& rObject);
-                            SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject);
-    virtual                 ~SdAnimationInfo();
+                            SAL_DLLPRIVATE SdAnimationInfo(SdrObject& rObject);
+                            SAL_DLLPRIVATE SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject);
+    SAL_DLLPRIVATE virtual                 ~SdAnimationInfo();
 
-    virtual SdrObjUserData* Clone(SdrObject* pObject) const SAL_OVERRIDE;
+    SAL_DLLPRIVATE virtual SdrObjUserData* Clone(SdrObject* pObject) const SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_SD_INC_ANMINFO_HXX