Generally better to have DLLPUBLIC class with some DLLPRIVATE members

...in the same vein as 80a1a2599e04142683d2286d0e32d0e13fb45de3.

Change-Id: I5ffb27f0bc965aede03e6d1e849cd68ef6e16e2a

3 files changed, 129 insertions, 129 deletions

diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 02c49007720b..8ab32cf2c55e 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -71,7 +71,7 @@ struct SvxMSDffTextRectangles;
 
 class SdrPathObj;
 
-class EnhancedCustomShape2d : public SfxItemSet
+class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet
 {
         SdrObject*                  pCustomShapeObj;
         MSO_SPT                     eSpType;
@@ -99,7 +99,7 @@ class EnhancedCustomShape2d : public SfxItemSet
         /*
 
         */
-        struct EquationResult {
+        struct SAL_DLLPRIVATE EquationResult {
             bool bReady;
             double fValue;
         };
@@ -123,27 +123,27 @@ class EnhancedCustomShape2d : public SfxItemSet
         bool                    bFlipV;
         sal_Int32               nRotateAngle;
 
-        bool                    SetAdjustValueAsDouble( const double& rValue, const sal_Int32 nIndex );
-        sal_Int32                   GetLuminanceChange( sal_uInt32 nIndex ) const;
-        Color                       GetColorData( const Color& rFillColor, sal_uInt32 nIndex, double dBrightness ) const;
-        void                        AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet,
+        SAL_DLLPRIVATE bool     SetAdjustValueAsDouble( const double& rValue, const sal_Int32 nIndex );
+        SAL_DLLPRIVATE sal_Int32 GetLuminanceChange( sal_uInt32 nIndex ) const;
+        SAL_DLLPRIVATE Color    GetColorData( const Color& rFillColor, sal_uInt32 nIndex, double dBrightness ) const;
+        SAL_DLLPRIVATE void     AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet,
                                                   sal_uInt32& nColorIndex, sal_uInt32 nColorCount);
-        bool                    GetParameter( double& rParameterReturnValue,  const com::sun::star::drawing::EnhancedCustomShapeParameter&,
+        SAL_DLLPRIVATE bool     GetParameter( double& rParameterReturnValue,  const com::sun::star::drawing::EnhancedCustomShapeParameter&,
                                                   const bool bReplaceGeoWidth, const bool bReplaceGeoHeight ) const;
-        Point                       GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair&,
+        SAL_DLLPRIVATE Point    GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair&,
                                                     const bool bScale = true, const bool bReplaceGeoSize = false ) const;
 
-        void                        CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegmentInd, std::vector< SdrPathObj* >& rObjectList,
+        SAL_DLLPRIVATE void     CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegmentInd, std::vector< SdrPathObj* >& rObjectList,
                                                    bool bLineGeometryNeededOnly, bool bSortFilledObjectsToBack,
                                                    sal_Int32 nIndex );
-        SdrObject*                  CreatePathObj( bool bLineGeometryNeededOnly );
-        const sal_Int32*            ApplyShapeAttributes( const SdrCustomShapeGeometryItem& rItem );
+        SAL_DLLPRIVATE SdrObject* CreatePathObj( bool bLineGeometryNeededOnly );
+        SAL_DLLPRIVATE const sal_Int32* ApplyShapeAttributes( const SdrCustomShapeGeometryItem& rItem );
 
-        void                        SetPathSize( sal_Int32 nIndex = 0 );
+        SAL_DLLPRIVATE void     SetPathSize( sal_Int32 nIndex = 0 );
 
     public :
 
-        struct Handle
+        struct SAL_DLLPRIVATE Handle
         {
             sal_uInt32  nFlags;
 
@@ -179,24 +179,24 @@ class EnhancedCustomShape2d : public SfxItemSet
             }
         };
 
