diff options
Diffstat (limited to 'sd/source')
93 files changed, 1269 insertions, 1269 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() { diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index be8b0e9ba4eb..852755704b82 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -164,7 +164,7 @@ void PPTWriter::exportPPTPost( ) mbStatus = sal_True; }; -// --------------------------------------------------------------------------------------------- + void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStream& rBinaryTagData10Atom ); @@ -358,7 +358,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ mpPptEscherEx->CloseContainer(); // EPP_Slide } -// --------------------------------------------------------------------------------------------- + void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet ) { @@ -446,7 +446,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->CloseContainer(); // EPP_MainMaster }; -// --------------------------------------------------------------------------------------------- + PPTWriter::~PPTWriter() { @@ -467,7 +467,7 @@ PPTWriter::~PPTWriter() mXStatusIndicator->end(); } -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriter::ImplCreateCurrentUserStream() { @@ -499,7 +499,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream() return sal_True; }; -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() { @@ -552,7 +552,7 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() return sal_True; } -// --------------------------------------------------------------------------------------------- + void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId ) { @@ -567,7 +567,7 @@ void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sa } } -// --------------------------------------------------------------------------------------------- + void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ) { @@ -593,7 +593,7 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star } } -// --------------------------------------------------------------------------------------------- + void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ) { @@ -677,7 +677,7 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com } } -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriter::ImplCreateDocument() { @@ -943,7 +943,7 @@ sal_Bool PPTWriter::ImplCreateDocument() return sal_True; }; -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) { @@ -1026,7 +1026,7 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) return sal_True; } -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriter::ImplCreateMainNotes() { @@ -1068,7 +1068,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes() return sal_True; } -// --------------------------------------------------------------------------------------------- + static OUString getInitials( const OUString& rName ) { @@ -1155,7 +1155,7 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr } } -// --------------------------------------------------------------------------------------------- + void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum ) { @@ -1281,7 +1281,7 @@ void PPTWriter::ImplWriteVBA() } } -// --------------------------------------------------------------------------------------------- + void PPTWriter::ImplWriteOLE( ) { @@ -1361,7 +1361,7 @@ void PPTWriter::ImplWriteOLE( ) } } -// --------------------------------------------------------------------------------------------- + // write PersistantTable and UserEditAtom sal_Bool PPTWriter::ImplWriteAtomEnding() @@ -1472,9 +1472,9 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() return sal_True; } -// --------------------- + // - exported function - -// --------------------- + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index cc47322acdd5..3843fb9b51e3 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -97,7 +97,7 @@ using namespace ::com::sun::star; #define DEFAULT_PITCH 0x00 #define FIXED_PITCH 0x01 -// --------------------------------------------------------------------------------------------- + PPTExBulletProvider::PPTExBulletProvider() { @@ -153,7 +153,7 @@ sal_uInt16 PPTExBulletProvider::GetId( const OString& rUniqueId, Size& rGraphicS return nRetValue; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm ) { @@ -172,7 +172,7 @@ sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm ) return nSize; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pStrm ) { @@ -223,7 +223,7 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream return nSize; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm ) { @@ -243,7 +243,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm ) return nSize; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm ) { @@ -274,7 +274,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm ) return nSize; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStream* pBinTagStrm ) { @@ -305,7 +305,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea return nSize; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBinTagStrm ) { @@ -328,7 +328,7 @@ sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBi return nSize; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm ) { @@ -353,7 +353,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm ) return nSize; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm ) { @@ -376,7 +376,7 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm ) return nSize; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const sal_uInt32 nType, const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ) @@ -416,7 +416,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const return nHyperId; } -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriter::ImplCloseDocument() { @@ -577,7 +577,7 @@ sal_Bool PPTWriter::ImplCloseDocument() return sal_False; } -// --------------------------------------------------------------------------------------------- + sal_Bool PropValue::GetPropertyValue( ::com::sun::star::uno::Any& rAny, @@ -617,7 +617,7 @@ sal_Bool PropValue::GetPropertyValue( return bRetValue; } -// --------------------------------------------------------------------------------------------- + ::com::sun::star::beans::PropertyState PropValue::GetPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, @@ -638,21 +638,21 @@ sal_Bool PropValue::GetPropertyValue( return eRetValue; } -// --------------------------------------------------------------------------------------------- + sal_Bool PropValue::ImplGetPropertyValue( const OUString& rString ) { return GetPropertyValue( mAny, mXPropSet, rString ); } -// --------------------------------------------------------------------------------------------- + sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const OUString& rString ) { return GetPropertyValue( mAny, aXPropSet, rString ); } -// --------------------------------------------------------------------------------------------- + sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState ) { @@ -681,7 +681,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool return bRetValue; } -// --------------------------------------------------------------------------------------------- + void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) { @@ -3890,7 +3890,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mpPptEscherEx->CloseContainer(); } -//---------------------------------------------------------------------------------------------------------- + void TextObjBinary::Write( SvStream* pStrm ) { diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index abd2081e7887..7e2eadf6ae0f 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -19,9 +19,9 @@ #include "escherex.hxx" -// --------------------------------------------------------------------------------------------- -// --------------------------------------------------------------------------------------------- -// --------------------------------------------------------------------------------------------- + + + PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) : EscherEx( EscherExGlobalRef( new EscherExGlobal ), &rOutStrm ) @@ -30,7 +30,7 @@ PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) : mnCurrentDg = 0; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PptEscherEx::DrawingGroupContainerSize() { @@ -46,7 +46,7 @@ void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt ) ImplWriteDggContainer( rSt ); } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PptEscherEx::ImplDggContainerSize() { @@ -76,7 +76,7 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt ) } } -// --------------------------------------------------------------------------------------------- + #define ESCHER_OPT_COUNT 6 @@ -104,7 +104,7 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt ) } } -// --------------------------------------------------------------------------------------------- + #define ESCHER_SPLIT_MENU_COLORS_COUNT 4 @@ -131,13 +131,13 @@ void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt ) } -// --------------------------------------------------------------------------------------------- + PptEscherEx::~PptEscherEx() { } -// --------------------------------------------------------------------------------------------- + void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance ) { @@ -175,7 +175,7 @@ void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance } } -// --------------------------------------------------------------------------------------------- + void PptEscherEx::CloseContainer() { @@ -222,7 +222,7 @@ void PptEscherEx::CloseContainer() } } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData ) { @@ -285,6 +285,6 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie return nShapeId; } -// --------------------------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index f65ecc1eaeec..aae16dede5b1 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -273,7 +273,7 @@ AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContai { } -// -------------------------------------------------------------------- + sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault ) { diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 4ffe04677735..afa63d3c8bc0 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -165,7 +165,7 @@ PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel, { } -// --------------------------------------------------------------------------------------------- + PPTWriterBase::~PPTWriterBase() { @@ -177,7 +177,7 @@ PPTWriterBase::~PPTWriterBase() mXStatusIndicator->end(); } -// --------------------------------------------------------------------------------------------- + void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData ) { @@ -258,7 +258,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert exportPPTPost(); } -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriterBase::InitSOIface() { @@ -287,7 +287,7 @@ sal_Bool PPTWriterBase::InitSOIface() return sal_False; } -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { @@ -372,7 +372,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) return sal_False; } -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) { @@ -419,7 +419,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) return sal_True; }; -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum ) { @@ -432,7 +432,7 @@ sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum ) return sal_True; }; -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) { @@ -451,7 +451,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) return sal_True; }; -// --------------------------------------------------------------------------------------------- + sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const { @@ -484,7 +484,7 @@ PHLayout& PPTWriterBase::GetLayout( const ::com::sun::star::uno::Reference< ::c return pPHLayout[ GetLayoutOffsetFixed( rXPropSet ) ]; } -// --------------------------------------------------------------------------------------------- + PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const { @@ -496,7 +496,7 @@ PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const return pPHLayout[ 0 ]; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType ) { @@ -540,7 +540,7 @@ sal_Bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) return bRet; } -// --------------------------------------------------------------------------------------------- + sal_Bool PPTWriterBase::GetStyleSheets() { diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx b/sd/source/filter/eppt/pptx-grouptable.cxx index 2345716f0d49..60252c26aa71 100644 --- a/sd/source/filter/eppt/pptx-grouptable.cxx +++ b/sd/source/filter/eppt/pptx-grouptable.cxx @@ -31,7 +31,7 @@ GroupTable::GroupTable() : ImplResizeGroupTable( 32 ); } -// --------------------------------------------------------------------------------------------- + GroupTable::~GroupTable() { @@ -39,7 +39,7 @@ GroupTable::~GroupTable() delete[] mpGroupEntry; } -// --------------------------------------------------------------------------------------------- + void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys ) { @@ -55,7 +55,7 @@ void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys ) } } -// --------------------------------------------------------------------------------------------- + sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef ) { @@ -76,7 +76,7 @@ sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::s return bRet; } -// --------------------------------------------------------------------------------------------- + sal_uInt32 GroupTable::GetGroupsClosed() { @@ -85,7 +85,7 @@ sal_uInt32 GroupTable::GetGroupsClosed() return nRet; } -// --------------------------------------------------------------------------------------------- + void GroupTable::ClearGroupTable() { @@ -93,7 +93,7 @@ void GroupTable::ClearGroupTable() mnCurrentGroupEntry = 0; } -// --------------------------------------------------------------------------------------------- + void GroupTable::ResetGroupTable( sal_uInt32 nCount ) { @@ -101,7 +101,7 @@ void GroupTable::ResetGroupTable( sal_uInt32 nCount ) mpGroupEntry[ mnCurrentGroupEntry++ ] = new GroupEntry( nCount ); } -// --------------------------------------------------------------------------------------------- + sal_Bool GroupTable::GetNextGroupEntry() { @@ -120,6 +120,6 @@ sal_Bool GroupTable::GetNextGroupEntry() return sal_False; } -// --------------------------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index a2a7582ca3e3..86ea3b45dc61 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -48,14 +48,14 @@ #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" -// -- + #include <comphelper/processfactory.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <vcl/graphicfilter.hxx> #include <svx/xoutbmp.hxx> -// -- + #include "sdpage.hxx" #include "drawdoc.hxx" @@ -89,7 +89,7 @@ using namespace com::sun::star::ui::dialogs; using namespace ::sfx2; -// ----------------------------------------------------------------------------- + class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler > { @@ -129,22 +129,22 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc } -// --------------- + // - SdPPTFilter - -// --------------- + SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : SdFilter( rMedium, rDocShell, sal_True ) { } -// ----------------------------------------------------------------------------- + SdGRFFilter::~SdGRFFilter() { } -// ----------------------------------------------------------------------------- + void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError ) { @@ -188,7 +188,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n } } -// ----------------------------------------------------------------------------- + sal_Bool SdGRFFilter::Import() { @@ -247,7 +247,7 @@ sal_Bool SdGRFFilter::Import() return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SdGRFFilter::Export() { diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 28d1bf3375f9..02071ef64aa5 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -116,27 +116,27 @@ Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() return aRet; } -// ----------------------------------------------------------------------------- + SdHtmlOptionsDialog::SdHtmlOptionsDialog() : meDocType ( DOCUMENT_TYPE_DRAW ) { } -// ----------------------------------------------------------------------------- + SdHtmlOptionsDialog::~SdHtmlOptionsDialog() { } -// ----------------------------------------------------------------------------- + void SAL_CALL SdHtmlOptionsDialog::acquire() throw() { OWeakObject::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL SdHtmlOptionsDialog::release() throw() { diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index e3590fe7993c..7b16e80fe50e 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -604,7 +604,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams mnHeightPixel = (sal_uInt16)(mnWidthPixel/dRatio); - //------------------------------------------------------------------ + // we come up with a destination... INetURLObject aINetURLObj( maPath ); @@ -673,7 +673,7 @@ void HtmlExport::ExportHtml() mpDocSh->SetWaitCursor( true ); - //------------------------------------------------------------------ + // Exceptions are cool... CreateFileNames(); @@ -2992,7 +2992,7 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA return false; } -// --------------------------------------------------------------------- + bool HtmlExport::checkForExistingFiles() { diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index 83a97d1c9f63..23f27ede3da9 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -39,22 +39,22 @@ #include "htmlex.hxx" #include "sdhtmlfilter.hxx" -// --------------- + // - SdPPTFilter - -// --------------- + SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ) { } -// ----------------------------------------------------------------------------- + SdHTMLFilter::~SdHTMLFilter() { } -// ----------------------------------------------------------------------------- + sal_Bool SdHTMLFilter::Export() { diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index fc30f643cf85..241407338503 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -//--------------------------------------------------------------------------------------- + void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn ) { @@ -57,7 +57,7 @@ void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn ) rIn.ReadUChar( nUnknown2 ); } -//--------------------------------------------------------------------------------------- + #define MEMBER_CONSTRUCTOR_LIST() \ m_aAtom() \ diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index b6ce991f4267..fed3b94c3c6a 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2716,9 +2716,9 @@ ImplSdPPTImport::ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Ref return false; } -// --------------------- + // - exported function - -// --------------------- + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium ) diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index e61122ee2e3e..628158d5ba3e 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -165,7 +165,7 @@ bool PropertySet::hasProperty( sal_Int32 nProperty ) const return maProperties.find( nProperty ) != maProperties.end(); } -// -------------------------------------------------------------------- + Any PropertySet::getProperty( sal_Int32 nProperty ) const { @@ -220,7 +220,7 @@ AnimationImporter::AnimationImporter( ImplSdPPTImport* pPPTImport, SvStream& rSt { } -// -------------------------------------------------------------------- + int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRecordHeader& rProgTagContentHd ) { @@ -260,14 +260,14 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec return nNodes; } -// -------------------------------------------------------------------- + void AnimationImporter::processAfterEffectNodes() { std::for_each( maAfterEffectNodes.begin(), maAfterEffectNodes.end(), sd::stl_process_after_effect_node_func ); } -// -------------------------------------------------------------------- + Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, const AnimationNode& rNode ) { @@ -332,7 +332,7 @@ Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, co return xNode; } -// -------------------------------------------------------------------- + static bool is_random( const AnimationNode& rNode, const PropertySet& rSet, sal_Int32& rPresetClass ) { @@ -573,7 +573,7 @@ int AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refere return nNodes; } -// -------------------------------------------------------------------- + void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { try @@ -638,7 +638,7 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe } } -// -------------------------------------------------------------------- + void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { @@ -663,7 +663,7 @@ void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::un } } -// -------------------------------------------------------------------- + bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& xNode, const Reference< XAnimationNode >& xParent ) { @@ -1043,7 +1043,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any return bRet; } -// -------------------------------------------------------------------- + static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_Int32 nPresetSubType ) { @@ -1104,7 +1104,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId return OUString::number( nPresetSubType ); } -// -------------------------------------------------------------------- + void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const AnimationNode& rNode, const PropertySet& rSet ) { @@ -1386,7 +1386,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim } } -// -------------------------------------------------------------------- + int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -1498,7 +1498,7 @@ int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< return nNodes; } -// -------------------------------------------------------------------- + int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -1574,7 +1574,7 @@ int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Re return nNodes; } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -1653,7 +1653,7 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R } } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -1798,7 +1798,7 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom } } -// -------------------------------------------------------------------- + sal_Int16 AnimationImporter::implGetColorSpace( sal_Int32 nMode, sal_Int32 /*nA*/, sal_Int32 /*nB*/, sal_Int32 /*nC*/ ) { @@ -1816,7 +1816,7 @@ sal_Int16 AnimationImporter::implGetColorSpace( sal_Int32 nMode, sal_Int32 /*nA* } } -// -------------------------------------------------------------------- + Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ) { @@ -1937,7 +1937,7 @@ void AnimationImporter::importAnimateColorContainer( const Atom* pAtom, const Re } } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -1996,7 +1996,7 @@ void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Refe } } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2075,7 +2075,7 @@ void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Referen } } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2157,7 +2157,7 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R } } -// -------------------------------------------------------------------- + void AnimationImporter::importCommandContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2290,7 +2290,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen } } -// -------------------------------------------------------------------- + int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2369,7 +2369,7 @@ int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference< return nNodes; } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2470,7 +2470,7 @@ void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Re } } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2539,7 +2539,7 @@ void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const } } } -// -------------------------------------------------------------------- + bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ) { @@ -2577,7 +2577,7 @@ bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUStri return true; } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimationValues( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2655,7 +2655,7 @@ void AnimationImporter::importAnimationValues( const Atom* pAtom, const Referenc } } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2789,7 +2789,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen } } -// -------------------------------------------------------------------- + bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny ) { @@ -2864,7 +2864,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny ) return bOk; } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -2982,7 +2982,7 @@ void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Referenc #endif } -// -------------------------------------------------------------------- + void AnimationImporter::importAnimationActions( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { @@ -3021,7 +3021,7 @@ void AnimationImporter::importAnimationActions( const Atom* pAtom, const Referen } } -// -------------------------------------------------------------------- + sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rTarget, sal_Int16& rSubType ) { @@ -3144,7 +3144,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An return nRefMode; } -// -------------------------------------------------------------------- + void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertySet& rSet ) { @@ -3233,7 +3233,7 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA } } -// -------------------------------------------------------------------- + void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine ) { @@ -3260,7 +3260,7 @@ void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine ) fprintf(mpFile,"\n"); } -// -------------------------------------------------------------------- + void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) { @@ -3326,7 +3326,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) } } -// -------------------------------------------------------------------- + void AnimationImporter::dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen ) { diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 2d0831f8e5e5..a7df9aff0e5c 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -35,17 +35,17 @@ #include "drawdoc.hxx" #include "sdfilter.hxx" -// -------------- + // - Namespaces - -// -------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -// ------------ + // - SdFilter - -// ------------ + SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : mxModel( rDocShell.GetModel() ) @@ -57,13 +57,13 @@ SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool { } -// ----------------------------------------------------------------------------- + SdFilter::~SdFilter() { } -// ----------------------------------------------------------------------------- + OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const { @@ -71,7 +71,7 @@ OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const return aTemp.replaceFirst( "?", rLibraryName ); } -// ----------------------------------------------------------------------------- + #ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } @@ -86,7 +86,7 @@ extern "C" { static void SAL_CALL thisModule() {} } #endif -// ----------------------------------------------------------------------------- + void SdFilter::CreateStatusIndicator() { diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index fc27da66dfda..be51d9c4ae8f 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -31,9 +31,9 @@ #include "drawdoc.hxx" #include <tools/urlobj.hxx> -// -------------- + // - Namespaces - -// -------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -62,9 +62,9 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& ); #endif -// --------------- + // - SdPPTFilter - -// --------------- + SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ), @@ -72,14 +72,14 @@ SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal { } -// ----------------------------------------------------------------------------- + SdPPTFilter::~SdPPTFilter() { delete pBas; // deleting the compressed basic storage } -// ----------------------------------------------------------------------------- + sal_Bool SdPPTFilter::Import() { @@ -131,7 +131,7 @@ sal_Bool SdPPTFilter::Import() return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SdPPTFilter::Export() { diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 6578d4dc04f8..29a208c46639 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -165,9 +165,9 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) } -// ---------------- + // - SdXMLWrapper - -// ---------------- + SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) : SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer ) @@ -414,7 +414,7 @@ sal_Int32 ReadThroughComponent( return SD_XML_READERROR; } -// ----------------------------------------------------------------------------- + sal_Bool SdXMLFilter::Import( ErrCode& nError ) { @@ -424,7 +424,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) Reference< uno::XComponentContext > rxContext = comphelper::getProcessComponentContext(); - // ------------------------------------- + SdDrawDocument* pDoc = mrDocShell.GetDoc(); pDoc->EnableUndo(false); @@ -432,11 +432,11 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) pDoc->CreateFirstPages(); pDoc->StopWorkStartupDelay(); - // ------------------------------------- + mxModel->lockControllers(); - // ------------------------------------- + /** property map for import info set */ PropertyMapEntry const aImportInfoMap[] = @@ -490,7 +490,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) } } - // ------------------------------------- + Reference< io::XActiveDataSource > xSource; Reference< XInterface > xPipe; @@ -501,7 +501,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) Reference< lang::XComponent > xModelComp( mxModel, uno::UNO_QUERY ); - // ------------------------------------- + // try to get an XStatusIndicator from the Medium if( mbShowProgress ) @@ -536,9 +536,9 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) } } - // ------------------------------------- + // get the input stream (storage or stream) - // ------------------------------------- + SvStorageStreamRef xDocStream; Reference<io::XInputStream> xInputStream; @@ -586,7 +586,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) if (SDXMLMODE_Organizer == meFilterMode) xInfoSet->setPropertyValue("OrganizerMode", uno::makeAny(sal_True)); - // ------------------------------------- + if( 0 == nRet ) { @@ -645,7 +645,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) } } - // ------------------------------------- + if( pGraphicHelper ) SvXMLGraphicHelper::Destroy( pGraphicHelper ); xGraphicResolver = 0; @@ -785,7 +785,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) return nRet == 0; } -// ----------------------------------------------------------------------------- + sal_Bool SdXMLFilter::Export() { diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index cb838dbc3f28..1e1912fde7bf 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -65,7 +65,7 @@ const int EXIT = 2; const int MOTIONPATH = 3; const int MISCEFFECTS = 4; -// -------------------------------------------------------------------- + extern void fillDurationComboBox( ListBox* pBox ); @@ -146,7 +146,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) } } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(CategoryListBox, implDoubleClickHdl) { @@ -154,7 +154,7 @@ IMPL_LINK_NOARG(CategoryListBox, implDoubleClickHdl) return 0; } -// -------------------------------------------------------------------- + void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -170,7 +170,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) } } -// -------------------------------------------------------------------- + class CustomAnimationCreateTabPage : public TabPage { @@ -498,7 +498,7 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) return false; } -// -------------------------------------------------------------------- + CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) : TabDialog( pParent, "CustomAnimationCreate", "modules/simpress/ui/customanimationcreatedialog.ui" ) diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 60135d8b0ad4..c66b5e70f5e9 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -116,7 +116,7 @@ private: ListBox* mpControl; }; -// -------------------------------------------------------------------- + PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ) : PropertySubControl( nControlType ) @@ -165,21 +165,21 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId ) } } -// -------------------------------------------------------------------- + PresetPropertyBox::~PresetPropertyBox() { delete mpControl; } -// -------------------------------------------------------------------- + Any PresetPropertyBox::getValue() { return makeAny( maPropertyValues[mpControl->GetSelectEntryPos()] ); } -// -------------------------------------------------------------------- + Control* PresetPropertyBox::getControl() { @@ -202,7 +202,7 @@ private: ColorListBox* mpControl; }; -// -------------------------------------------------------------------- + ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) @@ -235,14 +235,14 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con } } -// -------------------------------------------------------------------- + ColorPropertyBox::~ColorPropertyBox() { delete mpControl; } -// -------------------------------------------------------------------- + void ColorPropertyBox::setValue( const Any& rValue, const OUString& ) { @@ -256,14 +256,14 @@ void ColorPropertyBox::setValue( const Any& rValue, const OUString& ) } } -// -------------------------------------------------------------------- + Any ColorPropertyBox::getValue() { return makeAny( (sal_Int32)mpControl->GetSelectEntryColor().GetRGBColor() ); } -// -------------------------------------------------------------------- + Control* ColorPropertyBox::getControl() { @@ -287,7 +287,7 @@ private: FontNameBox* mpControl; }; -// -------------------------------------------------------------------- + FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) @@ -321,7 +321,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const setValue( rValue, aPresetId ); } -// -------------------------------------------------------------------- + void FontPropertyBox::setValue( const Any& rValue, const OUString& ) { @@ -333,14 +333,14 @@ void FontPropertyBox::setValue( const Any& rValue, const OUString& ) } } -// -------------------------------------------------------------------- + FontPropertyBox::~FontPropertyBox() { delete mpControl; } -// -------------------------------------------------------------------- + Any FontPropertyBox::getValue() { @@ -348,7 +348,7 @@ Any FontPropertyBox::getValue() return makeAny( aFontName ); } -// -------------------------------------------------------------------- + Control* FontPropertyBox::getControl() { @@ -374,7 +374,7 @@ private: PopupMenu* mpMenu; }; -// -------------------------------------------------------------------- + DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu ) : Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ), @@ -390,7 +390,7 @@ DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* mpSubControl->Show(); } -// -------------------------------------------------------------------- + DropdownMenuBox::~DropdownMenuBox() { @@ -400,7 +400,7 @@ DropdownMenuBox::~DropdownMenuBox() delete mpMenu; } -// -------------------------------------------------------------------- + void DropdownMenuBox::Resize() { @@ -412,7 +412,7 @@ void DropdownMenuBox::Resize() mpDropdownButton->setPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() ); } -// -------------------------------------------------------------------- + bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt ) { @@ -439,7 +439,7 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt ) return nResult; } -// -------------------------------------------------------------------- + class CharHeightPropertyBox : public PropertySubControl { @@ -460,7 +460,7 @@ private: MetricField* mpMetric; }; -// -------------------------------------------------------------------- + CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) @@ -480,14 +480,14 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pP setValue( rValue, aPresetId ); } -// -------------------------------------------------------------------- + CharHeightPropertyBox::~CharHeightPropertyBox() { delete mpControl; } -// -------------------------------------------------------------------- + IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) { @@ -504,7 +504,7 @@ IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } -// -------------------------------------------------------------------- + void CharHeightPropertyBox::setValue( const Any& rValue, const OUString& ) { @@ -516,14 +516,14 @@ void CharHeightPropertyBox::setValue( const Any& rValue, const OUString& ) } } -// -------------------------------------------------------------------- + Any CharHeightPropertyBox::getValue() { return makeAny( (double)((double)mpMetric->GetValue() / 100.0) ); } -// -------------------------------------------------------------------- + Control* CharHeightPropertyBox::getControl() { @@ -555,7 +555,7 @@ private: Link maModifyHdl; }; -// -------------------------------------------------------------------- + TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) @@ -585,14 +585,14 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window setValue( rValue, aPresetId ); } -// -------------------------------------------------------------------- + TransparencyPropertyBox::~TransparencyPropertyBox() { delete mpControl; } -// -------------------------------------------------------------------- + void TransparencyPropertyBox::updateMenu() { @@ -601,7 +601,7 @@ void TransparencyPropertyBox::updateMenu() mpMenu->CheckItem( i, nValue == i ); } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl) { @@ -611,7 +611,7 @@ IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl) return 0; } -// -------------------------------------------------------------------- + IMPL_LINK( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) { @@ -624,7 +624,7 @@ IMPL_LINK( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } -// -------------------------------------------------------------------- + void TransparencyPropertyBox::setValue( const Any& rValue, const OUString& ) { @@ -638,21 +638,21 @@ void TransparencyPropertyBox::setValue( const Any& rValue, const OUString& ) } } -// -------------------------------------------------------------------- + Any TransparencyPropertyBox::getValue() { return makeAny( (double)((double)mpMetric->GetValue()) / 100.0 ); } -// -------------------------------------------------------------------- + Control* TransparencyPropertyBox::getControl() { return mpControl; } -// -------------------------------------------------------------------- + class RotationPropertyBox : public PropertySubControl { @@ -677,7 +677,7 @@ private: Link maModifyHdl; }; -// -------------------------------------------------------------------- + RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) @@ -701,14 +701,14 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParen setValue( rValue, aPresetId ); } -// -------------------------------------------------------------------- + RotationPropertyBox::~RotationPropertyBox() { delete mpControl; } -// -------------------------------------------------------------------- + void RotationPropertyBox::updateMenu() { @@ -725,7 +725,7 @@ void RotationPropertyBox::updateMenu() mpMenu->CheckItem( CM_COUNTERCLOCKWISE, !bDirection ); } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(RotationPropertyBox, implModifyHdl) { @@ -765,7 +765,7 @@ IMPL_LINK( RotationPropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } -// -------------------------------------------------------------------- + void RotationPropertyBox::setValue( const Any& rValue, const OUString& ) { @@ -779,21 +779,21 @@ void RotationPropertyBox::setValue( const Any& rValue, const OUString& ) } } -// -------------------------------------------------------------------- + Any RotationPropertyBox::getValue() { return makeAny( (double)((double)mpMetric->GetValue()) ); } -// -------------------------------------------------------------------- + Control* RotationPropertyBox::getControl() { return mpControl; } -// -------------------------------------------------------------------- + class ScalePropertyBox : public PropertySubControl { @@ -819,7 +819,7 @@ private: int mnDirection; }; -// -------------------------------------------------------------------- + ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) @@ -842,14 +842,14 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, con setValue( rValue, aPresetId ); } -// -------------------------------------------------------------------- + ScalePropertyBox::~ScalePropertyBox() { delete mpControl; } -// -------------------------------------------------------------------- + void ScalePropertyBox::updateMenu() { @@ -865,7 +865,7 @@ void ScalePropertyBox::updateMenu() mpMenu->CheckItem( CM_BOTH, mnDirection == 3 ); } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(ScalePropertyBox, implModifyHdl) { @@ -914,7 +914,7 @@ IMPL_LINK( ScalePropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } -// -------------------------------------------------------------------- + void ScalePropertyBox::setValue( const Any& rValue, const OUString& ) { @@ -946,7 +946,7 @@ void ScalePropertyBox::setValue( const Any& rValue, const OUString& ) } } -// -------------------------------------------------------------------- + Any ScalePropertyBox::getValue() { @@ -965,7 +965,7 @@ Any ScalePropertyBox::getValue() return makeAny( aValues ); } -// -------------------------------------------------------------------- + Control* ScalePropertyBox::getControl() { @@ -1000,7 +1000,7 @@ private: sal_Int16 mnFontUnderline; }; -// -------------------------------------------------------------------- + FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) @@ -1018,14 +1018,14 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pPar setValue( rValue, aPresetId ); } -// -------------------------------------------------------------------- + FontStylePropertyBox::~FontStylePropertyBox() { delete mpControl; } -// -------------------------------------------------------------------- + void FontStylePropertyBox::update() { @@ -1043,7 +1043,7 @@ void FontStylePropertyBox::update() mpEdit->Invalidate(); } -// -------------------------------------------------------------------- + IMPL_LINK( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb ) { @@ -1077,7 +1077,7 @@ IMPL_LINK( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb ) return 0; } -// -------------------------------------------------------------------- + void FontStylePropertyBox::setValue( const Any& rValue, const OUString& ) { @@ -1091,7 +1091,7 @@ void FontStylePropertyBox::setValue( const Any& rValue, const OUString& ) update(); } -// -------------------------------------------------------------------- + Any FontStylePropertyBox::getValue() { @@ -1102,7 +1102,7 @@ Any FontStylePropertyBox::getValue() return makeAny( aValues ); } -// -------------------------------------------------------------------- + Control* FontStylePropertyBox::getControl() { @@ -1523,7 +1523,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleAfterEffectOnNextEffect, makeAny( bAfterEffectOnNextEffect ) ); } - // --- + nPos = mpLBTextAnim->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -1547,7 +1547,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleIterateType, makeAny( nIterateType ) ); } - // --- + { double fIterateInterval = static_cast< double >( mpMFTextDelay->GetValue() ) / 10; @@ -1930,7 +1930,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleStart, makeAny( nStart ) ); } - // --- + { double fBegin = static_cast<double>( mpMFStartDelay->GetValue()) / 10.0; @@ -1943,7 +1943,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleBegin, makeAny( fBegin ) ); } - // --- + nPos = mpCBRepeat->GetSelectEntryPos(); if( (nPos != LISTBOX_ENTRY_NOTFOUND) || (!mpCBRepeat->GetText().isEmpty()) ) @@ -1989,7 +1989,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleEnd, aEnd ); } - // --- + double fDuration = -1.0; nPos = mpCBDuration->GetSelectEntryPos(); @@ -2017,7 +2017,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleDuration, makeAny( fDuration ) ); } - // --- + if( mpCBXRewind->GetState() != STATE_DONTKNOW ) { @@ -2249,7 +2249,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl) return 0; } -// -------------------------------------------------------------------- + CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, OString sPage) : TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui") diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 641d7ff6af94..cca0944cadf5 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -217,7 +217,7 @@ private: CustomAnimationEffectPtr mpEffect; }; -// -------------------------------------------------------------------- + CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ) : SvLBoxString( pEntry, nFlags, aDescription ) @@ -227,13 +227,13 @@ CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEn { } -// -------------------------------------------------------------------- + CustomAnimationListEntryItem::~CustomAnimationListEntryItem() { } -// -------------------------------------------------------------------- + void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData ) { @@ -246,7 +246,7 @@ void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeLis pViewData->maSize = aSize; } -// -------------------------------------------------------------------- + void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry) @@ -303,14 +303,14 @@ void CustomAnimationListEntryItem::Paint( rDev.DrawText( aPos, rDev.GetEllipsisString( maDescription, rDev.GetOutputSizePixel().Width() - aPos.X() ) ); } -// -------------------------------------------------------------------- + SvLBoxItem* CustomAnimationListEntryItem::Create() const { return NULL; } -// -------------------------------------------------------------------- + void CustomAnimationListEntryItem::Clone( SvLBoxItem* ) { @@ -331,20 +331,20 @@ private: CustomAnimationEffectPtr mpEffect; }; -// -------------------------------------------------------------------- + CustomAnimationListEntry::CustomAnimationListEntry() { } -// -------------------------------------------------------------------- + CustomAnimationListEntry::CustomAnimationListEntry( CustomAnimationEffectPtr pEffect ) : mpEffect( pEffect ) { } -// -------------------------------------------------------------------- + CustomAnimationListEntry::~CustomAnimationListEntry() { @@ -368,27 +368,27 @@ private: OUString maDescription; }; -// -------------------------------------------------------------------- + CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription ) : SvLBoxString( pEntry, nFlags, aDescription ), maDescription( aDescription ) { } -// -------------------------------------------------------------------- + CustomAnimationTriggerEntryItem::~CustomAnimationTriggerEntryItem() { } -// -------------------------------------------------------------------- + sal_uInt16 CustomAnimationTriggerEntryItem::IsA() { return (sal_uInt16)-1; } -// -------------------------------------------------------------------- + void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData ) { @@ -401,7 +401,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTree pViewData->maSize = aSize; } -// -------------------------------------------------------------------- + void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/) @@ -441,14 +441,14 @@ void CustomAnimationTriggerEntryItem::Paint( rDev.Pop(); } -// -------------------------------------------------------------------- + SvLBoxItem* CustomAnimationTriggerEntryItem::Create() const { return NULL; } -// -------------------------------------------------------------------- + void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) { @@ -475,7 +475,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomAnimationList( ::Wind return new CustomAnimationList( pParent ); } -// -------------------------------------------------------------------- + const Image& CustomAnimationList::getImage( sal_uInt16 nId ) { @@ -490,7 +490,7 @@ const Image& CustomAnimationList::getImage( sal_uInt16 nId ) return rImage; } -// -------------------------------------------------------------------- + CustomAnimationList::~CustomAnimationList() { @@ -500,7 +500,7 @@ CustomAnimationList::~CustomAnimationList() clear(); } -// -------------------------------------------------------------------- + void CustomAnimationList::KeyInput( const KeyEvent& rKEvt ) { @@ -522,7 +522,7 @@ void CustomAnimationList::KeyInput( const KeyEvent& rKEvt ) ::SvTreeListBox::KeyInput( rKEvt ); } -// -------------------------------------------------------------------- + /** selects or deselects the given effect. Selections of other effects are not changed */ @@ -547,7 +547,7 @@ void CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool bSelect } } -// -------------------------------------------------------------------- + void CustomAnimationList::clear() { @@ -557,7 +557,7 @@ void CustomAnimationList::clear() mxLastTargetShape = 0; } -// -------------------------------------------------------------------- + void CustomAnimationList::update( MainSequencePtr pMainSequence ) { @@ -571,7 +571,7 @@ void CustomAnimationList::update( MainSequencePtr pMainSequence ) mpMainSequence->addListener( this ); } -// -------------------------------------------------------------------- + struct stl_append_effect_func : public std::unary_function<CustomAnimationEffectPtr, void> { @@ -584,7 +584,7 @@ void stl_append_effect_func::operator()(CustomAnimationEffectPtr pEffect) { mrList.append( pEffect ); } -// -------------------------------------------------------------------- + void CustomAnimationList::update() { @@ -756,7 +756,7 @@ void CustomAnimationList::update() Invalidate(); } -// -------------------------------------------------------------------- + void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) { @@ -806,7 +806,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) } } -// -------------------------------------------------------------------- + void selectShape( SvTreeListBox* pTreeList, Reference< XShape > xShape ) { @@ -824,7 +824,7 @@ void selectShape( SvTreeListBox* pTreeList, Reference< XShape > xShape ) } } -// -------------------------------------------------------------------- + void CustomAnimationList::onSelectionChanged( Any aSelection ) { @@ -862,7 +862,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection ) } } -// -------------------------------------------------------------------- + void CustomAnimationList::SelectHdl() { @@ -872,7 +872,7 @@ void CustomAnimationList::SelectHdl() mpController->onSelect(); } -// -------------------------------------------------------------------- + bool CustomAnimationList::isExpanded( const CustomAnimationEffectPtr& pEffect ) const { @@ -892,7 +892,7 @@ bool CustomAnimationList::isExpanded( const CustomAnimationEffectPtr& pEffect ) return (pEntry == 0) || IsExpanded( pEntry ); } -// -------------------------------------------------------------------- + EffectSequence CustomAnimationList::getSelection() const { EffectSequence aSelection; @@ -928,7 +928,7 @@ EffectSequence CustomAnimationList::getSelection() const return aSelection; } -// -------------------------------------------------------------------- + sal_Bool CustomAnimationList::DoubleClickHdl() { @@ -936,7 +936,7 @@ sal_Bool CustomAnimationList::DoubleClickHdl() return false; } -// -------------------------------------------------------------------- + PopupMenu* CustomAnimationList::CreateContextMenu() { @@ -978,21 +978,21 @@ PopupMenu* CustomAnimationList::CreateContextMenu() return pMenu; } -// -------------------------------------------------------------------- + void CustomAnimationList::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { mpController->onContextMenu( nSelectedPopupEntry ); } -// -------------------------------------------------------------------- + void CustomAnimationList::SetTabs() { SvTreeListBox::SetTabs(); } -// -------------------------------------------------------------------- + void CustomAnimationList::notify_change() { diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 4f479db1801f..f093d0afcb2e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -103,7 +103,7 @@ using ::sd::framework::FrameworkHelper; namespace sd { -// -------------------------------------------------------------------- + void fillDurationComboBox( ListBox* pBox ) { @@ -147,7 +147,7 @@ void fillRepeatComboBox( ListBox* pBox ) pBox->SetEntryData( pBox->InsertEntry( aEndOfSlide ), (void*)((sal_Int32)-2) ); } -// -------------------------------------------------------------------- + CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 2c9460a330c6..080b33cc41eb 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -68,7 +68,7 @@ namespace sd const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; static const int DRGPIX = 2; // Drag MinMove in Pixel -// -------------------------------------------------------------------- + class PathDragMove : public SdrDragMove { @@ -132,7 +132,7 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/) mxTag->MovePath( DragStat().GetDX(), DragStat().GetDY() ); return true; } -// -------------------------------------------------------------------- + class PathDragResize : public SdrDragResize { @@ -193,7 +193,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) return true; } -// -------------------------------------------------------------------- + class PathDragObjOwn : public SdrDragObjOwn { @@ -245,7 +245,7 @@ bool PathDragObjOwn::EndSdrDrag(bool /*bCopy*/) } } -// -------------------------------------------------------------------- + class SdPathHdl : public SmartHdl { @@ -262,7 +262,7 @@ private: rtl::Reference< MotionPathTag > mxTag; }; -// -------------------------------------------------------------------- + SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj ) : SmartHdl( xTag, pPathObj->GetCurrentBoundRect().TopLeft() ) @@ -271,13 +271,13 @@ SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj ) { } -// -------------------------------------------------------------------- + SdPathHdl::~SdPathHdl() { } -// -------------------------------------------------------------------- + void SdPathHdl::CreateB2dIAObject() { @@ -317,21 +317,21 @@ void SdPathHdl::CreateB2dIAObject() } } -// -------------------------------------------------------------------- + sal_Bool SdPathHdl::IsFocusHdl() const { return sal_False; } -// -------------------------------------------------------------------- + bool SdPathHdl::isMarkable() const { return false; } -// -------------------------------------------------------------------- + Pointer SdPathHdl::GetSdrDragPointer() const { @@ -408,7 +408,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con } } -// -------------------------------------------------------------------- + MotionPathTag::~MotionPathTag() { @@ -416,7 +416,7 @@ MotionPathTag::~MotionPathTag() Dispose(); } -// -------------------------------------------------------------------- + void MotionPathTag::updatePathAttributes() { @@ -446,7 +446,7 @@ void MotionPathTag::updatePathAttributes() } } -// -------------------------------------------------------------------- + void MotionPathTag::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { @@ -465,7 +465,7 @@ void MotionPathTag::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } -// -------------------------------------------------------------------- + void MotionPathTag::MovePath( int nDX, int nDY ) { @@ -476,7 +476,7 @@ void MotionPathTag::MovePath( int nDX, int nDY ) } } -// -------------------------------------------------------------------- + /** returns true if the MotionPathTag handled the event. */ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) @@ -606,7 +606,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) return false; } -// -------------------------------------------------------------------- + /** returns true if the SmartTag consumes this event. */ bool MotionPathTag::KeyInput( const KeyEvent& rKEvt ) @@ -816,7 +816,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) return true; } -// -------------------------------------------------------------------- + sal_uLong MotionPathTag::GetMarkablePointCount() const { @@ -830,7 +830,7 @@ sal_uLong MotionPathTag::GetMarkablePointCount() const } } -// -------------------------------------------------------------------- + sal_uLong MotionPathTag::GetMarkedPointCount() const { @@ -845,7 +845,7 @@ sal_uLong MotionPathTag::GetMarkedPointCount() const } } -// -------------------------------------------------------------------- + sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) { @@ -866,7 +866,7 @@ sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) return bRet; } -// -------------------------------------------------------------------- + sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark ) { @@ -897,7 +897,7 @@ sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark ) return bChgd; } -// -------------------------------------------------------------------- + bool MotionPathTag::getContext( SdrViewContext& rContext ) { @@ -912,7 +912,7 @@ bool MotionPathTag::getContext( SdrViewContext& rContext ) } } -// -------------------------------------------------------------------- + void MotionPathTag::CheckPossibilities() { @@ -941,7 +941,7 @@ void MotionPathTag::CheckPossibilities() } } -// -------------------------------------------------------------------- + void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) { @@ -1054,7 +1054,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) } } -// -------------------------------------------------------------------- + void MotionPathTag::disposing() { @@ -1082,7 +1082,7 @@ void MotionPathTag::disposing() SmartTag::disposing(); } -// -------------------------------------------------------------------- + void MotionPathTag::deselect() { @@ -1107,9 +1107,9 @@ void MotionPathTag::selectionChanged() rBindings.InvalidateAll(sal_True); } } -// -------------------------------------------------------------------- + // IPolyPolygonEditorController -// -------------------------------------------------------------------- + void MotionPathTag::DeleteMarkedPoints() { diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 3da2764a151b..6aa7e0ac60a4 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -100,11 +100,11 @@ using namespace ::com::sun::star::office; namespace sd { -// -------------------------------------------------------------------- + extern TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation ); -// -------------------------------------------------------------------- + SfxItemPool* GetAnnotationPool() { @@ -121,7 +121,7 @@ SfxItemPool* GetAnnotationPool() return mpAnnotationPool; } -// -------------------------------------------------------------------- + static SfxBindings* getBindings( ViewShellBase& rBase ) { @@ -131,7 +131,7 @@ static SfxBindings* getBindings( ViewShellBase& rBase ) return 0; } -// -------------------------------------------------------------------- + static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) { @@ -176,7 +176,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio return sRet; } -// -------------------------------------------------------------------- + AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) : AnnotationManagerImplBase( m_aMutex ) @@ -190,7 +190,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) mbShowAnnotations = pOptions->IsShowComments() == sal_True; } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::init() { @@ -216,7 +216,7 @@ void AnnotationManagerImpl::init() } } -// -------------------------------------------------------------------- + // WeakComponentImplHelper1 void SAL_CALL AnnotationManagerImpl::disposing () @@ -244,7 +244,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () mxCurrentPage.clear(); } -// -------------------------------------------------------------------- + // XEventListener void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) @@ -274,7 +274,7 @@ void AnnotationManagerImpl::ShowAnnotations( bool bShow ) } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) { @@ -301,7 +301,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& /*rReq*/) { @@ -309,7 +309,7 @@ void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& /*rReq*/) InsertAnnotation(); } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) { @@ -358,7 +358,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) UpdateTags(); } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::InsertAnnotation() { @@ -437,7 +437,7 @@ void AnnotationManagerImpl::InsertAnnotation() } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) { @@ -504,7 +504,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::DeleteAnnotation( Reference< XAnnotation > xAnnotation ) { @@ -582,7 +582,7 @@ void AnnotationManagerImpl::DeleteAllAnnotations() mpDoc->EndUndo(); } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) { @@ -628,7 +628,7 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) { @@ -737,7 +737,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) while( true ); } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::onTagSelected( AnnotationTag& rTag ) { @@ -745,7 +745,7 @@ void AnnotationManagerImpl::onTagSelected( AnnotationTag& rTag ) invalidateSlots(); } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) { @@ -756,7 +756,7 @@ void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = sal_False */ ) { @@ -776,7 +776,7 @@ void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ) { @@ -798,7 +798,7 @@ void AnnotationManagerImpl::invalidateSlots() } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::onSelectionChanged() { @@ -892,7 +892,7 @@ void AnnotationManagerImpl::CreateTags() } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::DisposeTags() { @@ -909,7 +909,7 @@ void AnnotationManagerImpl::DisposeTags() } } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::addListener() { @@ -922,7 +922,7 @@ void AnnotationManagerImpl::addListener() | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED); } -// -------------------------------------------------------------------- + void AnnotationManagerImpl::removeListener() { @@ -930,7 +930,7 @@ void AnnotationManagerImpl::removeListener() mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } -// -------------------------------------------------------------------- + IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, tools::EventMultiplexerEvent*,pEvent) diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 857ff1a09bb6..aff8b343f247 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -59,7 +59,7 @@ namespace sd const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; static const int DRGPIX = 2; // Drag MinMove in Pixel -// -------------------------------------------------------------------- + static OUString getInitials( const OUString& rName ) { @@ -93,9 +93,9 @@ static OUString getInitials( const OUString& rName ) return sInitials; } -// -------------------------------------------------------------------- -// -------------------------------------------------------------------- + + class AnnotationDragMove : public SdrDragMove { @@ -158,7 +158,7 @@ void AnnotationDragMove::CancelSdrDrag() Hide(); } -// -------------------------------------------------------------------- + class AnnotationHdl : public SmartHdl { @@ -176,7 +176,7 @@ private: rtl::Reference< AnnotationTag > mxTag; }; -// -------------------------------------------------------------------- + AnnotationHdl::AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt ) : SmartHdl( xTag, rPnt ) @@ -185,13 +185,13 @@ AnnotationHdl::AnnotationHdl( const SmartTagReference& xTag, const Reference< XA { } -// -------------------------------------------------------------------- + AnnotationHdl::~AnnotationHdl() { } -// -------------------------------------------------------------------- + void AnnotationHdl::CreateB2dIAObject() { @@ -255,21 +255,21 @@ void AnnotationHdl::CreateB2dIAObject() } } -// -------------------------------------------------------------------- + sal_Bool AnnotationHdl::IsFocusHdl() const { return sal_True; } -// -------------------------------------------------------------------- + bool AnnotationHdl::isMarkable() const { return false; } -// -------------------------------------------------------------------- + Pointer AnnotationHdl::GetSdrDragPointer() const { @@ -303,7 +303,7 @@ AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView { } -// -------------------------------------------------------------------- + AnnotationTag::~AnnotationTag() { @@ -311,7 +311,7 @@ AnnotationTag::~AnnotationTag() Dispose(); } -// -------------------------------------------------------------------- + /** returns true if the AnnotationTag handled the event. */ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ ) @@ -347,7 +347,7 @@ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ return bRet; } -// -------------------------------------------------------------------- + /** returns true if the SmartTag consumes this event. */ bool AnnotationTag::KeyInput( const KeyEvent& rKEvt ) @@ -469,27 +469,27 @@ bool AnnotationTag::OnMove( const KeyEvent& rKEvt ) return true; } -// -------------------------------------------------------------------- + void AnnotationTag::CheckPossibilities() { } -// -------------------------------------------------------------------- + sal_uLong AnnotationTag::GetMarkablePointCount() const { return 0; } -// -------------------------------------------------------------------- + sal_uLong AnnotationTag::GetMarkedPointCount() const { return 0; } -// -------------------------------------------------------------------- + sal_Bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) { @@ -497,7 +497,7 @@ sal_Bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) return bRet; } -// -------------------------------------------------------------------- + sal_Bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ ) { @@ -505,14 +505,14 @@ sal_Bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmar return bChgd; } -// -------------------------------------------------------------------- + bool AnnotationTag::getContext( SdrViewContext& /*rContext*/ ) { return false; } -// -------------------------------------------------------------------- + void AnnotationTag::addCustomHandles( SdrHdlList& rHandlerList ) { @@ -532,7 +532,7 @@ void AnnotationTag::addCustomHandles( SdrHdlList& rHandlerList ) } } -// -------------------------------------------------------------------- + void AnnotationTag::disposing() { @@ -552,7 +552,7 @@ void AnnotationTag::disposing() SmartTag::disposing(); } -// -------------------------------------------------------------------- + void AnnotationTag::select() { @@ -571,7 +571,7 @@ void AnnotationTag::select() } } -// -------------------------------------------------------------------- + void AnnotationTag::deselect() { @@ -582,7 +582,7 @@ void AnnotationTag::deselect() mrManager.onTagDeselected( *this ); } -// -------------------------------------------------------------------- + BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected ) { diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index ee1ab02d015b..d570ed2a6229 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -518,7 +518,7 @@ SvxLanguageItem AnnotationWindow::GetLanguage(void) return SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE ); } -// -------------------------------------------------------------------- + TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation ) { @@ -530,7 +530,7 @@ TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation ) return 0; } -// -------------------------------------------------------------------- + void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotation, bool bGrabFocus ) { diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index ee478f30bbfe..fcf18b394fcc 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -45,9 +45,9 @@ template< class T > T getSafeValue( const Any& rAny ) return value; } -// ----------------- + // - SdOptionsItem - -// ----------------- + SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rSubTree ) : ConfigItem ( rSubTree ), @@ -55,13 +55,13 @@ SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rS { } -// ----------------------------------------------------------------------------- + SdOptionsItem::~SdOptionsItem() { } -// ----------------------------------------------------------------------------- + void SdOptionsItem::Commit() { @@ -73,30 +73,30 @@ void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) {} -// ----------------------------------------------------------------------------- + Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) { return ConfigItem::GetProperties( rNames ); } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsItem::PutProperties( const Sequence< OUString >& rNames, const Sequence< Any>& rValues ) { return ConfigItem::PutProperties( rNames, rValues ); } -// ----------------------------------------------------------------------------- + void SdOptionsItem::SetModified() { ConfigItem::SetModified(); } -// -------------------- + // - SdOptionsGeneric - -// -------------------- + SdOptionsGeneric::SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ) : maSubTree ( rSubTree ), @@ -106,7 +106,7 @@ SdOptionsGeneric::SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTr { } -// ----------------------------------------------------------------------------- + void SdOptionsGeneric::Init() const { @@ -133,7 +133,7 @@ void SdOptionsGeneric::Init() const } } -// ----------------------------------------------------------------------------- + SdOptionsGeneric::~SdOptionsGeneric() { @@ -141,7 +141,7 @@ SdOptionsGeneric::~SdOptionsGeneric() mpCfgItem = NULL; } -// ----------------------------------------------------------------------------- + void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const { @@ -159,7 +159,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const } } -// ----------------------------------------------------------------------------- + Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const { @@ -177,7 +177,7 @@ Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const return aNames; } -// ----------------------------------------------------------------------------- + void SdOptionsGeneric::Store() { @@ -185,7 +185,7 @@ void SdOptionsGeneric::Store() mpCfgItem->Commit(); } -// ----------------------------------------------------------------------------- + bool SdOptionsGeneric::isMetricSystem() { @@ -218,7 +218,7 @@ SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : EnableModify( sal_True ); } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { @@ -231,7 +231,7 @@ sal_Bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const GetDefTab() == rOpt.GetDefTab() ); } -// ----------------------------------------------------------------------------- + void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { @@ -265,7 +265,7 @@ void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ppNames = aPropNamesNonMetric; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsLayout::ReadData( const Any* pValues ) { @@ -280,7 +280,7 @@ sal_Bool SdOptionsLayout::ReadData( const Any* pValues ) return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const { @@ -307,7 +307,7 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich ) { } -// ---------------------------------------------------------------------- + SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) @@ -337,7 +337,7 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, } } -// ---------------------------------------------------------------------- + SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const { @@ -345,7 +345,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const } -// ---------------------------------------------------------------------- + bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const { @@ -354,7 +354,7 @@ bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsLayout == static_cast< const SdOptionsLayoutItem& >( rAttr ).maOptionsLayout ); } -// ----------------------------------------------------------------------- + void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const { @@ -386,14 +386,14 @@ SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig EnableModify( sal_True ); } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const { return true; } -// ----------------------------------------------------------------------------- + void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { @@ -409,14 +409,14 @@ void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCou ppNames = aPropNames; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsContents::ReadData(const Any*) { return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsContents::WriteData( Any* pValues ) const { @@ -441,14 +441,14 @@ SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*, ::s { } -// ---------------------------------------------------------------------- + SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const { return new SdOptionsContentsItem( *this ); } -// ---------------------------------------------------------------------- + bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const { @@ -457,7 +457,7 @@ bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsContents == static_cast<const SdOptionsContentsItem&>( rAttr ).maOptionsContents ); } -// ----------------------------------------------------------------------- + void SdOptionsContentsItem::SetOptions(SdOptions*) const { @@ -508,7 +508,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : EnableModify( sal_True ); } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { @@ -542,7 +542,7 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const ); } -// ----------------------------------------------------------------------------- + void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { @@ -587,7 +587,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) ppNames = aPropNames; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsMisc::ReadData( const Any* pValues ) { @@ -648,7 +648,7 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues ) return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const { @@ -703,7 +703,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich ) { } -// ---------------------------------------------------------------------- + SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) @@ -762,7 +762,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd } } -// ---------------------------------------------------------------------- + SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const { @@ -770,7 +770,7 @@ SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const } -// ---------------------------------------------------------------------- + bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const { @@ -779,7 +779,7 @@ bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsMisc == static_cast< const SdOptionsMiscItem& >(rAttr).maOptionsMisc ); } -// ----------------------------------------------------------------------- + void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const { @@ -843,7 +843,7 @@ SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : EnableModify( sal_True ); } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { @@ -859,7 +859,7 @@ sal_Bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const GetEliminatePolyPointLimitAngle() == rOpt.GetEliminatePolyPointLimitAngle() ); } -// ----------------------------------------------------------------------------- + void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { @@ -881,7 +881,7 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) ppNames = aPropNames; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsSnap::ReadData( const Any* pValues ) { @@ -899,7 +899,7 @@ sal_Bool SdOptionsSnap::ReadData( const Any* pValues ) return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const { @@ -929,7 +929,7 @@ SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich ) { } -// ---------------------------------------------------------------------- + SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) @@ -963,7 +963,7 @@ SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd } } -// ---------------------------------------------------------------------- + SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const { @@ -971,7 +971,7 @@ SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const } -// ---------------------------------------------------------------------- + bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const { @@ -980,7 +980,7 @@ bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsSnap == static_cast< const SdOptionsSnapItem& >(rAttr).maOptionsSnap ); } -// ----------------------------------------------------------------------- + void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const { @@ -1016,7 +1016,7 @@ SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : EnableModify( sal_True ); } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const { @@ -1029,7 +1029,7 @@ sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const ( nY1 == nY2 ) ); } -// ----------------------------------------------------------------------------- + void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { @@ -1043,7 +1043,7 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) ppNames = aPropNames; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsZoom::ReadData( const Any* pValues ) { @@ -1057,7 +1057,7 @@ sal_Bool SdOptionsZoom::ReadData( const Any* pValues ) return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const { @@ -1089,13 +1089,13 @@ SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : EnableModify( sal_True ); } -// ----------------------------------------------------------------------------- + SdOptionsGrid::~SdOptionsGrid() { } -// ----------------------------------------------------------------------------- + void SdOptionsGrid::SetDefaults() { @@ -1113,7 +1113,7 @@ void SdOptionsGrid::SetDefaults() SetEqualGrid( sal_True ); } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { @@ -1129,7 +1129,7 @@ sal_Bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const IsEqualGrid() == rOpt.IsEqualGrid() ); } -// ----------------------------------------------------------------------------- + void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { @@ -1169,7 +1169,7 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) ppNames = aPropNamesNonMetric; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsGrid::ReadData( const Any* pValues ) { @@ -1198,7 +1198,7 @@ sal_Bool SdOptionsGrid::ReadData( const Any* pValues ) return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsGrid::WriteData( Any* pValues ) const { @@ -1252,7 +1252,7 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd } } -// ----------------------------------------------------------------------- + void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const { @@ -1305,7 +1305,7 @@ SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : EnableModify( sal_True ); } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const { @@ -1332,7 +1332,7 @@ sal_Bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const GetHandoutPages() == rOpt.GetHandoutPages() ); } -// ----------------------------------------------------------------------------- + void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { @@ -1392,7 +1392,7 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount } } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsPrint::ReadData( const Any* pValues ) { @@ -1422,7 +1422,7 @@ sal_Bool SdOptionsPrint::ReadData( const Any* pValues ) return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const { @@ -1464,7 +1464,7 @@ SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich ) { } -// ---------------------------------------------------------------------- + SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* ) : SfxPoolItem ( _nWhich ) @@ -1494,14 +1494,14 @@ SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, :: } } -// ---------------------------------------------------------------------- + SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const { return new SdOptionsPrintItem( *this ); } -// ---------------------------------------------------------------------- + bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const { @@ -1510,7 +1510,7 @@ bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const return bSameType && ( maOptionsPrint == static_cast< const SdOptionsPrintItem& >( rAttr ).maOptionsPrint ); } -// ----------------------------------------------------------------------- + void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const { @@ -1555,13 +1555,13 @@ SdOptions::SdOptions( sal_uInt16 nConfigId ) : { } -// ---------------------------------------------------------------------- + SdOptions::~SdOptions() { } -// ---------------------------------------------------------------------- + void SdOptions::StoreConfig( sal_uLong nOptionsRange ) { diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 606bc1696fbf..9ec549c91b15 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -46,7 +46,7 @@ private: virtual void Select(); }; -// ----------------------------------------------------------------------- + SdTemplatePopup_Impl::SdTemplatePopup_Impl() : PopupMenu(), @@ -54,7 +54,7 @@ SdTemplatePopup_Impl::SdTemplatePopup_Impl() : { } -// ----------------------------------------------------------------------- + void SdTemplatePopup_Impl::Select() { @@ -70,13 +70,13 @@ SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId, { } -// ----------------------------------------------------------------------- + SdTemplateControl::~SdTemplateControl() { } -// ----------------------------------------------------------------------- + void SdTemplateControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) @@ -90,14 +90,14 @@ void SdTemplateControl::StateChanged( } } -// ----------------------------------------------------------------------- + void SdTemplateControl::Paint( const UserDrawEvent& ) { GetStatusBar().SetItemText( GetId(), msTemplate ); } -// ----------------------------------------------------------------------- + void SdTemplateControl::Command( const CommandEvent& rCEvt ) { diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index b9266f9bdf6e..86de6d3f04b4 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -65,7 +65,7 @@ namespace sd extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); -// ----------------------------------------------------------------------- + class LayoutToolbarMenu : public svtools::ToolbarMenu { @@ -84,7 +84,7 @@ private: ValueSet* mpLayoutSet2; }; -// ----------------------------------------------------------------------- + struct snewfoil_value_info { @@ -138,7 +138,7 @@ static const snewfoil_value_info v_standard[] = {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; -// ----------------------------------------------------------------------- + static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pInfo ) { @@ -159,7 +159,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) ); } -// ----------------------------------------------------------------------- + LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage ) : svtools::ToolbarMenu(xFrame, pParent, WB_CLIPCHILDREN ) @@ -265,13 +265,13 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const SetOutputSizePixel( getMenuSize() ); } -// ----------------------------------------------------------------------- + LayoutToolbarMenu::~LayoutToolbarMenu() { } -// ----------------------------------------------------------------------- + IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl ) { @@ -316,7 +316,7 @@ OUString SlideLayoutController_getImplementationName() return OUString( "com.sun.star.comp.sd.SlideLayoutController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( RuntimeException ) { @@ -325,7 +325,7 @@ Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( Ru return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { @@ -333,14 +333,14 @@ Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Ref new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:AssignLayout", false )); } -// -------------------------------------------------------------------- + OUString InsertSlideController_getImplementationName() { return OUString( "com.sun.star.comp.sd.InsertSlideController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( RuntimeException ) { @@ -349,7 +349,7 @@ Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( Ru return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { @@ -367,16 +367,16 @@ SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentCo { } -// -------------------------------------------------------------------- + ::Window* SlideLayoutController::createPopupWindow( ::Window* pParent ) { return new sd::LayoutToolbarMenu( *this, m_xFrame, pParent, mbInsertPage ); } -// -------------------------------------------------------------------- + // XServiceInfo -// -------------------------------------------------------------------- + OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeException ) { @@ -386,7 +386,7 @@ OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeE return SlideLayoutController_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( ) throw( RuntimeException ) { diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index b3d80e3393f0..eda2615eaa3a 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -34,37 +34,37 @@ using namespace ::com::sun::star; namespace sd { -//------------------------------------------------------------------------------ + // struct ClientBoxEntry -//------------------------------------------------------------------------------ + ClientBoxEntry::ClientBoxEntry( ClientInfo* pClientInfo ) : m_bActive( false ), m_pClientInfo( pClientInfo ) { } -//------------------------------------------------------------------------------ + ClientBoxEntry::~ClientBoxEntry() {} -//------------------------------------------------------------------------------ + // ClientRemovedListener -//------------------------------------------------------------------------------ + void ClientRemovedListener::disposing( lang::EventObject const & rEvt ) throw ( uno::RuntimeException ) { (void) rEvt; } -//------------------------------------------------------------------------------ + ClientRemovedListener::~ClientRemovedListener() { } -//------------------------------------------------------------------------------ + // ClientBox -//------------------------------------------------------------------------------ + ClientBox::ClientBox( Window* pParent, WinBits nStyle ) : Control( pParent, nStyle ), m_bHasScrollBar( false ), @@ -126,7 +126,7 @@ Size ClientBox::GetOptimalSize() const return LogicToPixel(Size(200, 140), MAP_APPFONT); } -//------------------------------------------------------------------------------ + ClientBox::~ClientBox() { if ( ! m_bInDelete ) @@ -146,7 +146,7 @@ ClientBox::~ClientBox() m_xRemoveListener.clear(); } -//------------------------------------------------------------------------------ + // Title + description void ClientBox::CalcActiveHeight( const long nPos ) { @@ -179,7 +179,7 @@ void ClientBox::CalcActiveHeight( const long nPos ) m_nActiveHeight = aTextHeight + 2; } -//------------------------------------------------------------------------------ + Rectangle ClientBox::GetEntryRect( const long nPos ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -201,7 +201,7 @@ Rectangle ClientBox::GetEntryRect( const long nPos ) const return Rectangle( aPos, aSize ); } -//------------------------------------------------------------------------------ + void ClientBox::DeleteRemoved() { const ::osl::MutexGuard aGuard( m_entriesMutex ); @@ -224,7 +224,7 @@ long ClientBox::GetActiveEntryIndex() return -1; } -//------------------------------------------------------------------------------ + //This function may be called with nPos < 0 void ClientBox::selectEntry( const long nPos ) { @@ -269,7 +269,7 @@ void ClientBox::selectEntry( const long nPos ) guard.clear(); } -// ----------------------------------------------------------------------- + void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -377,7 +377,7 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry ) DrawLine( rRect.BottomLeft(), rRect.BottomRight() ); } -// ----------------------------------------------------------------------- + void ClientBox::RecalcAll() { if ( m_bHasActive ) @@ -428,13 +428,13 @@ void ClientBox::RecalcAll() m_bNeedsRecalc = false; } -// ----------------------------------------------------------------------- + bool ClientBox::HandleTabKey( bool ) { return false; } -// ----------------------------------------------------------------------- + bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode ) { if ( m_vEntries.empty() ) @@ -479,7 +479,7 @@ bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode ) return true; } -// ----------------------------------------------------------------------- + void ClientBox::Paint( const Rectangle &/*rPaintRect*/ ) { if ( !m_bInDelete ) @@ -506,7 +506,7 @@ void ClientBox::Paint( const Rectangle &/*rPaintRect*/ ) } } -// ----------------------------------------------------------------------- + long ClientBox::GetTotalHeight() const { long nHeight = m_vEntries.size() * m_nStdHeight; @@ -519,7 +519,7 @@ long ClientBox::GetTotalHeight() const return nHeight; } -// ----------------------------------------------------------------------- + void ClientBox::SetupScrollBar() { const Size aSize = GetOutputSizePixel(); @@ -552,13 +552,13 @@ void ClientBox::SetupScrollBar() m_bHasScrollBar = bNeedsScrollBar; } -// ----------------------------------------------------------------------- + void ClientBox::Resize() { RecalcAll(); } -//------------------------------------------------------------------------------ + long ClientBox::PointToPos( const Point& rPos ) { long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight; @@ -579,7 +579,7 @@ OUString ClientBox::getPin() return OUString::number( m_aPinBox.GetValue() ); } -//------------------------------------------------------------------------------ + void ClientBox::MouseButtonDown( const MouseEvent& rMEvt ) { long nPos = PointToPos( rMEvt.GetPosPixel() ); @@ -593,7 +593,7 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt ) } } -//------------------------------------------------------------------------------ + bool ClientBox::Notify( NotifyEvent& rNEvt ) { if ( !m_bInDelete ) @@ -638,7 +638,7 @@ bool ClientBox::Notify( NotifyEvent& rNEvt ) } -//------------------------------------------------------------------------------ + long ClientBox::addEntry( ClientInfo* pClientInfo ) { long nPos = 0; @@ -700,7 +700,7 @@ long ClientBox::addEntry( ClientInfo* pClientInfo ) return nPos; } -// ----------------------------------------------------------------------- + void ClientBox::DoScroll( long nDelta ) { m_nTopIndex += nDelta; @@ -713,7 +713,7 @@ void ClientBox::DoScroll( long nDelta ) m_aScrollBar.SetPosPixel( aNewSBPt ); } -// ----------------------------------------------------------------------- + IMPL_LINK( ClientBox, ScrollHdl, ScrollBar*, pScrBar ) { DoScroll( pScrBar->GetDelta() ); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index b81471c1c584..2651d367deb0 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -67,13 +67,13 @@ SdDisplay::SdDisplay( Window* pWin, SdResId Id ) : SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) ); } -// ----------------------------------------------------------------------- + SdDisplay::~SdDisplay() { } -// ----------------------------------------------------------------------- + void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx ) { @@ -89,7 +89,7 @@ void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx ) } } -// ----------------------------------------------------------------------- + void SdDisplay::Paint( const Rectangle& ) { @@ -107,7 +107,7 @@ void SdDisplay::Paint( const Rectangle& ) aBitmapEx.Draw( this, aPt, aBmpSize ); } -// ----------------------------------------------------------------------- + void SdDisplay::SetScale( const Fraction& rFrac ) { @@ -217,7 +217,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, aBtnRemoveAll.SetAccessibleRelationMemberOf( &aGrpBitmap ); } -// ----------------------------------------------------------------------- + AnimationWindow::~AnimationWindow() { @@ -235,7 +235,7 @@ AnimationWindow::~AnimationWindow() delete pMyDoc; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) { @@ -245,7 +245,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl) { @@ -253,7 +253,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) { @@ -374,7 +374,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) { @@ -385,7 +385,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) { @@ -411,7 +411,7 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) { @@ -425,7 +425,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) { @@ -502,7 +502,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) { @@ -514,7 +514,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) { @@ -532,7 +532,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) { @@ -545,7 +545,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) return( 0L ); } -// ----------------------------------------------------------------------- + void AnimationWindow::UpdateControl(bool const bDisableCtrls) { @@ -649,7 +649,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) ClickRbtHdl( NULL ); } -// ----------------------------------------------------------------------- + void AnimationWindow::ResetAttrs() { @@ -661,7 +661,7 @@ void AnimationWindow::ResetAttrs() UpdateControl(); } -// ----------------------------------------------------------------------- + void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pProgress ) const @@ -682,7 +682,7 @@ void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, } } -// ----------------------------------------------------------------------- + Fraction AnimationWindow::GetScale() { @@ -709,7 +709,7 @@ Fraction AnimationWindow::GetScale() return( aFrac ); } -// ----------------------------------------------------------------------- + void AnimationWindow::Resize() { @@ -809,7 +809,7 @@ void AnimationWindow::Resize() SfxDockingWindow::Resize(); } -// ----------------------------------------------------------------------- + bool AnimationWindow::Close() { @@ -830,14 +830,14 @@ bool AnimationWindow::Close() } } -// ----------------------------------------------------------------------- + void AnimationWindow::FillInfo( SfxChildWinInfo& rInfo ) const { SfxDockingWindow::FillInfo( rInfo ) ; } -// ----------------------------------------------------------------------- + void AnimationWindow::AddObj (::sd::View& rView ) { @@ -1020,7 +1020,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) } } -// ----------------------------------------------------------------------- + void AnimationWindow::CreateAnimObj (::sd::View& rView ) { @@ -1269,7 +1269,7 @@ AnimationControllerItem::AnimationControllerItem( { } -// ----------------------------------------------------------------------- + void AnimationControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index f6b0988476a7..553553994ee8 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -69,13 +69,13 @@ SdPagesField::SdPagesField( Window* pParent, Show(); } -// ----------------------------------------------------------------------- + SdPagesField::~SdPagesField() { } -// ----------------------------------------------------------------------- + void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem ) { @@ -92,7 +92,7 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem ) SetText( OUString() ); } -// ----------------------------------------------------------------------- + void SdPagesField::Modify() { diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 05f76fc49d3e..da4dced8eece 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -48,7 +48,7 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr, mnCharPosition = AddTabPage( "RID_SVXPAGE_CHAR_POSITION", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); } -// ----------------------------------------------------------------------- + void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index fd21be04ffd9..84c1d34a0712 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -67,7 +67,7 @@ void FadeEffectLB::Fill() } -// ----------------------------------------------------------------------------- + void FadeEffectLB::applySelected( SdPage* pSlide ) const { diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 24afe3c4c86a..92a785c5cdd5 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -43,9 +43,9 @@ #include <vcl/graphicfilter.hxx> -// -------------------------------------------------------------------- + // ----------- SdFileDialog_Imp --------------------------- -// -------------------------------------------------------------------- + class SdFileDialog_Imp : public sfx2::FileDialogHelper { private: @@ -76,7 +76,7 @@ public: virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); }; -// ------------------------------------------------------------------------ + void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) { SolarMutexGuard aGuard; @@ -99,7 +99,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil } } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) { maUpdateTimer.Stop(); @@ -167,7 +167,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl) { SolarMutexGuard aGuard; @@ -224,7 +224,7 @@ void SdFileDialog_Imp::CheckSelectionState() } } -//----------------------------------------------------------------------------- + SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection ) : FileDialogHelper( nDialogType, 0 ), @@ -273,14 +273,14 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, } -// ------------------------------------------------------------------------ + SdFileDialog_Imp::~SdFileDialog_Imp() { if( mnPlaySoundEvent ) Application::RemoveUserEvent( mnPlaySoundEvent ); } -// ------------------------------------------------------------------------ + ErrCode SdFileDialog_Imp::Execute() { // make sure selection checkbox is disabled if @@ -289,9 +289,9 @@ ErrCode SdFileDialog_Imp::Execute() return FileDialogHelper::Execute(); } -// -------------------------------------------------------------------- + // ----------- SdOpenSoundFileDialog ----------------------- -// -------------------------------------------------------------------- + // these are simple forwarders SdOpenSoundFileDialog::SdOpenSoundFileDialog() : @@ -323,24 +323,24 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() : #endif } -// ------------------------------------------------------------------------ + SdOpenSoundFileDialog::~SdOpenSoundFileDialog() { } -// ------------------------------------------------------------------------ + ErrCode SdOpenSoundFileDialog::Execute() { return mpImpl->Execute(); } -// ------------------------------------------------------------------------ + OUString SdOpenSoundFileDialog::GetPath() const { return mpImpl->GetPath(); } -// ------------------------------------------------------------------------ + void SdOpenSoundFileDialog::SetPath( const OUString& rPath ) { mpImpl->SetDisplayDirectory( rPath ); diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index b499e3f9f7bc..e3efd3676396 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -251,7 +251,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent mpNotesHandoutsTabPage->init( maNotesHandoutSettings, false ); } -// ----------------------------------------------------------------------- + HeaderFooterDialog::~HeaderFooterDialog() { @@ -259,7 +259,7 @@ HeaderFooterDialog::~HeaderFooterDialog() delete mpNotesHandoutsTabPage; } -// ----------------------------------------------------------------------- + IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { @@ -272,14 +272,14 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(HeaderFooterDialog, DeactivatePageHdl) { return sal_True; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl) { @@ -287,7 +287,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl) { @@ -295,7 +295,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl) { @@ -303,7 +303,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl) return 0; } -// ----------------------------------------------------------------------- + short HeaderFooterDialog::Execute() { @@ -313,7 +313,7 @@ short HeaderFooterDialog::Execute() return nRet; } -// ----------------------------------------------------------------------- + void HeaderFooterDialog::ApplyToAll() { @@ -322,7 +322,7 @@ void HeaderFooterDialog::ApplyToAll() EndDialog(1); } -// ----------------------------------------------------------------------- + void HeaderFooterDialog::Apply() { @@ -331,14 +331,14 @@ void HeaderFooterDialog::Apply() EndDialog(1); } -// ----------------------------------------------------------------------- + void HeaderFooterDialog::Cancel() { EndDialog(); } -// ----------------------------------------------------------------------- + void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) { @@ -418,7 +418,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager()->AddUndoAction(pUndoGroup); } -// ----------------------------------------------------------------------- + void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ) { @@ -489,13 +489,13 @@ HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window* FillFormatList(SVXDATEFORMAT_A); } -// ----------------------------------------------------------------------- + HeaderFooterTabPage::~HeaderFooterTabPage() { } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl) { @@ -505,7 +505,7 @@ IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl) return 0L; } -// ----------------------------------------------------------------------- + void HeaderFooterTabPage::FillFormatList( int eFormat ) { @@ -532,7 +532,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat ) } } -// ----------------------------------------------------------------------- + void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNotOnTitle ) { @@ -568,7 +568,7 @@ void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNot update(); } -// ----------------------------------------------------------------------- + void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ) { @@ -591,7 +591,7 @@ void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOn rNotOnTitle = mpCBNotOnTitle->IsChecked(); } -// ----------------------------------------------------------------------- + void HeaderFooterTabPage::update() { @@ -612,7 +612,7 @@ void HeaderFooterTabPage::update() mpCTPreview->update( aSettings ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl) { @@ -621,7 +621,7 @@ IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl) return 0; } -// ----------------------------------------------------------------------- + void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet ) { @@ -654,7 +654,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } -// ----------------------------------------------------------------------- + void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage ) { @@ -739,7 +739,7 @@ PresLayoutPreview::PresLayoutPreview( ::Window* pParent ) { } -// ----------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makePresLayoutPreview( ::Window *pParent, VclBuilder::stringmap & ) { @@ -755,7 +755,7 @@ Size PresLayoutPreview::GetOptimalSize() const return LogicToPixel(Size(80, 80), MAP_APPFONT); } -// ----------------------------------------------------------------------- + void PresLayoutPreview::init( SdPage *pMaster ) { @@ -769,7 +769,7 @@ void PresLayoutPreview::update( HeaderFooterSettings& rSettings ) Invalidate(); } -// ----------------------------------------------------------------------- + void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisible, bool bDotted /* = false*/ ) { @@ -816,7 +816,7 @@ void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisib } } -// ----------------------------------------------------------------------- + void PresLayoutPreview::Paint( const Rectangle& ) { diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index af3a252f66ef..b0b5b4928d1e 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -89,7 +89,7 @@ void MorphDlg::LoadSettings() m_pCbxAttributes->Check( bAttrib ); } -// ----------------------------------------------------------------------------- + void MorphDlg::SaveSettings() const { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 71781cbe8425..66a3ca0aa9f9 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -150,7 +150,7 @@ SdNavigatorWin::SdNavigatorWin( rUpdateRequest(); } -// ----------------------------------------------------------------------- + SdNavigatorWin::~SdNavigatorWin() { @@ -158,7 +158,7 @@ SdNavigatorWin::~SdNavigatorWin() delete mpPageNameCtrlItem; } -// ----------------------------------------------------------------------- + //when object is marked , fresh the corresponding entry tree . void SdNavigatorWin::FreshTree( const SdDrawDocument* pDoc ) @@ -304,7 +304,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl) @@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) { @@ -390,7 +390,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) { @@ -428,7 +428,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) { @@ -559,7 +559,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) return 0; } -// ----------------------------------------------------------------------- + void SdNavigatorWin::Resize() { @@ -598,7 +598,7 @@ void SdNavigatorWin::Resize() Window::Resize(); } -// ----------------------------------------------------------------------- + bool SdNavigatorWin::InsertFile(const OUString& rFileName) { @@ -675,7 +675,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName) return true; } -// ----------------------------------------------------------------------- + void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) { @@ -744,7 +744,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) maLbDocs.SelectEntryPos( nPos ); } -//------------------------------------------------------------------------ + sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage ) { @@ -763,7 +763,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool b return( 0 ); } -//------------------------------------------------------------------------ + NavDocInfo* SdNavigatorWin::GetDocInfo() { @@ -889,7 +889,7 @@ SdNavigatorControllerItem::SdNavigatorControllerItem( { } -// ----------------------------------------------------------------------- + void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) @@ -974,7 +974,7 @@ SdPageNameControllerItem::SdPageNameControllerItem( { } -// ----------------------------------------------------------------------- + void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index d83df4d4ed77..d0c8c2a84432 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -221,14 +221,14 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, nHatchingListState = CT_NONE; } -// ----------------------------------------------------------------------- + SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() { delete pOutSet; } -// ----------------------------------------------------------------------- + void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { @@ -299,8 +299,8 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const return SfxTabDialog::GetOutputItemSet(); } -// --------------------------------------------------------------------- -// --------------------------------------------------------------------- + + sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const { switch( ePO ) diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 2e999f64d373..f9cec00e5f76 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -72,13 +72,13 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : m_pCbxBack->SetAccessibleRelationLabeledBy( m_pRbtBooklet ); } -// ----------------------------------------------------------------------- + SdPrintOptions::~SdPrintOptions() { } -// ----------------------------------------------------------------------- + sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) { @@ -131,7 +131,7 @@ sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) return( sal_False ); } -// ----------------------------------------------------------------------- + void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) { @@ -188,7 +188,7 @@ void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) ClickBookletHdl( NULL ); } -// ----------------------------------------------------------------------- + SfxTabPage* SdPrintOptions::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) @@ -196,7 +196,7 @@ SfxTabPage* SdPrintOptions::Create( Window* pWindow, return( new SdPrintOptions( pWindow, rOutAttrs ) ); } -//----------------------------------------------------------------------- + IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx ) { @@ -208,7 +208,7 @@ IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx ) return 0; } -//----------------------------------------------------------------------- + IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl) { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 1c1ffb06ea14..7dd1477c935a 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -82,9 +82,9 @@ sal_Bool SdPageObjsTLB::IsInDrag() sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MAX_UINT32; -// ----------------------------------------- + // - SdPageObjsTLB::SdPageObjsTransferable - -// ----------------------------------------- + SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( SdPageObjsTLB& rParent, @@ -114,7 +114,7 @@ SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable() { } -// ----------------------------------------------------------------------------- + void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() { @@ -123,7 +123,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() AddFormat(GetListBoxDropFormatId()); } -// ----------------------------------------------------------------------------- + sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { @@ -143,7 +143,7 @@ sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star: } } -// ----------------------------------------------------------------------------- + void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction ) { @@ -151,21 +151,21 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction ) SdTransferable::DragFinished(nDropAction); } -// ----------------------------------------------------------------------------- + ::sd::DrawDocShell& SdPageObjsTLB::SdPageObjsTransferable::GetDocShell() const { return mrDocShell; } -// ----------------------------------------------------------------------------- + NavigatorDragType SdPageObjsTLB::SdPageObjsTransferable::GetDragType() const { return meDragType; } -// ----------------------------------------------------------------------------- + sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ) { @@ -192,7 +192,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdPageObjsTLB::SdPageObjsTran return theSdPageObjsTLBUnoTunnelId::get().getSeq(); } -// ----------------------------------------------------------------------------- + SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw() diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 70782416ea29..1cd52db0578b 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -108,7 +108,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, nHatchingListState = CT_NONE; } -// ----------------------------------------------------------------------- + void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { @@ -175,7 +175,7 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } -// ----------------------------------------------------------------------- + const SfxItemSet* SdTabTemplateDlg::GetRefreshedSet() { diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 919b9db24d0f..602fc58b7e6a 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -140,13 +140,13 @@ SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet& rInAttrs) ClickActionHdl( this ); } -// ----------------------------------------------------------------------- + SdTPAction::~SdTPAction() { } -// ----------------------------------------------------------------------- + void SdTPAction::SetView( const ::sd::View* pSdView ) { @@ -171,7 +171,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView ) } } -// ----------------------------------------------------------------------- + void SdTPAction::Construct() { @@ -263,7 +263,7 @@ void SdTPAction::Construct() } -// ----------------------------------------------------------------------- + sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) { @@ -308,7 +308,7 @@ sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) return( bModified ); } -//------------------------------------------------------------------------ + void SdTPAction::Reset( const SfxItemSet& rAttrs ) { @@ -357,13 +357,13 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) m_pEdtSound->SaveValue(); } -// ----------------------------------------------------------------------- + void SdTPAction::ActivatePage( const SfxItemSet& ) { } -// ----------------------------------------------------------------------- + int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) { @@ -373,7 +373,7 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) return( LEAVE_PAGE ); } -// ----------------------------------------------------------------------- + SfxTabPage* SdTPAction::Create( Window* pWindow, const SfxItemSet& rAttrs ) @@ -381,7 +381,7 @@ SfxTabPage* SdTPAction::Create( Window* pWindow, return( new SdTPAction( pWindow, rAttrs ) ); } -//------------------------------------------------------------------------ + void SdTPAction::UpdateTree() { @@ -393,7 +393,7 @@ void SdTPAction::UpdateTree() } } -//------------------------------------------------------------------------ + void SdTPAction::OpenFileDialog() { @@ -474,7 +474,7 @@ void SdTPAction::OpenFileDialog() } } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl) { @@ -483,7 +483,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) { @@ -660,7 +660,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl) { @@ -668,7 +668,7 @@ IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl) return( 0L ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) { @@ -718,7 +718,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) return( 0L ); } -//------------------------------------------------------------------------ + presentation::ClickAction SdTPAction::GetActualClickAction() { @@ -730,7 +730,7 @@ presentation::ClickAction SdTPAction::GetActualClickAction() return( eCA ); } -//------------------------------------------------------------------------ + void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) { @@ -741,7 +741,7 @@ void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) m_pLbAction->SelectEntryPos( pIter-maCurrentActions.begin() ); } -//------------------------------------------------------------------------ + void SdTPAction::SetEditText( OUString const & rStr ) { @@ -804,7 +804,7 @@ void SdTPAction::SetEditText( OUString const & rStr ) } } -//------------------------------------------------------------------------ + OUString SdTPAction::GetEditText( sal_Bool bFullDocDestination ) { @@ -871,7 +871,7 @@ OUString SdTPAction::GetEditText( sal_Bool bFullDocDestination ) return( aStr ); } -//------------------------------------------------------------------------ + sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) { diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 22097b8063aa..afd3547087a3 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -52,13 +52,13 @@ SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ) pSnapFrames->Show(); } -// ----------------------------------------------------------------------- + SdTpOptionsSnap::~SdTpOptionsSnap() { } -// ----------------------------------------------------------------------- + sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) { @@ -83,7 +83,7 @@ sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) return( sal_True ); } -// ----------------------------------------------------------------------- + void SdTpOptionsSnap::Reset( const SfxItemSet& rAttrs ) { @@ -106,7 +106,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet& rAttrs ) pCbxRotate->GetClickHdl().Call(0); } -// ----------------------------------------------------------------------- + SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, const SfxItemSet& rAttrs ) @@ -129,13 +129,13 @@ SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& rIn get( m_pCbxMoveOutline, "moveoutline"); } -// ----------------------------------------------------------------------- + SdTpOptionsContents::~SdTpOptionsContents() { } -// ----------------------------------------------------------------------- + sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) { @@ -159,7 +159,7 @@ sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) return( bModified ); } -// ----------------------------------------------------------------------- + void SdTpOptionsContents::Reset( const SfxItemSet& rAttrs ) { @@ -180,7 +180,7 @@ void SdTpOptionsContents::Reset( const SfxItemSet& rAttrs ) m_pCbxHandlesBezier->SaveValue(); } -// ----------------------------------------------------------------------- + SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, const SfxItemSet& rAttrs ) @@ -289,12 +289,12 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) m_pCbScale->InsertEntry( GetScale( aTable[i], 1 ) ); } -// ----------------------------------------------------------------------- + SdTpOptionsMisc::~SdTpOptionsMisc() { } -// ----------------------------------------------------------------------- + void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) { // We have to call SaveValue again since it can happen that the value @@ -339,7 +339,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { @@ -363,7 +363,7 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) return( LEAVE_PAGE ); } -// ----------------------------------------------------------------------- + sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { @@ -432,7 +432,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) return( bModified ); } -// ----------------------------------------------------------------------- + void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) { @@ -512,14 +512,14 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) UpdateCompatibilityControls (); } -// ----------------------------------------------------------------------- + SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow, const SfxItemSet& rAttrs ) { return( new SdTpOptionsMisc( pWindow, rAttrs ) ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl) { @@ -569,14 +569,14 @@ void SdTpOptionsMisc::SetDrawMode() m_pCbxUsePrinterMetrics->SetPosPixel (m_pCbxCompatibility->GetPosPixel()); } -// ----------------------------------------------------------------------- + OUString SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY ) { return OUString::number(nX) + OUString(TOKEN) + OUString::number(nY); } -// ----------------------------------------------------------------------- + sal_Bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ) { diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index a4c08409ae82..1deda09f7243 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -304,7 +304,7 @@ void SAL_CALL Configuration::setName (const OUString& rsName) -// ---------------------------------------------------------------------------- + void Configuration::PostEvent ( const Reference<XResourceId>& rxResourceId, diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 6d1f70825950..ac4eb3a44d57 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -627,7 +627,7 @@ void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArgumen -//----------------------------------------------------------------------------- + void ConfigurationController::ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException) diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 330951f722e6..49519d379acf 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -482,7 +482,7 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) -//----------------------------------------------------------------------------- + /** When eMode is DIRECTLY then the anchor of the called object and the anchor represented by the given sequence of anchor URLs have to be diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 904c257650ca..ed51255f8437 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -413,7 +413,7 @@ void SAL_CALL BasicPaneFactory::disposing ( -//----------------------------------------------------------------------------- + Reference<XResource> BasicPaneFactory::CreateFrameWindowPane ( const Reference<XResourceId>& rxPaneId) diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index abe7232bbf26..4b3e61d960a8 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -201,7 +201,7 @@ void SAL_CALL FullScreenPane::setAccessible ( -//----------------------------------------------------------------------------- + IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent) { diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 42cb84cfc84d..523b3cf0a7ff 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -221,7 +221,7 @@ sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) -//----------------------------------------------------------------------------- + Reference<rendering::XCanvas> Pane::CreateCanvas (void) throw (RuntimeException) diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index ce7b026ff834..51103b1b1fb9 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -232,7 +232,7 @@ void SAL_CALL PresentationFactory::disposing ( -//----------------------------------------------------------------------------- + void PresentationFactory::ThrowIfDisposed (void) const throw (lang::DisposedException) diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index c731435182cb..97256c8e704b 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -147,7 +147,7 @@ void SAL_CALL ToolBarModule::notifyConfigurationChange ( -//----------------------------------------------------------------------------- + void ToolBarModule::HandleUpdateStart (void) diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index dffa7092cdb4..95300a078bc3 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -313,7 +313,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) } } -// ----------------------------------------------------------------------------- + sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) { @@ -409,7 +409,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) return (bOK); } -// ----------------------------------------------------------------------------- + void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) { @@ -548,7 +548,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) delete pDlg; } -// ----------------------------------------------------------------------------- + void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) { @@ -684,7 +684,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) delete pOutliner; } -// ----------------------------------------------------------------------------- + sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) { @@ -730,7 +730,7 @@ sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) return sal_False; } -// ----------------------------------------------------------------------------- + void FuInsertFile::GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector ) { diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index f2882c9bab24..e5cbc4f0d2e8 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -36,13 +36,13 @@ SmartTag::SmartTag( ::sd::View& rView ) mrView.getSmartTags().add( xThis ); } -// -------------------------------------------------------------------- + SmartTag::~SmartTag() { } -// -------------------------------------------------------------------- + bool SmartTag::MouseButtonDown( const MouseEvent&, SmartHdl& ) { @@ -67,34 +67,34 @@ bool SmartTag::Command( const CommandEvent& /*rCEvt*/ ) return false; } -// -------------------------------------------------------------------- + void SmartTag::addCustomHandles( SdrHdlList& /*rHandlerList*/ ) { } -// -------------------------------------------------------------------- + void SmartTag::select() { mbSelected = true; } -// -------------------------------------------------------------------- + void SmartTag::deselect() { mbSelected = false; } -// -------------------------------------------------------------------- + bool SmartTag::isSelected() const { return mbSelected; } -// -------------------------------------------------------------------- + void SmartTag::disposing() { @@ -102,42 +102,42 @@ void SmartTag::disposing() mrView.getSmartTags().remove( xThis ); } -// -------------------------------------------------------------------- + bool SmartTag::getContext( SdrViewContext& /*rContext*/ ) { return false; } -// -------------------------------------------------------------------- + sal_uLong SmartTag::GetMarkablePointCount() const { return 0; } -// -------------------------------------------------------------------- + sal_uLong SmartTag::GetMarkedPointCount() const { return 0; } -// -------------------------------------------------------------------- + sal_Bool SmartTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) { return sal_False; } -// -------------------------------------------------------------------- + sal_Bool SmartTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ ) { return sal_False; } -// -------------------------------------------------------------------- + void SmartTag::CheckPossibilities() { @@ -150,13 +150,13 @@ SmartTagSet::SmartTagSet( View& rView ) { } -// -------------------------------------------------------------------- + SmartTagSet::~SmartTagSet() { } -// -------------------------------------------------------------------- + void SmartTagSet::add( const SmartTagReference& xTag ) { @@ -170,7 +170,7 @@ void SmartTagSet::add( const SmartTagReference& xTag ) mxSelectedTag.clear(); } -// -------------------------------------------------------------------- + void SmartTagSet::remove( const SmartTagReference& xTag ) { @@ -186,7 +186,7 @@ void SmartTagSet::remove( const SmartTagReference& xTag ) mxSelectedTag.clear(); } -// -------------------------------------------------------------------- + void SmartTagSet::Dispose() { @@ -199,7 +199,7 @@ void SmartTagSet::Dispose() mxSelectedTag.clear(); } -// -------------------------------------------------------------------- + void SmartTagSet::select( const SmartTagReference& xTag ) { @@ -218,7 +218,7 @@ void SmartTagSet::select( const SmartTagReference& xTag ) } } -// -------------------------------------------------------------------- + void SmartTagSet::deselect() { @@ -231,7 +231,7 @@ void SmartTagSet::deselect() } } -// -------------------------------------------------------------------- + bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -257,7 +257,7 @@ bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt ) return false; } -// -------------------------------------------------------------------- + bool SmartTagSet::KeyInput( const KeyEvent& rKEvt ) { @@ -279,7 +279,7 @@ bool SmartTagSet::KeyInput( const KeyEvent& rKEvt ) return false; } -// -------------------------------------------------------------------- + bool SmartTagSet::RequestHelp( const HelpEvent& rHEvt ) { @@ -300,7 +300,7 @@ bool SmartTagSet::RequestHelp( const HelpEvent& rHEvt ) return false; } -// -------------------------------------------------------------------- + /** returns true if the SmartTag consumes this event. */ bool SmartTagSet::Command( const CommandEvent& rCEvt ) @@ -331,7 +331,7 @@ bool SmartTagSet::Command( const CommandEvent& rCEvt ) return false; } -// -------------------------------------------------------------------- + void SmartTagSet::addCustomHandles( SdrHdlList& rHandlerList ) { @@ -342,7 +342,7 @@ void SmartTagSet::addCustomHandles( SdrHdlList& rHandlerList ) } } -// -------------------------------------------------------------------- + /** returns true if the currently selected smart tag has a special context, returned in rContext. */ @@ -354,16 +354,16 @@ bool SmartTagSet::getContext( SdrViewContext& rContext ) const return false; } -// -------------------------------------------------------------------- + // support point editing -// -------------------------------------------------------------------- + sal_Bool SmartTagSet::HasMarkablePoints() const { return GetMarkablePointCount() != 0 ? sal_True : sal_False; } -// -------------------------------------------------------------------- + sal_uLong SmartTagSet::GetMarkablePointCount() const { @@ -372,14 +372,14 @@ sal_uLong SmartTagSet::GetMarkablePointCount() const return 0; } -// -------------------------------------------------------------------- + sal_Bool SmartTagSet::HasMarkedPoints() const { return GetMarkedPointCount() != 0 ? sal_True : sal_False; } -// -------------------------------------------------------------------- + sal_uLong SmartTagSet::GetMarkedPointCount() const { @@ -389,7 +389,7 @@ sal_uLong SmartTagSet::GetMarkedPointCount() const return 0; } -// -------------------------------------------------------------------- + sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const { @@ -398,7 +398,7 @@ sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const return pSmartHdl && pSmartHdl->isMarkable(); } -// -------------------------------------------------------------------- + sal_Bool SmartTagSet::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) { @@ -408,7 +408,7 @@ sal_Bool SmartTagSet::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) return sal_False; } -// -------------------------------------------------------------------- + sal_Bool SmartTagSet::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) { @@ -417,7 +417,7 @@ sal_Bool SmartTagSet::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) return sal_False; } -// -------------------------------------------------------------------- + void SmartTagSet::CheckPossibilities() { @@ -434,7 +434,7 @@ SmartHdl::SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Poi SetObj( pObject ); } -// -------------------------------------------------------------------- + SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind /*=HDL_MOVE*/ ) : SdrHdl( rPnt, eNewKind ) @@ -442,7 +442,7 @@ SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind { } -// -------------------------------------------------------------------- + bool SmartHdl::isMarkable() const { diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index 8b821cbe8780..b6436608f664 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -26,7 +26,7 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction ); -// ----------------------------------------------------------------------------- + SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, @@ -40,14 +40,14 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SetComment( aString ); } -// ----------------------------------------------------------------------------- + SdBackgroundObjUndoAction::~SdBackgroundObjUndoAction() { delete mpItemSet; } -// ----------------------------------------------------------------------------- + void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() { @@ -61,21 +61,21 @@ void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() mrPage.ActionChanged(); } -// ----------------------------------------------------------------------------- + void SdBackgroundObjUndoAction::Undo() { ImplRestoreBackgroundObj(); } -// ----------------------------------------------------------------------------- + void SdBackgroundObjUndoAction::Redo() { ImplRestoreBackgroundObj(); } -// ----------------------------------------------------------------------------- + SdUndoAction* SdBackgroundObjUndoAction::Clone() const { diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 415c339026ec..1fb36b0a7f1a 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -810,7 +810,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap( -//----------------------------------------------------------------------------- + rendering::ViewState PresenterCanvas::MergeViewState ( const rendering::ViewState& rViewState) @@ -1180,7 +1180,7 @@ Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void) -//----------------------------------------------------------------------------- + void PresenterCustomSprite::ThrowIfDisposed (void) throw (css::lang::DisposedException) diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 162ca5539a38..f1ae9f7994c8 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -253,7 +253,7 @@ void SAL_CALL PresenterPreviewCache::resume (void) -//----------------------------------------------------------------------------- + void PresenterPreviewCache::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) @@ -453,7 +453,7 @@ Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel (vo -//----------------------------------------------------------------------------- + const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage ( const sal_Int32 nSlideIndex) const diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index a8be21fed460..4f3b069f2bee 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -189,7 +189,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments) -//----------------------------------------------------------------------------- + Any PresenterTextView::GetPropertyValue (const OUString& rsPropertyName) { diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index bb3e3f528c63..938dbe36bc6c 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -170,7 +170,7 @@ awt::Size SAL_CALL SlideRenderer::calculatePreviewSize ( -//----------------------------------------------------------------------------- + BitmapEx SlideRenderer::CreatePreview ( const Reference<drawing::XDrawPage>& rxSlide, diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 2093c96a27e7..006919aae283 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -289,7 +289,7 @@ void ShowWindow::GetFocus() Window::GetFocus(); } -// ----------------------------------------------------------------------------- + void ShowWindow::LoseFocus() { @@ -299,21 +299,21 @@ void ShowWindow::LoseFocus() TerminateShow(); } -// ----------------------------------------------------------------------------- + void ShowWindow::Resize() { ::sd::Window::Resize(); } -// ----------------------------------------------------------------------------- + void ShowWindow::Move() { ::sd::Window::Move(); } -// ----------------------------------------------------------------------------- + bool ShowWindow::SetEndMode() { @@ -336,7 +336,7 @@ bool ShowWindow::SetEndMode() return( SHOWWINDOWMODE_END == meShowWindowMode ); } -// ----------------------------------------------------------------------------- + bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo ) { @@ -376,7 +376,7 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout return( SHOWWINDOWMODE_PAUSE == meShowWindowMode ); } -// ----------------------------------------------------------------------------- + bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ) { @@ -400,14 +400,14 @@ bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan return( SHOWWINDOWMODE_BLANK == meShowWindowMode ); } -// ----------------------------------------------------------------------------- + void ShowWindow::SetPreviewMode() { meShowWindowMode = SHOWWINDOWMODE_PREVIEW; } -// ----------------------------------------------------------------------------- + void ShowWindow::TerminateShow() { @@ -435,14 +435,14 @@ void ShowWindow::TerminateShow() mnRestartPageIndex = PAGE_NO_END; } -// ----------------------------------------------------------------------------- + void ShowWindow::RestartShow() { RestartShow( mnRestartPageIndex ); } -// ----------------------------------------------------------------------------- + void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) @@ -486,7 +486,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) } } -// ----------------------------------------------------------------------------- + void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) { @@ -561,7 +561,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) } } -// ----------------------------------------------------------------------------- + void ShowWindow::DrawEndScene() { @@ -581,14 +581,14 @@ void ShowWindow::DrawEndScene() SetFont( aOldFont ); } -// ----------------------------------------------------------------------------- + void ShowWindow::DrawBlankScene() { // just blank through background color => nothing to be done here } -// ----------------------------------------------------------------------------- + IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer ) { diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 6795f92e8fb4..8f3f757bb182 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -102,7 +102,7 @@ namespace { ////////////////////////////////////////////////////////////////////////////// -// -------------------------------------------------------------------- + const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() { @@ -130,9 +130,9 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() return aPresentationPropertyMap_Impl; } -// -------------------------------------------------------------------- + // class SlideShow -// -------------------------------------------------------------------- + SlideShow::SlideShow( SdDrawDocument* pDoc ) : SlideshowBase( m_aMutex ) @@ -146,7 +146,7 @@ SlideShow::SlideShow( SdDrawDocument* pDoc ) { } -// -------------------------------------------------------------------- + void SlideShow::ThrowIfDisposed() throw (RuntimeException) { @@ -154,7 +154,7 @@ void SlideShow::ThrowIfDisposed() throw (RuntimeException) throw DisposedException(); } -// -------------------------------------------------------------------- + /// used by the model to create a slideshow for it rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc ) @@ -162,7 +162,7 @@ rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc ) return new SlideShow( pDoc ); } -// -------------------------------------------------------------------- + rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) { @@ -174,7 +174,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) return xRet; } -// -------------------------------------------------------------------- + rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument& rDocument ) { @@ -182,14 +182,14 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument& rDocument ) dynamic_cast< SlideShow* >( rDocument.getPresentation().get() ) ); } -// -------------------------------------------------------------------- + rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) { return GetSlideShow( rBase.GetDocument() ); } -// -------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SlideShow::GetSlideShowController(ViewShellBase& rBase ) { @@ -202,7 +202,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) return xRet; } -// -------------------------------------------------------------------- + bool SlideShow::StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, @@ -216,7 +216,7 @@ bool SlideShow::StartPreview( ViewShellBase& rBase, return false; } -// -------------------------------------------------------------------- + void SlideShow::Stop( ViewShellBase& rBase ) { @@ -225,7 +225,7 @@ void SlideShow::Stop( ViewShellBase& rBase ) xSlideShow->end(); } -// -------------------------------------------------------------------- + bool SlideShow::IsRunning( ViewShellBase& rBase ) { @@ -233,7 +233,7 @@ bool SlideShow::IsRunning( ViewShellBase& rBase ) return xSlideShow.is() && xSlideShow->isRunning(); } -// -------------------------------------------------------------------- + bool SlideShow::IsRunning( ViewShell& rViewShell ) { @@ -241,7 +241,7 @@ bool SlideShow::IsRunning( ViewShell& rViewShell ) return xSlideShow.is() && xSlideShow->isRunning() && (xSlideShow->mxController->getViewShell() == &rViewShell); } -// -------------------------------------------------------------------- + void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ) { @@ -561,7 +561,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const mpDoc->SetChanged( true ); } -// -------------------------------------------------------------------- + Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -629,33 +629,33 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U } } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// -------------------------------------------------------------------- + // XPresentation -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::start() throw(RuntimeException) { @@ -663,7 +663,7 @@ void SAL_CALL SlideShow::start() throw(RuntimeException) startWithArguments( aArguments ); } -// -------------------------------------------------------------------- + WorkWindow *SlideShow::GetWorkWindow() { @@ -820,7 +820,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException) { @@ -830,9 +830,9 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException) startWithArguments( aArguments ); } -// -------------------------------------------------------------------- + // XPresentation2 -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rArguments ) throw (RuntimeException) { @@ -895,7 +895,7 @@ void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rA } -// -------------------------------------------------------------------- + ::sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException) { @@ -903,7 +903,7 @@ void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rA return mxController.is() && mxController->isRunning(); } -// -------------------------------------------------------------------- + Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (RuntimeException) { @@ -913,9 +913,9 @@ Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (R return xController; } -// -------------------------------------------------------------------- + // XComponent -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::disposing (void) { @@ -938,7 +938,7 @@ void SAL_CALL SlideShow::disposing (void) mpDoc = 0; } -// --------------------------------------------------------- + bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, ::Window* pParent ) { @@ -965,21 +965,21 @@ bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Ref return true; } -// --------------------------------------------------------- + ShowWindow* SlideShow::getShowWindow() { return mxController.is() ? mxController->mpShowWindow : 0; } -// --------------------------------------------------------- + int SlideShow::getAnimationMode() { return mxController.is() ? mxController->meAnimationMode : ANIMATIONMODE_SHOW; } -// --------------------------------------------------------- + void SlideShow::jumpToPageIndex( sal_Int32 nPageIndex ) { @@ -987,7 +987,7 @@ void SlideShow::jumpToPageIndex( sal_Int32 nPageIndex ) mxController->displaySlideIndex( nPageIndex ); } -// --------------------------------------------------------- + void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber ) { @@ -995,14 +995,14 @@ void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber ) mxController->displaySlideNumber( nPageNumber ); } -// --------------------------------------------------------- + sal_Int32 SlideShow::getCurrentPageNumber() { return mxController.is() ? mxController->getCurrentSlideNumber() : 0; } -// --------------------------------------------------------- + void SlideShow::jumpToBookmark( const OUString& sBookmark ) { @@ -1010,14 +1010,14 @@ void SlideShow::jumpToBookmark( const OUString& sBookmark ) mxController->jumpToBookmark( sBookmark ); } -// --------------------------------------------------------- + bool SlideShow::isFullScreen() { return mxController.is() ? mxController->maPresSettings.mbFullScreen : false; } -// --------------------------------------------------------- + void SlideShow::resize( const Size &rSize ) { @@ -1025,7 +1025,7 @@ void SlideShow::resize( const Size &rSize ) mxController->resize( rSize ); } -// --------------------------------------------------------- + void SlideShow::activate( ViewShellBase& rBase ) { @@ -1058,21 +1058,21 @@ void SlideShow::activate( ViewShellBase& rBase ) } -// --------------------------------------------------------- + void SlideShow::deactivate( ViewShellBase& /*rBase*/ ) { mxController->deactivate(); } -// --------------------------------------------------------- + bool SlideShow::keyInput(const KeyEvent& rKEvt) { return mxController.is() ? mxController->keyInput(rKEvt) : false; } -// --------------------------------------------------------- + void SlideShow::paint( const Rectangle& rRect ) { @@ -1080,14 +1080,14 @@ void SlideShow::paint( const Rectangle& rRect ) mxController->paint( rRect ); } -// --------------------------------------------------------- + bool SlideShow::isAlwaysOnTop() { return mxController.is() ? mxController->maPresSettings.mbAlwaysOnTop : false; } -// --------------------------------------------------------- + bool SlideShow::pause( bool bPause ) { @@ -1101,7 +1101,7 @@ bool SlideShow::pause( bool bPause ) return true; } -// --------------------------------------------------------- + void SlideShow::receiveRequest(SfxRequest& rReq) { @@ -1109,35 +1109,35 @@ void SlideShow::receiveRequest(SfxRequest& rReq) mxController->receiveRequest( rReq ); } -// --------------------------------------------------------- + sal_Int32 SlideShow::getFirstPageNumber() { return mxController.is() ? mxController->getFirstSlideNumber() : 0; } -// --------------------------------------------------------- + sal_Int32 SlideShow::getLastPageNumber() { return mxController.is() ? mxController->getLastSlideNumber() : 0; } -// --------------------------------------------------------- + bool SlideShow::isEndless() { return mxController.is() ? mxController->isEndless() : false; } -// --------------------------------------------------------- + bool SlideShow::isDrawingPossible() { return mxController.is() ? mxController->getUsePen() : false; } -// --------------------------------------------------------- + void SlideShow::StartInPlacePresentationConfigurationCallback() { @@ -1147,7 +1147,7 @@ void SlideShow::StartInPlacePresentationConfigurationCallback() mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) ); } -// --------------------------------------------------------- + IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) { @@ -1156,7 +1156,7 @@ IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) return 0; } -// --------------------------------------------------------- + void SlideShow::StartInPlacePresentation() { @@ -1227,7 +1227,7 @@ void SlideShow::StartInPlacePresentation() } } -// --------------------------------------------------------- + void SlideShow::StartFullscreenPresentation( ) { @@ -1274,7 +1274,7 @@ void SlideShow::StartFullscreenPresentation( ) } } -// --------------------------------------------------------- + /// convert configuration setting display concept to real screens sal_Int32 SlideShow::GetDisplay() @@ -1297,7 +1297,7 @@ sal_Int32 SlideShow::GetDisplay() return nDisplay; } -// --------------------------------------------------------- + bool SlideShow::dependsOn( ViewShellBase* pViewShellBase ) @@ -1305,13 +1305,13 @@ bool SlideShow::dependsOn( ViewShellBase* pViewShellBase ) return mxController.is() && (pViewShellBase == mpCurrentViewShellBase) && mpFullScreenViewShellBase; } -// --------------------------------------------------------- + Reference< presentation::XPresentation2 > CreatePresentation( const SdDrawDocument& rDocument ) { return Reference< presentation::XPresentation2 >( SlideShow::Create( const_cast< SdDrawDocument* >( &rDocument ) ).get() ); } -// --------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index d04c43228261..eee338483171 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -915,7 +915,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) mbRehearseTimings = pPresSettings->mbRehearseTimings; } - // --- + OUString aPresSlide( maPresSettings.maPresPage ); SdPage* pStartPage = mpViewShell->GetActualPage(); @@ -1229,7 +1229,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException) { @@ -1237,7 +1237,7 @@ void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowLi mxListenerProxy->addSlideShowListener( xListener ); } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException) { @@ -1245,7 +1245,7 @@ void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideSho mxListenerProxy->removeSlideShowListener( xListener ); } -// --------------------------------------------------------- + void SlideshowImpl::slideEnded(const bool bReverse) { @@ -1255,7 +1255,7 @@ void SlideshowImpl::slideEnded(const bool bReverse) gotoNextSlide(); } -// --------------------------------------------------------- + void SlideshowImpl::removeShapeEvents() { @@ -1283,7 +1283,7 @@ void SlideshowImpl::removeShapeEvents() } } -// --------------------------------------------------------- + void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) { @@ -1318,7 +1318,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) } } -// --------------------------------------------------------- + void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Exception ) { @@ -1396,7 +1396,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( } } -// --------------------------------------------------------- + void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) { @@ -1427,7 +1427,7 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) } } -// --------------------------------------------------------- + void SlideshowImpl::endPresentation() { @@ -1442,7 +1442,7 @@ void SlideshowImpl::endPresentation() mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) ); } -// --------------------------------------------------------- + IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) { @@ -1453,7 +1453,7 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) return 0; } -// --------------------------------------------------------- + void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) { @@ -1481,7 +1481,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) } } -// --------------------------------------------------------- + void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) { @@ -1520,7 +1520,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) #endif } -// --------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException) { @@ -1528,7 +1528,7 @@ sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException) return mbIsPaused; } -// --------------------------------------------------------- + void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException) { @@ -1543,9 +1543,9 @@ void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeExcep } } -// --------------------------------------------------------- + // XShapeEventListener -// --------------------------------------------------------- + void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& /* aOriginalEvent */ ) { @@ -1665,7 +1665,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: } } -// --------------------------------------------------------- + sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark ) { @@ -1691,7 +1691,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark return ( nPgNum - 1) >> 1; } -// --------------------------------------------------------- + void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { @@ -1709,7 +1709,7 @@ void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (Runtim mpDocSh->OpenBookmark( aBookmark ); } -// --------------------------------------------------------- + void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber ) { @@ -1722,7 +1722,7 @@ void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber ) } } -// --------------------------------------------------------- + /** nSlideIndex == -1 displays current slide again */ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex ) @@ -1736,7 +1736,7 @@ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex ) } } -// --------------------------------------------------------- + void SlideshowImpl::jumpToBookmark( const OUString& sBookmark ) { @@ -1745,14 +1745,14 @@ void SlideshowImpl::jumpToBookmark( const OUString& sBookmark ) displaySlideNumber( nSlideNumber ); } -// --------------------------------------------------------- + sal_Int32 SlideshowImpl::getCurrentSlideNumber() { return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1; } -// --------------------------------------------------------- + sal_Int32 SlideshowImpl::getFirstSlideNumber() { @@ -1775,7 +1775,7 @@ sal_Int32 SlideshowImpl::getFirstSlideNumber() return nRet; } -// --------------------------------------------------------- + sal_Int32 SlideshowImpl::getLastSlideNumber() { @@ -1798,7 +1798,7 @@ sal_Int32 SlideshowImpl::getLastSlideNumber() return nRet; } -// --------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException ) { @@ -1806,7 +1806,7 @@ sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException ) return maPresSettings.mbEndless; } -// --------------------------------------------------------- + double SlideshowImpl::update() { @@ -1814,7 +1814,7 @@ double SlideshowImpl::update() return -1; } -// --------------------------------------------------------- + void SlideshowImpl::startUpdateTimer() { @@ -1823,7 +1823,7 @@ void SlideshowImpl::startUpdateTimer() maUpdateTimer.Start(); } -// --------------------------------------------------------- + /** this timer is called 20ms after a new slide was displayed. This is used to unfreeze user input that was disabled after @@ -1835,7 +1835,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl) return 0; } -// --------------------------------------------------------- + /** if I catch someone someday who calls this method by hand and not by using the timer, I will personaly punish this @@ -1938,7 +1938,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) return 0; } -// --------------------------------------------------------- + bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) { @@ -2145,7 +2145,7 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent ) return 0; } -// --------------------------------------------------------- + void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) { @@ -2156,7 +2156,7 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) } } -// --------------------------------------------------------- + IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) { @@ -2292,7 +2292,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) return 0; } -// --------------------------------------------------------- + IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) { @@ -2448,7 +2448,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) return 0; } -// --------------------------------------------------------- + Reference< XSlideShow > SlideshowImpl::createSlideShow() const { @@ -2474,7 +2474,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const return xShow; } -// --------------------------------------------------------- + void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { @@ -2564,7 +2564,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) } } -// --------------------------------------------------------- + typedef sal_uInt16 (*FncGetChildWindowId)(); @@ -2612,7 +2612,7 @@ void SlideshowImpl::hideChildWindows() } } -// --------------------------------------------------------- + void SlideshowImpl::showChildWindows() { @@ -2632,28 +2632,28 @@ void SlideshowImpl::showChildWindows() } } -// --------------------------------------------------------- + SfxViewFrame* SlideshowImpl::getViewFrame() const { return mpViewShell ? mpViewShell->GetViewFrame() : 0; } -// --------------------------------------------------------- + SfxDispatcher* SlideshowImpl::getDispatcher() const { return (mpViewShell && mpViewShell->GetViewFrame()) ? mpViewShell->GetViewFrame()->GetDispatcher() : 0; } -// --------------------------------------------------------- + SfxBindings* SlideshowImpl::getBindings() const { return (mpViewShell && mpViewShell->GetViewFrame()) ? &mpViewShell->GetViewFrame()->GetBindings() : 0; } -// --------------------------------------------------------- + void SlideshowImpl::resize( const Size& rSize ) { @@ -2681,7 +2681,7 @@ void SlideshowImpl::resize( const Size& rSize ) } } -// ----------------------------------------------------------------------------- + void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) { @@ -2715,7 +2715,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) } } -// ----------------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::activate() throw (RuntimeException) { @@ -2756,7 +2756,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException) } } -// ----------------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException) { @@ -2768,7 +2768,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException) } } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) { @@ -2792,7 +2792,7 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) return 0; } -// --------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException) { @@ -2800,7 +2800,7 @@ sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException) return mbActive; } -// ----------------------------------------------------------------------------- + void SlideshowImpl::receiveRequest(SfxRequest& rReq) { @@ -2854,7 +2854,7 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq) } } -// --------------------------------------------------------- + void SlideshowImpl::setAutoSaveState( bool bOn) { @@ -2880,7 +2880,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn) } } -// --------------------------------------------------------- + Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException) { @@ -2897,7 +2897,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE return xSlide; } -// --------------------------------------------------------- + sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException) { @@ -2913,23 +2913,23 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException) } } -// --------------------------------------------------------- + sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException) { return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1; } -// -------------------------------------------------------------------- + // ::com::sun::star::presentation::XSlideShowController: -// -------------------------------------------------------------------- + ::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException) { return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0; } -// -------------------------------------------------------------------- + Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException) { @@ -2945,7 +2945,7 @@ sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException) return maPresSettings.mbAlwaysOnTop; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException) { @@ -2957,7 +2957,7 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx } } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException) { @@ -2965,7 +2965,7 @@ sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException) return maPresSettings.mbFullScreen; } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException) { @@ -2973,7 +2973,7 @@ sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException) return maPresSettings.mbMouseVisible; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException) { @@ -2986,7 +2986,7 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime } } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException) { @@ -2994,7 +2994,7 @@ sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException) return mbUsePen; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException) { @@ -3037,7 +3037,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc } } -// -------------------------------------------------------------------- + double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException) { @@ -3045,7 +3045,7 @@ double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException) return mdUserPaintStrokeWidth; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException) { @@ -3054,7 +3054,7 @@ void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeEx setUsePen( true ); // enable pen mode, update color and width } -// -------------------------------------------------------------------- + sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException) { @@ -3062,7 +3062,7 @@ sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException) return mnUserPaintColor; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException) { @@ -3071,13 +3071,13 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeExcep setUsePen( true ); // enable pen mode, update color } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setUseEraser( ::sal_Bool /*_usepen*/ ) throw (css::uno::RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException) { @@ -3086,7 +3086,7 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (css::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -3105,7 +3105,7 @@ void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (cs } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -3123,7 +3123,7 @@ void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometr "exception caught: " << comphelper::anyToString( cppu::getCaughtException() )); } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException) { @@ -3153,9 +3153,9 @@ void SAL_CALL SlideshowImpl::setEraserMode( bool /*bSwitchEraserMode*/ ) throw ( { } -// -------------------------------------------------------------------- + // XSlideShowController Methods -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException) { @@ -3163,7 +3163,7 @@ sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException) return mxShow.is(); } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException) { @@ -3191,7 +3191,7 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException) { @@ -3215,7 +3215,7 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException) { @@ -3238,7 +3238,7 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) { @@ -3311,7 +3311,7 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException) { @@ -3367,7 +3367,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException) { @@ -3393,7 +3393,7 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException) { @@ -3407,7 +3407,7 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru displaySlideNumber( nSlideNumber ); } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) throw(IllegalArgumentException, RuntimeException) @@ -3430,7 +3430,7 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException) { @@ -3442,7 +3442,7 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx displaySlideIndex( nIndex ); } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) { @@ -3467,44 +3467,44 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + // XIndexAccess -// -------------------------------------------------------------------- + ::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (::com::sun::star::uno::RuntimeException) { return getSlideCount(); } -// -------------------------------------------------------------------- + ::com::sun::star::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return Any( getSlideByIndex( Index ) ); } -// -------------------------------------------------------------------- + ::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (::com::sun::star::uno::RuntimeException) { return cppu::UnoType<XDrawPage>::get(); } -// -------------------------------------------------------------------- + ::sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (::com::sun::star::uno::RuntimeException) { return getSlideCount() != 0; } -// -------------------------------------------------------------------- + Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException) { return mxShow; } -// -------------------------------------------------------------------- + PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r ) @@ -3631,9 +3631,9 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const //////////////////////////////// -// --------------------------------------------------------- + // XAnimationListener -// --------------------------------------------------------- + SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow ) : maListeners( m_aMutex ) @@ -3642,13 +3642,13 @@ SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowI { } -// --------------------------------------------------------- + SlideShowListenerProxy::~SlideShowListenerProxy() { } -// --------------------------------------------------------- + void SlideShowListenerProxy::addAsSlideShowListener() { @@ -3659,7 +3659,7 @@ void SlideShowListenerProxy::addAsSlideShowListener() } } -// --------------------------------------------------------- + void SlideShowListenerProxy::removeAsSlideShowListener() { @@ -3670,7 +3670,7 @@ void SlideShowListenerProxy::removeAsSlideShowListener() } } -// --------------------------------------------------------- + void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ) { @@ -3681,7 +3681,7 @@ void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< c } } -// --------------------------------------------------------- + void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ) { @@ -3692,21 +3692,21 @@ void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference } } -// --------------------------------------------------------- + void SlideShowListenerProxy::addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& xListener ) { maListeners.addInterface(xListener); } -// --------------------------------------------------------- + void SlideShowListenerProxy::removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& xListener ) { maListeners.removeInterface(xListener); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException) { @@ -3716,7 +3716,7 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNod maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::beginEvent, _1, boost::cref(xNode) )); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException) { @@ -3726,7 +3726,7 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::endEvent, _1, boost::cref(xNode) )); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException) { @@ -3736,9 +3736,9 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::repeat, _1, boost::cref(xNode), boost::cref(nRepeat) )); } -// --------------------------------------------------------- + // ::com::sun::star::presentation::XSlideShowListener: -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3748,7 +3748,7 @@ void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::R maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::paused ) ); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3758,7 +3758,7 @@ void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno:: maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::resumed ) ); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException) { @@ -3768,7 +3768,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionStarted ) ); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3778,7 +3778,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun: maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionEnded ) ); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3788,7 +3788,7 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideAnimationsEnded ) ); } -// --------------------------------------------------------- + void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException) { @@ -3807,7 +3807,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti } } -// --------------------------------------------------------- + void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { @@ -3825,9 +3825,9 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro } } -// --------------------------------------------------------- + // XEventListener -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::EventObject& aDisposeEvent ) throw (RuntimeException) { @@ -3836,9 +3836,9 @@ void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::E mxSlideShow.clear(); } -// --------------------------------------------------------- + // XShapeEventListener -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException) { diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 45c9b2b1aa27..2eed17d46b69 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -314,7 +314,7 @@ void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeExcept SolarMutexGuard aSolarGuard; // fill the bounds rectangle in black - // ---------------------------------- + const Size aWindowSize( mrOutputWindow.GetSizePixel() ); diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 9961a19959bf..2fe886e84d45 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1270,7 +1270,7 @@ void SlotManager::NotifyEditModeChange (void) -//----------------------------------------------------------------------------- + namespace { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 5d9512156f3c..634638fcf6a1 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -599,7 +599,7 @@ void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) -//----------------------------------------------------------------------------- + void SlideSorterService::Resize (void) { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 9a02cf4f59c2..45ae4beae044 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -76,7 +76,7 @@ static const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) - (nPreview static const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewRows - 1); -// -------------------------------------------------------------------- + static const OUString* getPropertyNames() { @@ -91,7 +91,7 @@ static const OUString* getPropertyNames() }; return &gPropNames[0]; } -// -------------------------------------------------------------------- + TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal ) : mrBase(rBase) @@ -143,14 +143,14 @@ TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBas updateControls(); } -// -------------------------------------------------------------------- + TableDesignWidget::~TableDesignWidget() { removeListener(); } -// -------------------------------------------------------------------- + static SfxBindings* getBindings( ViewShellBase& rBase ) { @@ -160,7 +160,7 @@ static SfxBindings* getBindings( ViewShellBase& rBase ) return 0; } -// -------------------------------------------------------------------- + static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) { @@ -170,7 +170,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) return 0; } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl) { @@ -180,7 +180,7 @@ IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl) return 0; } -// -------------------------------------------------------------------- + void TableDesignWidget::ApplyStyle() { @@ -231,7 +231,7 @@ void TableDesignWidget::ApplyStyle() } } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl) { @@ -244,7 +244,7 @@ IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl) return 0; } -// -------------------------------------------------------------------- + void TableDesignWidget::ApplyOptions() { @@ -282,7 +282,7 @@ void TableDesignWidget::ApplyOptions() } } -// -------------------------------------------------------------------- + void TableDesignWidget::onSelectionChanged() { @@ -326,7 +326,7 @@ void TableDesignWidget::onSelectionChanged() } } -// -------------------------------------------------------------------- + void TableValueSet::Resize() { @@ -396,7 +396,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeTableValueSet(::Window *p return new TableValueSet(pParent, nWinStyle); } -// -------------------------------------------------------------------- + void TableDesignWidget::updateControls() { @@ -451,7 +451,7 @@ void TableDesignWidget::updateControls() m_pValueSet->SelectItem( nSelection ); } -// -------------------------------------------------------------------- + void TableDesignWidget::addListener() { @@ -465,7 +465,7 @@ void TableDesignWidget::addListener() | tools::EventMultiplexerEvent::EID_DISPOSING); } -// -------------------------------------------------------------------- + void TableDesignWidget::removeListener() { @@ -473,7 +473,7 @@ void TableDesignWidget::removeListener() mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); } -// -------------------------------------------------------------------- + IMPL_LINK(TableDesignWidget,EventMultiplexerListener, tools::EventMultiplexerEvent*,pEvent) @@ -498,7 +498,7 @@ IMPL_LINK(TableDesignWidget,EventMultiplexerListener, return 0; } -// -------------------------------------------------------------------- + struct CellInfo { @@ -535,7 +535,7 @@ CellInfo::CellInfo( const Reference< XStyle >& xStyle ) } } -// -------------------------------------------------------------------- + typedef std::vector< boost::shared_ptr< CellInfo > > CellInfoVector; typedef boost::shared_ptr< CellInfo > CellInfoMatrix[nPreviewColumns][nPreviewRows]; @@ -558,7 +558,7 @@ struct TableStyleSettings , mbUseColumnBanding(false) {} }; -// -------------------------------------------------------------------- + static void FillCellInfoVector( const Reference< XIndexAccess >& xTableStyle, CellInfoVector& rVector ) { @@ -655,7 +655,7 @@ static void FillCellInfoMatrix( const CellInfoVector& rStyle, const TableStyleSe } } -// -------------------------------------------------------------------- + const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark ) { diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 7df51bef77ae..bb8482cb0351 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -220,7 +220,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) } } -// -------------------------------------------------------------------- + void DrawViewShell::GetTableMenuState( SfxItemSet &rSet ) { @@ -244,7 +244,7 @@ void DrawViewShell::GetTableMenuState( SfxItemSet &rSet ) } } -// -------------------------------------------------------------------- + void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ) { diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 21d44e705888..ff48ace15463 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -71,19 +71,19 @@ void RegisterInterfaces(SfxModule* pMod) TableObjectBar::RegisterInterface(pMod); } -// ------------------ + // - TableObjectBar - -// ------------------ + TYPEINIT1( TableObjectBar, SfxShell ); -// ----------------------------------------------------------------------------- + SFX_IMPL_INTERFACE( TableObjectBar, SfxShell, SdResId( STR_TABLEOBJECTBARSHELL ) ) { } -// ----------------------------------------------------------------------------- + TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell( pSdViewShell->GetViewShell() ) @@ -102,14 +102,14 @@ TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Table)); } -// ----------------------------------------------------------------------------- + TableObjectBar::~TableObjectBar() { SetRepeatTarget( NULL ); } -// ----------------------------------------------------------------------------- + void TableObjectBar::GetState( SfxItemSet& rSet ) { @@ -130,7 +130,7 @@ void TableObjectBar::GetState( SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------------- + void TableObjectBar::GetAttrState( SfxItemSet& rSet ) { @@ -139,7 +139,7 @@ void TableObjectBar::GetAttrState( SfxItemSet& rSet ) pDrawViewShell->GetAttrState( rSet ); } -// ----------------------------------------------------------------------------- + void TableObjectBar::Execute( SfxRequest& rReq ) { diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index defe3f2b5939..f16f2439cb77 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -187,7 +187,7 @@ void SAL_CALL PropertySet::removeVetoableChangeListener ( -//----------------------------------------------------------------------------- + void PropertySet::CallListeners ( const OUString& rsPropertyName, diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 4068a5182293..99591d1fd5a7 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -931,7 +931,7 @@ void DrawController::getFastPropertyValue ( -//----------------------------------------------------------------------------- + void DrawController::ProvideFrameworkControllers (void) { diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 39e2956b9763..71dd63b77eb8 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -271,7 +271,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) return bOk; } -//---------------------------------------------------------------------- + Any SAL_CALL SdUnoDrawView::getSelection() throw(RuntimeException) @@ -486,7 +486,7 @@ void SAL_CALL SdUnoDrawView::setCurrentPage ( } } -//---------------------------------------------------------------------- + Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() throw(RuntimeException) diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index b77e26de2b14..9d8253e06aa5 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -200,7 +200,7 @@ using namespace ::sd::sidebar; -// ---------------------------------------------------------------------------- + // Declaration and initialization of a map from service names to locally // unique factory identifiers. diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 45221ce0fc48..4a54b13ee4d2 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -152,7 +152,7 @@ private: Reference< XAnimate > mxFirstNode; }; -// -------------------------------------------------------------------- + SD_DLLPUBLIC Reference< XInterface > RandomAnimationNode_createInstance( sal_Int16 nPresetClass ) { @@ -160,7 +160,7 @@ SD_DLLPUBLIC Reference< XInterface > RandomAnimationNode_createInstance( sal_Int return xInt; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL RandomNode_createInstance( const Reference< XMultiServiceFactory > & ) { @@ -168,14 +168,14 @@ Reference< XInterface > SAL_CALL RandomNode_createInstance( const Reference< XMu return xInt; } -// -------------------------------------------------------------------- + OUString RandomNode__getImplementationName() throw( RuntimeException ) { return OUString( "sd::RandomAnimationNode" ) ; } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( RuntimeException ) { @@ -185,7 +185,7 @@ Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( Runti return aSeq; } -// -------------------------------------------------------------------- + RandomAnimationNode::RandomAnimationNode( const RandomAnimationNode& rNode ) : RandomAnimationNodeBase(), @@ -208,7 +208,7 @@ RandomAnimationNode::RandomAnimationNode( const RandomAnimationNode& rNode ) { } -// -------------------------------------------------------------------- + RandomAnimationNode::RandomAnimationNode( sal_Int16 nPresetClass ) { @@ -232,7 +232,7 @@ void RandomAnimationNode::init( sal_Int16 nPresetClass ) mbAutoReverse = sal_False; } -// -------------------------------------------------------------------- + // XInitialization void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) @@ -254,7 +254,7 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments maTarget = aArguments[0]; } -// -------------------------------------------------------------------- + // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException) @@ -263,7 +263,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException) return ::com::sun::star::animations::AnimationNodeType::PAR; } -// -------------------------------------------------------------------- + // XAnimationNode Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException) @@ -272,7 +272,7 @@ Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException) return maBegin; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeException) @@ -281,7 +281,7 @@ void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeE maBegin = _begin; } -// -------------------------------------------------------------------- + // XAnimationNode Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException) @@ -290,7 +290,7 @@ Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException) return maDuration; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (RuntimeException) @@ -299,7 +299,7 @@ void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (Ru maDuration = _duration; } -// -------------------------------------------------------------------- + // XAnimationNode Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException) @@ -308,7 +308,7 @@ Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException) return maEnd; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeException) @@ -317,7 +317,7 @@ void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeExcep maEnd = _end; } -// -------------------------------------------------------------------- + // XAnimationNode Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException) @@ -326,7 +326,7 @@ Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException) return maEndSync; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException) @@ -335,7 +335,7 @@ void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (Runt maEndSync = _endsync; } -// -------------------------------------------------------------------- + // XAnimationNode Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException) @@ -344,7 +344,7 @@ Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException) return maRepeatCount; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException) @@ -353,7 +353,7 @@ void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) thr maRepeatCount = _repeatcount; } -// -------------------------------------------------------------------- + // XAnimationNode Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException) @@ -362,7 +362,7 @@ Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException) return maRepeatDuration; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException) @@ -371,7 +371,7 @@ void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration maRepeatDuration = _repeatduration; } -// -------------------------------------------------------------------- + // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException) @@ -380,7 +380,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException) return mnFill; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException) @@ -389,7 +389,7 @@ void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeExce mnFill = _fill; } -// -------------------------------------------------------------------- + // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException) @@ -398,7 +398,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException return mnFillDefault; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException) @@ -407,7 +407,7 @@ void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) thro mnFillDefault = _filldefault; } -// -------------------------------------------------------------------- + // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException) @@ -416,7 +416,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException) return mnRestart; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException) @@ -425,7 +425,7 @@ void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (Runti mnRestart = _restart; } -// -------------------------------------------------------------------- + // XAnimationNode sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeException) @@ -434,7 +434,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeExcept return mnRestartDefault; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException) @@ -443,7 +443,7 @@ void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault mnRestartDefault = _restartdefault; } -// -------------------------------------------------------------------- + // XAnimationNode double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException) @@ -452,7 +452,7 @@ double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException) return mfAcceleration; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException) @@ -461,7 +461,7 @@ void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw mfAcceleration = _acceleration; } -// -------------------------------------------------------------------- + // XAnimationNode double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException) @@ -470,7 +470,7 @@ double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException) return mfDecelerate; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException) @@ -479,7 +479,7 @@ void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (Ru mfDecelerate = _decelerate; } -// -------------------------------------------------------------------- + // XAnimationNode sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException) @@ -488,7 +488,7 @@ sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException) return mbAutoReverse; } -// -------------------------------------------------------------------- + // XAnimationNode void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException) @@ -497,7 +497,7 @@ void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw mbAutoReverse = _autoreverse; } -// -------------------------------------------------------------------- + Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (RuntimeException) { @@ -505,7 +505,7 @@ Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (Runtim return maUserData; } -// -------------------------------------------------------------------- + void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException) { @@ -513,7 +513,7 @@ void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _u maUserData = _userdata; } -// -------------------------------------------------------------------- + // XChild Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (RuntimeException) @@ -522,7 +522,7 @@ Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (Runtime return mxParent; } -// -------------------------------------------------------------------- + // XChild void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException) @@ -531,7 +531,7 @@ void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Par mxParent = Parent; } -// -------------------------------------------------------------------- + // XCloneable Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (RuntimeException) @@ -540,7 +540,7 @@ Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (Runti return xNewNode; } -// -------------------------------------------------------------------- + // XElementAccess Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException) @@ -548,7 +548,7 @@ Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException) return ::getCppuType((const Reference< XAnimationNode >*)0); } -// -------------------------------------------------------------------- + // XElementAccess sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException) @@ -556,7 +556,7 @@ sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException) return sal_True; } -// -------------------------------------------------------------------- + // XEnumerationAccess Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() @@ -602,7 +602,7 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() return xEnum; } -// -------------------------------------------------------------------- + // XTimeContainer @@ -612,7 +612,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertBefore( const Re return appendChild( newChild ); } -// -------------------------------------------------------------------- + // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) @@ -621,7 +621,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Ref return appendChild( newChild ); } -// -------------------------------------------------------------------- + // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) @@ -630,7 +630,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Re return appendChild( newChild ); } -// -------------------------------------------------------------------- + // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Reference< XAnimationNode >& oldChild ) @@ -639,7 +639,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Ref return oldChild; } -// -------------------------------------------------------------------- + // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Reference< XAnimationNode >& newChild ) diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 11dd9cf7a204..79770d7c0685 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -261,7 +261,7 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException) mpSdCustomShow = NULL; } -//---------------------------------------------------------------------- + void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw(uno::RuntimeException) { @@ -271,7 +271,7 @@ void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lan aDisposeListeners.addInterface(xListener); } -//---------------------------------------------------------------------- + void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException) { if( !bDisposing ) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 42cca8620c0d..d066bc8222ef 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1466,7 +1466,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj ) } -//---------------------------------------------------------------------- + // XServiceInfo Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() @@ -1479,7 +1479,7 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() return aSeq; } -//---------------------------------------------------------------------- + // XLinkTargetSupplier Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks( ) @@ -1488,21 +1488,21 @@ Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks( ) return new SdPageLinkTargets( (SdGenericDrawPage*)this ); } -//---------------------------------------------------------------------- + void SdGenericDrawPage::setBackground( const Any& ) throw(lang::IllegalArgumentException) { OSL_FAIL( "Don't call me, I'm useless!" ); } -//---------------------------------------------------------------------- + void SdGenericDrawPage::getBackground( Any& ) throw() { OSL_FAIL( "Don't call me, I'm useless!" ); } -//---------------------------------------------------------------------- + OUString SdGenericDrawPage::getBookmarkURL() const { @@ -1522,7 +1522,7 @@ OUString SdGenericDrawPage::getBookmarkURL() const return aRet.makeStringAndClear(); } -//---------------------------------------------------------------------- + void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) { if( SvxFmDrawPage::mpPage ) @@ -1544,7 +1544,7 @@ void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) } } -//---------------------------------------------------------------------- + Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Reference< drawing::XShapes >& xShapes ) throw( uno::RuntimeException ) { @@ -1581,7 +1581,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc return xShape; } -//---------------------------------------------------------------------- + void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGroup ) throw( uno::RuntimeException ) { @@ -1600,7 +1600,7 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro GetModel()->SetModified(); } -//---------------------------------------------------------------------- + Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< drawing::XShapes >& xShapes ) throw( uno::RuntimeException ) { @@ -1634,7 +1634,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< return xShape; } -//---------------------------------------------------------------------- + void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 64bf53da46ba..1f950457b552 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -56,19 +56,19 @@ namespace sd { -// ----------------------- + // - GraphicObjectBar - -// ----------------------- + SFX_IMPL_INTERFACE( GraphicObjectBar, SfxShell, SdResId( STR_GRAFOBJECTBARSHELL ) ) { } -// ----------------------------------------------------------------------------- + TYPEINIT1( GraphicObjectBar, SfxShell ); -// ----------------------------------------------------------------------------- + GraphicObjectBar::GraphicObjectBar ( ViewShell* pSdViewShell, @@ -87,14 +87,14 @@ GraphicObjectBar::GraphicObjectBar ( SetName( OUString( "Graphic objectbar" )); } -// ----------------------------------------------------------------------------- + GraphicObjectBar::~GraphicObjectBar() { SetRepeatTarget( NULL ); } -// ----------------------------------------------------------------------------- + void GraphicObjectBar::GetAttrState( SfxItemSet& rSet ) { @@ -102,7 +102,7 @@ void GraphicObjectBar::GetAttrState( SfxItemSet& rSet ) SvxGrafAttrHelper::GetGrafAttrState( rSet, *mpView ); } -// ----------------------------------------------------------------------------- + void GraphicObjectBar::Execute( SfxRequest& rReq ) { @@ -113,7 +113,7 @@ void GraphicObjectBar::Execute( SfxRequest& rReq ) } } -// ----------------------------------------------------------------------------- + void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) { @@ -132,7 +132,7 @@ void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) SvxGraphicFilter::DisableGraphicFilterSlots( rSet ); } -// ----------------------------------------------------------------------------- + void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq ) { diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index bdd1f807c637..90cc1e344674 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -48,19 +48,19 @@ using namespace sd; namespace sd { -// ------------------ + // - MediaObjectBar - -// ------------------ + TYPEINIT1( MediaObjectBar, SfxShell ); -// ----------------------------------------------------------------------------- + SFX_IMPL_INTERFACE( MediaObjectBar, SfxShell, SdResId( STR_MEDIAOBJECTBARSHELL ) ) { } -// ----------------------------------------------------------------------------- + MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell( pSdViewShell->GetViewShell() ), @@ -76,14 +76,14 @@ MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SetName(SD_RESSTR(RID_DRAW_MEDIA_TOOLBOX)); } -// ----------------------------------------------------------------------------- + MediaObjectBar::~MediaObjectBar() { SetRepeatTarget( NULL ); } -// ----------------------------------------------------------------------------- + void MediaObjectBar::GetState( SfxItemSet& rSet ) { @@ -121,7 +121,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------------- + void MediaObjectBar::Execute( SfxRequest& rReq ) { diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index f75d77fc8957..ccb7fab2fcf8 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -409,7 +409,7 @@ sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) -//----------------------------------------------------------------------------- + bool ViewTabBar::ActivatePage (void) { diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 3c2daa7565d7..5f0012ed50da 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -79,9 +79,9 @@ namespace sd { sal_Bool DrawViewShell::mbPipette = sal_False; -// ------------------------ + // - ScannerEventListener - -// ------------------------ + class ScannerEventListener : public ::cppu::WeakImplHelper1< lang::XEventListener > { @@ -100,13 +100,13 @@ public: void ParentDestroyed() { mpParent = NULL; } }; -// ----------------------------------------------------------------------------- + ScannerEventListener::~ScannerEventListener() { } -// ----------------------------------------------------------------------------- + void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException) { @@ -814,7 +814,7 @@ void DrawViewShell::ExecuteAnnotation (SfxRequest& rRequest) mpAnnotationManager->ExecuteAnnotation( rRequest ); } -// -------------------------------------------------------------------- + void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) { diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 5a9129d9669d..1d38edc577ff 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -354,7 +354,7 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) } } -// ----------------------------------------------------------------------------- + IMPL_LINK( DrawViewShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog ) { diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index bed8e9ed55b5..143b31ef5fe6 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -61,9 +61,9 @@ using namespace ::com::sun::star::presentation; namespace sd { -// ------------------- + // - PresentationViewShell - -// ------------------- + SFX_IMPL_INTERFACE( PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSHELL ) ) { diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index a2e25358b268..7eb729c3ffbc 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -784,7 +784,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(sal_Bool bDontDeleteReally ) return(eKind); } -// -------------------------------------------------------------------- + /** restores the default text if the given text object is currently in edit mode and no text has been entered already. Is only useful just before text edit ends. */ diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 3e8d460d7606..dc36ec97c9a2 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -70,9 +70,9 @@ namespace sd { using namespace ::com::sun::star; -// ------------------------ + // - SdNavigatorDropEvent - -// ------------------------ + struct SdNavigatorDropEvent : public ExecuteDropEvent { @@ -95,7 +95,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent {} }; -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, ::Window& ) { @@ -162,7 +162,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos ) { @@ -213,7 +213,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow ) { @@ -240,7 +240,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -// ----------------------------------------------------------------------------- + void View::UpdateSelectionClipboard( sal_Bool bForceDeselect ) { @@ -256,7 +256,7 @@ void View::UpdateSelectionClipboard( sal_Bool bForceDeselect ) } } -// ----------------------------------------------------------------------------- + void View::DoCut(::Window* ) { @@ -275,7 +275,7 @@ void View::DoCut(::Window* ) } } -// ----------------------------------------------------------------------------- + void View::DoCopy (::Window* pWindow) { @@ -290,7 +290,7 @@ void View::DoCopy (::Window* pWindow) } } -// ----------------------------------------------------------------------------- + void View::DoPaste (::Window* pWindow) { @@ -371,7 +371,7 @@ void View::DoPaste (::Window* pWindow) } } -// ----------------------------------------------------------------------------- + void View::StartDrag( const Point& rStartPos, ::Window* pWindow ) { @@ -404,7 +404,7 @@ void View::StartDrag( const Point& rStartPos, ::Window* pWindow ) } } -// ----------------------------------------------------------------------------- + void View::DragFinished( sal_Int8 nDropAction ) { @@ -468,7 +468,7 @@ void View::DragFinished( sal_Int8 nDropAction ) mpDragSrcMarkList = NULL; } -// ----------------------------------------------------------------------------- + sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window*, sal_uInt16, sal_uInt16 nLayer ) @@ -649,7 +649,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge return nRet; } -// ----------------------------------------------------------------------------- + sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) @@ -834,7 +834,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar return nRet; } -// ----------------------------------------------------------------------------- + IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEvent ) { diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 3b755f1026bc..7cf130ca4a0e 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -75,9 +75,9 @@ #include <svx/sdrhittesthelper.hxx> #include <svx/xbtmpit.hxx> -// -------------- + // - Namespaces - -// -------------- + using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 6b7ad96e73fc..7229da7458d9 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -268,7 +268,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, return pNewGrafObj; } -// ----------------------------------------------------------------------------- + SdrMediaObj* View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize, diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 84f170e862f3..73b0357431ad 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -45,29 +45,29 @@ namespace sd { -// ----------------------------------------- + // - SdTabControl::SdPageObjsTransferable - -// ----------------------------------------- + TabControl::TabControlTransferable::~TabControlTransferable() { } -// ----------------------------------------------------------------------------- + void TabControl::TabControlTransferable::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_STARDRAW_TABBAR ); } -// ----------------------------------------------------------------------------- + sal_Bool TabControl::TabControlTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& ) { return sal_False; } -// ----------------------------------------------------------------------------- + void TabControl::TabControlTransferable::DragFinished( sal_Int8 nDropAction ) { diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 6eae63a9cf6e..b456f7f24bc2 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -63,12 +63,12 @@ namespace sd { class ImageButtonHdl; -// -------------------------------------------------------------------- + static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; -// -------------------------------------------------------------------- + static BitmapEx loadImageResource( sal_uInt16 nId ) { @@ -78,7 +78,7 @@ static BitmapEx loadImageResource( sal_uInt16 nId ) return BitmapEx( aResId ); } -// -------------------------------------------------------------------- + static BitmapEx* getButtonImage( int index, bool large ) { @@ -104,7 +104,7 @@ static BitmapEx* getButtonImage( int index, bool large ) } } -// -------------------------------------------------------------------- + const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; @@ -158,7 +158,7 @@ private: sal_uLong mnTip; }; -// -------------------------------------------------------------------- + ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt ) : SmartHdl( xTag, rPnt ) @@ -169,14 +169,14 @@ ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSI { } -// -------------------------------------------------------------------- + ImageButtonHdl::~ImageButtonHdl() { HideTip(); } -// -------------------------------------------------------------------- + void ImageButtonHdl::HideTip() { @@ -187,7 +187,7 @@ void ImageButtonHdl::HideTip() } } -// -------------------------------------------------------------------- + extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); @@ -227,7 +227,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) } } -// -------------------------------------------------------------------- + void ImageButtonHdl::onMouseLeave() { @@ -236,7 +236,7 @@ void ImageButtonHdl::onMouseLeave() Touch(); } -// -------------------------------------------------------------------- + void ImageButtonHdl::CreateB2dIAObject() { @@ -281,21 +281,21 @@ void ImageButtonHdl::CreateB2dIAObject() } } -// -------------------------------------------------------------------- + sal_Bool ImageButtonHdl::IsFocusHdl() const { return false; } -// -------------------------------------------------------------------- + bool ImageButtonHdl::isMarkable() const { return false; } -// -------------------------------------------------------------------- + Pointer ImageButtonHdl::GetPointer() const { @@ -310,13 +310,13 @@ ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlace { } -// -------------------------------------------------------------------- + ChangePlaceholderTag::~ChangePlaceholderTag() { } -// -------------------------------------------------------------------- + /** returns true if the ChangePlaceholderTag handled the event. */ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHdl& rHdl ) @@ -342,7 +342,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd return false; } -// -------------------------------------------------------------------- + /** returns true if the SmartTag consumes this event. */ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) @@ -363,7 +363,7 @@ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) } } -// -------------------------------------------------------------------- + BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) { @@ -442,28 +442,28 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) } } -// -------------------------------------------------------------------- + void ChangePlaceholderTag::disposing() { SmartTag::disposing(); } -// -------------------------------------------------------------------- + void ChangePlaceholderTag::select() { SmartTag::select(); } -// -------------------------------------------------------------------- + void ChangePlaceholderTag::deselect() { SmartTag::deselect(); } -// -------------------------------------------------------------------- + ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) : mrBase( rViewShellBase ) @@ -479,7 +479,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) StartListening( *mrBase.GetDocShell() ); } -// -------------------------------------------------------------------- + ViewOverlayManager::~ViewOverlayManager() { @@ -495,7 +495,7 @@ ViewOverlayManager::~ViewOverlayManager() DisposeTags(); } -// -------------------------------------------------------------------- + void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint) { @@ -562,7 +562,7 @@ bool ViewOverlayManager::CreateTags() return bChanges; } -// -------------------------------------------------------------------- + bool ViewOverlayManager::DisposeTags() { @@ -583,7 +583,7 @@ bool ViewOverlayManager::DisposeTags() return false; } -// -------------------------------------------------------------------- + IMPL_LINK(ViewOverlayManager,EventMultiplexerListener, tools::EventMultiplexerEvent*,pEvent) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 46f60850f70f..f59f11475a52 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1122,7 +1122,7 @@ void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const } } -// ----------------------------------------------------------------------------- + void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const { @@ -1152,7 +1152,7 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const } } -// ----------------------------------------------------------------------------- + void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq) { @@ -1201,7 +1201,7 @@ void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq) rReq.Done(); } -// ----------------------------------------------------------------------------- + void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq) { @@ -1250,7 +1250,7 @@ void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq) rReq.Done(); } -// ----------------------------------------------------------------------------- + void ViewShell::ExecReq( SfxRequest& rReq ) { |