diff options
Diffstat (limited to 'sd/source/core')
| -rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 234 | ||||
| -rw-r--r-- | sd/source/core/EffectMigration.cxx | 42 | ||||
| -rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/stlfamily.cxx | 76 | ||||
| -rw-r--r-- | sd/source/core/stlpool.cxx | 50 | ||||
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 72 | ||||
| -rw-r--r-- | sd/source/core/undo/undoobjects.cxx | 46 |
7 files changed, 261 insertions, 261 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 0d32e356471a..fc22835f3e0d 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -153,7 +153,7 @@ CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Refer setNode( xNode ); } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { @@ -278,7 +278,7 @@ void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::c checkForText(); } -// -------------------------------------------------------------------- + sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_Int16 nIterateType ) { @@ -374,13 +374,13 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In return nSubItems; } -// -------------------------------------------------------------------- + CustomAnimationEffect::~CustomAnimationEffect() { } -// -------------------------------------------------------------------- + CustomAnimationEffectPtr CustomAnimationEffect::clone() const { @@ -391,7 +391,7 @@ CustomAnimationEffectPtr CustomAnimationEffect::clone() const return pEffect; } -// -------------------------------------------------------------------- + sal_Int32 CustomAnimationEffect::get_node_type( const Reference< XAnimationNode >& xNode ) { @@ -419,7 +419,7 @@ sal_Int32 CustomAnimationEffect::get_node_type( const Reference< XAnimationNode return nNodeType; } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setPresetClass( sal_Int16 nPresetClass ) { @@ -503,7 +503,7 @@ void CustomAnimationEffect::setNodeType( sal_Int16 nNodeType ) } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId ) { @@ -543,7 +543,7 @@ void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId ) } } -// -------------------------------------------------------------------- + /** checks if the text for this effect has changed and updates internal flags. returns true if something changed. @@ -645,7 +645,7 @@ bool CustomAnimationEffect::calculateIterateDuration() return bChange; } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget ) { @@ -700,7 +700,7 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem ) { @@ -737,7 +737,7 @@ void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem ) } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setDuration( double fDuration ) { @@ -789,7 +789,7 @@ void CustomAnimationEffect::setDuration( double fDuration ) } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setBegin( double fBegin ) { @@ -804,7 +804,7 @@ void CustomAnimationEffect::setBegin( double fBegin ) } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setAcceleration( double fAcceleration ) { @@ -818,7 +818,7 @@ void CustomAnimationEffect::setAcceleration( double fAcceleration ) OSL_FAIL( "sd::CustomAnimationEffect::setAcceleration(), exception caught!" ); } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setDecelerate( double fDecelerate ) { @@ -833,7 +833,7 @@ void CustomAnimationEffect::setDecelerate( double fDecelerate ) } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse ) { @@ -848,7 +848,7 @@ void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse ) } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { @@ -885,7 +885,7 @@ void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference< setIterateInterval( fIterateInterval ); } -// -------------------------------------------------------------------- + Reference< XShape > CustomAnimationEffect::getTargetShape() const { @@ -901,7 +901,7 @@ Reference< XShape > CustomAnimationEffect::getTargetShape() const return xShape; } -// -------------------------------------------------------------------- + Any CustomAnimationEffect::getRepeatCount() const { @@ -916,7 +916,7 @@ Any CustomAnimationEffect::getRepeatCount() const } } -// -------------------------------------------------------------------- + Any CustomAnimationEffect::getEnd() const { @@ -931,7 +931,7 @@ Any CustomAnimationEffect::getEnd() const } } -// -------------------------------------------------------------------- + sal_Int16 CustomAnimationEffect::getFill() const { @@ -941,7 +941,7 @@ sal_Int16 CustomAnimationEffect::getFill() const return 0; } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount ) { @@ -954,7 +954,7 @@ void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount ) } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setEnd( const Any& rEnd ) { @@ -962,7 +962,7 @@ void CustomAnimationEffect::setEnd( const Any& rEnd ) mxNode->setEnd( rEnd ); } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setFill( sal_Int16 nFill ) { @@ -970,7 +970,7 @@ void CustomAnimationEffect::setFill( sal_Int16 nFill ) mxNode->setFill( nFill ); } -// -------------------------------------------------------------------- + Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const throw (Exception) { @@ -1025,7 +1025,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const return xAnimate; } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) { @@ -1116,7 +1116,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) { @@ -1135,7 +1135,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) } } -// -------------------------------------------------------------------- + OUString CustomAnimationEffect::getPath() const { @@ -1163,7 +1163,7 @@ OUString CustomAnimationEffect::getPath() const return aPath; } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setPath( const OUString& rPath ) { @@ -1189,7 +1189,7 @@ void CustomAnimationEffect::setPath( const OUString& rPath ) } } -// -------------------------------------------------------------------- + Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue ) { @@ -1240,7 +1240,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt return aProperty; } -// -------------------------------------------------------------------- + bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const Any& rValue ) { @@ -1317,14 +1317,14 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA return bChanged; } -// -------------------------------------------------------------------- + static bool implIsColorAttribute( const OUString& rAttributeName ) { return rAttributeName == "FillColor" || rAttributeName == "LineColor" || rAttributeName == "CharColor"; } -// -------------------------------------------------------------------- + Any CustomAnimationEffect::getColor( sal_Int32 nIndex ) { @@ -1373,7 +1373,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex ) return aColor; } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) { @@ -1426,7 +1426,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) } } -// -------------------------------------------------------------------- + Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType, EValue eValue ) { @@ -1474,7 +1474,7 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType, return aProperty; } -// -------------------------------------------------------------------- + bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const Any& rValue ) { @@ -1547,7 +1547,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType, return bChanged; } -// -------------------------------------------------------------------- + void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSource, double fVolume /* = 1.0 */ ) { @@ -1567,7 +1567,7 @@ void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSour } } -// -------------------------------------------------------------------- + static Reference< XCommand > findCommandNode( const Reference< XAnimationNode >& xRootNode ) { @@ -1623,7 +1623,7 @@ void CustomAnimationEffect::removeAudio() } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animations::XAudio >& xAudio ) { @@ -1642,7 +1642,7 @@ void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animati } } -// -------------------------------------------------------------------- + void CustomAnimationEffect::setStopAudio() { @@ -1667,14 +1667,14 @@ void CustomAnimationEffect::setStopAudio() } } -// -------------------------------------------------------------------- + bool CustomAnimationEffect::getStopAudio() const { return mnCommand == EffectCommands::STOPAUDIO; } -// -------------------------------------------------------------------- + SdrPathObj* CustomAnimationEffect::createSdrPathObjFromPath() { @@ -1683,7 +1683,7 @@ SdrPathObj* CustomAnimationEffect::createSdrPathObjFromPath() return pPathObj; } -// -------------------------------------------------------------------- + void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) { @@ -1709,7 +1709,7 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) rPathObj.SetPathPoly( xPolyPoly ); } -// -------------------------------------------------------------------- + void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj ) { @@ -1754,7 +1754,7 @@ EffectSequenceHelper::EffectSequenceHelper() { } -// -------------------------------------------------------------------- + EffectSequenceHelper::EffectSequenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot ) : mxSequenceRoot( xSequenceRoot ), mnSequenceType( EffectNodeType::DEFAULT ) @@ -1763,14 +1763,14 @@ EffectSequenceHelper::EffectSequenceHelper( const ::com::sun::star::uno::Referen create( xNode ); } -// -------------------------------------------------------------------- + EffectSequenceHelper::~EffectSequenceHelper() { reset(); } -// -------------------------------------------------------------------- + void EffectSequenceHelper::reset() { @@ -1790,7 +1790,7 @@ Reference< XAnimationNode > EffectSequenceHelper::getRootNode() return xRoot; } -// -------------------------------------------------------------------- + void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect ) { @@ -1799,7 +1799,7 @@ void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect ) rebuild(); } -// -------------------------------------------------------------------- + CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPresetPtr& pPreset, const Any& rTarget, double fDuration /* = -1.0 */ ) { @@ -1872,7 +1872,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres return pEffect; } -// -------------------------------------------------------------------- + CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathObj, const Any& rTarget, double fDuration /* = -1.0 */ ) { @@ -1921,7 +1921,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb return pEffect; } -// -------------------------------------------------------------------- + void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pPreset, const OUString& rPresetSubType, double fDuration /* = -1.0 */ ) { @@ -1943,7 +1943,7 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pPreset, double fDuration /* = -1.0 */ ) { @@ -1951,7 +1951,7 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con replace( pEffect, pPreset, strEmpty, fDuration ); } -// -------------------------------------------------------------------- + void EffectSequenceHelper::remove( const CustomAnimationEffectPtr& pEffect ) { @@ -1964,14 +1964,14 @@ void EffectSequenceHelper::remove( const CustomAnimationEffectPtr& pEffect ) rebuild(); } -// -------------------------------------------------------------------- + void EffectSequenceHelper::rebuild() { implRebuild(); } -// -------------------------------------------------------------------- + void EffectSequenceHelper::implRebuild() { @@ -2097,21 +2097,21 @@ void EffectSequenceHelper::implRebuild() } } -// -------------------------------------------------------------------- + stl_CustomAnimationEffect_search_node_predict::stl_CustomAnimationEffect_search_node_predict( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSearchNode ) : mxSearchNode( xSearchNode ) { } -// -------------------------------------------------------------------- + bool stl_CustomAnimationEffect_search_node_predict::operator()( CustomAnimationEffectPtr pEffect ) const { return pEffect->getNode() == mxSearchNode; } -// -------------------------------------------------------------------- + static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Reference< XTimeContainer >& xCurrent, Reference< XTimeContainer >& xNext ) throw(Exception) @@ -2133,7 +2133,7 @@ static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Referen return xNext.is(); } -// -------------------------------------------------------------------- + void stl_process_after_effect_node_func(AfterEffectNode& rNode) { @@ -2246,14 +2246,14 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode) } } -// -------------------------------------------------------------------- + EffectSequence::iterator EffectSequenceHelper::find( const CustomAnimationEffectPtr& pEffect ) { return std::find( maEffects.begin(), maEffects.end(), pEffect ); } -// -------------------------------------------------------------------- + CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const { @@ -2272,7 +2272,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const ::com::sun::sta return pEffect; } -// -------------------------------------------------------------------- + sal_Int32 EffectSequenceHelper::getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const { @@ -2288,7 +2288,7 @@ sal_Int32 EffectSequenceHelper::getOffsetFromEffect( const CustomAnimationEffect return -1; } -// -------------------------------------------------------------------- + CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nOffset ) const { @@ -2303,7 +2303,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nO return pEffect; } -// -------------------------------------------------------------------- + bool EffectSequenceHelper::disposeShape( const Reference< XShape >& xShape ) { @@ -2327,7 +2327,7 @@ bool EffectSequenceHelper::disposeShape( const Reference< XShape >& xShape ) return bChanges; } -// -------------------------------------------------------------------- + bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) { @@ -2342,7 +2342,7 @@ bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com: return false; } -// -------------------------------------------------------------------- + void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTarget ) { @@ -2364,7 +2364,7 @@ void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTar rebuild(); } -// -------------------------------------------------------------------- + void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTarget ) { @@ -2418,7 +2418,7 @@ void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTa rebuild(); } -// -------------------------------------------------------------------- + CustomAnimationTextGroup::CustomAnimationTextGroup( const Reference< XShape >& rTarget, sal_Int32 nGroupId ) : maTarget( rTarget ), @@ -2427,7 +2427,7 @@ CustomAnimationTextGroup::CustomAnimationTextGroup( const Reference< XShape >& r reset(); } -// -------------------------------------------------------------------- + void CustomAnimationTextGroup::reset() { @@ -2445,7 +2445,7 @@ void CustomAnimationTextGroup::reset() maEffects.clear(); } -// -------------------------------------------------------------------- + void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect ) { @@ -2495,7 +2495,7 @@ void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect ) } } -// -------------------------------------------------------------------- + class TextGroupMapImpl : public std::map< sal_Int32, CustomAnimationTextGroup* > { @@ -2503,7 +2503,7 @@ public: CustomAnimationTextGroup* findGroup( sal_Int32 nGroupId ); }; -// -------------------------------------------------------------------- + CustomAnimationTextGroupPtr EffectSequenceHelper::findGroup( sal_Int32 nGroupId ) { @@ -2516,7 +2516,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::findGroup( sal_Int32 nGroupId return aPtr; } -// -------------------------------------------------------------------- + void EffectSequenceHelper::updateTextGroups() { @@ -2545,7 +2545,7 @@ void EffectSequenceHelper::updateTextGroups() } } -// -------------------------------------------------------------------- + CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse ) { @@ -2604,7 +2604,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimati return pTextGroup; } -// -------------------------------------------------------------------- + void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextGroupPtr pTextGroup, CustomAnimationEffectPtr pEffect, bool bUsed ) { @@ -2699,7 +2699,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGroup, sal_Int32 nTextGrouping ) { @@ -2781,7 +2781,7 @@ void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGro } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm ) { @@ -2855,7 +2855,7 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::setTextGroupingAuto( CustomAnimationTextGroupPtr pTextGroup, double fTextGroupingAuto ) { @@ -2899,7 +2899,7 @@ void EffectSequenceHelper::setTextGroupingAuto( CustomAnimationTextGroupPtr pTex notify_listeners(); } -// -------------------------------------------------------------------- + struct ImplStlTextGroupSortHelper { @@ -2909,7 +2909,7 @@ struct ImplStlTextGroupSortHelper sal_Int32 getTargetParagraph( const CustomAnimationEffectPtr& p1 ); }; -// -------------------------------------------------------------------- + sal_Int32 ImplStlTextGroupSortHelper::getTargetParagraph( const CustomAnimationEffectPtr& p1 ) { @@ -2926,7 +2926,7 @@ sal_Int32 ImplStlTextGroupSortHelper::getTargetParagraph( const CustomAnimationE } } -// -------------------------------------------------------------------- + bool ImplStlTextGroupSortHelper::operator()( const CustomAnimationEffectPtr& p1, const CustomAnimationEffectPtr& p2 ) { @@ -2940,7 +2940,7 @@ bool ImplStlTextGroupSortHelper::operator()( const CustomAnimationEffectPtr& p1, } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bTextReverse ) { @@ -2976,7 +2976,7 @@ void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGrou } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::addListener( ISequenceListener* pListener ) { @@ -2984,14 +2984,14 @@ void EffectSequenceHelper::addListener( ISequenceListener* pListener ) maListeners.push_back( pListener ); } -// -------------------------------------------------------------------- + void EffectSequenceHelper::removeListener( ISequenceListener* pListener ) { maListeners.remove( pListener ); } -// -------------------------------------------------------------------- + struct stl_notify_listeners_func : public std::unary_function<ISequenceListener*, void> { @@ -2999,7 +2999,7 @@ struct stl_notify_listeners_func : public std::unary_function<ISequenceListener* void operator()(ISequenceListener* pListener) { pListener->notify_change(); } }; -// -------------------------------------------------------------------- + void EffectSequenceHelper::notify_listeners() { @@ -3007,7 +3007,7 @@ void EffectSequenceHelper::notify_listeners() std::for_each( maListeners.begin(), maListeners.end(), aFunc ); } -// -------------------------------------------------------------------- + void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { @@ -3029,7 +3029,7 @@ void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode >& xNode ) { @@ -3052,7 +3052,7 @@ void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNode ) { @@ -3098,7 +3098,7 @@ void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNo } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >& xNode ) { @@ -3198,7 +3198,7 @@ MainSequence::MainSequence() init(); } -// -------------------------------------------------------------------- + MainSequence::MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) : mxTimingRootNode( xNode, UNO_QUERY ) @@ -3210,14 +3210,14 @@ MainSequence::MainSequence( const ::com::sun::star::uno::Reference< ::com::sun:: init(); } -// -------------------------------------------------------------------- + MainSequence::~MainSequence() { reset(); } -// -------------------------------------------------------------------- + void MainSequence::init() { @@ -3231,7 +3231,7 @@ void MainSequence::init() createMainSequence(); } -// -------------------------------------------------------------------- + void MainSequence::reset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode ) { @@ -3242,7 +3242,7 @@ void MainSequence::reset( const ::com::sun::star::uno::Reference< ::com::sun::st createMainSequence(); } -// -------------------------------------------------------------------- + Reference< ::com::sun::star::animations::XAnimationNode > MainSequence::getRootNode() { @@ -3258,7 +3258,7 @@ Reference< ::com::sun::star::animations::XAnimationNode > MainSequence::getRootN return EffectSequenceHelper::getRootNode(); } -// -------------------------------------------------------------------- + void MainSequence::createMainSequence() { @@ -3320,7 +3320,7 @@ void MainSequence::createMainSequence() DBG_ASSERT( mxSequenceRoot.is(), "sd::MainSequence::create(), found no main sequence!" ); } -// -------------------------------------------------------------------- + void MainSequence::reset() { @@ -3343,7 +3343,7 @@ void MainSequence::reset() } } -// -------------------------------------------------------------------- + InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) { @@ -3368,7 +3368,7 @@ InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun return pIS; } -// -------------------------------------------------------------------- + CustomAnimationEffectPtr MainSequence::findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const { @@ -3385,7 +3385,7 @@ CustomAnimationEffectPtr MainSequence::findEffect( const ::com::sun::star::uno:: return pEffect; } -// -------------------------------------------------------------------- + sal_Int32 MainSequence::getOffsetFromEffect( const CustomAnimationEffectPtr& pEffect ) const { @@ -3409,7 +3409,7 @@ sal_Int32 MainSequence::getOffsetFromEffect( const CustomAnimationEffectPtr& pEf return -1; } -// -------------------------------------------------------------------- + CustomAnimationEffectPtr MainSequence::getEffectFromOffset( sal_Int32 nOffset ) const { @@ -3433,7 +3433,7 @@ CustomAnimationEffectPtr MainSequence::getEffectFromOffset( sal_Int32 nOffset ) return pEffect; } -// -------------------------------------------------------------------- + bool MainSequence::disposeShape( const Reference< XShape >& xShape ) { @@ -3451,7 +3451,7 @@ bool MainSequence::disposeShape( const Reference< XShape >& xShape ) return bChanges; } -// -------------------------------------------------------------------- + bool MainSequence::hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) { @@ -3471,7 +3471,7 @@ bool MainSequence::hasEffect( const com::sun::star::uno::Reference< com::sun::st return false; } -// -------------------------------------------------------------------- + void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget ) { @@ -3483,7 +3483,7 @@ void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget ) (*aIter)->insertTextRange( aTarget ); } } -// -------------------------------------------------------------------- + void MainSequence::disposeTextRange( const com::sun::star::uno::Any& aTarget ) { @@ -3496,7 +3496,7 @@ void MainSequence::disposeTextRange( const com::sun::star::uno::Any& aTarget ) } } -// -------------------------------------------------------------------- + /** callback from the sd::View when an object just left text edit mode */ void MainSequence::onTextChanged( const Reference< XShape >& xShape ) @@ -3510,7 +3510,7 @@ void MainSequence::onTextChanged( const Reference< XShape >& xShape ) } } -// -------------------------------------------------------------------- + void EffectSequenceHelper::onTextChanged( const Reference< XShape >& xShape ) { @@ -3527,21 +3527,21 @@ void EffectSequenceHelper::onTextChanged( const Reference< XShape >& xShape ) EffectSequenceHelper::implRebuild(); } -// -------------------------------------------------------------------- + void MainSequence::rebuild() { startRebuildTimer(); } -// -------------------------------------------------------------------- + void MainSequence::lockRebuilds() { mnRebuildLockGuard++; } -// -------------------------------------------------------------------- + void MainSequence::unlockRebuilds() { @@ -3556,7 +3556,7 @@ void MainSequence::unlockRebuilds() } } -// -------------------------------------------------------------------- + void MainSequence::implRebuild() { @@ -3596,14 +3596,14 @@ void MainSequence::implRebuild() mbRebuilding = false; } -// -------------------------------------------------------------------- + void MainSequence::notify_change() { notify_listeners(); } -// -------------------------------------------------------------------- + bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTriggerShape ) { @@ -3648,7 +3648,7 @@ bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const :: } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(MainSequence, onTimerHdl) { @@ -3665,7 +3665,7 @@ IMPL_LINK_NOARG(MainSequence, onTimerHdl) return 0; } -// -------------------------------------------------------------------- + /** starts a timer that recreates the internal structure from the API core after 1 second */ void MainSequence::startRecreateTimer() @@ -3677,7 +3677,7 @@ void MainSequence::startRecreateTimer() } } -// -------------------------------------------------------------------- + /** starts a timer that rebuilds the API core from the internal structure after 1 second */ void MainSequence::startRebuildTimer() @@ -3716,7 +3716,7 @@ InteractiveSequence::InteractiveSequence( const Reference< XTimeContainer >& xSe } } -// -------------------------------------------------------------------- + void InteractiveSequence::rebuild() { @@ -3728,7 +3728,7 @@ void InteractiveSequence::implRebuild() EffectSequenceHelper::implRebuild(); } -// -------------------------------------------------------------------- + MainSequenceRebuildGuard::MainSequenceRebuildGuard( const MainSequencePtr& pMainSequence ) : mpMainSequence( pMainSequence ) diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index b919a54519d1..951a6dd05402 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -532,7 +532,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff } } -// -------------------------------------------------------------------- + AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) { @@ -577,7 +577,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) } -// -------------------------------------------------------------------- + void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect eEffect ) { @@ -718,7 +718,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect } } -// -------------------------------------------------------------------- + AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape ) { @@ -751,7 +751,7 @@ AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape ) return eEffect; } -// -------------------------------------------------------------------- + bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, AnimationEffect& rEffect ) { @@ -781,7 +781,7 @@ bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString* } } -// -------------------------------------------------------------------- + bool EffectMigration::ConvertAnimationEffect( const AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType ) { @@ -800,7 +800,7 @@ bool EffectMigration::ConvertAnimationEffect( const AnimationEffect& rEffect, OU return false; } -// -------------------------------------------------------------------- + double EffectMigration::ConvertAnimationSpeed( AnimationSpeed eSpeed ) { @@ -814,7 +814,7 @@ double EffectMigration::ConvertAnimationSpeed( AnimationSpeed eSpeed ) } return fDuration; } -// -------------------------------------------------------------------- + void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed ) { @@ -851,7 +851,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed pMainSequence->rebuild(); } -// -------------------------------------------------------------------- + AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape ) { @@ -880,7 +880,7 @@ AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape ) return ConvertDuration( fDuration ); } -// -------------------------------------------------------------------- + AnimationSpeed EffectMigration::ConvertDuration( double fDuration ) { @@ -896,7 +896,7 @@ AnimationSpeed EffectMigration::ConvertDuration( double fDuration ) return eSpeed; } -// -------------------------------------------------------------------- + void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) { @@ -932,7 +932,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) pMainSequence->rebuild(); } -// -------------------------------------------------------------------- + sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) { @@ -964,7 +964,7 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) return nColor; } -// -------------------------------------------------------------------- + void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide ) @@ -1004,7 +1004,7 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide ) pMainSequence->rebuild(); } -// -------------------------------------------------------------------- + sal_Bool EffectMigration::GetDimHide( SvxShape* pShape ) { @@ -1036,7 +1036,7 @@ sal_Bool EffectMigration::GetDimHide( SvxShape* pShape ) return bRet; } -// -------------------------------------------------------------------- + void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious ) { @@ -1078,7 +1078,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious ) pMainSequence->rebuild(); } -// -------------------------------------------------------------------- + sal_Bool EffectMigration::GetDimPrevious( SvxShape* pShape ) { @@ -1110,7 +1110,7 @@ sal_Bool EffectMigration::GetDimPrevious( SvxShape* pShape ) return bRet; } -// -------------------------------------------------------------------- + void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos ) { @@ -1201,7 +1201,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos } } -// -------------------------------------------------------------------- + /** Returns the position of the given SdrObject in the Presentation order. * This function returns -1 if the SdrObject is not in the Presentation order @@ -1242,7 +1242,7 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape ) return nFound; } -// -------------------------------------------------------------------- + void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInfo ) { @@ -1282,7 +1282,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInf } } -// -------------------------------------------------------------------- + OUString EffectMigration::GetSoundFile( SvxShape* pShape ) { @@ -1315,14 +1315,14 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape ) return aSoundFile; } -// -------------------------------------------------------------------- + sal_Bool EffectMigration::GetSoundOn( SvxShape* pShape ) { return !GetSoundFile( pShape ).isEmpty(); } -// -------------------------------------------------------------------- + void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj ) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 1e17fadb4e49..64d9d1407ec0 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1686,7 +1686,7 @@ SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum) return FmFormPage::ReplaceObject(pNewObj, nObjNum); } -// ------------------------------------------------------------------------- + // called after a shape is removed or replaced from this slide diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 507f25545ce2..7e698975a7d0 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; using namespace ::com::sun::star::beans; -// ---------------------------------------------------------- + typedef std::map< OUString, rtl::Reference< SdStyleSheet > > PresStyleMap; @@ -88,7 +88,7 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets() return maStyleSheets; } -// ---------------------------------------------------------- + SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, SfxStyleFamily nFamily ) : mnFamily( nFamily ) @@ -97,7 +97,7 @@ SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, { } -// ---------------------------------------------------------- + SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, const SdPage* pMasterPage ) : mnFamily( SD_STYLE_FAMILY_MASTERPAGE ) @@ -108,7 +108,7 @@ SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, mpImpl->mxPool = xPool; } -// ---------------------------------------------------------- + SdStyleFamily::~SdStyleFamily() { @@ -116,7 +116,7 @@ SdStyleFamily::~SdStyleFamily() delete mpImpl; } -// ---------------------------------------------------------- + void SdStyleFamily::throwIfDisposed() const throw(RuntimeException) { @@ -124,7 +124,7 @@ void SdStyleFamily::throwIfDisposed() const throw(RuntimeException) throw DisposedException(); } -// ---------------------------------------------------------- + SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any& rElement ) throw(IllegalArgumentException) { @@ -137,7 +137,7 @@ SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any& rElement ) throw(Illeg return pStyle; } -// ---------------------------------------------------------- + SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException ) { @@ -212,15 +212,15 @@ OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException) } } -// ---------------------------------------------------------- + void SAL_CALL SdStyleFamily::setName( const OUString& ) throw (RuntimeException) { } -// ---------------------------------------------------------- + // XNameAccess -// ---------------------------------------------------------- + Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -229,7 +229,7 @@ Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchEleme return Any( Reference< XStyle >( static_cast<SfxUnoStyleSheet*>(GetSheetByName( rName )) ) ); } -// ---------------------------------------------------------- + Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeException) { @@ -269,7 +269,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce } } -// ---------------------------------------------------------- + sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException) { @@ -299,16 +299,16 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim return sal_False; } -// ---------------------------------------------------------- + // XElementAccess -// ---------------------------------------------------------- + Type SAL_CALL SdStyleFamily::getElementType() throw(RuntimeException) { return cppu::UnoType<XStyle>::get(); } -// ---------------------------------------------------------- + sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException) { @@ -333,9 +333,9 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException) return sal_False; } -// ---------------------------------------------------------- + // XIndexAccess -// ---------------------------------------------------------- + sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException) { @@ -361,7 +361,7 @@ sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException) return nCount; } -// ---------------------------------------------------------- + Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { @@ -401,9 +401,9 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds throw IndexOutOfBoundsException(); } -// ---------------------------------------------------------- + // XNameContainer -// ---------------------------------------------------------- + void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { @@ -421,7 +421,7 @@ void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rEl mxPool->Insert( pStyle ); } -// ---------------------------------------------------------- + void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -436,9 +436,9 @@ void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchE mxPool->Remove( pStyle ); } -// ---------------------------------------------------------- + // XNameReplace -// ---------------------------------------------------------- + void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -452,9 +452,9 @@ void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aE mxPool->Insert( pNewStyle ); } -// ---------------------------------------------------------- + // XSingleServiceFactory -// ---------------------------------------------------------- + Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception, RuntimeException) { @@ -471,16 +471,16 @@ Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception } } -// ---------------------------------------------------------- + Reference< XInterface > SAL_CALL SdStyleFamily::createInstanceWithArguments( const Sequence< Any >& ) throw(Exception, RuntimeException) { return createInstance(); } -// ---------------------------------------------------------- + // XComponent -// ---------------------------------------------------------- + void SAL_CALL SdStyleFamily::dispose( ) throw (RuntimeException) { @@ -494,21 +494,21 @@ void SAL_CALL SdStyleFamily::dispose( ) throw (RuntimeException) } } -// ---------------------------------------------------------- + void SAL_CALL SdStyleFamily::addEventListener( const Reference< XEventListener >& ) throw (RuntimeException) { } -// ---------------------------------------------------------- + void SAL_CALL SdStyleFamily::removeEventListener( const Reference< XEventListener >& ) throw (RuntimeException) { } -// ---------------------------------------------------------- + // XPropertySet -// ---------------------------------------------------------- + Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo() throw (RuntimeException) { @@ -516,14 +516,14 @@ Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo() throw (RuntimeEx return Reference<XPropertySetInfo>(); } -// ---------------------------------------------------------- + void SdStyleFamily::setPropertyValue( const OUString& , const Any& ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// ---------------------------------------------------------- + Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -545,28 +545,28 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno } } -// ---------------------------------------------------------- + void SdStyleFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// ---------------------------------------------------------- + void SdStyleFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// ---------------------------------------------------------- + void SdStyleFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "###unexpected!" ); } -// ---------------------------------------------------------- + void SdStyleFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 52107528eaa5..c42c02aaf6c9 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -99,7 +99,7 @@ SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, OUString aStyleName) } -// ---------------------------------------------------------- + SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pDocument) : SdStyleSheetPoolBase( _rPool ) @@ -127,28 +127,28 @@ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pD } } -// ---------------------------------------------------------- + SdStyleSheetPool::~SdStyleSheetPool() { DBG_ASSERT( mpDoc == NULL, "sd::SdStyleSheetPool::~SdStyleSheetPool(), dispose me first!" ); } -// ---------------------------------------------------------- + SfxStyleSheetBase* SdStyleSheetPool::Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 _nMask ) { return new SdStyleSheet(rName, *this, eFamily, _nMask); } -// ---------------------------------------------------------- + SfxStyleSheetBase* SdStyleSheetPool::Create(const SdStyleSheet& rStyle) { return new SdStyleSheet( rStyle ); } -// ---------------------------------------------------------- + SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName) { @@ -1000,9 +1000,9 @@ void SdStyleSheetPool::UpdateStdNames() for ( size_t i = 0, n = aEraseList.size(); i < n; ++i ) Remove( aEraseList[ i ] ); } -// -------------------------------------------------------------------- + // Set new SvxNumBulletItem for the respective style sheet -// -------------------------------------------------------------------- + void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont ) @@ -1162,7 +1162,7 @@ Font SdStyleSheetPool::GetBulletFont() const return aBulletFont; } -// -------------------------------------------------------------------- + void SdStyleSheetPool::AddStyleFamily( const SdPage* pPage ) { @@ -1170,7 +1170,7 @@ void SdStyleSheetPool::AddStyleFamily( const SdPage* pPage ) maStyleFamilyMap[pPage] = new SdStyleFamily( xPool, pPage ); } -// -------------------------------------------------------------------- + void SdStyleSheetPool::RemoveStyleFamily( const SdPage* pPage ) { @@ -1190,7 +1190,7 @@ void SdStyleSheetPool::RemoveStyleFamily( const SdPage* pPage ) } } -// -------------------------------------------------------------------- + void SdStyleSheetPool::throwIfDisposed() throw(::com::sun::star::uno::RuntimeException) { @@ -1238,7 +1238,7 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl throw NoSuchElementException(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeException) { @@ -1259,7 +1259,7 @@ Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeE return aNames; } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(RuntimeException) { @@ -1283,9 +1283,9 @@ sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(Run return sal_False; } -// -------------------------------------------------------------------- + // XElementAccess -// -------------------------------------------------------------------- + Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException) { @@ -1294,16 +1294,16 @@ Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException) return cppu::UnoType<XNameAccess>::get(); } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SdStyleSheetPool::hasElements() throw(RuntimeException) { return sal_True; } -// -------------------------------------------------------------------- + // XIndexAccess -// -------------------------------------------------------------------- + sal_Int32 SAL_CALL SdStyleSheetPool::getCount() throw(RuntimeException) { @@ -1312,7 +1312,7 @@ sal_Int32 SAL_CALL SdStyleSheetPool::getCount() throw(RuntimeException) return maStyleFamilyMap.size() + 3; } -// -------------------------------------------------------------------- + Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { @@ -1341,9 +1341,9 @@ Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou } } -// -------------------------------------------------------------------- + // XComponent -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException) { @@ -1376,19 +1376,19 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheetPool::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheetPool::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException) { } -// -------------------------------------------------------------------- + SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) { @@ -1410,7 +1410,7 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) return aResult; } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheetPool::acquire (void) throw () { @@ -1422,6 +1422,6 @@ void SAL_CALL SdStyleSheetPool::release (void) throw () SdStyleSheetPoolBase::release(); } -// -------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 059d3d128016..4cef76e32069 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -606,35 +606,35 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingIte } } -// -------------------------------------------------------------------- + bool SdStyleSheet::HasFollowSupport() const { return false; } -// -------------------------------------------------------------------- + bool SdStyleSheet::HasParentSupport() const { return true; } -// -------------------------------------------------------------------- + bool SdStyleSheet::HasClearParentSupport() const { return true; } -// -------------------------------------------------------------------- + bool SdStyleSheet::SetName( const OUString& rName ) { return SfxStyleSheet::SetName( rName ); } -// -------------------------------------------------------------------- + void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) { @@ -691,7 +691,7 @@ void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) } } -// -------------------------------------------------------------------- + OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily ) { @@ -706,7 +706,7 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily ) } } -// -------------------------------------------------------------------- + void SdStyleSheet::throwIfDisposed() throw (RuntimeException) { @@ -714,7 +714,7 @@ void SdStyleSheet::throwIfDisposed() throw (RuntimeException) throw DisposedException(); } -// -------------------------------------------------------------------- + SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily ) { @@ -730,9 +730,9 @@ SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, return new SdStyleSheet(aName, rPool, eFamily, SFXSTYLEBIT_USERDEF); } -// -------------------------------------------------------------------- + // XInterface -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::release( ) throw () { @@ -756,9 +756,9 @@ void SAL_CALL SdStyleSheet::release( ) throw () } } -// -------------------------------------------------------------------- + // XComponent -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException) { @@ -800,14 +800,14 @@ void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SdStyleSheet::disposing() { mxPool.clear(); } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException) { @@ -824,16 +824,16 @@ void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >& } } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException) { mrBHelper.removeListener( ::getCppuType( &xListener ), xListener ); } -//------------------------------------------------------------------------ + // XModifyBroadcaster -//------------------------------------------------------------------------ + void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException) { @@ -852,14 +852,14 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener } } -//------------------------------------------------------------------------ + void SAL_CALL SdStyleSheet::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException) { mrBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener ); } -//------------------------------------------------------------------------ + void SdStyleSheet::notifyModifyListener() { @@ -911,7 +911,7 @@ OUString SAL_CALL SdStyleSheet::getName() throw(RuntimeException) return GetApiName(); } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeException) { @@ -925,9 +925,9 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeExcep } } -// -------------------------------------------------------------------- + // XStyle -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException) { @@ -936,7 +936,7 @@ sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException) return IsUserDefined() ? sal_True : sal_False; } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException) { @@ -945,7 +945,7 @@ sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException) return IsUsed() ? sal_True : sal_False; } -// -------------------------------------------------------------------- + OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException) { @@ -961,7 +961,7 @@ OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException) return OUString(); } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw(NoSuchElementException, RuntimeException) { @@ -994,9 +994,9 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw } } -// -------------------------------------------------------------------- + // XPropertySet -// -------------------------------------------------------------------- + Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeException) { @@ -1007,7 +1007,7 @@ Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeEx return xInfo; } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { @@ -1095,7 +1095,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con } } -// -------------------------------------------------------------------- + Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -1192,16 +1192,16 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro } } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) {} void SAL_CALL SdStyleSheet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) {} void SAL_CALL SdStyleSheet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) {} void SAL_CALL SdStyleSheet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) {} -// -------------------------------------------------------------------- + // XPropertyState -// -------------------------------------------------------------------- + PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { @@ -1280,7 +1280,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN } } -// -------------------------------------------------------------------- + Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) { @@ -1300,7 +1300,7 @@ Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequen return aPropertyStateSequence; } -// -------------------------------------------------------------------- + void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { @@ -1326,7 +1326,7 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); } -// -------------------------------------------------------------------- + Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -1360,7 +1360,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t return aRet; } -// -------------------------------------------------------------------- + /** this is used because our property map is not sorted yet */ const SfxItemPropertySimpleEntry* SdStyleSheet::getPropertyMapEntry( const OUString& rPropertyName ) const throw() diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index 66ad69902c9f..7eeec67546ec 100644 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.cxx @@ -52,7 +52,7 @@ UndoRemovePresObjectImpl::UndoRemovePresObjectImpl( SdrObject& rObject ) } } -//--------------------------------------------------------------------- + UndoRemovePresObjectImpl::~UndoRemovePresObjectImpl() { @@ -61,7 +61,7 @@ UndoRemovePresObjectImpl::~UndoRemovePresObjectImpl() delete mpUndoUsercall; } -//--------------------------------------------------------------------- + void UndoRemovePresObjectImpl::Undo() { @@ -73,7 +73,7 @@ void UndoRemovePresObjectImpl::Undo() mpUndoAnimation->Undo(); } -//--------------------------------------------------------------------- + void UndoRemovePresObjectImpl::Redo() { @@ -94,7 +94,7 @@ UndoRemoveObject::UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) { } -//--------------------------------------------------------------------- + void UndoRemoveObject::Undo() { @@ -106,7 +106,7 @@ void UndoRemoveObject::Undo() } } -//--------------------------------------------------------------------- + void UndoRemoveObject::Redo() { @@ -127,7 +127,7 @@ UndoDeleteObject::UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) { } -//--------------------------------------------------------------------- + void UndoDeleteObject::Undo() { @@ -139,7 +139,7 @@ void UndoDeleteObject::Undo() } } -//--------------------------------------------------------------------- + void UndoDeleteObject::Redo() { @@ -160,7 +160,7 @@ UndoReplaceObject::UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObje { } -//--------------------------------------------------------------------- + void UndoReplaceObject::Undo() { @@ -172,7 +172,7 @@ void UndoReplaceObject::Undo() } } -//--------------------------------------------------------------------- + void UndoReplaceObject::Redo() { @@ -203,14 +203,14 @@ UndoObjectSetText::UndoObjectSetText( SdrObject& rObject, sal_Int32 nText ) } } -//--------------------------------------------------------------------- + UndoObjectSetText::~UndoObjectSetText() { delete mpUndoAnimation; } -//--------------------------------------------------------------------- + void UndoObjectSetText::Undo() { @@ -224,7 +224,7 @@ void UndoObjectSetText::Undo() } } -//--------------------------------------------------------------------- + void UndoObjectSetText::Redo() { @@ -249,7 +249,7 @@ UndoObjectUserCall::UndoObjectUserCall(SdrObject& rObject) { } -//--------------------------------------------------------------------- + void UndoObjectUserCall::Undo() { @@ -261,7 +261,7 @@ void UndoObjectUserCall::Undo() } } -//--------------------------------------------------------------------- + void UndoObjectUserCall::Redo() { @@ -288,7 +288,7 @@ UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject) meOldKind = static_cast< SdPage* >( mxPage.get() )->GetPresObjKind( &rObject ); } -//--------------------------------------------------------------------- + void UndoObjectPresentationKind::Undo() { @@ -303,7 +303,7 @@ void UndoObjectPresentationKind::Undo() } } -//--------------------------------------------------------------------- + void UndoObjectPresentationKind::Redo() { @@ -324,14 +324,14 @@ UndoAutoLayoutPosAndSize::UndoAutoLayoutPosAndSize( SdPage& rPage ) { } -//--------------------------------------------------------------------- + void UndoAutoLayoutPosAndSize::Undo() { // do nothing } -//--------------------------------------------------------------------- + void UndoAutoLayoutPosAndSize::Redo() { @@ -349,7 +349,7 @@ UndoGeoObject::UndoGeoObject( SdrObject& rNewObj ) { } -//--------------------------------------------------------------------- + void UndoGeoObject::Undo() { @@ -368,7 +368,7 @@ void UndoGeoObject::Undo() } } -//--------------------------------------------------------------------- + void UndoGeoObject::Redo() { @@ -387,7 +387,7 @@ void UndoGeoObject::Redo() } } -//--------------------------------------------------------------------- + ////////////////////////////////////////////////////////////////////////////// @@ -398,7 +398,7 @@ UndoAttrObject::UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSav { } -//--------------------------------------------------------------------- + void UndoAttrObject::Undo() { @@ -417,7 +417,7 @@ void UndoAttrObject::Undo() } } -//--------------------------------------------------------------------- + void UndoAttrObject::Redo() { |