-        bool                        IsFlipVert() { return bFlipV; };
-        bool                        IsFlipHorz() { return bFlipH; };
-        sal_Int32                   GetRotateAngle() { return nRotateAngle; };
-        SVX_DLLPUBLIC bool          IsPostRotate() const;
+        SAL_DLLPRIVATE bool     IsFlipVert() { return bFlipV; };
+        SAL_DLLPRIVATE bool     IsFlipHorz() { return bFlipH; };
+        SAL_DLLPRIVATE sal_Int32 GetRotateAngle() { return nRotateAngle; };
+        bool                    IsPostRotate() const;
 
-        SVX_DLLPUBLIC SdrObject*                CreateLineGeometry();
-        SVX_DLLPUBLIC SdrObject*                CreateObject( bool bLineGeometryNeededOnly );
-        SVX_DLLPUBLIC void                      ApplyGluePoints( SdrObject* pObj );
-        SVX_DLLPUBLIC Rectangle                 GetTextRect() const;
+        SdrObject*              CreateLineGeometry();
+        SdrObject*              CreateObject( bool bLineGeometryNeededOnly );
+        void                    ApplyGluePoints( SdrObject* pObj );
+        Rectangle               GetTextRect() const;
 
-        SVX_DLLPUBLIC sal_uInt32                GetHdlCount() const;
-        SVX_DLLPUBLIC bool                  GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const;
-        SVX_DLLPUBLIC bool                  SetHandleControllerPosition( const sal_uInt32 nIndex, const com::sun::star::awt::Point& rPosition );
+        sal_uInt32              GetHdlCount() const;
+        bool                    GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const;
+        bool                    SetHandleControllerPosition( const sal_uInt32 nIndex, const com::sun::star::awt::Point& rPosition );
 
-        SVX_DLLPUBLIC EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape );
-        SVX_DLLPUBLIC virtual ~EnhancedCustomShape2d();
+        EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape );
+        virtual ~EnhancedCustomShape2d();
 
-        enum EnumFunc
+        enum SAL_DLLPRIVATE EnumFunc
         {
             ENUM_FUNC_PI,
             ENUM_FUNC_LEFT,
@@ -212,25 +212,25 @@ class EnhancedCustomShape2d : public SfxItemSet
             ENUM_FUNC_LOGWIDTH,
             ENUM_FUNC_LOGHEIGHT
         };
-        double                      GetEnumFunc( const EnumFunc eVal ) const;
+        SAL_DLLPRIVATE double   GetEnumFunc( const EnumFunc eVal ) const;
 
-        double                      GetAdjustValueAsDouble( const sal_Int32 nIndex ) const;
-        double                      GetEquationValueAsDouble( const sal_Int32 nIndex ) const;
-        sal_Int32                   GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const;
+        SAL_DLLPRIVATE double   GetAdjustValueAsDouble( const sal_Int32 nIndex ) const;
+        SAL_DLLPRIVATE double   GetEquationValueAsDouble( const sal_Int32 nIndex ) const;
+        SAL_DLLPRIVATE sal_Int32 GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const;
 
-        SVX_DLLPUBLIC static OUString      GetEquation( const sal_uInt16 nFlags, sal_Int32 nPara1, sal_Int32 nPara2, sal_Int32 nPara3 );
+        static OUString         GetEquation( const sal_uInt16 nFlags, sal_Int32 nPara1, sal_Int32 nPara2, sal_Int32 nPara3 );
 
-        static void                 AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int32 nPara, const bool bIsSpecialValue );
+        SAL_DLLPRIVATE static void AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int32 nPara, const bool bIsSpecialValue );
 
-        static void                 SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
+        SAL_DLLPRIVATE static void SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
                                         rParameter, const sal_Int16 nPara, const bool bIsSpecialValue );
-        SVX_DLLPUBLIC static void                   SetEnhancedCustomShapeParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
+        static void             SetEnhancedCustomShapeParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
                                         rParameter, const sal_Int32 nValue );
