Skip to content

C
core
Kaydet (Commit) 6b322d0f authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Generally better to have DLLPUBLIC class with some DLLPRIVATE members 

...in the same vein as 80a1a259.

Change-Id: I5ffb27f0bc965aede03e6d1e849cd68ef6e16e2a
üst d53a9dc1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 89 deletions
include/svx/EnhancedCustomShape2d.hxx
Dosyayı görüntüle @ 6b322d0f
......@@ -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
......
include/svx/gallery1.hxx
Dosyayı görüntüle @ 6b322d0f
......@@ -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
......
include/svx/galtheme.hxx
Dosyayı görüntüle @ 6b322d0f
This diff is collapsed.
include/tools/rtti.hxx
Dosyayı görüntüle @ 6b322d0f
......@@ -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; } \
......
svx/source/inc/fmobj.hxx
Dosyayı görüntüle @ 6b322d0f
......@@ -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 );
};
......
svx/source/inc/fmshimp.hxx
Dosyayı görüntüle @ 6b322d0f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment