Kaydet (Commit) d4cf8c25 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Generally better to have DLLPUBLIC class with some DLLPRIVATE members

...in the same vein as 80a1a259.

Change-Id: I330665957aec2c9b98c7aff7fa7f25525e4cdf7d
üst 2d73a9d7
......@@ -52,132 +52,132 @@ typedef std::list< CustomAnimationEffectPtr > EffectSequence;
class EffectSequenceHelper;
class CustomAnimationEffect
class SD_DLLPUBLIC CustomAnimationEffect
{
friend class MainSequence;
friend class EffectSequenceHelper;
public:
SD_DLLPUBLIC CustomAnimationEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
SD_DLLPUBLIC virtual ~CustomAnimationEffect();
CustomAnimationEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
virtual ~CustomAnimationEffect();
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& getNode() const { return mxNode; }
void setNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
void replaceNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& getNode() const { return mxNode; }
SAL_DLLPRIVATE void setNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE void replaceNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
CustomAnimationEffectPtr clone() const;
SAL_DLLPRIVATE CustomAnimationEffectPtr clone() const;
// attributes
const OUString& getPresetId() const { return maPresetId; }
const OUString& getPresetSubType() const { return maPresetSubType; }
const OUString& getProperty() const { return maProperty; }
SAL_DLLPRIVATE const OUString& getPresetId() const { return maPresetId; }
SAL_DLLPRIVATE const OUString& getPresetSubType() const { return maPresetSubType; }
SAL_DLLPRIVATE const OUString& getProperty() const { return maProperty; }
sal_Int16 getPresetClass() const { return mnPresetClass; }
void setPresetClass( sal_Int16 nPresetClass );
SAL_DLLPRIVATE sal_Int16 getPresetClass() const { return mnPresetClass; }
SAL_DLLPRIVATE void setPresetClass( sal_Int16 nPresetClass );
sal_Int16 getNodeType() const { return mnNodeType; }
SD_DLLPUBLIC void setNodeType( sal_Int16 nNodeType );
SAL_DLLPRIVATE sal_Int16 getNodeType() const { return mnNodeType; }
void setNodeType( sal_Int16 nNodeType );
::com::sun::star::uno::Any getRepeatCount() const;
void setRepeatCount( const ::com::sun::star::uno::Any& rRepeatCount );
SAL_DLLPRIVATE ::com::sun::star::uno::Any getRepeatCount() const;
SAL_DLLPRIVATE void setRepeatCount( const ::com::sun::star::uno::Any& rRepeatCount );
::com::sun::star::uno::Any getEnd() const;
void setEnd( const ::com::sun::star::uno::Any& rEnd );
SAL_DLLPRIVATE ::com::sun::star::uno::Any getEnd() const;
SAL_DLLPRIVATE void setEnd( const ::com::sun::star::uno::Any& rEnd );
sal_Int16 getFill() const;
void setFill( sal_Int16 nFill );
SAL_DLLPRIVATE sal_Int16 getFill() const;
SAL_DLLPRIVATE void setFill( sal_Int16 nFill );
double getBegin() const { return mfBegin; }
SD_DLLPUBLIC void setBegin( double fBegin );
SAL_DLLPRIVATE double getBegin() const { return mfBegin; }
void setBegin( double fBegin );
double getDuration() const { return mfDuration; }
SD_DLLPUBLIC void setDuration( double fDuration );
SAL_DLLPRIVATE double getDuration() const { return mfDuration; }
void setDuration( double fDuration );
double getAbsoluteDuration() const { return mfAbsoluteDuration; }
SAL_DLLPRIVATE double getAbsoluteDuration() const { return mfAbsoluteDuration; }
const OUString& getName() const { return maName; }
void setName( const OUString& rName ) { maName = rName; }
SAL_DLLPRIVATE const OUString& getName() const { return maName; }
SAL_DLLPRIVATE void setName( const OUString& rName ) { maName = rName; }
sal_Int16 getIterateType() const { return mnIterateType; }
SD_DLLPUBLIC void setIterateType( sal_Int16 nIterateType );
SAL_DLLPRIVATE sal_Int16 getIterateType() const { return mnIterateType; }
void setIterateType( sal_Int16 nIterateType );
double getIterateInterval() const { return mfIterateInterval; }
SD_DLLPUBLIC void setIterateInterval( double fIterateInterval );
SAL_DLLPRIVATE double getIterateInterval() const { return mfIterateInterval; }
void setIterateInterval( double fIterateInterval );
::com::sun::star::uno::Any getTarget() const { return maTarget; }
SD_DLLPUBLIC void setTarget( const ::com::sun::star::uno::Any& rTarget );
SAL_DLLPRIVATE ::com::sun::star::uno::Any getTarget() const { return maTarget; }
void setTarget( const ::com::sun::star::uno::Any& rTarget );
bool hasAfterEffect() const { return mbHasAfterEffect; }
void setHasAfterEffect( bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
SAL_DLLPRIVATE bool hasAfterEffect() const { return mbHasAfterEffect; }
SAL_DLLPRIVATE void setHasAfterEffect( bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
::com::sun::star::uno::Any getDimColor() const { return maDimColor; }
void setDimColor( ::com::sun::star::uno::Any aDimColor ) { maDimColor = aDimColor; }
SAL_DLLPRIVATE ::com::sun::star::uno::Any getDimColor() const { return maDimColor; }
SAL_DLLPRIVATE void setDimColor( ::com::sun::star::uno::Any aDimColor ) { maDimColor = aDimColor; }
bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; }
void setAfterEffectOnNext( bool bOnNextEffect ) { mbAfterEffectOnNextEffect = bOnNextEffect; }
SAL_DLLPRIVATE bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; }
SAL_DLLPRIVATE void setAfterEffectOnNext( bool bOnNextEffect ) { mbAfterEffectOnNextEffect = bOnNextEffect; }
sal_Int32 getParaDepth() const { return mnParaDepth; }
SAL_DLLPRIVATE sal_Int32 getParaDepth() const { return mnParaDepth; }
bool hasText() const { return mbHasText; }
SAL_DLLPRIVATE bool hasText() const { return mbHasText; }
sal_Int16 getCommand() const { return mnCommand; }
SAL_DLLPRIVATE sal_Int16 getCommand() const { return mnCommand; }
double getAcceleration() const { return mfAcceleration; }
void setAcceleration( double fAcceleration );
SAL_DLLPRIVATE double getAcceleration() const { return mfAcceleration; }
SAL_DLLPRIVATE void setAcceleration( double fAcceleration );
double getDecelerate() const { return mfDecelerate; }
void setDecelerate( double fDecelerate );
SAL_DLLPRIVATE double getDecelerate() const { return mfDecelerate; }
SAL_DLLPRIVATE void setDecelerate( double fDecelerate );
bool getAutoReverse() const { return mbAutoReverse; }
void setAutoReverse( bool bAutoReverse );
SAL_DLLPRIVATE bool getAutoReverse() const { return mbAutoReverse; }
SAL_DLLPRIVATE void setAutoReverse( bool bAutoReverse );
::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue );
bool setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
SAL_DLLPRIVATE ::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue );
SAL_DLLPRIVATE bool setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
::com::sun::star::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue );
SAL_DLLPRIVATE ::com::sun::star::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
SAL_DLLPRIVATE bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue );
::com::sun::star::uno::Any getColor( sal_Int32 nIndex );
void setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor );
SAL_DLLPRIVATE ::com::sun::star::uno::Any getColor( sal_Int32 nIndex );
SAL_DLLPRIVATE void setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor );
::com::sun::star::uno::Any getRotation();
void setRotation( const ::com::sun::star::uno::Any& rRotation );
SAL_DLLPRIVATE ::com::sun::star::uno::Any getRotation();
SAL_DLLPRIVATE void setRotation( const ::com::sun::star::uno::Any& rRotation );
sal_Int32 getGroupId() const { return mnGroupId; }
void setGroupId( sal_Int32 nGroupId );
SAL_DLLPRIVATE sal_Int32 getGroupId() const { return mnGroupId; }
SAL_DLLPRIVATE void setGroupId( sal_Int32 nGroupId );
sal_Int16 getTargetSubItem() const { return mnTargetSubItem; }
SD_DLLPUBLIC void setTargetSubItem( sal_Int16 nSubItem );
SAL_DLLPRIVATE sal_Int16 getTargetSubItem() const { return mnTargetSubItem; }
void setTargetSubItem( sal_Int16 nSubItem );
OUString getPath() const;
void setPath( const OUString& rPath );
SAL_DLLPRIVATE OUString getPath() const;
SAL_DLLPRIVATE void setPath( const OUString& rPath );
bool checkForText();
bool calculateIterateDuration();
SAL_DLLPRIVATE bool checkForText();
SAL_DLLPRIVATE bool calculateIterateDuration();
void setAudio( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& xAudio );
bool getStopAudio() const;
SD_DLLPUBLIC void setStopAudio();
SD_DLLPUBLIC void createAudio( const ::com::sun::star::uno::Any& rSource, double fVolume = 1.0 );
void removeAudio();
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& getAudio() const { return mxAudio; }
SAL_DLLPRIVATE void setAudio( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& xAudio );
SAL_DLLPRIVATE bool getStopAudio() const;
void setStopAudio();
void createAudio( const ::com::sun::star::uno::Any& rSource, double fVolume = 1.0 );
SAL_DLLPRIVATE void removeAudio();
SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& getAudio() const { return mxAudio; }
EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; }
SAL_DLLPRIVATE EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; }
// helper
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAfterEffectNode() const throw (com::sun::star::uno::Exception);
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetShape() const;
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAfterEffectNode() const throw (com::sun::star::uno::Exception);
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetShape() const;
// static helpers
static sal_Int32 get_node_type( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
static sal_Int32 getNumberOfSubitems( const ::com::sun::star::uno::Any& aTarget, sal_Int16 nIterateType );
SAL_DLLPRIVATE static sal_Int32 get_node_type( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE static sal_Int32 getNumberOfSubitems( const ::com::sun::star::uno::Any& aTarget, sal_Int16 nIterateType );
SdrPathObj* createSdrPathObjFromPath();
void updateSdrPathObjFromPath( SdrPathObj& rPathObj );
void updatePathFromSdrPathObj( const SdrPathObj& rPathObj );
SAL_DLLPRIVATE SdrPathObj* createSdrPathObjFromPath();
SAL_DLLPRIVATE void updateSdrPathObjFromPath( SdrPathObj& rPathObj );
SAL_DLLPRIVATE void updatePathFromSdrPathObj( const SdrPathObj& rPathObj );
protected:
void setEffectSequence( EffectSequenceHelper* pSequence ) { mpEffectSequence = pSequence; }
SAL_DLLPRIVATE void setEffectSequence( EffectSequenceHelper* pSequence ) { mpEffectSequence = pSequence; }
private:
sal_Int16 mnNodeType;
......@@ -271,82 +271,82 @@ private:
typedef boost::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr;
typedef std::map< sal_Int32, CustomAnimationTextGroupPtr > CustomAnimationTextGroupMap;
class EffectSequenceHelper
class SD_DLLPUBLIC EffectSequenceHelper
{
friend class MainSequence;
public:
EffectSequenceHelper();
EffectSequenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot );
virtual ~EffectSequenceHelper();
SAL_DLLPRIVATE EffectSequenceHelper();
SAL_DLLPRIVATE EffectSequenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot );
SAL_DLLPRIVATE virtual ~EffectSequenceHelper();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode();
SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode();
CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 );
CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 );
SD_DLLPUBLIC void append( const CustomAnimationEffectPtr& pEffect );
void insert( EffectSequence::iterator& rPos, const CustomAnimationEffectPtr& pEffect );
void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration = -1.0 );
void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration = -1.0 );
void remove( const CustomAnimationEffectPtr& pEffect );
SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 );
SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 );
void append( const CustomAnimationEffectPtr& pEffect );
SAL_DLLPRIVATE void insert( EffectSequence::iterator& rPos, const CustomAnimationEffectPtr& pEffect );
SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration = -1.0 );
SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration = -1.0 );
SAL_DLLPRIVATE void remove( const CustomAnimationEffectPtr& pEffect );
void create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
void createEffectsequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
void processAfterEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
void createEffects( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE void create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE void createEffectsequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE void processAfterEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE void createEffects( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
sal_Int32 getCount() const { return sal::static_int_cast< sal_Int32 >( maEffects.size() ); }
SAL_DLLPRIVATE sal_Int32 getCount() const { return sal::static_int_cast< sal_Int32 >( maEffects.size() ); }
virtual CustomAnimationEffectPtr findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const;
SAL_DLLPRIVATE virtual CustomAnimationEffectPtr findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const;
virtual bool disposeShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
virtual void insertTextRange( const com::sun::star::uno::Any& aTarget );
virtual void disposeTextRange( const com::sun::star::uno::Any& aTarget );
virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
SAL_DLLPRIVATE virtual bool disposeShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
SAL_DLLPRIVATE virtual void insertTextRange( const com::sun::star::uno::Any& aTarget );
SAL_DLLPRIVATE virtual void disposeTextRange( const com::sun::star::uno::Any& aTarget );
SAL_DLLPRIVATE virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
SAL_DLLPRIVATE virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
/** this must be called if effects from this sequence are changed.
the method will call the registered listeners */
void update( const CustomAnimationEffectPtr& pEffect );
SAL_DLLPRIVATE void update( const CustomAnimationEffectPtr& pEffect );
/** this method rebuilds the animation nodes */
virtual void rebuild();
SAL_DLLPRIVATE virtual void rebuild();
EffectSequence::iterator getBegin() { return maEffects.begin(); }
EffectSequence::iterator getEnd() { return maEffects.end(); }
EffectSequence::iterator find( const CustomAnimationEffectPtr& pEffect );
SAL_DLLPRIVATE EffectSequence::iterator getBegin() { return maEffects.begin(); }
SAL_DLLPRIVATE EffectSequence::iterator getEnd() { return maEffects.end(); }
SAL_DLLPRIVATE EffectSequence::iterator find( const CustomAnimationEffectPtr& pEffect );
EffectSequence& getSequence() { return maEffects; }
SAL_DLLPRIVATE EffectSequence& getSequence() { return maEffects; }
void addListener( ISequenceListener* pListener );
void removeListener( ISequenceListener* pListener );
SAL_DLLPRIVATE void addListener( ISequenceListener* pListener );
SAL_DLLPRIVATE void removeListener( ISequenceListener* pListener );
// text group methods
CustomAnimationTextGroupPtr findGroup( sal_Int32 nGroupId );
SD_DLLPUBLIC CustomAnimationTextGroupPtr createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, bool bAnimateForm, bool bTextReverse );
void setTextGrouping( CustomAnimationTextGroupPtr pTextGroup, sal_Int32 nTextGrouping );
void setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, bool bAnimateForm );
void setTextGroupingAuto( CustomAnimationTextGroupPtr pTextGroup, double fTextGroupingAuto );
void setTextReverse( CustomAnimationTextGroupPtr pTextGroup, bool bAnimateForm );
SAL_DLLPRIVATE CustomAnimationTextGroupPtr findGroup( sal_Int32 nGroupId );
CustomAnimationTextGroupPtr createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, bool bAnimateForm, bool bTextReverse );
SAL_DLLPRIVATE void setTextGrouping( CustomAnimationTextGroupPtr pTextGroup, sal_Int32 nTextGrouping );
SAL_DLLPRIVATE void setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, bool bAnimateForm );
SAL_DLLPRIVATE void setTextGroupingAuto( CustomAnimationTextGroupPtr pTextGroup, double fTextGroupingAuto );
SAL_DLLPRIVATE void setTextReverse( CustomAnimationTextGroupPtr pTextGroup, bool bAnimateForm );
sal_Int32 getSequenceType() const { return mnSequenceType; }
SAL_DLLPRIVATE sal_Int32 getSequenceType() const { return mnSequenceType; }
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTriggerShape() const { return mxEventSource; }
void setTriggerShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTrigger ) { mxEventSource = xTrigger; }
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTriggerShape() const { return mxEventSource; }
SAL_DLLPRIVATE void setTriggerShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTrigger ) { mxEventSource = xTrigger; }
virtual sal_Int32 getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const;
virtual CustomAnimationEffectPtr getEffectFromOffset( sal_Int32 nOffset ) const;
SAL_DLLPRIVATE virtual sal_Int32 getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const;
SAL_DLLPRIVATE virtual CustomAnimationEffectPtr getEffectFromOffset( sal_Int32 nOffset ) const;
protected:
virtual void implRebuild();
virtual void reset();
SAL_DLLPRIVATE virtual void implRebuild();
SAL_DLLPRIVATE virtual void reset();
void createTextGroupParagraphEffects( CustomAnimationTextGroupPtr pTextGroup, CustomAnimationEffectPtr pEffect, bool bUsed );
SAL_DLLPRIVATE void createTextGroupParagraphEffects( CustomAnimationTextGroupPtr pTextGroup, CustomAnimationEffectPtr pEffect, bool bUsed );
void notify_listeners();
SAL_DLLPRIVATE void notify_listeners();
void updateTextGroups();
SAL_DLLPRIVATE void updateTextGroups();
protected:
::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer > mxSequenceRoot;
......
......@@ -88,38 +88,38 @@ struct PresetCategory
typedef boost::shared_ptr< PresetCategory > PresetCategoryPtr;
typedef std::vector< PresetCategoryPtr > PresetCategoryList;
class CustomAnimationPresets
class SD_DLLPUBLIC CustomAnimationPresets
{
public:
CustomAnimationPresets();
virtual ~CustomAnimationPresets();
SAL_DLLPRIVATE CustomAnimationPresets();
SAL_DLLPRIVATE virtual ~CustomAnimationPresets();
void init();
SAL_DLLPRIVATE void init();
SD_DLLPUBLIC static const CustomAnimationPresets& getCustomAnimationPresets();
static const CustomAnimationPresets& getCustomAnimationPresets();
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const;
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const;
SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const OUString& rPresetId ) const;
CustomAnimationPresetPtr getEffectDescriptor( const OUString& rPresetId ) const;
const OUString& getUINameForPresetId( const OUString& rPresetId ) const;
const OUString& getUINameForProperty( const OUString& rProperty ) const;
SAL_DLLPRIVATE const OUString& getUINameForPresetId( const OUString& rPresetId ) const;
SAL_DLLPRIVATE const OUString& getUINameForProperty( const OUString& rProperty ) const;
const PresetCategoryList& getEntrancePresets() const { return maEntrancePresets; }
const PresetCategoryList& getEmphasisPresets() const { return maEmphasisPresets; }
const PresetCategoryList& getExitPresets() const { return maExitPresets; }
const PresetCategoryList& getMotionPathsPresets() const { return maMotionPathsPresets; }
const PresetCategoryList& getMiscPresets() const { return maMiscPresets; }
SAL_DLLPRIVATE const PresetCategoryList& getEntrancePresets() const { return maEntrancePresets; }
SAL_DLLPRIVATE const PresetCategoryList& getEmphasisPresets() const { return maEmphasisPresets; }
SAL_DLLPRIVATE const PresetCategoryList& getExitPresets() const { return maExitPresets; }
SAL_DLLPRIVATE const PresetCategoryList& getMotionPathsPresets() const { return maMotionPathsPresets; }
SAL_DLLPRIVATE const PresetCategoryList& getMiscPresets() const { return maMiscPresets; }
void changePresetSubType( CustomAnimationEffectPtr pEffect, const OUString& rPresetSubType ) const;
SAL_DLLPRIVATE void changePresetSubType( CustomAnimationEffectPtr pEffect, const OUString& rPresetSubType ) const;
private:
void importEffects();
void importResources();
SAL_DLLPRIVATE void importEffects();
SAL_DLLPRIVATE void importResources();
void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap );
SAL_DLLPRIVATE void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap );
const OUString& translateName( const OUString& rId, const UStringMap& rNameMap ) const;
SAL_DLLPRIVATE const OUString& translateName( const OUString& rId, const UStringMap& rNameMap ) const;
private:
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode;
......@@ -133,7 +133,7 @@ private:
PresetCategoryList maMotionPathsPresets;
PresetCategoryList maMiscPresets;
static CustomAnimationPresets* mpCustomAnimationPresets;
SAL_DLLPRIVATE static CustomAnimationPresets* mpCustomAnimationPresets;
};
typedef boost::shared_ptr< CustomAnimationPresets > CustomAnimationPresetsPtr;
......
......@@ -31,7 +31,7 @@
class SdrObject;
class SdrPathObj;
class SdAnimationInfo : public SdrObjUserData
class SD_DLLPUBLIC SdAnimationInfo : public SdrObjUserData
{
public:
PresObjKind mePresObjKind;
......@@ -60,14 +60,14 @@ public:
sal_uLong mnPresOrder;
SdrObject& mrObject;
SD_DLLPUBLIC void SetBookmark( const OUString& rBookmark );
SD_DLLPUBLIC OUString GetBookmark();
void SetBookmark( const OUString& rBookmark );
OUString GetBookmark();
public:
SdAnimationInfo(SdrObject& rObject);
SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject);
virtual ~SdAnimationInfo();
SAL_DLLPRIVATE SdAnimationInfo(SdrObject& rObject);
SAL_DLLPRIVATE SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject);
SAL_DLLPRIVATE virtual ~SdAnimationInfo();
virtual SdrObjUserData* Clone(SdrObject* pObject) const SAL_OVERRIDE;
SAL_DLLPRIVATE virtual SdrObjUserData* Clone(SdrObject* pObject) const SAL_OVERRIDE;
};
#endif // INCLUDED_SD_INC_ANMINFO_HXX
......
......@@ -133,18 +133,18 @@ namespace sd
}
// SdDrawDocument
class SdDrawDocument : public FmFormModel
class SD_DLLPUBLIC SdDrawDocument : public FmFormModel
{
private:
OUString msDocAccTitle;
public:
virtual void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; }
virtual const OUString getDocAccTitle() const { return msDocAccTitle; }
SAL_DLLPRIVATE virtual void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; }
SAL_DLLPRIVATE virtual const OUString getDocAccTitle() const { return msDocAccTitle; }
private:
bool bReadOnly;
public:
virtual void setDocReadOnly( bool b){ bReadOnly = b; }
virtual bool getDocReadOnly() const { return bReadOnly; }
SAL_DLLPRIVATE virtual void setDocReadOnly( bool b){ bReadOnly = b; }
SAL_DLLPRIVATE virtual bool getDocReadOnly() const { return bReadOnly; }
private:
::sd::Outliner* mpOutliner; ///< local outliner for outline mode
::sd::Outliner* mpInternalOutliner; ///< internal outliner for creation of text objects
......@@ -184,14 +184,14 @@ private:
::std::auto_ptr<ImpDrawPageListWatcher> mpDrawPageListWatcher;
::std::auto_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher;
void UpdatePageObjectsInNotes(sal_uInt16 nStartPos);
void UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_Int32 nIncrement);
void FillOnlineSpellingList(SdPage* pPage);
void SpellObject(SdrTextObj* pObj);
SAL_DLLPRIVATE void UpdatePageObjectsInNotes(sal_uInt16 nStartPos);
SAL_DLLPRIVATE void UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_Int32 nIncrement);
SAL_DLLPRIVATE void FillOnlineSpellingList(SdPage* pPage);
SAL_DLLPRIVATE void SpellObject(SdrTextObj* pObj);
DECL_LINK(WorkStartupHdl, void *);
DECL_LINK(OnlineSpellingHdl, void *);
DECL_LINK(OnlineSpellEventHdl, EditStatus*);
DECL_DLLPRIVATE_LINK(WorkStartupHdl, void *);
DECL_DLLPRIVATE_LINK(OnlineSpellingHdl, void *);
DECL_DLLPRIVATE_LINK(OnlineSpellEventHdl, EditStatus*);
std::vector< OUString > maAnnotationAuthors;
std::vector<com::sun::star::uno::Reference<
......@@ -203,90 +203,90 @@ private:
bool mbUseEmbedFonts;
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE;
SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
TYPEINFO_VISIBILITY_OVERRIDE(SAL_DLLPRIVATE);
SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh);
virtual ~SdDrawDocument();
SAL_DLLPRIVATE SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh);
SAL_DLLPRIVATE virtual ~SdDrawDocument();
SdDrawDocument* AllocSdDrawDocument() const;
virtual SdrModel* AllocModel() const SAL_OVERRIDE; //forwards to AllocSdDrawDocument
SAL_DLLPRIVATE SdDrawDocument* AllocSdDrawDocument() const;
SAL_DLLPRIVATE virtual SdrModel* AllocModel() const SAL_OVERRIDE; //forwards to AllocSdDrawDocument
SdPage* AllocSdPage(bool bMasterPage);
virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE; //forwards to AllocSdPage
SAL_DLLPRIVATE SdPage* AllocSdPage(bool bMasterPage);
SAL_DLLPRIVATE virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE; //forwards to AllocSdPage
virtual bool IsReadOnly() const SAL_OVERRIDE;
virtual void SetChanged(bool bFlag = true) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual bool IsReadOnly() const SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void SetChanged(bool bFlag = true) SAL_OVERRIDE;
SfxItemPool& GetPool() { return( *pItemPool ); }
SAL_DLLPRIVATE SfxItemPool& GetPool() { return( *pItemPool ); }
::sd::Outliner* GetOutliner(bool bCreateOutliner=true);
SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(bool bCreateOutliner=true);
SAL_DLLPRIVATE ::sd::Outliner* GetOutliner(bool bCreateOutliner=true);
::sd::Outliner* GetInternalOutliner(bool bCreateOutliner=true);
::sd::DrawDocShell* GetDocSh() const { return mpDocSh; }
SAL_DLLPRIVATE ::sd::DrawDocShell* GetDocSh() const { return mpDocSh; }
LanguageType GetLanguage( const sal_uInt16 nId ) const;
void SetLanguage( const LanguageType eLang, const sal_uInt16 nId );
SAL_DLLPRIVATE LanguageType GetLanguage( const sal_uInt16 nId ) const;
SAL_DLLPRIVATE void SetLanguage( const LanguageType eLang, const sal_uInt16 nId );
SvxNumType GetPageNumType() const SAL_OVERRIDE;
void SetPageNumType(SvxNumType eType) { mePageNumType = eType; }
SD_DLLPUBLIC OUString CreatePageNumValue(sal_uInt16 nNum) const;
SAL_DLLPRIVATE SvxNumType GetPageNumType() const SAL_OVERRIDE;
SAL_DLLPRIVATE void SetPageNumType(SvxNumType eType) { mePageNumType = eType; }
OUString CreatePageNumValue(sal_uInt16 nNum) const;
DocumentType GetDocumentType() const { return meDocType; }
SAL_DLLPRIVATE DocumentType GetDocumentType() const { return meDocType; }
void SetAllocDocSh(bool bAlloc);
SAL_DLLPRIVATE void SetAllocDocSh(bool bAlloc);
void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; }
SAL_DLLPRIVATE void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; }
/** if the document does not contain at least one handout, one slide and one notes page with
at least one master each this methods creates them.
If a reference document is given, the sizes and border settings of that document are used
for newly created slides.
*/
SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 );
SD_DLLPUBLIC bool CreateMissingNotesAndHandoutPages();
void CreateFirstPages( SdDrawDocument* pRefDocument = 0 );
bool CreateMissingNotesAndHandoutPages();
void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) SAL_OVERRIDE;
void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE;
void DeletePage(sal_uInt16 nPgNum) SAL_OVERRIDE;
SdrPage* RemovePage(sal_uInt16 nPgNum) SAL_OVERRIDE;
SAL_DLLPRIVATE void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) SAL_OVERRIDE;
SAL_DLLPRIVATE void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE;
SAL_DLLPRIVATE void DeletePage(sal_uInt16 nPgNum) SAL_OVERRIDE;
SAL_DLLPRIVATE SdrPage* RemovePage(sal_uInt16 nPgNum) SAL_OVERRIDE;
virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE;
virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum) SAL_OVERRIDE;
void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, bool bOnlyDuplicatePages=false, bool bUndo=true );
SD_DLLPUBLIC void SetMasterPage(sal_uInt16 nSdPageNum, const OUString& rLayoutName,
SAL_DLLPRIVATE void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, bool bOnlyDuplicatePages=false, bool bUndo=true );
void SetMasterPage(sal_uInt16 nSdPageNum, const OUString& rLayoutName,
SdDrawDocument* pSourceDoc, bool bMaster, bool bCheckMasters);
SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const OUString& rBookmarkFile);
SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium);
SdDrawDocument* OpenBookmarkDoc(const OUString& rBookmarkFile);
SAL_DLLPRIVATE SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium);
bool InsertBookmark(const std::vector<OUString> &rBookmarkList,
SAL_DLLPRIVATE bool InsertBookmark(const std::vector<OUString> &rBookmarkList,
std::vector<OUString> &rExchangeList, bool bLink,
bool bReplace, sal_uInt16 nPgPos, bool bNoDialogs,
::sd::DrawDocShell* pBookmarkDocSh, bool bCopy,
Point* pObjPos);
bool IsStartWithPresentation() const { return mbStartWithPresentation;}
void SetStartWithPresentation( bool bStartWithPresentation );
SAL_DLLPRIVATE bool IsStartWithPresentation() const { return mbStartWithPresentation;}
SAL_DLLPRIVATE void SetStartWithPresentation( bool bStartWithPresentation );
bool IsExitAfterPresenting() const { return mbExitAfterPresenting;}
void SetExitAfterPresenting( bool bExitAfterPresenting );
SAL_DLLPRIVATE bool IsExitAfterPresenting() const { return mbExitAfterPresenting;}
SAL_DLLPRIVATE void SetExitAfterPresenting( bool bExitAfterPresenting );
/// load xml-based impress layout definitions into document
void InitLayoutVector();
SAL_DLLPRIVATE void InitLayoutVector();
/// return reference to vector of Impress layout definitions
const std::vector<com::sun::star::uno::Reference<
SAL_DLLPRIVATE const std::vector<com::sun::star::uno::Reference<
com::sun::star::xml::dom::XNode> >& GetLayoutVector() const
{ return maLayoutInfo; }
/// load xml-based impress master presentation object definitions into document
void InitObjectVector();
SAL_DLLPRIVATE void InitObjectVector();
/// return reference to vector of master presentation object definitions
const std::vector<com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> >& GetObjectVector() const { return maPresObjectInfo; }
SAL_DLLPRIVATE const std::vector<com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> >& GetObjectVector() const { return maPresObjectInfo; }
/** Insert pages into this document
This method inserts whole pages into this document, either
......@@ -333,21 +333,21 @@ public:
page, or preserve the old name
*/
bool InsertBookmarkAsPage(const std::vector<OUString> &rBookmarkList,
SAL_DLLPRIVATE bool InsertBookmarkAsPage(const std::vector<OUString> &rBookmarkList,
std::vector<OUString> *pExchangeList,
bool bLink, bool bReplace, sal_uInt16 nPgPos,
bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh,
bool bCopy, bool bMergeMasterPages,
bool bPreservePageNames);
bool InsertBookmarkAsObject(const std::vector<OUString> &rBookmarkList,
SAL_DLLPRIVATE bool InsertBookmarkAsObject(const std::vector<OUString> &rBookmarkList,
const std::vector<OUString> &rExchangeList,
bool bLink, ::sd::DrawDocShell* pBookmarkDocSh,
Point* pObjPos, bool bCalcObjCount = false);
SD_DLLPUBLIC void CloseBookmarkDoc();
void CloseBookmarkDoc();
SdrObject* GetObj(const OUString& rObjName) const;
SAL_DLLPRIVATE SdrObject* GetObj(const OUString& rObjName) const;
/** Return the first page that has the given name. Regular pages and
notes pages are searched first. When not found then the master
......@@ -362,27 +362,27 @@ public:
Returns the index of the page with the given name or
SDRPAGE_NOTFOUND (=0xffff) when such a page does not exist.
*/
sal_uInt16 GetPageByName(const OUString& rPgName, bool& rbIsMasterPage ) const;
SD_DLLPUBLIC SdPage*GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const;
SD_DLLPUBLIC sal_uInt16 GetSdPageCount(PageKind ePgKind) const;
SAL_DLLPRIVATE sal_uInt16 GetPageByName(const OUString& rPgName, bool& rbIsMasterPage ) const;
SdPage*GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const;
sal_uInt16 GetSdPageCount(PageKind ePgKind) const;
void SetSelected(SdPage* pPage, bool bSelect);
bool MovePages(sal_uInt16 nTargetPage);
SAL_DLLPRIVATE void SetSelected(SdPage* pPage, bool bSelect);
SAL_DLLPRIVATE bool MovePages(sal_uInt16 nTargetPage);
SD_DLLPUBLIC SdPage*GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind);
SD_DLLPUBLIC sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const;
SdPage*GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind);
sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const;
SD_DLLPUBLIC sal_uInt16 GetActiveSdPageCount() const;
sal_uInt16 GetActiveSdPageCount() const;
sal_uInt16 GetMasterPageUserCount(SdrPage* pMaster) const;
SAL_DLLPRIVATE sal_uInt16 GetMasterPageUserCount(SdrPage* pMaster) const;
const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; }
sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; }
SAL_DLLPRIVATE const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; }
SAL_DLLPRIVATE sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; }
const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 >& getPresentation() const;
SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 >& getPresentation() const;
void SetSummationOfParagraphs( bool bOn = true ) { mbSummationOfParagraphs = bOn; }
bool IsSummationOfParagraphs() const { return mbSummationOfParagraphs; }
SAL_DLLPRIVATE void SetSummationOfParagraphs( bool bOn = true ) { mbSummationOfParagraphs = bOn; }
SAL_DLLPRIVATE bool IsSummationOfParagraphs() const { return mbSummationOfParagraphs; }
/** Set the mode that controls whether (and later how) the formatting of the document
depends on the current printer metrics.
......@@ -393,7 +393,7 @@ public:
scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const>
to make formatting depend on the current printer metrics.
*/
void SetPrinterIndependentLayout (sal_Int32 nMode);
SAL_DLLPRIVATE void SetPrinterIndependentLayout (sal_Int32 nMode);
/** Get the flag that controls whether the formatting of the document
depends on the current printer metrics.
......@@ -404,74 +404,74 @@ public:
scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const>
when formatting depends on the current printer metrics.
*/
sal_Int32 GetPrinterIndependentLayout (void) { return mnPrinterIndependentLayout;}
SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout (void) { return mnPrinterIndependentLayout;}
void SetOnlineSpell( bool bIn );
bool GetOnlineSpell() const { return mbOnlineSpell; }
void StopOnlineSpelling();
void StartOnlineSpelling(bool bForceSpelling=true);
SAL_DLLPRIVATE void SetOnlineSpell( bool bIn );
SAL_DLLPRIVATE bool GetOnlineSpell() const { return mbOnlineSpell; }
SAL_DLLPRIVATE void StopOnlineSpelling();
SAL_DLLPRIVATE void StartOnlineSpelling(bool bForceSpelling=true);
void ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner* pOutl);
SAL_DLLPRIVATE void ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner* pOutl);
void InsertObject(SdrObject* pObj, SdPage* pPage);
void RemoveObject(SdrObject* pObj, SdPage* pPage);
SAL_DLLPRIVATE void InsertObject(SdrObject* pObj, SdPage* pPage);
SAL_DLLPRIVATE void RemoveObject(SdrObject* pObj, SdPage* pPage);
sal_uLong GetLinkCount();
SAL_DLLPRIVATE sal_uLong GetLinkCount();
std::vector<sd::FrameView*>& GetFrameViewList() { return maFrameViewList; }
SD_DLLPUBLIC SdCustomShowList* GetCustomShowList(bool bCreate = false);
SAL_DLLPRIVATE std::vector<sd::FrameView*>& GetFrameViewList() { return maFrameViewList; }
SdCustomShowList* GetCustomShowList(bool bCreate = false);
void NbcSetChanged(bool bFlag = true);
SAL_DLLPRIVATE void NbcSetChanged(bool bFlag = true);
void SetTextDefaults() const;
SAL_DLLPRIVATE void SetTextDefaults() const;
void CreateLayoutTemplates();
void RenameLayoutTemplate(const OUString& rOldLayoutName, const OUString& rNewName);
SAL_DLLPRIVATE void CreateLayoutTemplates();
SAL_DLLPRIVATE void RenameLayoutTemplate(const OUString& rOldLayoutName, const OUString& rNewName);
void CreateDefaultCellStyles();
SAL_DLLPRIVATE void CreateDefaultCellStyles();
SD_DLLPUBLIC void StopWorkStartupDelay();
void StopWorkStartupDelay();
void NewOrLoadCompleted(DocCreationMode eMode);
void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool );
bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; }
SAL_DLLPRIVATE void NewOrLoadCompleted(DocCreationMode eMode);
SAL_DLLPRIVATE void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool );
SAL_DLLPRIVATE bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; }
::sd::FrameView* GetFrameView(sal_uLong nPos) {
SAL_DLLPRIVATE ::sd::FrameView* GetFrameView(sal_uLong nPos) {
return nPos < maFrameViewList.size() ? maFrameViewList[nPos] : NULL; }
/** deprecated*/
SdAnimationInfo* GetAnimationInfo(SdrObject* pObject) const;
SAL_DLLPRIVATE SdAnimationInfo* GetAnimationInfo(SdrObject* pObject) const;
SD_DLLPUBLIC static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const;
IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::Window& rCmpWnd );
SAL_DLLPRIVATE SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const;
SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::Window& rCmpWnd );
CharClass* GetCharClass() const { return mpCharClass; }
SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass; }
void RestoreLayerNames();
SAL_DLLPRIVATE void RestoreLayerNames();
void UpdateAllLinks();
SAL_DLLPRIVATE void UpdateAllLinks();
void CheckMasterPages();
SAL_DLLPRIVATE void CheckMasterPages();
void Merge(SdrModel& rSourceModel,
SAL_DLLPRIVATE void Merge(SdrModel& rSourceModel,
sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF,
sal_uInt16 nDestPos=0xFFFF,
bool bMergeMasterPages = false, bool bAllMasterPages = false,
bool bUndo = true, bool bTreadSourceAsConst = false) SAL_OVERRIDE;
SD_DLLPUBLIC ::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode );
::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
SAL_DLLPRIVATE void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode );
/** replacespOldPage from all custom shows with pNewPage or removes pOldPage from
all custom shows if pNewPage is 0.
*/
void ReplacePageInCustomShows( const SdPage* pOldPage, const SdPage* pNewPage );
SAL_DLLPRIVATE void ReplacePageInCustomShows( const SdPage* pOldPage, const SdPage* pNewPage );
public:
static SdDrawDocument* pDocLockedInsertingLinks; // static to prevent recursions while resolving links
SAL_DLLPRIVATE static SdDrawDocument* pDocLockedInsertingLinks; // static to prevent recursions while resolving links
/** Create and insert a set of two new pages: a standard (draw) page and
the associated notes page. The new pages are inserted directly
......@@ -510,7 +510,7 @@ public:
Returns an index of the inserted pages that can be used with the
<member>GetSdPage()</member> method.
*/
sal_uInt16 CreatePage (
SAL_DLLPRIVATE sal_uInt16 CreatePage (
SdPage* pCurrentPage,
PageKind ePageKind,
const OUString& sStandardPageName,
......@@ -531,7 +531,7 @@ public:
Returns an index of the inserted pages that can be used with the
<member>GetSdPage()</member> method.
*/
sal_uInt16 DuplicatePage (sal_uInt16 nPageNum);
SAL_DLLPRIVATE sal_uInt16 DuplicatePage (sal_uInt16 nPageNum);
/** Create and insert a set of two new pages that are copies of the
given <argument>pCurrentPage</argument> and its associated notes
......@@ -560,7 +560,7 @@ public:
Returns an index of the inserted pages that can be used with the
<member>GetSdPage()</member> method.
*/
sal_uInt16 DuplicatePage (
SAL_DLLPRIVATE sal_uInt16 DuplicatePage (
SdPage* pCurrentPage,
PageKind ePageKind,
const OUString& sStandardPageName,
......@@ -571,25 +571,25 @@ public:
/** return the document fonts for latin, cjk and ctl according to the current
languages set at this document */
void getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rCTLFont );
SAL_DLLPRIVATE void getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rCTLFont );
sd::UndoManager* GetUndoManager() const;
SAL_DLLPRIVATE sd::UndoManager* GetUndoManager() const;
/** converts the given western font height to a corresponding ctl font height, depending on the system language */
static sal_uInt32 convertFontHeightToCTL( sal_uInt32 nWesternFontHeight );
SAL_DLLPRIVATE static sal_uInt32 convertFontHeightToCTL( sal_uInt32 nWesternFontHeight );
/** Get the style sheet pool if it was a SdStyleSheetPool.
*/
SD_DLLPUBLIC SdStyleSheetPool* GetSdStyleSheetPool() const;
SdStyleSheetPool* GetSdStyleSheetPool() const;
void UpdatePageRelativeURLs(const OUString& rOldName, const OUString& rNewName);
SAL_DLLPRIVATE void UpdatePageRelativeURLs(const OUString& rOldName, const OUString& rNewName);
void SetCalcFieldValueHdl( ::Outliner* pOutliner);
SAL_DLLPRIVATE void SetCalcFieldValueHdl( ::Outliner* pOutliner);
sal_uInt16 GetAnnotationAuthorIndex( const OUString& rAuthor );
SAL_DLLPRIVATE sal_uInt16 GetAnnotationAuthorIndex( const OUString& rAuthor );
bool IsUsingEmbededFonts() { return mbUseEmbedFonts; }
void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts = bUse; }
SAL_DLLPRIVATE bool IsUsingEmbededFonts() { return mbUseEmbedFonts; }
SAL_DLLPRIVATE void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts = bUse; }
private:
/** This member stores the printer independent layout mode. Please
......@@ -626,7 +626,7 @@ private:
Returns an index of the inserted pages that can be used with the
<member>GetSdPage()</member> method.
*/
sal_uInt16 InsertPageSet (
SAL_DLLPRIVATE sal_uInt16 InsertPageSet (
SdPage* pCurrentPage,
PageKind ePageKind,
const OUString& sStandardPageName,
......@@ -652,7 +652,7 @@ private:
This flag indicates whether to show the shapes on the master
page.
*/
void SetupNewPage (
SAL_DLLPRIVATE void SetupNewPage (
SdPage* pPreviousPage,
SdPage* pPage,
const OUString& sPageName,
......@@ -660,9 +660,9 @@ private:
bool bIsPageBack,
bool bIsPageObj);
virtual void PageListChanged() SAL_OVERRIDE;
virtual void MasterPageListChanged() SAL_OVERRIDE;
virtual ImageMap* GetImageMapForObject(SdrObject* pObj) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void PageListChanged() SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void MasterPageListChanged() SAL_OVERRIDE;
SAL_DLLPRIVATE virtual ImageMap* GetImageMapForObject(SdrObject* pObj) SAL_OVERRIDE;
};
namespace sd
......
......@@ -52,19 +52,19 @@ typedef ::cppu::ImplInheritanceHelper4< SfxStyleSheetPool,
::com::sun::star::container::XNameAccess,
::com::sun::star::lang::XComponent > SdStyleSheetPoolBase;
class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
class SD_DLLPUBLIC SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
{
friend class SdDrawDocument;
public:
SdStyleSheetPool(SfxItemPool const& rPool, SdDrawDocument* pDocument);
SAL_DLLPRIVATE SdStyleSheetPool(SfxItemPool const& rPool, SdDrawDocument* pDocument);
void SetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet) { mpActualStyleSheet = pActStyleSheet; }
SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; }
SAL_DLLPRIVATE void SetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet) { mpActualStyleSheet = pActStyleSheet; }
SAL_DLLPRIVATE SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; }
SfxStyleSheetBase* GetTitleSheet(const OUString& rLayoutName);
SAL_DLLPRIVATE SfxStyleSheetBase* GetTitleSheet(const OUString& rLayoutName);
// Caller has to delete the list
void CreateOutlineSheetList(const OUString& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles);
SAL_DLLPRIVATE void CreateOutlineSheetList(const OUString& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles);
/** creates all layout style sheets for the given layout name if they
don't exist yet.
......@@ -74,69 +74,69 @@ public:
had to be created. This is used to assert errors in documents
when styles are missing.
*/
SD_DLLPUBLIC void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false );
void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const;
void CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets);
void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
void CopyGraphicSheets(SdStyleSheetPool& rSourcePool);
void CopyCellSheets(SdStyleSheetPool& rSourcePool);
void CopyTableStyles(SdStyleSheetPool& rSourcePool);
void CopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets);
void RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix);
void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false );
SAL_DLLPRIVATE void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const;
SAL_DLLPRIVATE void CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets);
SAL_DLLPRIVATE void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
SAL_DLLPRIVATE void CopyGraphicSheets(SdStyleSheetPool& rSourcePool);
SAL_DLLPRIVATE void CopyCellSheets(SdStyleSheetPool& rSourcePool);
SAL_DLLPRIVATE void CopyTableStyles(SdStyleSheetPool& rSourcePool);
SAL_DLLPRIVATE void CopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets);
SAL_DLLPRIVATE void RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix);
void CreatePseudosIfNecessary();
void UpdateStdNames();
static void PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont );
static Font GetBulletFont();
SAL_DLLPRIVATE void CreatePseudosIfNecessary();
SAL_DLLPRIVATE void UpdateStdNames();
SAL_DLLPRIVATE static void PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont );
SAL_DLLPRIVATE static Font GetBulletFont();
SdDrawDocument* GetDoc() const { return mpDoc; }
SAL_DLLPRIVATE SdDrawDocument* GetDoc() const { return mpDoc; }
static SdStyleSheetVector CreateChildList( SdStyleSheet* pSheet );
SAL_DLLPRIVATE static SdStyleSheetVector CreateChildList( SdStyleSheet* pSheet );
static void setDefaultOutlineNumberFormatBulletAndIndent(sal_uInt16 i, SvxNumberFormat &rNumberFormat);
SAL_DLLPRIVATE static void setDefaultOutlineNumberFormatBulletAndIndent(sal_uInt16 i, SvxNumberFormat &rNumberFormat);
public:
void throwIfDisposed() throw(::com::sun::star::uno::RuntimeException);
SAL_DLLPRIVATE void throwIfDisposed() throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
SAL_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL acquire (void) throw () SAL_OVERRIDE;
virtual void SAL_CALL release (void) throw () SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void SAL_CALL acquire (void) throw () SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void SAL_CALL release (void) throw () SAL_OVERRIDE;
protected:
void RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix);
void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily );
void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets );
void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix );
SAL_DLLPRIVATE void RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix);
SAL_DLLPRIVATE void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily );
SAL_DLLPRIVATE void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets );
SAL_DLLPRIVATE void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix );
virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask) SAL_OVERRIDE;
virtual SfxStyleSheetBase* Create(const SdStyleSheet& rStyle);
SAL_DLLPRIVATE virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual SfxStyleSheetBase* Create(const SdStyleSheet& rStyle);
using SfxStyleSheetPool::Create;
virtual ~SdStyleSheetPool();
SAL_DLLPRIVATE virtual ~SdStyleSheetPool();
void AddStyleFamily( const SdPage* pPage );
void RemoveStyleFamily( const SdPage* pPage );
SAL_DLLPRIVATE void AddStyleFamily( const SdPage* pPage );
SAL_DLLPRIVATE void RemoveStyleFamily( const SdPage* pPage );
private:
SfxStyleSheetBase* mpActualStyleSheet;
......
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