[Libreoffice-commits] core.git: include/svx include/tools svx/source
Stephan Bergmann
sbergman at redhat.com
Thu Jul 3 08:53:29 PDT 2014
include/svx/EnhancedCustomShape2d.hxx | 76 +++++------
include/svx/gallery1.hxx | 46 +++---
include/svx/galtheme.hxx | 136 +++++++++----------
include/tools/rtti.hxx | 7 +
svx/source/inc/fmobj.hxx | 56 ++++----
svx/source/inc/fmshimp.hxx | 234 +++++++++++++++++-----------------
6 files changed, 281 insertions(+), 274 deletions(-)
New commits:
commit 6b322d0f9dab9973e73cea7f82a4b7adb20f74bd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jul 3 17:50:44 2014 +0200
Generally better to have DLLPUBLIC class with some DLLPRIVATE members
...in the same vein as 80a1a2599e04142683d2286d0e32d0e13fb45de3.
Change-Id: I5ffb27f0bc965aede03e6d1e849cd68ef6e16e2a
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 02c4900..8ab32cf 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 1a496dc..75cb64e 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 548aca7..ba8c5bb 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 );
diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx
index a1e79a4..0a5696b 100644
--- a/include/tools/rtti.hxx
+++ b/include/tools/rtti.hxx
@@ -46,6 +46,13 @@ typedef void* (*TypeId)();
visibility virtual TypeId Type() const SAL_OVERRIDE; \
visibility virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE
+#define TYPEINFO_VISIBILITY_OVERRIDE(visibility) \
+ visibility static void* CreateType(); \
+ visibility static TypeId StaticType(); \
+ visibility static bool IsOf( TypeId aSameOrSuperType ); \
+ visibility virtual TypeId Type() const SAL_OVERRIDE; \
+ visibility virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE
+
#define TYPEINIT_FACTORY(sType, Factory ) \
void* sType::CreateType() { return Factory; } \
TypeId sType::StaticType() { return &CreateType; } \
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 475bd50..606148f 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -27,7 +27,7 @@
// FmFormObj
-class FmFormObj: public SdrUnoObj
+class SVX_DLLPUBLIC FmFormObj: public SdrUnoObj
{
::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > aEvts; // events des Objects
::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor> m_aEventsHistory;
@@ -45,41 +45,41 @@ class FmFormObj: public SdrUnoObj
// only to be used for comparison with the current ref device!
public:
- SVX_DLLPUBLIC FmFormObj(const OUString& rModelName);
- SVX_DLLPUBLIC FmFormObj();
+ FmFormObj(const OUString& rModelName);
+ FmFormObj();
- TYPEINFO_OVERRIDE();
+ TYPEINFO_VISIBILITY_OVERRIDE(SAL_DLLPRIVATE);
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>&
+ SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>&
GetOriginalParent() const { return m_xParent; }
- const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >&
+ SAL_DLLPRIVATE const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >&
GetOriginalEvents() const { return aEvts; }
- sal_Int32
+ SAL_DLLPRIVATE sal_Int32
GetOriginalIndex() const { return m_nPos; }
- void SetObjEnv(
+ SAL_DLLPRIVATE void SetObjEnv(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xForm,
const sal_Int32 nIdx,
const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& rEvts );
- void ClearObjEnv();
+ SAL_DLLPRIVATE void ClearObjEnv();
public:
- virtual ~FmFormObj();
- virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual ~FmFormObj();
+ SAL_DLLPRIVATE virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE;
- virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE;
- virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
- virtual void NbcReformatText() SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void NbcReformatText() SAL_OVERRIDE;
- virtual FmFormObj* Clone() const SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual FmFormObj* Clone() const SAL_OVERRIDE;
// #116235# virtual SdrObject* Clone(SdrPage* pPage, SdrModel* pModel) const;
- FmFormObj& operator= (const FmFormObj& rObj);
+ SAL_DLLPRIVATE FmFormObj& operator= (const FmFormObj& rObj);
- virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE;
- virtual void clonedFrom(const FmFormObj* _pSource);
+ SAL_DLLPRIVATE virtual void clonedFrom(const FmFormObj* _pSource);
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> ensureModelEnv(
+ SAL_DLLPRIVATE static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> ensureModelEnv(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rSourceContainer,
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& _rTopLevelDestContainer);
@@ -89,28 +89,28 @@ public:
is a virtual object whose referenced object is an FmFormObj, then this referenced
object is returned. In all other cases, NULL is returned.
*/
- static FmFormObj* GetFormObject( SdrObject* _pSdrObject );
- static const FmFormObj* GetFormObject( const SdrObject* _pSdrObject );
+ SAL_DLLPRIVATE static FmFormObj* GetFormObject( SdrObject* _pSdrObject );
+ SAL_DLLPRIVATE static const FmFormObj* GetFormObject( const SdrObject* _pSdrObject );
- virtual void SetUnoControlModel( const ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& _rxModel ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SetUnoControlModel( const ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& _rxModel ) SAL_OVERRIDE;
protected:
- virtual bool EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) SAL_OVERRIDE;
- virtual void BrkCreate( SdrDragStat& rStat ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void BrkCreate( SdrDragStat& rStat ) SAL_OVERRIDE;
// #i70852# overload Layer interface to force to FormColtrol layer
- virtual SdrLayerID GetLayer() const SAL_OVERRIDE;
- virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual SdrLayerID GetLayer() const SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE;
private:
/** isolates the control model from its form component hierarchy, i.e. removes it from
its parent.
*/
- void impl_isolateControlModel_nothrow();
+ SAL_DLLPRIVATE void impl_isolateControlModel_nothrow();
/** forwards the reference device of our SdrModel to the control model
*/
- void impl_checkRefDevice_nothrow( bool _force = false );
+ SAL_DLLPRIVATE void impl_checkRefDevice_nothrow( bool _force = false );
};
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 906b9aa..d01a620 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -144,7 +144,7 @@ struct SdrViewEvent;
class FmFormShell;
class FmFormView;
class FmFormObj;
-class FmXFormShell :public FmXFormShell_BASE
+class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE
,public FmXFormShell_CFGBASE
,public ::svxform::OStaticDataAccessTools
,public ::svx::IControllerFeatureInvalidation
@@ -161,7 +161,7 @@ class FmXFormShell :public FmXFormShell_BASE
// We enable a permanent cursor for the grid we found a searched text, it's disabled in the next "found" event.
FmFormArray m_aSearchForms;
- struct InvalidSlotInfo {
+ struct SAL_DLLPRIVATE InvalidSlotInfo {
sal_uInt16 id;
sal_uInt8 flags;
inline InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {};
@@ -244,103 +244,103 @@ class FmXFormShell :public FmXFormShell_BASE
public:
// attribute access
- inline const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
+ SAL_DLLPRIVATE inline const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
getHostFrame() const { return m_xAttachedFrame; }
- inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >&
+ SAL_DLLPRIVATE inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >&
getExternallyDisplayedForm() const { return m_xExternalDisplayedForm; }
- inline bool
+ SAL_DLLPRIVATE inline bool
didPrepareClose() const { return m_bPreparedClose; }
- inline void
+ SAL_DLLPRIVATE inline void
didPrepareClose( bool _bDid ) { m_bPreparedClose = _bDid; }
public:
- FmXFormShell(FmFormShell& _rShell, SfxViewFrame* _pViewFrame);
+ SAL_DLLPRIVATE FmXFormShell(FmFormShell& _rShell, SfxViewFrame* _pViewFrame);
// UNO Anbindung
DECLARE_UNO3_DEFAULTS(FmXFormShell, FmXFormShell_BASE)
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
protected:
- virtual ~FmXFormShell();
+ SAL_DLLPRIVATE virtual ~FmXFormShell();
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// EventListener
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// ::com::sun::star::container::XContainerListener
- virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XSelectionChangeListener
- virtual void SAL_CALL selectionChanged(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL selectionChanged(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// ::com::sun::star::beans::XPropertyChangeListener
- virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// ::com::sun::star::form::XFormControllerListener
- virtual void SAL_CALL formActivated(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL formDeactivated(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL formActivated(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL formDeactivated(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// OComponentHelper
- virtual void SAL_CALL disposing() SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void SAL_CALL disposing() SAL_OVERRIDE;
public:
- void EnableTrackProperties( bool bEnable) { m_bTrackProperties = bEnable; }
- bool IsTrackPropertiesEnabled() {return m_bTrackProperties;}
+ SAL_DLLPRIVATE void EnableTrackProperties( bool bEnable) { m_bTrackProperties = bEnable; }
+ SAL_DLLPRIVATE bool IsTrackPropertiesEnabled() {return m_bTrackProperties;}
// activation handling
- void viewActivated( FmFormView& _rCurrentView, bool _bSyncAction = false );
- void viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivateController = true );
+ SAL_DLLPRIVATE void viewActivated( FmFormView& _rCurrentView, bool _bSyncAction = false );
+ SAL_DLLPRIVATE void viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivateController = true );
// IControllerFeatureInvalidation
- virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) SAL_OVERRIDE;
- void ExecuteTabOrderDialog( // execute SID_FM_TAB_DIALOG
+ SAL_DLLPRIVATE void ExecuteTabOrderDialog( // execute SID_FM_TAB_DIALOG
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& _rxForForm
);
// stuff
- void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
- void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
+ SAL_DLLPRIVATE void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
+ SAL_DLLPRIVATE void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
/** updates m_xForms, to be either <NULL/>, if we're in alive mode, or our current page's forms collection,
if in design mode
*/
- void UpdateForms( bool _bInvalidate );
+ SAL_DLLPRIVATE void UpdateForms( bool _bInvalidate );
- void ExecuteSearch(); // execute SID_FM_SEARCH
- void CreateExternalView(); // execute SID_FM_VIEW_AS_GRID
+ SAL_DLLPRIVATE void ExecuteSearch(); // execute SID_FM_SEARCH
+ SAL_DLLPRIVATE void CreateExternalView(); // execute SID_FM_VIEW_AS_GRID
- bool GetY2KState(sal_uInt16& n);
- void SetY2KState(sal_uInt16 n);
+ SAL_DLLPRIVATE bool GetY2KState(sal_uInt16& n);
+ SAL_DLLPRIVATE void SetY2KState(sal_uInt16 n);
protected:
// activation handling
- inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
- inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
+ SAL_DLLPRIVATE inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
+ SAL_DLLPRIVATE inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
// form handling
/// load or unload the forms on a page
- void loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour = FORMS_LOAD | FORMS_SYNC );
- void smartControlReset( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxModels );
+ SAL_DLLPRIVATE void loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour = FORMS_LOAD | FORMS_SYNC );
+ SAL_DLLPRIVATE void smartControlReset( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxModels );
- void startListening();
- void stopListening();
+ SAL_DLLPRIVATE void startListening();
+ SAL_DLLPRIVATE void stopListening();
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
+ SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
impl_getControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& i_rxModel,
const FmFormObj& i_rKnownFormObj
);
// sammelt in strNames die Namen aller Formulare
- static void impl_collectFormSearchContexts_nothrow(
+ SAL_DLLPRIVATE static void impl_collectFormSearchContexts_nothrow(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxStartingPoint,
const OUString& _rCurrentLevelPrefix,
FmFormArray& _out_rForms,
@@ -349,173 +349,173 @@ protected:
/** checks whether the instance is already disposed, if so, this is reported as assertion error (debug
builds only) and <TRUE/> is returned.
*/
- bool impl_checkDisposed() const;
+ SAL_DLLPRIVATE bool impl_checkDisposed() const;
public:
// methode fuer nicht designmode (alive mode)
- void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false );
- const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;}
- const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; }
- const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& getActiveForm() const {return m_xActiveForm;}
- const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;}
+ SAL_DLLPRIVATE void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false );
+ SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;}
+ SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; }
+ SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& getActiveForm() const {return m_xActiveForm;}
+ SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;}
- inline const ::svx::ControllerFeatures& getActiveControllerFeatures() const
+ SAL_DLLPRIVATE inline const ::svx::ControllerFeatures& getActiveControllerFeatures() const
{ return m_aActiveControllerFeatures; }
- inline const ::svx::ControllerFeatures& getNavControllerFeatures() const
+ SAL_DLLPRIVATE inline const ::svx::ControllerFeatures& getNavControllerFeatures() const
{ return m_aNavControllerFeatures.isAssigned() ? m_aNavControllerFeatures : m_aActiveControllerFeatures; }
/** announces a new "current selection"
@return
<TRUE/> if and only if the to-bet-set selection was different from the previous selection
*/
- bool setCurrentSelection( const InterfaceBag& _rSelection );
+ SAL_DLLPRIVATE bool setCurrentSelection( const InterfaceBag& _rSelection );
/** sets the new selection to the last known marked controls
*/
- bool selectLastMarkedControls();
+ SAL_DLLPRIVATE bool selectLastMarkedControls();
/** retrieves the current selection
*/
- SVX_DLLPUBLIC void getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const;
+ void getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const;
/** sets a new current selection as indicated by a mark list
@return
<TRUE/> if and only if the to-bet-set selection was different from the previous selection
*/
- bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList);
+ SAL_DLLPRIVATE bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList);
/// returns the currently selected form, or the form which all currently selected controls belong to, or <NULL/>
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >
+ SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >
getCurrentForm() const { return m_xCurrentForm; }
- void forgetCurrentForm();
+ SAL_DLLPRIVATE void forgetCurrentForm();
/// returns whether the last known marking contained only controls
- bool onlyControlsAreMarked() const { return !m_aLastKnownMarkedControls.empty(); }
+ SAL_DLLPRIVATE bool onlyControlsAreMarked() const { return !m_aLastKnownMarkedControls.empty(); }
/// determines whether the current selection consists of exactly the given object
- bool isSolelySelected(
+ SAL_DLLPRIVATE bool isSolelySelected(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject
);
/// handles a MouseButtonDown event of the FmFormView
- void handleMouseButtonDown( const SdrViewEvent& _rViewEvent );
+ SAL_DLLPRIVATE void handleMouseButtonDown( const SdrViewEvent& _rViewEvent );
/// handles the request for showing the "Properties"
- void handleShowPropertiesRequest();
+ SAL_DLLPRIVATE void handleShowPropertiesRequest();
- bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}
- bool hasDatabaseBar() const {return m_bDatabaseBar;}
- bool canNavigate() const {return m_xNavigationController.is();}
+ SAL_DLLPRIVATE bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}
+ SAL_DLLPRIVATE bool hasDatabaseBar() const {return m_bDatabaseBar;}
+ SAL_DLLPRIVATE bool canNavigate() const {return m_xNavigationController.is();}
- void ShowSelectionProperties( bool bShow );
- bool IsPropBrwOpen() const;
+ SAL_DLLPRIVATE void ShowSelectionProperties( bool bShow );
+ SAL_DLLPRIVATE bool IsPropBrwOpen() const;
- void DetermineSelection(const SdrMarkList& rMarkList);
- void SetSelection(const SdrMarkList& rMarkList);
- void SetSelectionDelayed();
+ SAL_DLLPRIVATE void DetermineSelection(const SdrMarkList& rMarkList);
+ SAL_DLLPRIVATE void SetSelection(const SdrMarkList& rMarkList);
+ SAL_DLLPRIVATE void SetSelectionDelayed();
- void SetDesignMode(bool bDesign);
+ SAL_DLLPRIVATE void SetDesignMode(bool bDesign);
- bool GetWizardUsing() const { return m_bUseWizards; }
- void SetWizardUsing(bool _bUseThem);
+ SAL_DLLPRIVATE bool GetWizardUsing() const { return m_bUseWizards; }
+ SAL_DLLPRIVATE void SetWizardUsing(bool _bUseThem);
// Setzen des Filtermodus
- bool isInFilterMode() const {return m_bFilterMode;}
- void startFiltering();
- void stopFiltering(bool bSave);
+ SAL_DLLPRIVATE bool isInFilterMode() const {return m_bFilterMode;}
+ SAL_DLLPRIVATE void startFiltering();
+ SAL_DLLPRIVATE void stopFiltering(bool bSave);
- static PopupMenu* GetConversionMenu();
+ SAL_DLLPRIVATE static PopupMenu* GetConversionMenu();
// ein Menue, das alle ControlConversion-Eintraege enthaelt
/// checks whethere a given control conversion slot can be applied to the current selection
- bool canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot );
+ SAL_DLLPRIVATE bool canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot );
/// enables or disables all conversion slots in a menu, according to the current selection
- void checkControlConversionSlotsForCurrentSelection( Menu& rMenu );
+ SAL_DLLPRIVATE void checkControlConversionSlotsForCurrentSelection( Menu& rMenu );
/// executes a control conversion slot for a given object
- bool executeControlConversionSlot( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId );
+ SAL_DLLPRIVATE bool executeControlConversionSlot( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId );
/** executes a control conversion slot for the current selection
@precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <TRUE/>
*/
- bool executeControlConversionSlot( sal_uInt16 _nSlotId );
+ SAL_DLLPRIVATE bool executeControlConversionSlot( sal_uInt16 _nSlotId );
/// checks whether the given slot id denotes a control conversion slot
- static bool isControlConversionSlot( sal_uInt16 _nSlotId );
+ SAL_DLLPRIVATE static bool isControlConversionSlot( sal_uInt16 _nSlotId );
- void ExecuteTextAttribute( SfxRequest& _rReq );
- void GetTextAttributeState( SfxItemSet& _rSet );
- bool IsActiveControl( bool _bCountRichTextOnly = false ) const;
- void ForgetActiveControl();
- void SetControlActivationHandler( const Link& _rHdl );
+ SAL_DLLPRIVATE void ExecuteTextAttribute( SfxRequest& _rReq );
+ SAL_DLLPRIVATE void GetTextAttributeState( SfxItemSet& _rSet );
+ SAL_DLLPRIVATE bool IsActiveControl( bool _bCountRichTextOnly = false ) const;
+ SAL_DLLPRIVATE void ForgetActiveControl();
+ SAL_DLLPRIVATE void SetControlActivationHandler( const Link& _rHdl );
/// classifies our host document
- ::svxform::DocumentType
+ SAL_DLLPRIVATE ::svxform::DocumentType
getDocumentType() const;
- bool isEnhancedForm() const;
+ SAL_DLLPRIVATE bool isEnhancedForm() const;
/// determines whether our host document is currently read-only
- bool IsReadonlyDoc() const;
+ SAL_DLLPRIVATE bool IsReadonlyDoc() const;
// das Setzen des curObject/selObject/curForm erfolgt verzoegert (SetSelectionDelayed), mit den folgenden
// Funktionen laesst sich das abfragen/erzwingen
- inline bool IsSelectionUpdatePending();
- void ForceUpdateSelection(bool bLockInvalidation);
+ SAL_DLLPRIVATE inline bool IsSelectionUpdatePending();
+ SAL_DLLPRIVATE void ForceUpdateSelection(bool bLockInvalidation);
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getContextDocument() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> getInternalForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& _xForm) const;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> getInternalForm(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xForm) const;
+ SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getContextDocument() const;
+ SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> getInternalForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& _xForm) const;
+ SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> getInternalForm(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xForm) const;
// if the form belongs to the controller (extern) displaying a grid, the according internal form will
// be displayed, _xForm else
// check if the current control of the active controller has the focus
- bool HasControlFocus() const;
+ SAL_DLLPRIVATE bool HasControlFocus() const;
private:
- DECL_LINK(OnFoundData, FmFoundRecordInformation*);
- DECL_LINK(OnCanceledNotFound, FmFoundRecordInformation*);
- DECL_LINK(OnSearchContextRequest, FmSearchContext*);
- DECL_LINK(OnTimeOut, void*);
- DECL_LINK(OnFirstTimeActivation, void*);
- DECL_LINK(OnFormsCreated, FmFormPage*);
+ DECL_DLLPRIVATE_LINK(OnFoundData, FmFoundRecordInformation*);
+ DECL_DLLPRIVATE_LINK(OnCanceledNotFound, FmFoundRecordInformation*);
+ DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext*);
+ DECL_DLLPRIVATE_LINK(OnTimeOut, void*);
+ DECL_DLLPRIVATE_LINK(OnFirstTimeActivation, void*);
+ DECL_DLLPRIVATE_LINK(OnFormsCreated, FmFormPage*);
- void LoopGrids(sal_Int16 nWhat);
+ SAL_DLLPRIVATE void LoopGrids(sal_Int16 nWhat);
// Invalidierung von Slots
- void InvalidateSlot( sal_Int16 nId, bool bWithId );
- void UpdateSlot( sal_Int16 nId );
+ SAL_DLLPRIVATE void InvalidateSlot( sal_Int16 nId, bool bWithId );
+ SAL_DLLPRIVATE void UpdateSlot( sal_Int16 nId );
// Locking der Invalidierung - wenn der interne Locking-Counter auf 0 geht, werden alle aufgelaufenen Slots
// (asynchron) invalidiert
- void LockSlotInvalidation(bool bLock);
+ SAL_DLLPRIVATE void LockSlotInvalidation(bool bLock);
- DECL_LINK(OnInvalidateSlots, void*);
+ DECL_DLLPRIVATE_LINK(OnInvalidateSlots, void*);
- void CloseExternalFormViewer();
+ SAL_DLLPRIVATE void CloseExternalFormViewer();
// closes the task-local beamer displaying a grid view for a form
// ConfigItem related stuff
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
- virtual void Commit() SAL_OVERRIDE;
- void implAdjustConfigCache();
+ SAL_DLLPRIVATE virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void Commit() SAL_OVERRIDE;
+ SAL_DLLPRIVATE void implAdjustConfigCache();
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
+ SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
getControlContainerForView();
/** finds and sets a default for m_xCurrentForm, if it is currently NULL
*/
- void impl_defaultCurrentForm_nothrow();
+ SAL_DLLPRIVATE void impl_defaultCurrentForm_nothrow();
/** sets m_xCurrentForm to the provided form, and udpates everything which
depends on the current form
*/
- void impl_updateCurrentForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxNewCurForm );
+ SAL_DLLPRIVATE void impl_updateCurrentForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxNewCurForm );
/** adds or removes ourself as XEventListener at m_xActiveController
*/
- void impl_switchActiveControllerListening( const bool _bListen );
+ SAL_DLLPRIVATE void impl_switchActiveControllerListening( const bool _bListen );
/** add an element
*/
- void impl_AddElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
+ SAL_DLLPRIVATE void impl_AddElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
/** remove an element
*/
- void impl_RemoveElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
+ SAL_DLLPRIVATE void impl_RemoveElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
// asyncronous cursor actions/navigation slot handling
@@ -526,14 +526,14 @@ public:
@param _nSlot
the slot to execute
*/
- void ExecuteFormSlot( sal_Int32 _nSlot );
+ SAL_DLLPRIVATE void ExecuteFormSlot( sal_Int32 _nSlot );
/** determines whether the current form slot is currently enabled
*/
- bool IsFormSlotEnabled( sal_Int32 _nSlot, ::com::sun::star::form::runtime::FeatureState* _pCompleteState = NULL );
+ SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, ::com::sun::star::form::runtime::FeatureState* _pCompleteState = NULL );
protected:
- DECL_LINK( OnLoadForms, FmFormPage* );
+ DECL_DLLPRIVATE_LINK( OnLoadForms, FmFormPage* );
};
More information about the Libreoffice-commits
mailing list