-        SVX_DLLPUBLIC static void                   SetEnhancedCustomShapeHandleParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
+        static void             SetEnhancedCustomShapeHandleParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
                                         rParameter, const sal_Int32 nPara, const bool bIsSpecialValue, bool bHorz );
-        static bool             ConvertSequenceToEnhancedCustomShape2dHandle( const com::sun::star::beans::PropertyValues& rHandleProperties,
+        SAL_DLLPRIVATE static bool ConvertSequenceToEnhancedCustomShape2dHandle( const com::sun::star::beans::PropertyValues& rHandleProperties,
                                         EnhancedCustomShape2d::Handle& rDestinationHandle );
-        static void                 SwapStartAndEndArrow( SdrObject* pObj );
+        SAL_DLLPRIVATE static void SwapStartAndEndArrow( SdrObject* pObj );
 };
 #endif
 
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 1a496dc45709..75cb64e13f32 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -94,7 +94,7 @@ class SfxListener;
 class GalleryTheme;
 class GalleryThemeCacheEntry;
 
-class Gallery : public SfxBroadcaster
+class SVX_DLLPUBLIC Gallery : public SfxBroadcaster
 {
     // only for gengal utility!
     friend Gallery* createGallery( const OUString& );
@@ -111,43 +111,43 @@ private:
     rtl_TextEncoding            nReadTextEncoding;
     bool                        bMultiPath;
 
-    void                        ImplLoad( const OUString& rMultiPath );
-    void                        ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbIsReadOnly );
+    SAL_DLLPRIVATE void         ImplLoad( const OUString& rMultiPath );
+    SAL_DLLPRIVATE void         ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbIsReadOnly );
 
-    SVX_DLLPUBLIC GalleryThemeEntry*            ImplGetThemeEntry( const OUString& rThemeName );
-    GalleryThemeEntry*          ImplGetThemeEntry( sal_uIntPtr nThemeId );
+    GalleryThemeEntry*          ImplGetThemeEntry( const OUString& rThemeName );
+    SAL_DLLPRIVATE GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId );
 
-    GalleryTheme*               ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry );
-    void                        ImplDeleteCachedTheme( GalleryTheme* pTheme );
+    SAL_DLLPRIVATE GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry );
+    SAL_DLLPRIVATE void         ImplDeleteCachedTheme( GalleryTheme* pTheme );
 
-                                SVX_DLLPUBLIC Gallery( const OUString& rMultiPath );
-                                SVX_DLLPUBLIC virtual ~Gallery();
+                                Gallery( const OUString& rMultiPath );
+                                virtual ~Gallery();
 
 public:
 
-    SVX_DLLPUBLIC static Gallery* GetGalleryInstance();
+    static Gallery*             GetGalleryInstance();
 
-    size_t                      GetThemeCount() const { return aThemeList.size(); }
-    const GalleryThemeEntry*    GetThemeInfo( size_t nPos )
+    SAL_DLLPRIVATE size_t       GetThemeCount() const { return aThemeList.size(); }
+    SAL_DLLPRIVATE const GalleryThemeEntry* GetThemeInfo( size_t nPos )
                                 { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; }
-    const GalleryThemeEntry*    GetThemeInfo( const OUString& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
+    SAL_DLLPRIVATE const GalleryThemeEntry* GetThemeInfo( const OUString& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
 
-    SVX_DLLPUBLIC bool          HasTheme( const OUString& rThemeName );
-    OUString                    GetThemeName( sal_uIntPtr nThemeId ) const;
+    bool                        HasTheme( const OUString& rThemeName );
+    SAL_DLLPRIVATE OUString     GetThemeName( sal_uIntPtr nThemeId ) const;
 
-    SVX_DLLPUBLIC bool          CreateTheme( const OUString& rThemeName );
-    bool                        RenameTheme( const OUString& rOldName, const OUString& rNewName );
-    SVX_DLLPUBLIC bool          RemoveTheme( const OUString& rThemeName );
+    bool                        CreateTheme( const OUString& rThemeName );
+    SAL_DLLPRIVATE bool         RenameTheme( const OUString& rOldName, const OUString& rNewName );
+    bool                        RemoveTheme( const OUString& rThemeName );
 
-    SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const OUString& rThemeName, SfxListener& rListener );
-    SVX_DLLPUBLIC void          ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener );
+    GalleryTheme*               AcquireTheme( const OUString& rThemeName, SfxListener& rListener );
+    void                        ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener );
 
 public:
 
-    const INetURLObject&        GetUserURL() const { return aUserURL; }
-    const INetURLObject&        GetRelativeURL() const { return aRelURL; }
+    SAL_DLLPRIVATE const INetURLObject& GetUserURL() const { return aUserURL; }
+    SAL_DLLPRIVATE const INetURLObject& GetRelativeURL() const { return aRelURL; }
 
-    bool                        IsMultiPath() const { return bMultiPath; }
+    SAL_DLLPRIVATE bool         IsMultiPath() const { return bMultiPath; }
 };
 
 #endif // INCLUDED_SVX_GALLERY1_HXX
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 548aca7d223f..ba8c5bb17974 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -86,7 +86,7 @@ namespace unogallery
     class GalleryItem;
 }
 
-class GalleryTheme : public SfxBroadcaster
+class SVX_DLLPUBLIC GalleryTheme : public SfxBroadcaster
 {
     friend class Gallery;
     friend class GalleryThemeCacheEntry;
@@ -107,127 +107,127 @@ private:
     bool                        bDragging;
     bool                        bAbortActualize;
 
-    void                        ImplCreateSvDrawStorage();
-    SVX_DLLPUBLIC SgaObject*                    ImplReadSgaObject( GalleryObject* pEntry );
-    bool                        ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry );
-    void                        ImplWrite();
-    const GalleryObject*        ImplGetGalleryObject( size_t nPos ) const
+    SAL_DLLPRIVATE void         ImplCreateSvDrawStorage();
+    SgaObject*                  ImplReadSgaObject( GalleryObject* pEntry );
+    SAL_DLLPRIVATE bool         ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry );
+    SAL_DLLPRIVATE void         ImplWrite();
+    SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject( size_t nPos ) const
                                 { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : NULL; }
-    SVX_DLLPUBLIC const GalleryObject*      ImplGetGalleryObject( const INetURLObject& rURL );
+    const GalleryObject*        ImplGetGalleryObject( const INetURLObject& rURL );
 
-    size_t                      ImplGetGalleryObjectPos( const GalleryObject* pObj ) const
+    SAL_DLLPRIVATE size_t       ImplGetGalleryObjectPos( const GalleryObject* pObj ) const
                                 {
                                     for ( size_t i = 0, n = aObjectList.size(); i < n; ++i )
                                         if ( pObj == aObjectList[ i ] )
                                             return i;
                                     return size_t(-1);
                                 }
-    INetURLObject               ImplGetURL( const GalleryObject* pObject ) const;
-    INetURLObject               ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN );
-    void                        ImplSetModified( bool bModified );
-    void                        ImplBroadcast( sal_uIntPtr nUpdatePos );
+    SAL_DLLPRIVATE INetURLObject ImplGetURL( const GalleryObject* pObject ) const;
+    SAL_DLLPRIVATE INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN );
+    SAL_DLLPRIVATE void         ImplSetModified( bool bModified );
+    SAL_DLLPRIVATE void         ImplBroadcast( sal_uIntPtr nUpdatePos );
 
-                                GalleryTheme();
-                                GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry );
-                                virtual ~GalleryTheme();
+    SAL_DLLPRIVATE              GalleryTheme();
+    SAL_DLLPRIVATE              GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry );
+    SAL_DLLPRIVATE              virtual ~GalleryTheme();
 
 public:
 
-    static GalleryThemeEntry*   CreateThemeEntry( const INetURLObject& rURL, bool bReadOnly );
+    SAL_DLLPRIVATE static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, bool bReadOnly );
 
-    size_t                      GetObjectCount() const { return aObjectList.size(); }
+    SAL_DLLPRIVATE size_t       GetObjectCount() const { return aObjectList.size(); }
 
-    SVX_DLLPUBLIC SgaObject*    AcquireObject( size_t nPos );
-    SVX_DLLPUBLIC void          ReleaseObject( SgaObject* pObj );
+    SgaObject*                  AcquireObject( size_t nPos );
+    void                        ReleaseObject( SgaObject* pObj );
 
-    SVX_DLLPUBLIC bool          InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = CONTAINER_APPEND );
-    SVX_DLLPUBLIC bool          RemoveObject( size_t nPos );
-    bool                        ChangeObjectPos( size_t nOldPos, size_t nNewPos );
+    bool                        InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = CONTAINER_APPEND );
+    bool                        RemoveObject( size_t nPos );
+    SAL_DLLPRIVATE bool         ChangeObjectPos( size_t nOldPos, size_t nNewPos );
 
-    SVX_DLLPUBLIC const OUString& GetName() const;
-    const OUString&        GetRealName() const;
+    const OUString&             GetName() const;
+    SAL_DLLPRIVATE const OUString& GetRealName() const;
 
     // used for building gallery themes during compilation:
-    const OUString&             GetDestDir() const { return m_aDestDir; }
-    void                        SetDestDir(const OUString& rDestDir, bool bRelative = true)
+    SAL_DLLPRIVATE const OUString& GetDestDir() const { return m_aDestDir; }
+    SAL_DLLPRIVATE void         SetDestDir(const OUString& rDestDir, bool bRelative = true)
                                 { m_aDestDir = rDestDir; m_bDestDirRelative = bRelative; }
 
-    const INetURLObject&        GetThmURL() const;
-    SVX_DLLPUBLIC const INetURLObject&      GetSdgURL() const;
-    const INetURLObject&        GetSdvURL() const;
+    SAL_DLLPRIVATE const INetURLObject& GetThmURL() const;
+    const INetURLObject&        GetSdgURL() const;
+    SAL_DLLPRIVATE const INetURLObject& GetSdvURL() const;
 
-    SVX_DLLPUBLIC sal_uInt32    GetId() const;
-    void                        SetId( sal_uInt32 nNewId, bool bResetThemeName );
+    sal_uInt32                  GetId() const;
+    SAL_DLLPRIVATE void         SetId( sal_uInt32 nNewId, bool bResetThemeName );
 
-    void                        SetDragging( bool bSet ) { bDragging = bSet; }
-    bool                        IsDragging() const { return bDragging; }
+    SAL_DLLPRIVATE void         SetDragging( bool bSet ) { bDragging = bSet; }
+    SAL_DLLPRIVATE bool         IsDragging() const { return bDragging; }
 
-    void                        LockTheme() { ++mnThemeLockCount; }
-    bool                        UnlockTheme();
+    SAL_DLLPRIVATE void         LockTheme() { ++mnThemeLockCount; }
+    SAL_DLLPRIVATE bool         UnlockTheme();
 
-    void                        LockBroadcaster() { mnBroadcasterLockCount++; }
-    SVX_DLLPUBLIC void          UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 );
-    bool                        IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
+    SAL_DLLPRIVATE void         LockBroadcaster() { mnBroadcasterLockCount++; }
+    void                        UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 );
+    SAL_DLLPRIVATE bool         IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
 
-    void                        SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; }
-    sal_uIntPtr                     GetDragPos() const { return nDragPos; }
+    SAL_DLLPRIVATE void         SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; }
+    SAL_DLLPRIVATE sal_uIntPtr  GetDragPos() const { return nDragPos; }
 
-    bool                        IsThemeNameFromResource() const;
+    SAL_DLLPRIVATE bool         IsThemeNameFromResource() const;
 
-    SVX_DLLPUBLIC bool          IsReadOnly() const;
-    SVX_DLLPUBLIC bool          IsDefault() const;
-    bool                        IsModified() const;
+    bool                        IsReadOnly() const;
+    bool                        IsDefault() const;
+    SAL_DLLPRIVATE bool         IsModified() const;
 
-    SVX_DLLPUBLIC void                      Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
-    void                        AbortActualize() { bAbortActualize = true; }
+    void                        Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
+    SAL_DLLPRIVATE void         AbortActualize() { bAbortActualize = true; }
 
-    Gallery*                    GetParent() const { return pParent; }
-    SotStorageRef               GetSvDrawStorage() const { return aSvDrawStorageRef; }
+    SAL_DLLPRIVATE Gallery*     GetParent() const { return pParent; }
+    SAL_DLLPRIVATE SotStorageRef GetSvDrawStorage() const { return aSvDrawStorageRef; }
 
 public:
 
-    SgaObjKind                  GetObjectKind( sal_uIntPtr nPos ) const
+    SAL_DLLPRIVATE SgaObjKind   GetObjectKind( sal_uIntPtr nPos ) const
                                 {
                                     DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" );
                                     return ImplGetGalleryObject( nPos )->eObjKind;
                                 }
 
 
-    const INetURLObject&        GetObjectURL( sal_uIntPtr nPos ) const
+    SAL_DLLPRIVATE const INetURLObject& GetObjectURL( sal_uIntPtr nPos ) const
                                 {
                                     DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" );
                                     return ImplGetGalleryObject( nPos )->aURL;
                                 }
 
-    bool                        GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, bool bProgress = false );
+    SAL_DLLPRIVATE bool         GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, bool bProgress = false );
 
-    SVX_DLLPUBLIC bool         GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgress = false );
-    SVX_DLLPUBLIC bool         InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    bool                        GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgress = false );
+    bool                        InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
 
-    SVX_DLLPUBLIC bool          GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool bProgress = false );
-    SVX_DLLPUBLIC bool          InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    bool                        GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool bProgress = false );
+    bool                        InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
 
-    bool                        GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, bool bProgress = false );
-    bool                        InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    SAL_DLLPRIVATE bool         GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, bool bProgress = false );
+    SAL_DLLPRIVATE bool         InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
 
-    bool                        GetURL( sal_uIntPtr nPos, INetURLObject& rURL, bool bProgress = false );
-    SVX_DLLPUBLIC bool          InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
-    bool                        InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    SAL_DLLPRIVATE bool         GetURL( sal_uIntPtr nPos, INetURLObject& rURL, bool bProgress = false );
+    bool                        InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    SAL_DLLPRIVATE bool         InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
 
-    bool                        InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos );
+    SAL_DLLPRIVATE bool         InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos );
 
-    void                        CopyToClipboard( Window* pWindow, sal_uIntPtr nPos );
-    void                        StartDrag( Window* pWindow, sal_uIntPtr nPos );
+    SAL_DLLPRIVATE void         CopyToClipboard( Window* pWindow, sal_uIntPtr nPos );
+    SAL_DLLPRIVATE void         StartDrag( Window* pWindow, sal_uIntPtr nPos );
 
 public:
 
-    SvStream&                   WriteData( SvStream& rOut ) const;
-    SvStream&                   ReadData( SvStream& rIn );
-    static SVX_DLLPUBLIC void   InsertAllThemes( ListBox& rListBox );
+    SAL_DLLPRIVATE SvStream&    WriteData( SvStream& rOut ) const;
+    SAL_DLLPRIVATE SvStream&    ReadData( SvStream& rIn );
+    static void                 InsertAllThemes( ListBox& rListBox );
 
     // for buffering PreviewBitmaps and strings for object and path
-    void GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const;
-    void SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString& rPath);
+    SAL_DLLPRIVATE void GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const;
+    SAL_DLLPRIVATE void SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString& rPath);
 };
 
 SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme );